Reformatted code, first auditing developments

164 files changed, 13632 insertions, 12099 deletions

diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/annotations/HbAnnotationModelBuilder.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/annotations/HbAnnotationModelBuilder.java
index 81ad1dbca..454645d57 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/annotations/HbAnnotationModelBuilder.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/annotations/HbAnnotationModelBuilder.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEModelElement;
 import org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelFactory;
 
 /**
- * This class create the Hibernate-model versions of the various PaAnnotatedE* objects. 
+ * This class create the Hibernate-model versions of the various PaAnnotatedE* objects.
  */
 public class HbAnnotationModelBuilder extends BasicPamodelBuilder {
 
@@ -34,24 +34,25 @@ public class HbAnnotationModelBuilder extends BasicPamodelBuilder {
 		final EClass eModelElementEClass = eModelElement.eClass();
 		PAnnotatedEModelElement paElement;
 		switch (eModelElementEClass.getClassifierID()) {
-			case EcorePackage.EATTRIBUTE:
-				paElement = HbmodelFactory.eINSTANCE.createHbAnnotatedEAttribute();
-				break;
-			case EcorePackage.EREFERENCE:
-				paElement = HbmodelFactory.eINSTANCE.createHbAnnotatedEReference();
-				break;
-			case EcorePackage.ECLASS:
-				paElement = HbmodelFactory.eINSTANCE.createHbAnnotatedEClass();
-				break;
-			case EcorePackage.EPACKAGE:
-				paElement = HbmodelFactory.eINSTANCE.createHbAnnotatedEPackage();
-				break;
-			case EcorePackage.EENUM:
-			case EcorePackage.EDATA_TYPE:
-				paElement = HbmodelFactory.eINSTANCE.createHbAnnotatedEDataType();
-				break;
-			default:
-				throw new AssertionError("Trying to build HbAnnotatedEModelElement for a " + eModelElementEClass);
+		case EcorePackage.EATTRIBUTE:
+			paElement = HbmodelFactory.eINSTANCE.createHbAnnotatedEAttribute();
+			break;
+		case EcorePackage.EREFERENCE:
+			paElement = HbmodelFactory.eINSTANCE.createHbAnnotatedEReference();
+			break;
+		case EcorePackage.ECLASS:
+			paElement = HbmodelFactory.eINSTANCE.createHbAnnotatedEClass();
+			break;
+		case EcorePackage.EPACKAGE:
+			paElement = HbmodelFactory.eINSTANCE.createHbAnnotatedEPackage();
+			break;
+		case EcorePackage.EENUM:
+		case EcorePackage.EDATA_TYPE:
+			paElement = HbmodelFactory.eINSTANCE.createHbAnnotatedEDataType();
+			break;
+		default:
+			throw new AssertionError("Trying to build HbAnnotatedEModelElement for a "
+					+ eModelElementEClass);
 		}
 		paElement.setModelElement((ENamedElement) eModelElement);
 		return paElement;
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/annotations/HbAnnotationUtil.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/annotations/HbAnnotationUtil.java
index 588a78ebe..4990ec75c 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/annotations/HbAnnotationUtil.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/annotations/HbAnnotationUtil.java
@@ -39,17 +39,15 @@ public class HbAnnotationUtil {
 	protected static final Log log = LogFactory.getLog(HbAnnotationUtil.class);
 
 	/** Adds an index */
-	public static void setIndex(PAnnotatedEReference aReference,
-			AbstractAnnotator annotator, SQLNameStrategy namingStrategy) {
+	public static void setIndex(PAnnotatedEReference aReference, AbstractAnnotator annotator,
+			SQLNameStrategy namingStrategy) {
 		final String indexName;
 		if (namingStrategy instanceof ClassicSQLNameStrategy) {
-			indexName = ((ClassicSQLNameStrategy)namingStrategy).getForeignKeyIndexName(annotator, aReference);
+			indexName = ((ClassicSQLNameStrategy) namingStrategy).getForeignKeyIndexName(annotator,
+					aReference);
 		} else {
-			indexName = annotator.getPersistenceOptions()
-					.getSQLIndexNamePrefix()
-					+ annotator.getEntityName(aReference.getModelEReference()
-							.getEContainingClass())
-					+ "_"
+			indexName = annotator.getPersistenceOptions().getSQLIndexNamePrefix()
+					+ annotator.getEntityName(aReference.getModelEReference().getEContainingClass()) + "_"
 					+ aReference.getModelEReference().getName();
 		}
 		final HbAnnotatedEReference haReference = (HbAnnotatedEReference) aReference;
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/annotations/HbEAnnotationParserImporter.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/annotations/HbEAnnotationParserImporter.java
index 54516f7ae..0574d4343 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/annotations/HbEAnnotationParserImporter.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/annotations/HbEAnnotationParserImporter.java
@@ -40,12 +40,13 @@ public class HbEAnnotationParserImporter extends EAnnotationParserImporter {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.eclipse.emf.teneo.annotations.parser.EClassResolver#getEClass(java.lang.String)
+	 * @see org.eclipse.emf.teneo.annotations.parser.EClassResolver#getEClass(java. lang.String)
 	 */
 	@Override
 	public EClass getEClass(String name) {
 		if (name.startsWith(HB_PREFIX)) {
-			return (EClass) HbannotationPackage.eINSTANCE.getEClassifier(name.substring(HB_PREFIX.length()));
+			return (EClass) HbannotationPackage.eINSTANCE.getEClassifier(name.substring(HB_PREFIX
+					.length()));
 		} else {
 			final EClass eClass = super.getEClass(name);
 			if (eClass == null) {
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/annotations/HbEClassAnnotator.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/annotations/HbEClassAnnotator.java
index 73d1b8c9c..532b4e94c 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/annotations/HbEClassAnnotator.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/annotations/HbEClassAnnotator.java
@@ -44,14 +44,12 @@ public class HbEClassAnnotator extends EClassAnnotator {
 	// The logger
 	protected static final Log log = LogFactory.getLog(HbEClassAnnotator.class);
 
-	private String defaultCacheStrategy = CacheConcurrencyStrategy.NONE
-			.getName();
+	private String defaultCacheStrategy = CacheConcurrencyStrategy.NONE.getName();
 	private boolean optionSetProxy = false;
 
 	/**
-	 * Returns the annotated version of an EClass, Returns false if no efeatures
-	 * of this eclass should be annotated, true if its features can be
-	 * annotated.
+	 * Returns the annotated version of an EClass, Returns false if no efeatures of this eclass should
+	 * be annotated, true if its features can be annotated.
 	 */
 	@Override
 	protected boolean annotate(PAnnotatedEClass aClass) {
@@ -62,8 +60,7 @@ public class HbEClassAnnotator extends EClassAnnotator {
 		Class<?> concreteClass = EModelResolver.instance().getJavaClass(eclass);
 
 		// automatically add the proxy annotation
-		if ((optionSetProxy || getPersistenceOptions().isForceLazy())
-				&& hbClass.getHbProxy() == null) {
+		if ((optionSetProxy || getPersistenceOptions().isForceLazy()) && hbClass.getHbProxy() == null) {
 			// in this case use the DynamicEObjectImpl
 			if (concreteClass == null) {
 				concreteClass = DynamicEObjectImpl.class;
@@ -73,8 +70,8 @@ public class HbEClassAnnotator extends EClassAnnotator {
 				proxy.setLazy(true);
 				// interface class is set below.
 				((HbAnnotatedEClass) aClass).setHbProxy(proxy);
-				log.debug("Set proxy to true (" + proxy.getProxyClass()
-						+ ") for eclass " + aClass.getModelEClass().getName());
+				log.debug("Set proxy to true (" + proxy.getProxyClass() + ") for eclass "
+						+ aClass.getModelEClass().getName());
 			}
 		}
 
@@ -85,8 +82,7 @@ public class HbEClassAnnotator extends EClassAnnotator {
 			// set interfacename if not set
 			if (!getPersistenceOptions().isForceLazy()) {
 				final Proxy proxy = hbClass.getHbProxy();
-				final Class<?> interfaceClass = EModelResolver.instance()
-						.getJavaInterfaceClass(eclass);
+				final Class<?> interfaceClass = EModelResolver.instance().getJavaInterfaceClass(eclass);
 				if (interfaceClass != null) {
 					proxy.setProxyClass(interfaceClass.getName());
 				} else { // set the class itself
@@ -100,24 +96,18 @@ public class HbEClassAnnotator extends EClassAnnotator {
 		boolean hasCache = ((HbAnnotatedEClass) aClass).getHbCache() != null;
 
 		if (aClass.getPaSuperEntity() != null && hasCache) {
-			log.warn("EClass: "
-					+ aClass.getModelEClass().getName()
+			log.warn("EClass: " + aClass.getModelEClass().getName()
 					+ " has a cache strategy defined while it has a superclass, this strategy is ignored.");
 			return res;
 		}
 
 		if (!hasCache
-				&& defaultCacheStrategy
-						.compareToIgnoreCase(CacheConcurrencyStrategy.NONE
-								.getName()) != 0) {
-			final CacheConcurrencyStrategy ccs = CacheConcurrencyStrategy
-					.getByName(defaultCacheStrategy);
+				&& defaultCacheStrategy.compareToIgnoreCase(CacheConcurrencyStrategy.NONE.getName()) != 0) {
+			final CacheConcurrencyStrategy ccs = CacheConcurrencyStrategy.getByName(defaultCacheStrategy);
 			if (ccs == null) {
-				throw new StoreMappingException(
-						"The default cache strategy: "
-								+ defaultCacheStrategy
-								+ " is not one of the allowed values (uppercase) "
-								+ "as defined in the JPA Hibernate Annotation Extensions.");
+				throw new StoreMappingException("The default cache strategy: " + defaultCacheStrategy
+						+ " is not one of the allowed values (uppercase) "
+						+ "as defined in the JPA Hibernate Annotation Extensions.");
 			}
 
 			log.debug("Setting cache strategy " + defaultCacheStrategy + " on "
@@ -157,8 +147,7 @@ public class HbEClassAnnotator extends EClassAnnotator {
 		assert (aClass.getPaSuperEntity() == null);
 
 		// let the superclass do it
-		if (aClass.getEntity() != null
-				&& aClass.getEntity().getExtends() != null) {
+		if (aClass.getEntity() != null && aClass.getEntity().getExtends() != null) {
 			super.setSuperEntity(aClass);
 			return;
 		}
@@ -177,8 +166,7 @@ public class HbEClassAnnotator extends EClassAnnotator {
 	}
 
 	/** Compute the annotated superclass, ignore interfaces if parameterized */
-	private PAnnotatedEClass getPaSuperEntity(PAnnotatedEClass aClass,
-			boolean allowInterfaces) {
+	private PAnnotatedEClass getPaSuperEntity(PAnnotatedEClass aClass, boolean allowInterfaces) {
 		final PAnnotatedModel model = aClass.getPaModel();
 		for (EClass superEClass : aClass.getModelEClass().getESuperTypes()) {
 			final PAnnotatedEClass x = model.getPAnnotated(superEClass);
@@ -191,8 +179,7 @@ public class HbEClassAnnotator extends EClassAnnotator {
 	}
 
 	/**
-	 * Map Interface EClasses, default false, overridden by hibernate to return
-	 * true
+	 * Map Interface EClasses, default false, overridden by hibernate to return true
 	 */
 	@Override
 	protected boolean mapInterfaceEClass() {
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/annotations/HbEDataTypeAnnotator.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/annotations/HbEDataTypeAnnotator.java
index aa73555ef..967494a2d 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/annotations/HbEDataTypeAnnotator.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/annotations/HbEDataTypeAnnotator.java
@@ -49,15 +49,16 @@ public class HbEDataTypeAnnotator extends EDataTypeAnnotator {
 		}
 		final String typeClass = getCustomDataType(ped.getModelEDataType());
 		if (typeClass == null) {
-			log.debug("Not creating typedef for edatatype: " + ped.getModelEDataType().getName() +
-					" because it is natively handled by hibernate");
+			log.debug("Not creating typedef for edatatype: " + ped.getModelEDataType().getName()
+					+ " because it is natively handled by hibernate");
 			return;
 		}
 
 		// create default typedef
 		log.debug("Creating default typedef for edatatype " + hed.getModelEDataType().getName());
 		final TypeDef typeDef = HbannotationFactory.eINSTANCE.createTypeDef();
-		typeDef.setName(hed.getModelEDataType().getEPackage().getName() + "." + ped.getModelEDataType().getName());
+		typeDef.setName(hed.getModelEDataType().getEPackage().getName() + "."
+				+ ped.getModelEDataType().getName());
 		typeDef.setTypeClass(getDefaultUserType());
 		// add default parameters
 		final Parameter paramPackage = HbannotationFactory.eINSTANCE.createParameter();
@@ -76,7 +77,7 @@ public class HbEDataTypeAnnotator extends EDataTypeAnnotator {
 	 * get the Java class name of the class used to represent the custom data type.
 	 * 
 	 * @param classifier
-	 *            non-null classifier to inspect.
+	 *          non-null classifier to inspect.
 	 * @return Class name of the custom data type or null if the classifier does not represent a
 	 *         custom data type that is not already handled by Hibernate.
 	 */
@@ -88,10 +89,11 @@ public class HbEDataTypeAnnotator extends EDataTypeAnnotator {
 			return null;
 		} else if (eDataType.getInstanceClass() == Object.class) {
 			return null;
-// } else if (typeClassName != null && TypeFactory.basic(typeClassName) != null) {
-// // If Hibernate natively handles the type then don't bother creating
-// // a typedef.
-// return null;
+			// } else if (typeClassName != null && TypeFactory.basic(typeClassName) !=
+			// null) {
+			// // If Hibernate natively handles the type then don't bother creating
+			// // a typedef.
+			// return null;
 		}
 		if (typeClassName != null) {
 			final Class<?> instanceClass = eDataType.getInstanceClass();
@@ -101,12 +103,13 @@ public class HbEDataTypeAnnotator extends EDataTypeAnnotator {
 					return null;
 				}
 				// get rid of the [] at the end
-// final String primType = typeClassName.substring(0, typeClassName.length() - 2);
+				// final String primType = typeClassName.substring(0,
+				// typeClassName.length() - 2);
 				// check if hb supports it
 				// no dots is primitve
-// if (TypeFactory.basic(primType) != null) {
-// return null; // if so let hb do it
-// }
+				// if (TypeFactory.basic(primType) != null) {
+				// return null; // if so let hb do it
+				// }
 			}
 		}
 
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/annotations/HbMappingSchemaGenerator.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/annotations/HbMappingSchemaGenerator.java
index 4a1b47404..2970ab2f0 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/annotations/HbMappingSchemaGenerator.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/annotations/HbMappingSchemaGenerator.java
@@ -34,7 +34,8 @@ public class HbMappingSchemaGenerator extends PersistenceMappingSchemaGenerator
 	/** The main method */
 	public static void main(String[] args) {
 		final HbMappingSchemaGenerator pmsg = new HbMappingSchemaGenerator();
-		pmsg.setAnnotationEPackages(new EPackage[] { HbannotationPackage.eINSTANCE, PannotationPackage.eINSTANCE });
+		pmsg.setAnnotationEPackages(new EPackage[] { HbannotationPackage.eINSTANCE,
+				PannotationPackage.eINSTANCE });
 		pmsg.setModelEPackage(HbmodelPackage.eINSTANCE);
 		pmsg.setNameSpace("http://www.eclipse.org/emft/teneo");
 		try {
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/annotations/HbOneToManyAttributeAnnotator.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/annotations/HbOneToManyAttributeAnnotator.java
index 09a559a67..c508c2e11 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/annotations/HbOneToManyAttributeAnnotator.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/annotations/HbOneToManyAttributeAnnotator.java
@@ -49,27 +49,26 @@ public class HbOneToManyAttributeAnnotator extends OneToManyAttributeAnnotator {
 	/** Process the features of the eclass */
 	@Override
 	public void annotate(PAnnotatedEAttribute aAttribute) {
-		boolean isCollectionOfElements =
-				(aAttribute instanceof HbAnnotatedEAttribute && null != ((HbAnnotatedEAttribute) aAttribute)
-					.getHbCollectionOfElements());
+		boolean isCollectionOfElements = (aAttribute instanceof HbAnnotatedEAttribute && null != ((HbAnnotatedEAttribute) aAttribute)
+				.getHbCollectionOfElements());
 
 		final HbAnnotatedEAttribute hea = (HbAnnotatedEAttribute) aAttribute;
-		final HbAnnotatedEDataType hed =
-				(HbAnnotatedEDataType) aAttribute.getPaModel().getPAnnotated(
-					aAttribute.getModelEAttribute().getEAttributeType());
+		final HbAnnotatedEDataType hed = (HbAnnotatedEDataType) aAttribute.getPaModel().getPAnnotated(
+				aAttribute.getModelEAttribute().getEAttributeType());
 		if (isCollectionOfElements) {
 			CollectionOfElements coe = ((HbAnnotatedEAttribute) aAttribute).getHbCollectionOfElements();
 			if (coe.getTargetElement() == null) {
 				coe.setTargetElement(getTargetTypeName(aAttribute));
 			}
-		} else if (hea.getHbType() != null && hea.getOneToMany() == null && !aAttribute.getModelEAttribute().isMany()) {
+		} else if (hea.getHbType() != null && hea.getOneToMany() == null
+				&& !aAttribute.getModelEAttribute().isMany()) {
 			// assume this to be a single attribute, we can get here when
 			// the instance is an array or list in that case the user type is
 			// assumed
 			// to be able to handle the complete list/collection
 			singleAttributeAnnotator.annotate(aAttribute);
-		} else if (hed != null && hed.getHbTypeDef() != null && hea.getOneToMany() == null &&
-				!aAttribute.getModelEAttribute().isMany()) {
+		} else if (hed != null && hed.getHbTypeDef() != null && hea.getOneToMany() == null
+				&& !aAttribute.getModelEAttribute().isMany()) {
 			// assume this to be a single attribute, we can get here when
 			// the instance is an array or list in that case the user type is
 			// assumed
@@ -80,20 +79,20 @@ public class HbOneToManyAttributeAnnotator extends OneToManyAttributeAnnotator {
 		}
 	}
 
-// MT: is now recomputed in the mapping step
-// /** Returns the type name of a many attribute */
-// @Override
-// protected String getTargetTypeName(PAnnotatedEAttribute aAttribute) {
-// final HbAnnotatedEDataType ped =
-// (HbAnnotatedEDataType) aAttribute.getPaModel().getPAnnotated(
-// aAttribute.getModelEAttribute().getEAttributeType());
-// if (ped != null && ped.getHbTypeDef() != null) {
-// return ped.getHbTypeDef().getName();
-// }
-// if (((HbAnnotatedEAttribute) aAttribute).getHbType() != null) {
-// return ((HbAnnotatedEAttribute) aAttribute).getHbType().getType();
-// }
-// return EcoreDataTypes.INSTANCE.getTargetTypeName(aAttribute);
-// }
+	// MT: is now recomputed in the mapping step
+	// /** Returns the type name of a many attribute */
+	// @Override
+	// protected String getTargetTypeName(PAnnotatedEAttribute aAttribute) {
+	// final HbAnnotatedEDataType ped =
+	// (HbAnnotatedEDataType) aAttribute.getPaModel().getPAnnotated(
+	// aAttribute.getModelEAttribute().getEAttributeType());
+	// if (ped != null && ped.getHbTypeDef() != null) {
+	// return ped.getHbTypeDef().getName();
+	// }
+	// if (((HbAnnotatedEAttribute) aAttribute).getHbType() != null) {
+	// return ((HbAnnotatedEAttribute) aAttribute).getHbType().getType();
+	// }
+	// return EcoreDataTypes.INSTANCE.getTargetTypeName(aAttribute);
+	// }
 
 }
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/annotations/HbOneToManyReferenceAnnotator.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/annotations/HbOneToManyReferenceAnnotator.java
index 74acfb193..89873c09e 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/annotations/HbOneToManyReferenceAnnotator.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/annotations/HbOneToManyReferenceAnnotator.java
@@ -43,10 +43,8 @@ import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference;
 public class HbOneToManyReferenceAnnotator extends OneToManyReferenceAnnotator {
 
 	// The logger
-	protected static final Log log = LogFactory
-			.getLog(HbOneToManyReferenceAnnotator.class);
-	private String defaultCacheStrategy = CacheConcurrencyStrategy.NONE
-			.getName();
+	protected static final Log log = LogFactory.getLog(HbOneToManyReferenceAnnotator.class);
+	private String defaultCacheStrategy = CacheConcurrencyStrategy.NONE.getName();
 
 	/** Annotate it */
 	@Override
@@ -60,10 +58,8 @@ public class HbOneToManyReferenceAnnotator extends OneToManyReferenceAnnotator {
 		final boolean doHbCascade = otm == null || otm.getCascade().isEmpty();
 
 		// add an idbag annotation
-		if (getPersistenceOptions().alwaysMapListAsIdBag()
-				&& aReference.getModelEReference().isMany()
-				&& aReference.getOneToMany() == null
-				&& !aReference.getModelEReference().isContainment()) {
+		if (getPersistenceOptions().alwaysMapListAsIdBag() && aReference.getModelEReference().isMany()
+				&& aReference.getOneToMany() == null && !aReference.getModelEReference().isContainment()) {
 			hbReference.setHbIdBag(HbannotationFactory.eINSTANCE.createIdBag());
 			// add a join table
 		}
@@ -80,17 +76,12 @@ public class HbOneToManyReferenceAnnotator extends OneToManyReferenceAnnotator {
 		// none
 		boolean hasCache = hbReference.getHbCache() != null;
 		if (!hasCache
-				&& defaultCacheStrategy
-						.compareToIgnoreCase(CacheConcurrencyStrategy.NONE
-								.getName()) != 0) {
-			final CacheConcurrencyStrategy ccs = CacheConcurrencyStrategy
-					.getByName(defaultCacheStrategy);
+				&& defaultCacheStrategy.compareToIgnoreCase(CacheConcurrencyStrategy.NONE.getName()) != 0) {
+			final CacheConcurrencyStrategy ccs = CacheConcurrencyStrategy.getByName(defaultCacheStrategy);
 			if (ccs == null) {
-				throw new StoreMappingException(
-						"The default cache strategy: "
-								+ defaultCacheStrategy
-								+ " is not one of the allowed values (uppercase) "
-								+ "as defined in the JPA Hibernate Annotation Extensions.");
+				throw new StoreMappingException("The default cache strategy: " + defaultCacheStrategy
+						+ " is not one of the allowed values (uppercase) "
+						+ "as defined in the JPA Hibernate Annotation Extensions.");
 			}
 
 			log.debug("Setting cache strategy " + defaultCacheStrategy + " on "
@@ -106,34 +97,25 @@ public class HbOneToManyReferenceAnnotator extends OneToManyReferenceAnnotator {
 				if (getPersistenceOptions().isSetCascadeAllOnContainment()) {
 					option = HbCascadeType.ALL.getName();
 				} else {
-					option = getPersistenceOptions()
-							.getCascadePolicyForContainment();
+					option = getPersistenceOptions().getCascadePolicyForContainment();
 				}
 				// translate a previous default to LOCK, SAVE_UPDAT
 				if (getPersistenceOptions().isSetCascadePersistOnContainment()) {
-					option += HbCascadeType.LOCK.getName() + ", "
-							+ HbCascadeType.SAVE_UPDATE.getName();
+					option += HbCascadeType.LOCK.getName() + ", " + HbCascadeType.SAVE_UPDATE.getName();
 				}
-			} else if (getPersistenceOptions()
-					.isSetCascadePolicyForNonContainment()) {
-				option = getPersistenceOptions()
-						.getCascadePolicyForNonContainment();
+			} else if (getPersistenceOptions().isSetCascadePolicyForNonContainment()) {
+				option = getPersistenceOptions().getCascadePolicyForNonContainment();
 				// translate a previous default to LOCK, SAVE_UPDAT
-				if (getPersistenceOptions()
-						.isSetCascadePersistOnNonContainment()) {
-					option += HbCascadeType.LOCK.getName() + ", "
-							+ HbCascadeType.SAVE_UPDATE.getName();
+				if (getPersistenceOptions().isSetCascadePersistOnNonContainment()) {
+					option += HbCascadeType.LOCK.getName() + ", " + HbCascadeType.SAVE_UPDATE.getName();
 				}
 			} else {
-				option = HbCascadeType.PERSIST.getName() + ", "
-						+ HbCascadeType.MERGE.getName() + ", "
-						+ HbCascadeType.REFRESH.getName() + ", "
-						+ HbCascadeType.LOCK.getName() + ", "
+				option = HbCascadeType.PERSIST.getName() + ", " + HbCascadeType.MERGE.getName() + ", "
+						+ HbCascadeType.REFRESH.getName() + ", " + HbCascadeType.LOCK.getName() + ", "
 						+ HbCascadeType.SAVE_UPDATE.getName();
 			}
 
-			final Cascade hbCascade = HbannotationFactory.eINSTANCE
-					.createCascade();
+			final Cascade hbCascade = HbannotationFactory.eINSTANCE.createCascade();
 			for (HbCascadeType hbCascadeValue : HbCascadeType.values()) {
 				if (option.contains(hbCascadeValue.getName())) {
 					hbCascade.getValue().add(hbCascadeValue);
@@ -145,8 +127,7 @@ public class HbOneToManyReferenceAnnotator extends OneToManyReferenceAnnotator {
 		}
 	}
 
-	protected void setCascade(List<CascadeType> cascadeList,
-			boolean isContainment) {
+	protected void setCascade(List<CascadeType> cascadeList, boolean isContainment) {
 		if (!cascadeList.isEmpty()) {
 			return;
 		}
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/annotations/HbUnidirectionalManyToManyAnnotator.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/annotations/HbUnidirectionalManyToManyAnnotator.java
index 6ab7ebc61..1b95d1379 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/annotations/HbUnidirectionalManyToManyAnnotator.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/annotations/HbUnidirectionalManyToManyAnnotator.java
@@ -37,7 +37,8 @@ public class HbUnidirectionalManyToManyAnnotator extends UnidirectionalManyToMan
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.eclipse.emf.teneo.annotations.mapper.UnidirectionalManyToManyAnnotator#annotate(org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEReference)
+	 * @see org.eclipse.emf.teneo.annotations.mapper.UnidirectionalManyToManyAnnotator
+	 * #annotate(org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEReference)
 	 */
 	@Override
 	public void annotate(PAnnotatedEReference reference) {
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/cdo/CDOEntityMapper.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/cdo/CDOEntityMapper.java
index c89473053..ba59f0ab4 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/cdo/CDOEntityMapper.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/cdo/CDOEntityMapper.java
@@ -51,15 +51,15 @@ public class CDOEntityMapper extends EntityMapper {
 			resourceElement.addElement("column").addAttribute("name", "resID_Entity");
 			resourceElement.addElement("column").addAttribute("name", "resID_ID");
 			resourceElement.addElement("column").addAttribute("name", "resID_class");
-			resourceElement
-				.addAttribute("type", "org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOIDUserType");
+			resourceElement.addAttribute("type",
+					"org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOIDUserType");
 			final Element containerElement = entityElement.addElement("property");
 			containerElement.addAttribute("name", "containerID");
 			containerElement.addElement("column").addAttribute("name", "contID_Entity");
 			containerElement.addElement("column").addAttribute("name", "contID_ID");
 			containerElement.addElement("column").addAttribute("name", "contID_class");
 			containerElement.addAttribute("type",
-				"org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOIDUserType");
+					"org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOIDUserType");
 			final Element containingFeatureElement = entityElement.addElement("property");
 			containingFeatureElement.addAttribute("name", "containingFeatureID");
 			containingFeatureElement.addAttribute("column", "contFeatureID");
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/cdo/CDOHelper.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/cdo/CDOHelper.java
index c295db16b..6361a88ce 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/cdo/CDOHelper.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/cdo/CDOHelper.java
@@ -41,7 +41,7 @@ public class CDOHelper {
 
 	/**
 	 * @param instance
-	 *            the instance to set
+	 *          the instance to set
 	 */
 	public static void setInstance(CDOHelper instance) {
 		CDOHelper.instance = instance;
@@ -49,23 +49,26 @@ public class CDOHelper {
 
 	public void registerCDOExtensions(ExtensionManager extensionManager) {
 		MappingUtil.registerHbExtensions(extensionManager);
-		extensionManager.registerExtension(ExtensionUtil.createExtension(MappingContext.class, CDOMappingContext.class,
-				false));
+		extensionManager.registerExtension(ExtensionUtil.createExtension(MappingContext.class,
+				CDOMappingContext.class, false));
 	}
 
 	/**
-	 * Separate utility method, generates a hibernate mapping for a set of epackages and options. The hibernate.hbm.xml
-	 * is returned as a string. The mapping is not registered or used in any other way by Elver.
+	 * Separate utility method, generates a hibernate mapping for a set of epackages and options. The
+	 * hibernate.hbm.xml is returned as a string. The mapping is not registered or used in any other
+	 * way by Elver.
 	 */
 	public String generateMapping(EPackage[] epackages, Properties props) {
 		return generateMapping(epackages, props, ExtensionManagerFactory.getInstance().create());
 	}
 
 	/**
-	 * Separate utility method, generates a hibernate mapping for a set of epackages and options. The hibernate.hbm.xml
-	 * is returned as a string. The mapping is not registered or used in any other way by Elver.
+	 * Separate utility method, generates a hibernate mapping for a set of epackages and options. The
+	 * hibernate.hbm.xml is returned as a string. The mapping is not registered or used in any other
+	 * way by Elver.
 	 */
-	public String generateMapping(EPackage[] epackages, Properties props, ExtensionManager extensionManager) {
+	public String generateMapping(EPackage[] epackages, Properties props,
+			ExtensionManager extensionManager) {
 		props.put(PersistenceOptions.ALSO_MAP_AS_CLASS, "false");
 		CDOHelper.getInstance().registerCDOExtensions(extensionManager);
 		return MappingUtil.generateMapping(epackages, props, extensionManager);
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/cdo/CDOMappingContext.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/cdo/CDOMappingContext.java
index 15959d834..f2010f406 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/cdo/CDOMappingContext.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/cdo/CDOMappingContext.java
@@ -22,23 +22,23 @@ import org.eclipse.emf.teneo.simpledom.Element;
  * @author <a href="mtaal@elver.org">Martin Taal</a>
  */
 public class CDOMappingContext extends MappingContext {
-	
+
 	/** Add a tuplizer element or not */
 	@Override
 	public void addTuplizerElement(Element entityElement, PAnnotatedEClass aclass) {
-		Element tuplizerElement =
-				new Element("tuplizer").addAttribute("entity-mode", "dynamic-map").addAttribute("class",
-					"org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDORevisionTuplizer");
+		Element tuplizerElement = new Element("tuplizer").addAttribute("entity-mode", "dynamic-map")
+				.addAttribute("class",
+						"org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDORevisionTuplizer");
 		entityElement.add(0, tuplizerElement);
-		tuplizerElement =
-				new Element("tuplizer").addAttribute("entity-mode", "pojo").addAttribute("class",
-					"org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDORevisionTuplizer");
+		tuplizerElement = new Element("tuplizer").addAttribute("entity-mode", "pojo").addAttribute(
+				"class", "org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDORevisionTuplizer");
 		entityElement.add(0, tuplizerElement);
 	}
-	
+
 	public void setExtensionManager(ExtensionManager extensionManager) {
 		super.setExtensionManager(extensionManager);
-		extensionManager.registerExtension(EntityMapper.class.getName(), CDOEntityMapper.class.getName());
+		extensionManager.registerExtension(EntityMapper.class.getName(),
+				CDOEntityMapper.class.getName());
 	}
 
 	@Override
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Any.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Any.java
index dd603eb20..9f57c13b8 100644
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Any.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Any.java
@@ -10,33 +10,32 @@ import org.eclipse.emf.teneo.annotations.pannotation.Column;
 import org.eclipse.emf.teneo.annotations.pannotation.FetchType;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Any</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Any</b></em>'. <!--
+ * end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Any#getMetaDef <em>Meta Def</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Any#getMetaColumn <em>Meta Column</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Any#getFetch <em>Fetch</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Any#isOptional <em>Optional</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Any#getMetaDef <em> Meta Def</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Any#getMetaColumn <em>Meta Column</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Any#getFetch <em> Fetch</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Any#isOptional <em> Optional</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getAny()
- * @model annotation="http://annotation.elver.org/internal/Target 0='EStructuralFeature'"
+ * @model annotation= "http://annotation.elver.org/internal/Target 0='EStructuralFeature'"
  * @generated
  */
 public interface Any extends HbAnnotation {
 	/**
-	 * Returns the value of the '<em><b>Meta Def</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Meta Def</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Meta Def</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Meta Def</em>' attribute isn't clear, there really should be more of
+	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Meta Def</em>' attribute.
 	 * @see #setMetaDef(String)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getAny_MetaDef()
@@ -46,23 +45,25 @@ public interface Any extends HbAnnotation {
 	String getMetaDef();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Any#getMetaDef <em>Meta Def</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Meta Def</em>' attribute.
+	 * Sets the value of the ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.Any#getMetaDef
+	 * <em>Meta Def</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Meta Def</em>' attribute.
 	 * @see #getMetaDef()
 	 * @generated
 	 */
 	void setMetaDef(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Meta Column</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Meta Column</b></em>' containment reference. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Meta Column</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Meta Column</em>' containment reference isn't clear, there really
+	 * should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Meta Column</em>' containment reference.
 	 * @see #setMetaColumn(Column)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getAny_MetaColumn()
@@ -72,25 +73,26 @@ public interface Any extends HbAnnotation {
 	Column getMetaColumn();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Any#getMetaColumn <em>Meta Column</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Meta Column</em>' containment reference.
+	 * Sets the value of the ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.Any#getMetaColumn
+	 * <em>Meta Column</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Meta Column</em>' containment reference.
 	 * @see #getMetaColumn()
 	 * @generated
 	 */
 	void setMetaColumn(Column value);
 
 	/**
-	 * Returns the value of the '<em><b>Fetch</b></em>' attribute.
-	 * The default value is <code>"EAGER"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.teneo.annotations.pannotation.FetchType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Fetch</b></em>' attribute. The default value is
+	 * <code>"EAGER"</code>. The literals are from the enumeration
+	 * {@link org.eclipse.emf.teneo.annotations.pannotation.FetchType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Fetch</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Fetch</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Fetch</em>' attribute.
 	 * @see org.eclipse.emf.teneo.annotations.pannotation.FetchType
 	 * @see #setFetch(FetchType)
@@ -101,10 +103,11 @@ public interface Any extends HbAnnotation {
 	FetchType getFetch();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Any#getFetch <em>Fetch</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Fetch</em>' attribute.
+	 * Sets the value of the ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.Any#getFetch
+	 * <em>Fetch</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Fetch</em>' attribute.
 	 * @see org.eclipse.emf.teneo.annotations.pannotation.FetchType
 	 * @see #getFetch()
 	 * @generated
@@ -112,14 +115,14 @@ public interface Any extends HbAnnotation {
 	void setFetch(FetchType value);
 
 	/**
-	 * Returns the value of the '<em><b>Optional</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Optional</b></em>' attribute. The default value is
+	 * <code>"true"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Optional</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Optional</em>' attribute isn't clear, there really should be more of
+	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Optional</em>' attribute.
 	 * @see #setOptional(boolean)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getAny_Optional()
@@ -129,10 +132,11 @@ public interface Any extends HbAnnotation {
 	boolean isOptional();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Any#isOptional <em>Optional</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Optional</em>' attribute.
+	 * Sets the value of the ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.Any#isOptional
+	 * <em>Optional</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Optional</em>' attribute.
 	 * @see #isOptional()
 	 * @generated
 	 */
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/AnyMetaDef.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/AnyMetaDef.java
index 2b5f25ee3..0cdbbdc3f 100644
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/AnyMetaDef.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/AnyMetaDef.java
@@ -9,33 +9,36 @@ package org.eclipse.emf.teneo.hibernate.hbannotation;
 import org.eclipse.emf.common.util.EList;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Any Meta Def</b></em>'.
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Any Meta Def</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef#getMetaType <em>Meta Type</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef#getIdType <em>Id Type</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef#getMetaValues <em>Meta Values</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef#getName <em>Name</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef#getMetaType <em>Meta Type</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef#getIdType <em>Id Type</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef#getMetaValues <em>Meta Values
+ * </em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getAnyMetaDef()
- * @model annotation="http://annotation.elver.org/internal/Target 0='EStructuralFeature' 1='EClass' 2='EPackage'"
+ * @model annotation=
+ *        "http://annotation.elver.org/internal/Target 0='EStructuralFeature' 1='EClass' 2='EPackage'"
  * @generated
  */
 public interface AnyMetaDef extends HbAnnotation {
 	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getAnyMetaDef_Name()
@@ -45,24 +48,25 @@ public interface AnyMetaDef extends HbAnnotation {
 	String getName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
+	 * Sets the value of the ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef#getName
+	 * <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Name</em>' attribute.
 	 * @see #getName()
 	 * @generated
 	 */
 	void setName(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Meta Type</b></em>' attribute.
-	 * The default value is <code>"string"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Meta Type</b></em>' attribute. The default value is
+	 * <code>"string"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Meta Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Meta Type</em>' attribute isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Meta Type</em>' attribute.
 	 * @see #setMetaType(String)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getAnyMetaDef_MetaType()
@@ -72,24 +76,26 @@ public interface AnyMetaDef extends HbAnnotation {
 	String getMetaType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef#getMetaType <em>Meta Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Meta Type</em>' attribute.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef#getMetaType <em>Meta Type</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Meta Type</em>' attribute.
 	 * @see #getMetaType()
 	 * @generated
 	 */
 	void setMetaType(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Id Type</b></em>' attribute.
-	 * The default value is <code>"string"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id Type</b></em>' attribute. The default value is
+	 * <code>"string"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id Type</em>' attribute isn't clear, there really should be more of
+	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id Type</em>' attribute.
 	 * @see #setIdType(String)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getAnyMetaDef_IdType()
@@ -99,24 +105,27 @@ public interface AnyMetaDef extends HbAnnotation {
 	String getIdType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef#getIdType <em>Id Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id Type</em>' attribute.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef#getIdType <em>Id Type</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Id Type</em>' attribute.
 	 * @see #getIdType()
 	 * @generated
 	 */
 	void setIdType(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Meta Values</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.emf.teneo.hibernate.hbannotation.MetaValue}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Meta Values</b></em>' containment reference list. The list
+	 * contents are of type {@link org.eclipse.emf.teneo.hibernate.hbannotation.MetaValue}. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Meta Values</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Meta Values</em>' containment reference list isn't clear, there
+	 * really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Meta Values</em>' containment reference list.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getAnyMetaDef_MetaValues()
 	 * @model containment="true"
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/BatchSize.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/BatchSize.java
index e9446c4e5..28039dc7a 100644
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/BatchSize.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/BatchSize.java
@@ -6,32 +6,30 @@
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Batch Size</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Batch Size</b></em>'. <!--
+ * end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.BatchSize#getSize <em>Size</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.BatchSize#getSize <em>Size</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getBatchSize()
  * @model annotation="teneo/internal/Target 0='EClass' 1='EReference'"
  * @generated
  */
 public interface BatchSize extends HbAnnotation {
 	/**
-	 * Returns the value of the '<em><b>Size</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Size</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Size</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Size</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Size</em>' attribute.
 	 * @see #setSize(int)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getBatchSize_Size()
@@ -41,10 +39,11 @@ public interface BatchSize extends HbAnnotation {
 	int getSize();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.BatchSize#getSize <em>Size</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Size</em>' attribute.
+	 * Sets the value of the ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.BatchSize#getSize
+	 * <em>Size</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Size</em>' attribute.
 	 * @see #getSize()
 	 * @generated
 	 */
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Cache.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Cache.java
index c8049bed7..a4911cc7d 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Cache.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Cache.java
@@ -7,31 +7,33 @@
 package org.eclipse.emf.teneo.hibernate.hbannotation;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Cache</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Cache</b></em>'. <!--
+ * end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Cache#getUsage <em>Usage</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Cache#getRegion <em>Region</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Cache#getInclude <em>Include</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Cache#getUsage <em> Usage</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Cache#getRegion <em> Region</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Cache#getInclude <em> Include</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getCache()
- * @model annotation="http://annotation.elver.org/internal/Target 0='EReference' 1='EClass'"
+ * @model annotation= "http://annotation.elver.org/internal/Target 0='EReference' 1='EClass'"
  * @generated
  */
 public interface Cache extends HbAnnotation {
 	/**
-	 * Returns the value of the '<em><b>Usage</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.emf.teneo.hibernate.hbannotation.CacheConcurrencyStrategy}.
+	 * Returns the value of the '<em><b>Usage</b></em>' attribute. The literals are from the
+	 * enumeration {@link org.eclipse.emf.teneo.hibernate.hbannotation.CacheConcurrencyStrategy} .
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Usage</em>' attribute isn't clear, there really should be more of a description
-	 * here...
+	 * If the meaning of the '<em>Usage</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Usage</em>' attribute.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.CacheConcurrencyStrategy
 	 * @see #setUsage(CacheConcurrencyStrategy)
@@ -42,9 +44,11 @@ public interface Cache extends HbAnnotation {
 	CacheConcurrencyStrategy getUsage();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Cache#getUsage <em>Usage</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Usage</em>' attribute.
+	 * Sets the value of the ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.Cache#getUsage
+	 * <em>Usage</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Usage</em>' attribute.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.CacheConcurrencyStrategy
 	 * @see #getUsage()
 	 * @generated
@@ -52,13 +56,13 @@ public interface Cache extends HbAnnotation {
 	void setUsage(CacheConcurrencyStrategy value);
 
 	/**
-	 * Returns the value of the '<em><b>Region</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Region</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Region</em>' attribute isn't clear, there really should be more of a description
-	 * here...
+	 * If the meaning of the '<em>Region</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Region</em>' attribute.
 	 * @see #setRegion(String)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getCache_Region()
@@ -68,22 +72,24 @@ public interface Cache extends HbAnnotation {
 	String getRegion();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Cache#getRegion <em>Region</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Region</em>' attribute.
+	 * Sets the value of the ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.Cache#getRegion
+	 * <em>Region</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Region</em>' attribute.
 	 * @see #getRegion()
 	 * @generated
 	 */
 	void setRegion(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Include</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Include</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Include</em>' attribute isn't clear, there really should be more of a description
-	 * here...
+	 * If the meaning of the '<em>Include</em>' attribute isn't clear, there really should be more of
+	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Include</em>' attribute.
 	 * @see #setInclude(String)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getCache_Include()
@@ -93,9 +99,11 @@ public interface Cache extends HbAnnotation {
 	String getInclude();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Cache#getInclude <em>Include</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Include</em>' attribute.
+	 * Sets the value of the ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.Cache#getInclude
+	 * <em>Include</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Include</em>' attribute.
 	 * @see #getInclude()
 	 * @generated
 	 */
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/CacheConcurrencyStrategy.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/CacheConcurrencyStrategy.java
index 17919b12f..19e013d43 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/CacheConcurrencyStrategy.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/CacheConcurrencyStrategy.java
@@ -13,151 +13,148 @@ import java.util.List;
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
- * <!-- begin-user-doc --> A representation of the literals of the enumeration '<em><b>Cache Concurrency Strategy</b></em>',
- * and utility methods for working with them. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the literals of the enumeration '
+ * <em><b>Cache Concurrency Strategy</b></em>', and utility methods for working with them. <!--
+ * end-user-doc -->
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getCacheConcurrencyStrategy()
  * @model
  * @generated
  */
 public enum CacheConcurrencyStrategy implements Enumerator {
 	/**
-	 * The '<em><b>NONE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>NONE</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #NONE_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	NONE(0, "NONE", "NONE"), /**
-	 * The '<em><b>READ ONLY</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>READ ONLY</b></em>' literal object. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #READ_ONLY_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	READ_ONLY(1, "READ_ONLY", "READ_ONLY"), /**
-	 * The '<em><b>NONSTRICT READ WRITE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The ' <em><b>NONSTRICT READ WRITE</b></em>' literal
+	 * object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #NONSTRICT_READ_WRITE_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	NONSTRICT_READ_WRITE(2, "NONSTRICT_READ_WRITE", "NONSTRICT_READ_WRITE"), /**
-	 * The '<em><b>READ WRITE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * 
+	 * The '
+	 * <em><b>READ WRITE</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #READ_WRITE_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	READ_WRITE(3, "READ_WRITE", "READ_WRITE"), /**
-	 * The '<em><b>TRANSACTIONAL</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The ' <em><b>TRANSACTIONAL</b></em>' literal object.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #TRANSACTIONAL_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	TRANSACTIONAL(4, "TRANSACTIONAL", "TRANSACTIONAL");
 
-/**
-	 * The '<em><b>NONE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	/**
+	 * The '<em><b>NONE</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>NONE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>NONE</b></em>' literal object isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #NONE
 	 * @model
 	 * @generated
 	 * @ordered
 	 */
 	public static final int NONE_VALUE = 0;
-/**
-	 * The '<em><b>READ ONLY</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	/**
+	 * The '<em><b>READ ONLY</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>READ ONLY</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>READ ONLY</b></em>' literal object isn't clear, there really should
+	 * be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #READ_ONLY
 	 * @model
 	 * @generated
 	 * @ordered
 	 */
 	public static final int READ_ONLY_VALUE = 1;
-/**
-	 * The '<em><b>NONSTRICT READ WRITE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	/**
+	 * The '<em><b>NONSTRICT READ WRITE</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>NONSTRICT READ WRITE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>NONSTRICT READ WRITE</b></em>' literal object isn't clear, there
+	 * really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #NONSTRICT_READ_WRITE
 	 * @model
 	 * @generated
 	 * @ordered
 	 */
 	public static final int NONSTRICT_READ_WRITE_VALUE = 2;
-/**
-	 * The '<em><b>READ WRITE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	/**
+	 * The '<em><b>READ WRITE</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>READ WRITE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>READ WRITE</b></em>' literal object isn't clear, there really should
+	 * be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #READ_WRITE
 	 * @model
 	 * @generated
 	 * @ordered
 	 */
 	public static final int READ_WRITE_VALUE = 3;
-/**
-	 * The '<em><b>TRANSACTIONAL</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	/**
+	 * The '<em><b>TRANSACTIONAL</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>TRANSACTIONAL</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>TRANSACTIONAL</b></em>' literal object isn't clear, there really
+	 * should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #TRANSACTIONAL
 	 * @model
 	 * @generated
 	 * @ordered
 	 */
 	public static final int TRANSACTIONAL_VALUE = 4;
-/**
-	 * An array of all the '<em><b>Cache Concurrency Strategy</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * An array of all the '<em><b>Cache Concurrency Strategy</b></em>' enumerators. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final CacheConcurrencyStrategy[] VALUES_ARRAY =
-		new CacheConcurrencyStrategy[] {
-			NONE,
-			READ_ONLY,
-			NONSTRICT_READ_WRITE,
-			READ_WRITE,
-			TRANSACTIONAL,
-		};
-/**
-	 * A public read-only list of all the '<em><b>Cache Concurrency Strategy</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	private static final CacheConcurrencyStrategy[] VALUES_ARRAY = new CacheConcurrencyStrategy[] {
+			NONE, READ_ONLY, NONSTRICT_READ_WRITE, READ_WRITE, TRANSACTIONAL, };
+	/**
+	 * A public read-only list of all the ' <em><b>Cache Concurrency Strategy</b></em>' enumerators.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public static final List<CacheConcurrencyStrategy> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+	public static final List<CacheConcurrencyStrategy> VALUES = Collections.unmodifiableList(Arrays
+			.asList(VALUES_ARRAY));
 
-/**
-	 * Returns the '<em><b>Cache Concurrency Strategy</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the '<em><b>Cache Concurrency Strategy</b></em>' literal with the specified literal
+	 * value. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static CacheConcurrencyStrategy get(String literal) {
@@ -170,10 +167,10 @@ public enum CacheConcurrencyStrategy implements Enumerator {
 		return null;
 	}
 
-/**
-	 * Returns the '<em><b>Cache Concurrency Strategy</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the '<em><b>Cache Concurrency Strategy</b></em>' literal with the specified name. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static CacheConcurrencyStrategy getByName(String name) {
@@ -186,46 +183,50 @@ public enum CacheConcurrencyStrategy implements Enumerator {
 		return null;
 	}
 
-/**
-	 * Returns the '<em><b>Cache Concurrency Strategy</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the '<em><b>Cache Concurrency Strategy</b></em>' literal with the specified integer
+	 * value. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static CacheConcurrencyStrategy get(int value) {
 		switch (value) {
-			case NONE_VALUE: return NONE;
-			case READ_ONLY_VALUE: return READ_ONLY;
-			case NONSTRICT_READ_WRITE_VALUE: return NONSTRICT_READ_WRITE;
-			case READ_WRITE_VALUE: return READ_WRITE;
-			case TRANSACTIONAL_VALUE: return TRANSACTIONAL;
+		case NONE_VALUE:
+			return NONE;
+		case READ_ONLY_VALUE:
+			return READ_ONLY;
+		case NONSTRICT_READ_WRITE_VALUE:
+			return NONSTRICT_READ_WRITE;
+		case READ_WRITE_VALUE:
+			return READ_WRITE;
+		case TRANSACTIONAL_VALUE:
+			return TRANSACTIONAL;
 		}
 		return null;
 	}
 
-/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final int value;
-/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String name;
-/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String literal;
 
-/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Only this class can construct instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private CacheConcurrencyStrategy(int value, String name, String literal) {
@@ -234,37 +235,37 @@ public enum CacheConcurrencyStrategy implements Enumerator {
 		this.literal = literal;
 	}
 
-/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
-	  return value;
+		return value;
 	}
 
-/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
-	  return name;
+		return name;
 	}
 
-/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-	  return literal;
+		return literal;
 	}
 
-/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the literal value of the enumerator, which is its string representation. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Cascade.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Cascade.java
index bc76acc02..92ade629a 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Cascade.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Cascade.java
@@ -9,29 +9,29 @@ package org.eclipse.emf.teneo.hibernate.hbannotation;
 import org.eclipse.emf.common.util.EList;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Cascade</b></em>'. <!--
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Cascade</b></em>'. <!--
  * end-user-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Cascade#getValue <em>Value</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Cascade#getValue <em> Value</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getCascade()
- * @model annotation="http://annotation.elver.org/internal/Target 0='EStructuralFeature'"
+ * @model annotation= "http://annotation.elver.org/internal/Target 0='EStructuralFeature'"
  * @generated
  */
 public interface Cascade extends HbAnnotation {
 	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute list. The list contents are of
-	 * type {@link org.eclipse.emf.teneo.hibernate.hbannotation.HbCascadeType}. The literals are
-	 * from the enumeration {@link org.eclipse.emf.teneo.hibernate.hbannotation.HbCascadeType}. <!--
+	 * Returns the value of the '<em><b>Value</b></em>' attribute list. The list contents are of type
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.HbCascadeType}. The literals are from the
+	 * enumeration {@link org.eclipse.emf.teneo.hibernate.hbannotation.HbCascadeType}. <!--
 	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute list isn't clear, there really should be
-	 * more of a description here...
+	 * If the meaning of the '<em>Value</em>' attribute list isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * 
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/CollectionOfElements.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/CollectionOfElements.java
index a1cfb0676..96ef5ebe5 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/CollectionOfElements.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/CollectionOfElements.java
@@ -9,30 +9,34 @@ package org.eclipse.emf.teneo.hibernate.hbannotation;
 import org.eclipse.emf.teneo.annotations.pannotation.FetchType;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Collection Of Elements</b></em>'. <!--
- * end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Collection Of Elements</b></em>'. <!-- end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.CollectionOfElements#getTargetElement <em>Target Element</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.CollectionOfElements#getFetch <em>Fetch</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.CollectionOfElements#getTargetElement <em>
+ * Target Element</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.CollectionOfElements#getFetch <em>Fetch</em>}
+ * </li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getCollectionOfElements()
- * @model annotation="http://annotation.elver.org/internal/Target 0='EStructuralFeature'"
+ * @model annotation= "http://annotation.elver.org/internal/Target 0='EStructuralFeature'"
  * @generated
  */
 public interface CollectionOfElements extends HbAnnotation {
 	/**
-	 * Returns the value of the '<em><b>Target Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Target Element</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Target Element</em>' attribute isn't clear, there really should be more of a
-	 * description here...
+	 * If the meaning of the '<em>Target Element</em>' attribute isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Target Element</em>' attribute.
 	 * @see #setTargetElement(String)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getCollectionOfElements_TargetElement()
@@ -42,21 +46,24 @@ public interface CollectionOfElements extends HbAnnotation {
 	String getTargetElement();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.CollectionOfElements#getTargetElement <em>Target Element</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Target Element</em>' attribute.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.CollectionOfElements#getTargetElement
+	 * <em>Target Element</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Target Element</em>' attribute.
 	 * @see #getTargetElement()
 	 * @generated
 	 */
 	void setTargetElement(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Fetch</b></em>' attribute. The default value is <code>"LAZY"</code>. The
-	 * literals are from the enumeration {@link org.eclipse.emf.teneo.annotations.pannotation.FetchType}. <!--
-	 * begin-user-doc -->
+	 * Returns the value of the '<em><b>Fetch</b></em>' attribute. The default value is
+	 * <code>"LAZY"</code>. The literals are from the enumeration
+	 * {@link org.eclipse.emf.teneo.annotations.pannotation.FetchType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Fetch</em>' attribute isn't clear, there really should be more of a description
-	 * here...
+	 * If the meaning of the '<em>Fetch</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * 
@@ -70,9 +77,12 @@ public interface CollectionOfElements extends HbAnnotation {
 	FetchType getFetch();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.CollectionOfElements#getFetch <em>Fetch</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Fetch</em>' attribute.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.CollectionOfElements#getFetch
+	 * <em>Fetch</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Fetch</em>' attribute.
 	 * @see org.eclipse.emf.teneo.annotations.pannotation.FetchType
 	 * @see #getFetch()
 	 * @generated
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Columns.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Columns.java
index 851bf611b..f16d479e2 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Columns.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Columns.java
@@ -6,19 +6,19 @@
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation;
 
-
 /**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Columns</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Columns</b></em>'. <!--
+ * end-user-doc -->
  * 
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Columns#getValue <em>Value</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Columns#getValue <em> Value</em>}</li>
  * </ul>
  * </p>
  * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbAnnotationPackage#getColumns()
- * @model annotation="http://annotation.elver.org/internal/Target 0='EStructuralFeature'"
+ * @model annotation= "http://annotation.elver.org/internal/Target 0='EStructuralFeature'"
  * @generated
  */
 public interface Columns extends HbAnnotation {
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/DiscriminatorFormula.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/DiscriminatorFormula.java
index a92910688..d3ca678c6 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/DiscriminatorFormula.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/DiscriminatorFormula.java
@@ -6,32 +6,32 @@
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Discriminator Formula</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Discriminator Formula</b></em>'. <!-- end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.DiscriminatorFormula#getValue <em>Value</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.DiscriminatorFormula#getValue <em>Value</em>}
+ * </li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getDiscriminatorFormula()
  * @model annotation="teneo/internal/Target 0='EClass'"
  * @generated
  */
 public interface DiscriminatorFormula extends HbAnnotation {
 	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Value</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Value</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Value</em>' attribute.
 	 * @see #setValue(String)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getDiscriminatorFormula_Value()
@@ -41,10 +41,12 @@ public interface DiscriminatorFormula extends HbAnnotation {
 	String getValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.DiscriminatorFormula#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.DiscriminatorFormula#getValue
+	 * <em>Value</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Value</em>' attribute.
 	 * @see #getValue()
 	 * @generated
 	 */
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Fetch.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Fetch.java
index 7cd02aba7..6cd265d32 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Fetch.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Fetch.java
@@ -6,33 +6,32 @@
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Fetch</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Fetch</b></em>'. <!--
+ * end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Fetch#getValue <em>Value</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Fetch#getValue <em> Value</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getFetch()
- * @model annotation="http://annotation.elver.org/internal/Target 0='EStructuralFeature'"
+ * @model annotation= "http://annotation.elver.org/internal/Target 0='EStructuralFeature'"
  * @generated
  */
 public interface Fetch extends HbAnnotation {
 	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.emf.teneo.hibernate.hbannotation.HbFetchType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Value</b></em>' attribute. The literals are from the
+	 * enumeration {@link org.eclipse.emf.teneo.hibernate.hbannotation.HbFetchType}. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Value</em>' attribute list isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Value</em>' attribute.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbFetchType
 	 * @see #setValue(HbFetchType)
@@ -43,10 +42,11 @@ public interface Fetch extends HbAnnotation {
 	HbFetchType getValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Fetch#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
+	 * Sets the value of the ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.Fetch#getValue
+	 * <em>Value</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Value</em>' attribute.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbFetchType
 	 * @see #getValue()
 	 * @generated
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Filter.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Filter.java
index 2dcb141e7..2e53d858a 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Filter.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Filter.java
@@ -6,33 +6,31 @@
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Filter</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Filter</b></em>'. <!--
+ * end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Filter#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Filter#getCondition <em>Condition</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Filter#getName <em> Name</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Filter#getCondition <em>Condition</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getFilter()
- * @model annotation="http://annotation.elver.org/internal/Target 0='EClass' 1='EReference'"
+ * @model annotation= "http://annotation.elver.org/internal/Target 0='EClass' 1='EReference'"
  * @generated
  */
 public interface Filter extends HbAnnotation {
 	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getFilter_Name()
@@ -42,23 +40,24 @@ public interface Filter extends HbAnnotation {
 	String getName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Filter#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
+	 * Sets the value of the ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.Filter#getName
+	 * <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Name</em>' attribute.
 	 * @see #getName()
 	 * @generated
 	 */
 	void setName(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Condition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Condition</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Condition</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Condition</em>' attribute isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Condition</em>' attribute.
 	 * @see #setCondition(String)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getFilter_Condition()
@@ -68,10 +67,12 @@ public interface Filter extends HbAnnotation {
 	String getCondition();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Filter#getCondition <em>Condition</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Condition</em>' attribute.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Filter#getCondition <em>Condition</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Condition</em>' attribute.
 	 * @see #getCondition()
 	 * @generated
 	 */
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/FilterDef.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/FilterDef.java
index 4b290ae1f..0aae729b9 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/FilterDef.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/FilterDef.java
@@ -9,32 +9,34 @@ package org.eclipse.emf.teneo.hibernate.hbannotation;
 import org.eclipse.emf.common.util.EList;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Filter Def</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Filter Def</b></em>'. <!--
+ * end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.FilterDef#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.FilterDef#getDefaultCondition <em>Default Condition</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.FilterDef#getParameters <em>Parameters</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.FilterDef#getName <em>Name</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.FilterDef#getDefaultCondition <em>Default
+ * Condition</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.FilterDef#getParameters <em>Parameters</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getFilterDef()
- * @model annotation="http://annotation.elver.org/internal/Target 0='EClass' 1='EReference'"
+ * @model annotation= "http://annotation.elver.org/internal/Target 0='EClass' 1='EReference'"
  * @generated
  */
 public interface FilterDef extends HbAnnotation {
 	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getFilterDef_Name()
@@ -44,23 +46,24 @@ public interface FilterDef extends HbAnnotation {
 	String getName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.FilterDef#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
+	 * Sets the value of the ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.FilterDef#getName
+	 * <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Name</em>' attribute.
 	 * @see #getName()
 	 * @generated
 	 */
 	void setName(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Default Condition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Default Condition</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Default Condition</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Default Condition</em>' attribute isn't clear, there really should
+	 * be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Default Condition</em>' attribute.
 	 * @see #setDefaultCondition(String)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getFilterDef_DefaultCondition()
@@ -70,24 +73,26 @@ public interface FilterDef extends HbAnnotation {
 	String getDefaultCondition();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.FilterDef#getDefaultCondition <em>Default Condition</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Default Condition</em>' attribute.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.FilterDef#getDefaultCondition
+	 * <em>Default Condition</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Default Condition</em>' attribute.
 	 * @see #getDefaultCondition()
 	 * @generated
 	 */
 	void setDefaultCondition(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Parameters</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.emf.teneo.hibernate.hbannotation.ParamDef}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Parameters</b></em>' reference list. The list contents are of
+	 * type {@link org.eclipse.emf.teneo.hibernate.hbannotation.ParamDef}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Parameters</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Parameters</em>' reference list isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Parameters</em>' reference list.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getFilterDef_Parameters()
 	 * @model
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/FilterDefs.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/FilterDefs.java
index bcce44229..a26603f8d 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/FilterDefs.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/FilterDefs.java
@@ -9,31 +9,30 @@ package org.eclipse.emf.teneo.hibernate.hbannotation;
 import org.eclipse.emf.common.util.EList;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Filter Defs</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Filter Defs</b></em>'. <!--
+ * end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.FilterDefs#getValue <em>Value</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.FilterDefs#getValue <em>Value</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getFilterDefs()
- * @model annotation="http://annotation.elver.org/internal/Target 0='EClass' 1='EReference'"
+ * @model annotation= "http://annotation.elver.org/internal/Target 0='EClass' 1='EReference'"
  * @generated
  */
 public interface FilterDefs extends HbAnnotation {
 	/**
-	 * Returns the value of the '<em><b>Value</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.emf.teneo.hibernate.hbannotation.ParamDef}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Value</b></em>' reference list. The list contents are of type
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.ParamDef}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Value</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Value</em>' reference list isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Value</em>' reference list.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getFilterDefs_Value()
 	 * @model required="true"
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Filters.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Filters.java
index 7d430b158..890ceb26e 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Filters.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Filters.java
@@ -9,31 +9,30 @@ package org.eclipse.emf.teneo.hibernate.hbannotation;
 import org.eclipse.emf.common.util.EList;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Filters</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Filters</b></em>'. <!--
+ * end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Filters#getValue <em>Value</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Filters#getValue <em> Value</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getFilters()
- * @model annotation="http://annotation.elver.org/internal/Target 0='EClass' 1='EReference'"
+ * @model annotation= "http://annotation.elver.org/internal/Target 0='EClass' 1='EReference'"
  * @generated
  */
 public interface Filters extends HbAnnotation {
 	/**
-	 * Returns the value of the '<em><b>Value</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.emf.teneo.hibernate.hbannotation.Filter}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Value</b></em>' reference list. The list contents are of type
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Filter}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Value</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Value</em>' reference list isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Value</em>' reference list.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getFilters_Value()
 	 * @model required="true"
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/ForceDiscriminator.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/ForceDiscriminator.java
index 0bc75bce6..194134f34 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/ForceDiscriminator.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/ForceDiscriminator.java
@@ -6,13 +6,11 @@
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Force Discriminator</b></em>'.
- * <!-- end-user-doc -->
- *
- *
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Force Discriminator</b></em>'. <!-- end-user-doc -->
+ * 
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getForceDiscriminator()
  * @model annotation="teneo/internal/Target 0='EClass'"
  * @generated
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Formula.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Formula.java
index d05761a91..9276a6872 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Formula.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Formula.java
@@ -6,32 +6,30 @@
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Formula</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Formula</b></em>'. <!--
+ * end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Formula#getValue <em>Value</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Formula#getValue <em> Value</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getFormula()
  * @model annotation="teneo/internal/Target 0='EAttribute'"
  * @generated
  */
 public interface Formula extends HbAnnotation {
 	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Value</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Value</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Value</em>' attribute.
 	 * @see #setValue(String)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getFormula_Value()
@@ -41,10 +39,11 @@ public interface Formula extends HbAnnotation {
 	String getValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Formula#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
+	 * Sets the value of the ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.Formula#getValue
+	 * <em>Value</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Value</em>' attribute.
 	 * @see #getValue()
 	 * @generated
 	 */
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Generated.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Generated.java
index 1d6da8175..f35c786df 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Generated.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Generated.java
@@ -6,33 +6,32 @@
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Generated</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Generated</b></em>'. <!--
+ * end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Generated#getValue <em>Value</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Generated#getValue <em>Value</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getGenerated()
  * @model annotation="http://annotation.elver.org/internal/Target 0='EAttribute'"
  * @generated
  */
 public interface Generated extends HbAnnotation {
 	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.emf.teneo.hibernate.hbannotation.GenerationTime}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Value</b></em>' attribute. The literals are from the
+	 * enumeration {@link org.eclipse.emf.teneo.hibernate.hbannotation.GenerationTime}. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Value</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Value</em>' attribute.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.GenerationTime
 	 * @see #setValue(GenerationTime)
@@ -43,10 +42,11 @@ public interface Generated extends HbAnnotation {
 	GenerationTime getValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Generated#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
+	 * Sets the value of the ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.Generated#getValue
+	 * <em>Value</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Value</em>' attribute.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.GenerationTime
 	 * @see #getValue()
 	 * @generated
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/GenerationTime.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/GenerationTime.java
index 570e45fc3..54a350c26 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/GenerationTime.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/GenerationTime.java
@@ -13,19 +13,18 @@ import java.util.List;
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Generation Time</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the literals of the enumeration '
+ * <em><b>Generation Time</b></em>', and utility methods for working with them. <!-- end-user-doc
+ * -->
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getGenerationTime()
  * @model
  * @generated
  */
 public enum GenerationTime implements Enumerator {
 	/**
-	 * The '<em><b>NEVER</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>NEVER</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #NEVER_VALUE
 	 * @generated
 	 * @ordered
@@ -33,9 +32,8 @@ public enum GenerationTime implements Enumerator {
 	NEVER(0, "NEVER", "NEVER"),
 
 	/**
-	 * The '<em><b>INSERT</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>INSERT</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #INSERT_VALUE
 	 * @generated
 	 * @ordered
@@ -43,9 +41,8 @@ public enum GenerationTime implements Enumerator {
 	INSERT(1, "INSERT", "INSERT"),
 
 	/**
-	 * The '<em><b>ALWAYS</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>ALWAYS</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #ALWAYS_VALUE
 	 * @generated
 	 * @ordered
@@ -53,13 +50,13 @@ public enum GenerationTime implements Enumerator {
 	ALWAYS(2, "ALWAYS", "ALWAYS");
 
 	/**
-	 * The '<em><b>NEVER</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>NEVER</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>NEVER</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>NEVER</b></em>' literal object isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #NEVER
 	 * @model
 	 * @generated
@@ -68,13 +65,13 @@ public enum GenerationTime implements Enumerator {
 	public static final int NEVER_VALUE = 0;
 
 	/**
-	 * The '<em><b>INSERT</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>INSERT</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>INSERT</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>INSERT</b></em>' literal object isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #INSERT
 	 * @model
 	 * @generated
@@ -83,13 +80,13 @@ public enum GenerationTime implements Enumerator {
 	public static final int INSERT_VALUE = 1;
 
 	/**
-	 * The '<em><b>ALWAYS</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>ALWAYS</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>ALWAYS</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>ALWAYS</b></em>' literal object isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #ALWAYS
 	 * @model
 	 * @generated
@@ -98,30 +95,27 @@ public enum GenerationTime implements Enumerator {
 	public static final int ALWAYS_VALUE = 2;
 
 	/**
-	 * An array of all the '<em><b>Generation Time</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * An array of all the '<em><b>Generation Time</b></em>' enumerators. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final GenerationTime[] VALUES_ARRAY =
-		new GenerationTime[] {
-			NEVER,
-			INSERT,
-			ALWAYS,
-		};
+	private static final GenerationTime[] VALUES_ARRAY = new GenerationTime[] { NEVER, INSERT,
+			ALWAYS, };
 
 	/**
-	 * A public read-only list of all the '<em><b>Generation Time</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * A public read-only list of all the '<em><b>Generation Time</b></em>' enumerators. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public static final List<GenerationTime> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+	public static final List<GenerationTime> VALUES = Collections.unmodifiableList(Arrays
+			.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>Generation Time</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Generation Time</b></em>' literal with the specified literal value. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static GenerationTime get(String literal) {
@@ -135,9 +129,9 @@ public enum GenerationTime implements Enumerator {
 	}
 
 	/**
-	 * Returns the '<em><b>Generation Time</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Generation Time</b></em>' literal with the specified name. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static GenerationTime getByName(String name) {
@@ -151,45 +145,47 @@ public enum GenerationTime implements Enumerator {
 	}
 
 	/**
-	 * Returns the '<em><b>Generation Time</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Generation Time</b></em>' literal with the specified integer value. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static GenerationTime get(int value) {
 		switch (value) {
-			case NEVER_VALUE: return NEVER;
-			case INSERT_VALUE: return INSERT;
-			case ALWAYS_VALUE: return ALWAYS;
+		case NEVER_VALUE:
+			return NEVER;
+		case INSERT_VALUE:
+			return INSERT;
+		case ALWAYS_VALUE:
+			return ALWAYS;
 		}
 		return null;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final int value;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String name;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String literal;
 
 	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Only this class can construct instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private GenerationTime(int value, String name, String literal) {
@@ -199,41 +195,41 @@ public enum GenerationTime implements Enumerator {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
-	  return value;
+		return value;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
-	  return name;
+		return name;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-	  return literal;
+		return literal;
 	}
 
 	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the literal value of the enumerator, which is its string representation. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
 		return literal;
 	}
-	
-} //GenerationTime
+
+} // GenerationTime
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/GenericGenerator.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/GenericGenerator.java
index be013faf0..d7cdfc269 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/GenericGenerator.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/GenericGenerator.java
@@ -9,32 +9,39 @@ package org.eclipse.emf.teneo.hibernate.hbannotation;
 import org.eclipse.emf.common.util.EList;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Generic Generator</b></em>'. <!--
- * end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Generic Generator</b></em>
+ * '. <!-- end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator#getStrategy <em>Strategy</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator#getParameters <em>Parameters</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator#getName <em>Name</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator#getStrategy <em>Strategy
+ * </em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator#getParameters <em>Parameters
+ * </em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getGenericGenerator()
- * @model annotation="http://annotation.elver.org/internal/Target 0='EStructuralFeature' 1='EClass' 2='EPackage'"
- *        annotation="http://annotation.elver.org/internal/Collection name='GenericGenerators' packageNS='http://www.eclipse.org/emf/teneo/2006/HbAnnotation'"
+ * @model annotation=
+ *        "http://annotation.elver.org/internal/Target 0='EStructuralFeature' 1='EClass' 2='EPackage'"
+ *        annotation=
+ *        "http://annotation.elver.org/internal/Collection name='GenericGenerators' packageNS='http://www.eclipse.org/emf/teneo/2006/HbAnnotation'"
  * @generated
  */
 public interface GenericGenerator extends HbAnnotation {
 	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description
-	 * here...
+	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getGenericGenerator_Name()
@@ -44,22 +51,25 @@ public interface GenericGenerator extends HbAnnotation {
 	String getName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator#getName <em>Name</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Name</em>' attribute.
 	 * @see #getName()
 	 * @generated
 	 */
 	void setName(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Strategy</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Strategy</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Strategy</em>' attribute isn't clear, there really should be more of a description
-	 * here...
+	 * If the meaning of the '<em>Strategy</em>' attribute isn't clear, there really should be more of
+	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Strategy</em>' attribute.
 	 * @see #setStrategy(String)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getGenericGenerator_Strategy()
@@ -69,23 +79,26 @@ public interface GenericGenerator extends HbAnnotation {
 	String getStrategy();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator#getStrategy <em>Strategy</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Strategy</em>' attribute.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator#getStrategy
+	 * <em>Strategy</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Strategy</em>' attribute.
 	 * @see #getStrategy()
 	 * @generated
 	 */
 	void setStrategy(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Parameters</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.emf.teneo.hibernate.hbannotation.Parameter}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Parameters</b></em>' reference list. The list contents are of
+	 * type {@link org.eclipse.emf.teneo.hibernate.hbannotation.Parameter}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Parameters</em>' reference list isn't clear, there really should be more of a
-	 * description here...
+	 * If the meaning of the '<em>Parameters</em>' reference list isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Parameters</em>' reference list.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getGenericGenerator_Parameters()
 	 * @model
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/HbAnnotation.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/HbAnnotation.java
index 99ded43c4..3616156c2 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/HbAnnotation.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/HbAnnotation.java
@@ -9,8 +9,8 @@ package org.eclipse.emf.teneo.hibernate.hbannotation;
 import org.eclipse.emf.teneo.annotations.pannotation.PAnnotation;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Hb Annotation</b></em>'. <!-- end-user-doc
- * -->
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Hb Annotation</b></em>'.
+ * <!-- end-user-doc -->
  * 
  * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbAnnotationPackage#getHbAnnotation()
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/HbCascadeType.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/HbCascadeType.java
index 526b10ee9..68c6f2135 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/HbCascadeType.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/HbCascadeType.java
@@ -13,19 +13,18 @@ import java.util.List;
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Hb Cascade Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the literals of the enumeration '
+ * <em><b>Hb Cascade Type</b></em>', and utility methods for working with them. <!-- end-user-doc
+ * -->
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getHbCascadeType()
  * @model
  * @generated
  */
 public enum HbCascadeType implements Enumerator {
 	/**
-	 * The '<em><b>ALL</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>ALL</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #ALL_VALUE
 	 * @generated
 	 * @ordered
@@ -33,9 +32,8 @@ public enum HbCascadeType implements Enumerator {
 	ALL(0, "ALL", "ALL"),
 
 	/**
-	 * The '<em><b>PERSIST</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>PERSIST</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #PERSIST_VALUE
 	 * @generated
 	 * @ordered
@@ -43,9 +41,8 @@ public enum HbCascadeType implements Enumerator {
 	PERSIST(1, "PERSIST", "PERSIST"),
 
 	/**
-	 * The '<em><b>MERGE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>MERGE</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #MERGE_VALUE
 	 * @generated
 	 * @ordered
@@ -53,9 +50,8 @@ public enum HbCascadeType implements Enumerator {
 	MERGE(2, "MERGE", "MERGE"),
 
 	/**
-	 * The '<em><b>REMOVE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>REMOVE</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #REMOVE_VALUE
 	 * @generated
 	 * @ordered
@@ -63,9 +59,8 @@ public enum HbCascadeType implements Enumerator {
 	REMOVE(3, "REMOVE", "REMOVE"),
 
 	/**
-	 * The '<em><b>REFRESH</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>REFRESH</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #REFRESH_VALUE
 	 * @generated
 	 * @ordered
@@ -73,9 +68,8 @@ public enum HbCascadeType implements Enumerator {
 	REFRESH(4, "REFRESH", "REFRESH"),
 
 	/**
-	 * The '<em><b>DELETE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>DELETE</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #DELETE_VALUE
 	 * @generated
 	 * @ordered
@@ -83,9 +77,8 @@ public enum HbCascadeType implements Enumerator {
 	DELETE(5, "DELETE", "DELETE"),
 
 	/**
-	 * The '<em><b>SAVE UPDATE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>SAVE UPDATE</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #SAVE_UPDATE_VALUE
 	 * @generated
 	 * @ordered
@@ -93,9 +86,8 @@ public enum HbCascadeType implements Enumerator {
 	SAVE_UPDATE(6, "SAVE_UPDATE", "SAVE_UPDATE"),
 
 	/**
-	 * The '<em><b>REPLICATE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>REPLICATE</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #REPLICATE_VALUE
 	 * @generated
 	 * @ordered
@@ -103,9 +95,9 @@ public enum HbCascadeType implements Enumerator {
 	REPLICATE(7, "REPLICATE", "REPLICATE"),
 
 	/**
-	 * The '<em><b>DELETE ORPHAN</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>DELETE ORPHAN</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #DELETE_ORPHAN_VALUE
 	 * @generated
 	 * @ordered
@@ -113,9 +105,8 @@ public enum HbCascadeType implements Enumerator {
 	DELETE_ORPHAN(8, "DELETE_ORPHAN", "DELETE_ORPHAN"),
 
 	/**
-	 * The '<em><b>LOCK</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>LOCK</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #LOCK_VALUE
 	 * @generated
 	 * @ordered
@@ -123,9 +114,8 @@ public enum HbCascadeType implements Enumerator {
 	LOCK(9, "LOCK", "LOCK"),
 
 	/**
-	 * The '<em><b>EVICT</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>EVICT</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #EVICT_VALUE
 	 * @generated
 	 * @ordered
@@ -133,13 +123,13 @@ public enum HbCascadeType implements Enumerator {
 	EVICT(10, "EVICT", "EVICT");
 
 	/**
-	 * The '<em><b>ALL</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>ALL</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>ALL</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>ALL</b></em>' literal object isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #ALL
 	 * @model
 	 * @generated
@@ -148,13 +138,13 @@ public enum HbCascadeType implements Enumerator {
 	public static final int ALL_VALUE = 0;
 
 	/**
-	 * The '<em><b>PERSIST</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>PERSIST</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>PERSIST</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>PERSIST</b></em>' literal object isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #PERSIST
 	 * @model
 	 * @generated
@@ -163,13 +153,13 @@ public enum HbCascadeType implements Enumerator {
 	public static final int PERSIST_VALUE = 1;
 
 	/**
-	 * The '<em><b>MERGE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>MERGE</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>MERGE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>MERGE</b></em>' literal object isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #MERGE
 	 * @model
 	 * @generated
@@ -178,13 +168,13 @@ public enum HbCascadeType implements Enumerator {
 	public static final int MERGE_VALUE = 2;
 
 	/**
-	 * The '<em><b>REMOVE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>REMOVE</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>REMOVE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>REMOVE</b></em>' literal object isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #REMOVE
 	 * @model
 	 * @generated
@@ -193,13 +183,13 @@ public enum HbCascadeType implements Enumerator {
 	public static final int REMOVE_VALUE = 3;
 
 	/**
-	 * The '<em><b>REFRESH</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>REFRESH</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>REFRESH</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>REFRESH</b></em>' literal object isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #REFRESH
 	 * @model
 	 * @generated
@@ -208,13 +198,13 @@ public enum HbCascadeType implements Enumerator {
 	public static final int REFRESH_VALUE = 4;
 
 	/**
-	 * The '<em><b>DELETE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>DELETE</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>DELETE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>DELETE</b></em>' literal object isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #DELETE
 	 * @model
 	 * @generated
@@ -223,13 +213,13 @@ public enum HbCascadeType implements Enumerator {
 	public static final int DELETE_VALUE = 5;
 
 	/**
-	 * The '<em><b>SAVE UPDATE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>SAVE UPDATE</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>SAVE UPDATE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>SAVE UPDATE</b></em>' literal object isn't clear, there really should
+	 * be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #SAVE_UPDATE
 	 * @model
 	 * @generated
@@ -238,13 +228,13 @@ public enum HbCascadeType implements Enumerator {
 	public static final int SAVE_UPDATE_VALUE = 6;
 
 	/**
-	 * The '<em><b>REPLICATE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>REPLICATE</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>REPLICATE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>REPLICATE</b></em>' literal object isn't clear, there really should
+	 * be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #REPLICATE
 	 * @model
 	 * @generated
@@ -253,13 +243,13 @@ public enum HbCascadeType implements Enumerator {
 	public static final int REPLICATE_VALUE = 7;
 
 	/**
-	 * The '<em><b>DELETE ORPHAN</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>DELETE ORPHAN</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>DELETE ORPHAN</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>DELETE ORPHAN</b></em>' literal object isn't clear, there really
+	 * should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #DELETE_ORPHAN
 	 * @model
 	 * @generated
@@ -268,13 +258,13 @@ public enum HbCascadeType implements Enumerator {
 	public static final int DELETE_ORPHAN_VALUE = 8;
 
 	/**
-	 * The '<em><b>LOCK</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>LOCK</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>LOCK</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>LOCK</b></em>' literal object isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #LOCK
 	 * @model
 	 * @generated
@@ -283,13 +273,13 @@ public enum HbCascadeType implements Enumerator {
 	public static final int LOCK_VALUE = 9;
 
 	/**
-	 * The '<em><b>EVICT</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>EVICT</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>EVICT</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>EVICT</b></em>' literal object isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #EVICT
 	 * @model
 	 * @generated
@@ -298,38 +288,27 @@ public enum HbCascadeType implements Enumerator {
 	public static final int EVICT_VALUE = 10;
 
 	/**
-	 * An array of all the '<em><b>Hb Cascade Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * An array of all the '<em><b>Hb Cascade Type</b></em>' enumerators. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final HbCascadeType[] VALUES_ARRAY =
-		new HbCascadeType[] {
-			ALL,
-			PERSIST,
-			MERGE,
-			REMOVE,
-			REFRESH,
-			DELETE,
-			SAVE_UPDATE,
-			REPLICATE,
-			DELETE_ORPHAN,
-			LOCK,
-			EVICT,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Hb Cascade Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	private static final HbCascadeType[] VALUES_ARRAY = new HbCascadeType[] { ALL, PERSIST, MERGE,
+			REMOVE, REFRESH, DELETE, SAVE_UPDATE, REPLICATE, DELETE_ORPHAN, LOCK, EVICT, };
+
+	/**
+	 * A public read-only list of all the '<em><b>Hb Cascade Type</b></em>' enumerators. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public static final List<HbCascadeType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+	public static final List<HbCascadeType> VALUES = Collections.unmodifiableList(Arrays
+			.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>Hb Cascade Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Hb Cascade Type</b></em>' literal with the specified literal value. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static HbCascadeType get(String literal) {
@@ -343,9 +322,9 @@ public enum HbCascadeType implements Enumerator {
 	}
 
 	/**
-	 * Returns the '<em><b>Hb Cascade Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Hb Cascade Type</b></em>' literal with the specified name. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static HbCascadeType getByName(String name) {
@@ -359,53 +338,63 @@ public enum HbCascadeType implements Enumerator {
 	}
 
 	/**
-	 * Returns the '<em><b>Hb Cascade Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Hb Cascade Type</b></em>' literal with the specified integer value. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static HbCascadeType get(int value) {
 		switch (value) {
-			case ALL_VALUE: return ALL;
-			case PERSIST_VALUE: return PERSIST;
-			case MERGE_VALUE: return MERGE;
-			case REMOVE_VALUE: return REMOVE;
-			case REFRESH_VALUE: return REFRESH;
-			case DELETE_VALUE: return DELETE;
-			case SAVE_UPDATE_VALUE: return SAVE_UPDATE;
-			case REPLICATE_VALUE: return REPLICATE;
-			case DELETE_ORPHAN_VALUE: return DELETE_ORPHAN;
-			case LOCK_VALUE: return LOCK;
-			case EVICT_VALUE: return EVICT;
+		case ALL_VALUE:
+			return ALL;
+		case PERSIST_VALUE:
+			return PERSIST;
+		case MERGE_VALUE:
+			return MERGE;
+		case REMOVE_VALUE:
+			return REMOVE;
+		case REFRESH_VALUE:
+			return REFRESH;
+		case DELETE_VALUE:
+			return DELETE;
+		case SAVE_UPDATE_VALUE:
+			return SAVE_UPDATE;
+		case REPLICATE_VALUE:
+			return REPLICATE;
+		case DELETE_ORPHAN_VALUE:
+			return DELETE_ORPHAN;
+		case LOCK_VALUE:
+			return LOCK;
+		case EVICT_VALUE:
+			return EVICT;
 		}
 		return null;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final int value;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String name;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String literal;
 
 	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Only this class can construct instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private HbCascadeType(int value, String name, String literal) {
@@ -415,41 +404,41 @@ public enum HbCascadeType implements Enumerator {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
-	  return value;
+		return value;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
-	  return name;
+		return name;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-	  return literal;
+		return literal;
 	}
 
 	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the literal value of the enumerator, which is its string representation. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
 		return literal;
 	}
-	
-} //HbCascadeType
+
+} // HbCascadeType
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/HbEntity.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/HbEntity.java
index 37425a438..9de8d41cc 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/HbEntity.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/HbEntity.java
@@ -6,38 +6,47 @@
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Hb Entity</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Hb Entity</b></em>'. <!--
+ * end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#isDynamicInsert <em>Dynamic Insert</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#isDynamicUpdate <em>Dynamic Update</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#isSelectBeforeUpdate <em>Select Before Update</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#isMutable <em>Mutable</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#getPersister <em>Persister</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#getOptimisticLock <em>Optimistic Lock</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#getPolymorphism <em>Polymorphism</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#isDynamicInsert <em>Dynamic Insert
+ * </em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#isDynamicUpdate <em>Dynamic Update
+ * </em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#isSelectBeforeUpdate <em>Select
+ * Before Update</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#isMutable <em>Mutable</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#getPersister <em>Persister</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#getOptimisticLock <em>Optimistic
+ * Lock</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#getPolymorphism <em>Polymorphism
+ * </em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getHbEntity()
- * @model annotation="http://annotation.elver.org/internal/Target 0='EStructuralFeature'"
+ * @model annotation= "http://annotation.elver.org/internal/Target 0='EStructuralFeature'"
  * @generated
  */
 public interface HbEntity extends HbAnnotation {
 	/**
-	 * Returns the value of the '<em><b>Dynamic Insert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dynamic Insert</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dynamic Insert</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dynamic Insert</em>' attribute isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dynamic Insert</em>' attribute.
 	 * @see #setDynamicInsert(boolean)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getHbEntity_DynamicInsert()
@@ -47,23 +56,25 @@ public interface HbEntity extends HbAnnotation {
 	boolean isDynamicInsert();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#isDynamicInsert <em>Dynamic Insert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Dynamic Insert</em>' attribute.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#isDynamicInsert
+	 * <em>Dynamic Insert</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Dynamic Insert</em>' attribute.
 	 * @see #isDynamicInsert()
 	 * @generated
 	 */
 	void setDynamicInsert(boolean value);
 
 	/**
-	 * Returns the value of the '<em><b>Dynamic Update</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Dynamic Update</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Dynamic Update</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Dynamic Update</em>' attribute isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Dynamic Update</em>' attribute.
 	 * @see #setDynamicUpdate(boolean)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getHbEntity_DynamicUpdate()
@@ -73,23 +84,26 @@ public interface HbEntity extends HbAnnotation {
 	boolean isDynamicUpdate();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#isDynamicUpdate <em>Dynamic Update</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Dynamic Update</em>' attribute.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#isDynamicUpdate
+	 * <em>Dynamic Update</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Dynamic Update</em>' attribute.
 	 * @see #isDynamicUpdate()
 	 * @generated
 	 */
 	void setDynamicUpdate(boolean value);
 
 	/**
-	 * Returns the value of the '<em><b>Select Before Update</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Select Before Update</b></em>' attribute. <!-- begin-user-doc
+	 * -->
 	 * <p>
-	 * If the meaning of the '<em>Select Before Update</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Select Before Update</em>' attribute isn't clear, there really
+	 * should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Select Before Update</em>' attribute.
 	 * @see #setSelectBeforeUpdate(boolean)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getHbEntity_SelectBeforeUpdate()
@@ -99,24 +113,26 @@ public interface HbEntity extends HbAnnotation {
 	boolean isSelectBeforeUpdate();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#isSelectBeforeUpdate <em>Select Before Update</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Select Before Update</em>' attribute.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#isSelectBeforeUpdate
+	 * <em>Select Before Update</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Select Before Update</em>' attribute.
 	 * @see #isSelectBeforeUpdate()
 	 * @generated
 	 */
 	void setSelectBeforeUpdate(boolean value);
 
 	/**
-	 * Returns the value of the '<em><b>Mutable</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Mutable</b></em>' attribute. The default value is
+	 * <code>"true"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mutable</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mutable</em>' attribute isn't clear, there really should be more of
+	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mutable</em>' attribute.
 	 * @see #setMutable(boolean)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getHbEntity_Mutable()
@@ -126,23 +142,24 @@ public interface HbEntity extends HbAnnotation {
 	boolean isMutable();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#isMutable <em>Mutable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Mutable</em>' attribute.
+	 * Sets the value of the ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#isMutable
+	 * <em>Mutable</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Mutable</em>' attribute.
 	 * @see #isMutable()
 	 * @generated
 	 */
 	void setMutable(boolean value);
 
 	/**
-	 * Returns the value of the '<em><b>Persister</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Persister</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Persister</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Persister</em>' attribute isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Persister</em>' attribute.
 	 * @see #setPersister(String)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getHbEntity_Persister()
@@ -152,25 +169,28 @@ public interface HbEntity extends HbAnnotation {
 	String getPersister();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#getPersister <em>Persister</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Persister</em>' attribute.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#getPersister <em>Persister</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Persister</em>' attribute.
 	 * @see #getPersister()
 	 * @generated
 	 */
 	void setPersister(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Optimistic Lock</b></em>' attribute.
-	 * The default value is <code>"VERSION"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.teneo.hibernate.hbannotation.OptimisticLockType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Optimistic Lock</b></em>' attribute. The default value is
+	 * <code>"VERSION"</code>. The literals are from the enumeration
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.OptimisticLockType}. <!-- begin-user-doc
+	 * -->
 	 * <p>
-	 * If the meaning of the '<em>Optimistic Lock</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Optimistic Lock</em>' attribute isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Optimistic Lock</em>' attribute.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.OptimisticLockType
 	 * @see #setOptimisticLock(OptimisticLockType)
@@ -181,10 +201,12 @@ public interface HbEntity extends HbAnnotation {
 	OptimisticLockType getOptimisticLock();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#getOptimisticLock <em>Optimistic Lock</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Optimistic Lock</em>' attribute.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#getOptimisticLock
+	 * <em>Optimistic Lock</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Optimistic Lock</em>' attribute.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.OptimisticLockType
 	 * @see #getOptimisticLock()
 	 * @generated
@@ -192,15 +214,15 @@ public interface HbEntity extends HbAnnotation {
 	void setOptimisticLock(OptimisticLockType value);
 
 	/**
-	 * Returns the value of the '<em><b>Polymorphism</b></em>' attribute.
-	 * The default value is <code>"IMPLICIT"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.emf.teneo.hibernate.hbannotation.PolymorphismType}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Polymorphism</b></em>' attribute. The default value is
+	 * <code>"IMPLICIT"</code>. The literals are from the enumeration
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.PolymorphismType}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Polymorphism</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Polymorphism</em>' attribute isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Polymorphism</em>' attribute.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.PolymorphismType
 	 * @see #setPolymorphism(PolymorphismType)
@@ -211,10 +233,12 @@ public interface HbEntity extends HbAnnotation {
 	PolymorphismType getPolymorphism();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#getPolymorphism <em>Polymorphism</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Polymorphism</em>' attribute.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#getPolymorphism
+	 * <em>Polymorphism</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Polymorphism</em>' attribute.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.PolymorphismType
 	 * @see #getPolymorphism()
 	 * @generated
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/HbFetchType.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/HbFetchType.java
index 391511523..e63ebe416 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/HbFetchType.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/HbFetchType.java
@@ -13,108 +13,101 @@ import java.util.List;
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Hb Fetch Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the literals of the enumeration '
+ * <em><b>Hb Fetch Type</b></em>', and utility methods for working with them. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getHbFetchType()
  * @model
  * @generated
  */
 public enum HbFetchType implements Enumerator {
 	/**
-	 * The '<em><b>JOIN</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>JOIN</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #JOIN_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	JOIN(0, "JOIN", "JOIN"), /**
-	 * The '<em><b>SELECT</b></em>' literal object.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>SELECT</b></em>' literal object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #SELECT_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	SELECT(1, "SELECT", "SELECT"), /**
-	 * The '<em><b>SUBSELECT</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>SUBSELECT</b></em>' literal object. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #SUBSELECT_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	SUBSELECT(2, "SUBSELECT", "SUBSELECT")
-	;
+	SUBSELECT(2, "SUBSELECT", "SUBSELECT");
 
-/**
-	 * The '<em><b>JOIN</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	/**
+	 * The '<em><b>JOIN</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>JOIN</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>JOIN</b></em>' literal object isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #JOIN
 	 * @model
 	 * @generated
 	 * @ordered
 	 */
 	public static final int JOIN_VALUE = 0;
-/**
-	 * The '<em><b>SELECT</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	/**
+	 * The '<em><b>SELECT</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>SELECT</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>SELECT</b></em>' literal object isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #SELECT
 	 * @model
 	 * @generated
 	 * @ordered
 	 */
 	public static final int SELECT_VALUE = 1;
-/**
-	 * The '<em><b>SUBSELECT</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	/**
+	 * The '<em><b>SUBSELECT</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>SUBSELECT</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>SUBSELECT</b></em>' literal object isn't clear, there really should
+	 * be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #SUBSELECT
 	 * @model
 	 * @generated
 	 * @ordered
 	 */
 	public static final int SUBSELECT_VALUE = 2;
-/**
-	 * An array of all the '<em><b>Hb Fetch Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * An array of all the '<em><b>Hb Fetch Type</b></em>' enumerators. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final HbFetchType[] VALUES_ARRAY =
-		new HbFetchType[] {
-			JOIN,
-			SELECT,
-			SUBSELECT,
-		};
-/**
-	 * A public read-only list of all the '<em><b>Hb Fetch Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	private static final HbFetchType[] VALUES_ARRAY = new HbFetchType[] { JOIN, SELECT, SUBSELECT, };
+	/**
+	 * A public read-only list of all the '<em><b>Hb Fetch Type</b></em>' enumerators. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public static final List<HbFetchType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+	public static final List<HbFetchType> VALUES = Collections.unmodifiableList(Arrays
+			.asList(VALUES_ARRAY));
 
-/**
-	 * Returns the '<em><b>Hb Fetch Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the '<em><b>Hb Fetch Type</b></em>' literal with the specified literal value. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static HbFetchType get(String literal) {
@@ -127,10 +120,10 @@ public enum HbFetchType implements Enumerator {
 		return null;
 	}
 
-/**
-	 * Returns the '<em><b>Hb Fetch Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the '<em><b>Hb Fetch Type</b></em>' literal with the specified name. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static HbFetchType getByName(String name) {
@@ -143,44 +136,46 @@ public enum HbFetchType implements Enumerator {
 		return null;
 	}
 
-/**
-	 * Returns the '<em><b>Hb Fetch Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the '<em><b>Hb Fetch Type</b></em>' literal with the specified integer value. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static HbFetchType get(int value) {
 		switch (value) {
-			case JOIN_VALUE: return JOIN;
-			case SELECT_VALUE: return SELECT;
-			case SUBSELECT_VALUE: return SUBSELECT;
+		case JOIN_VALUE:
+			return JOIN;
+		case SELECT_VALUE:
+			return SELECT;
+		case SUBSELECT_VALUE:
+			return SUBSELECT;
 		}
 		return null;
 	}
 
-/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final int value;
-/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String name;
-/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String literal;
 
-/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Only this class can construct instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private HbFetchType(int value, String name, String literal) {
@@ -189,37 +184,37 @@ public enum HbFetchType implements Enumerator {
 		this.literal = literal;
 	}
 
-/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
-	  return value;
+		return value;
 	}
 
-/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
-	  return name;
+		return name;
 	}
 
-/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-	  return literal;
+		return literal;
 	}
 
-/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	/**
+	 * Returns the literal value of the enumerator, which is its string representation. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/HbMapKey.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/HbMapKey.java
index a7a278b0c..3f8ed86d8 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/HbMapKey.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/HbMapKey.java
@@ -10,31 +10,31 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.teneo.annotations.pannotation.Column;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Hb Map Key</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Hb Map Key</b></em>'. <!--
+ * end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.HbMapKey#getColumns <em>Columns</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.HbMapKey#getColumns <em>Columns</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getHbMapKey()
- * @model annotation="http://annotation.elver.org/internal/Target 0='EStructuralFeature'"
+ * @model annotation= "http://annotation.elver.org/internal/Target 0='EStructuralFeature'"
  * @generated
  */
 public interface HbMapKey extends HbAnnotation {
 	/**
-	 * Returns the value of the '<em><b>Columns</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.emf.teneo.annotations.pannotation.Column}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Columns</b></em>' containment reference list. The list
+	 * contents are of type {@link org.eclipse.emf.teneo.annotations.pannotation.Column}. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Columns</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Columns</em>' containment reference list isn't clear, there really
+	 * should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Columns</em>' containment reference list.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getHbMapKey_Columns()
 	 * @model containment="true" ordered="false"
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/HbannotationFactory.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/HbannotationFactory.java
index 0b852db48..fca3cfa19 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/HbannotationFactory.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/HbannotationFactory.java
@@ -11,56 +11,56 @@ import org.eclipse.emf.ecore.EFactory;
 /**
  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each
  * non-abstract class of the model. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage
  * @generated
  */
 public interface HbannotationFactory extends EFactory {
 	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	HbannotationFactory eINSTANCE = org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationFactoryImpl.init();
+	HbannotationFactory eINSTANCE = org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationFactoryImpl
+			.init();
 
 	/**
-	 * Returns a new object of class '<em>Cascade</em>'.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
+	 * Returns a new object of class '<em>Cascade</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Cascade</em>'.
 	 * @generated
 	 */
 	Cascade createCascade();
 
 	/**
-	 * Returns a new object of class '<em>Collection Of Elements</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Collection Of Elements</em>'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Collection Of Elements</em>'.
 	 * @generated
 	 */
 	CollectionOfElements createCollectionOfElements();
 
 	/**
-	 * Returns a new object of class '<em>Hb Map Key</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Hb Map Key</em>'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return a new object of class '<em>Hb Map Key</em>'.
 	 * @generated
 	 */
 	HbMapKey createHbMapKey();
 
 	/**
-	 * Returns a new object of class '<em>Parameter</em>'.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
+	 * Returns a new object of class '<em>Parameter</em>'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return a new object of class '<em>Parameter</em>'.
 	 * @generated
 	 */
 	Parameter createParameter();
 
 	/**
-	 * Returns a new object of class '<em>Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
+	 * Returns a new object of class '<em>Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return a new object of class '<em>Type</em>'.
 	 * @generated
@@ -68,8 +68,7 @@ public interface HbannotationFactory extends EFactory {
 	Type createType();
 
 	/**
-	 * Returns a new object of class '<em>Where</em>'. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
+	 * Returns a new object of class '<em>Where</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return a new object of class '<em>Where</em>'.
 	 * @generated
@@ -77,26 +76,24 @@ public interface HbannotationFactory extends EFactory {
 	Where createWhere();
 
 	/**
-	 * Returns a new object of class '<em>Id Bag</em>'.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
+	 * Returns a new object of class '<em>Id Bag</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Id Bag</em>'.
 	 * @generated
 	 */
 	IdBag createIdBag();
 
 	/**
-	 * Returns a new object of class '<em>Generic Generator</em>'.
-	 * <!-- begin-user-doc --> <!--
+	 * Returns a new object of class '<em>Generic Generator</em>'. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Generic Generator</em>'.
 	 * @generated
 	 */
 	GenericGenerator createGenericGenerator();
 
 	/**
-	 * Returns a new object of class '<em>Cache</em>'. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
+	 * Returns a new object of class '<em>Cache</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return a new object of class '<em>Cache</em>'.
 	 * @generated
@@ -104,17 +101,16 @@ public interface HbannotationFactory extends EFactory {
 	Cache createCache();
 
 	/**
-	 * Returns a new object of class '<em>Type Def</em>'.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
+	 * Returns a new object of class '<em>Type Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return a new object of class '<em>Type Def</em>'.
 	 * @generated
 	 */
 	TypeDef createTypeDef();
 
 	/**
-	 * Returns a new object of class '<em>Fetch</em>'. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
+	 * Returns a new object of class '<em>Fetch</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return a new object of class '<em>Fetch</em>'.
 	 * @generated
@@ -122,17 +118,16 @@ public interface HbannotationFactory extends EFactory {
 	Fetch createFetch();
 
 	/**
-	 * Returns a new object of class '<em>On Delete</em>'.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
+	 * Returns a new object of class '<em>On Delete</em>'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return a new object of class '<em>On Delete</em>'.
 	 * @generated
 	 */
 	OnDelete createOnDelete();
 
 	/**
-	 * Returns a new object of class '<em>Proxy</em>'. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
+	 * Returns a new object of class '<em>Proxy</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return a new object of class '<em>Proxy</em>'.
 	 * @generated
@@ -140,8 +135,7 @@ public interface HbannotationFactory extends EFactory {
 	Proxy createProxy();
 
 	/**
-	 * Returns a new object of class '<em>Index</em>'. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
+	 * Returns a new object of class '<em>Index</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return a new object of class '<em>Index</em>'.
 	 * @generated
@@ -149,161 +143,158 @@ public interface HbannotationFactory extends EFactory {
 	Index createIndex();
 
 	/**
-	 * Returns a new object of class '<em>Generated</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Generated</em>'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return a new object of class '<em>Generated</em>'.
 	 * @generated
 	 */
 	Generated createGenerated();
 
 	/**
-	 * Returns a new object of class '<em>Named Query</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Named Query</em>'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return a new object of class '<em>Named Query</em>'.
 	 * @generated
 	 */
 	NamedQuery createNamedQuery();
 
 	/**
-	 * Returns a new object of class '<em>Filter</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Filter</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Filter</em>'.
 	 * @generated
 	 */
 	Filter createFilter();
 
 	/**
-	 * Returns a new object of class '<em>Param Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Param Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return a new object of class '<em>Param Def</em>'.
 	 * @generated
 	 */
 	ParamDef createParamDef();
 
 	/**
-	 * Returns a new object of class '<em>Filter Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Filter Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return a new object of class '<em>Filter Def</em>'.
 	 * @generated
 	 */
 	FilterDef createFilterDef();
 
 	/**
-	 * Returns a new object of class '<em>Discriminator Formula</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Discriminator Formula</em>'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Discriminator Formula</em>'.
 	 * @generated
 	 */
 	DiscriminatorFormula createDiscriminatorFormula();
 
 	/**
-	 * Returns a new object of class '<em>Natural Id</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Natural Id</em>'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return a new object of class '<em>Natural Id</em>'.
 	 * @generated
 	 */
 	NaturalId createNaturalId();
 
 	/**
-	 * Returns a new object of class '<em>Map Key Many To Many</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Map Key Many To Many</em>'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Map Key Many To Many</em>'.
 	 * @generated
 	 */
 	MapKeyManyToMany createMapKeyManyToMany();
 
 	/**
-	 * Returns a new object of class '<em>Force Discriminator</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Force Discriminator</em>'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Force Discriminator</em>'.
 	 * @generated
 	 */
 	ForceDiscriminator createForceDiscriminator();
 
 	/**
-	 * Returns a new object of class '<em>Immutable</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Immutable</em>'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return a new object of class '<em>Immutable</em>'.
 	 * @generated
 	 */
 	Immutable createImmutable();
 
 	/**
-	 * Returns a new object of class '<em>Formula</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Formula</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Formula</em>'.
 	 * @generated
 	 */
 	Formula createFormula();
 
 	/**
-	 * Returns a new object of class '<em>Not Found</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Not Found</em>'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return a new object of class '<em>Not Found</em>'.
 	 * @generated
 	 */
 	NotFound createNotFound();
 
 	/**
-	 * Returns a new object of class '<em>Hb Entity</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Hb Entity</em>'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return a new object of class '<em>Hb Entity</em>'.
 	 * @generated
 	 */
 	HbEntity createHbEntity();
 
 	/**
-	 * Returns a new object of class '<em>Batch Size</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Batch Size</em>'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return a new object of class '<em>Batch Size</em>'.
 	 * @generated
 	 */
 	BatchSize createBatchSize();
 
 	/**
-	 * Returns a new object of class '<em>Any</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Any</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Any</em>'.
 	 * @generated
 	 */
 	Any createAny();
 
 	/**
-	 * Returns a new object of class '<em>Meta Value</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Meta Value</em>'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return a new object of class '<em>Meta Value</em>'.
 	 * @generated
 	 */
 	MetaValue createMetaValue();
 
 	/**
-	 * Returns a new object of class '<em>Any Meta Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Any Meta Def</em>'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Any Meta Def</em>'.
 	 * @generated
 	 */
 	AnyMetaDef createAnyMetaDef();
 
 	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/HbannotationPackage.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/HbannotationPackage.java
index b5f639226..f4ea5a4b7 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/HbannotationPackage.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/HbannotationPackage.java
@@ -23,43 +23,46 @@ import org.eclipse.emf.teneo.annotations.pannotation.PannotationPackage;
  * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationFactory
- * @model kind="package"
- *        annotation="teneo.mapping.source 1='http://hibernate.elver.org/'"
+ * @model kind="package" annotation="teneo.mapping.source 1='http://hibernate.elver.org/'"
  * @generated
  */
 public interface HbannotationPackage extends EPackage {
 	/**
-	 * The package name.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNAME = "hbannotation";
 
 	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_URI = "http://www.eclipse.org/emf/teneo/2006/HbAnnotation";
 
 	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_PREFIX = "org.eclipse.emf.teneo.hibernate";
 
 	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	HbannotationPackage eINSTANCE = org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl.init();
+	HbannotationPackage eINSTANCE = org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl
+			.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbAnnotationImpl <em>Hb Annotation</em>}' class.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbAnnotationImpl
+	 * <em>Hb Annotation</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbAnnotationImpl
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getHbAnnotation()
 	 * @generated
@@ -67,26 +70,26 @@ public interface HbannotationPackage extends EPackage {
 	int HB_ANNOTATION = 0;
 
 	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EModel Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATION__EMODEL_ELEMENT = PannotationPackage.PANNOTATION__EMODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Generated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Generated</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATION__GENERATED = PannotationPackage.PANNOTATION__GENERATED;
 
 	/**
-	 * The number of structural features of the '<em>Hb Annotation</em>' class. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Hb Annotation</em>' class. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
 	 * 
 	 * @generated
 	 * @ordered
@@ -94,8 +97,10 @@ public interface HbannotationPackage extends EPackage {
 	int HB_ANNOTATION_FEATURE_COUNT = PannotationPackage.PANNOTATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.CascadeImpl <em>Cascade</em>}' class.
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.CascadeImpl <em>Cascade</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.CascadeImpl
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getCascade()
 	 * @generated
@@ -103,44 +108,46 @@ public interface HbannotationPackage extends EPackage {
 	int CASCADE = 1;
 
 	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EModel Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CASCADE__EMODEL_ELEMENT = HB_ANNOTATION__EMODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Generated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Generated</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CASCADE__GENERATED = HB_ANNOTATION__GENERATED;
 
 	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Value</b></em>' attribute list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CASCADE__VALUE = HB_ANNOTATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Cascade</em>' class.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Cascade</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CASCADE_FEATURE_COUNT = HB_ANNOTATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.CollectionOfElementsImpl <em>Collection Of Elements</em>}' class.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.CollectionOfElementsImpl
+	 * <em>Collection Of Elements</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.CollectionOfElementsImpl
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getCollectionOfElements()
 	 * @generated
@@ -148,36 +155,36 @@ public interface HbannotationPackage extends EPackage {
 	int COLLECTION_OF_ELEMENTS = 2;
 
 	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EModel Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int COLLECTION_OF_ELEMENTS__EMODEL_ELEMENT = HB_ANNOTATION__EMODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Generated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Generated</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int COLLECTION_OF_ELEMENTS__GENERATED = HB_ANNOTATION__GENERATED;
 
 	/**
-	 * The feature id for the '<em><b>Target Element</b></em>' attribute.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Target Element</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int COLLECTION_OF_ELEMENTS__TARGET_ELEMENT = HB_ANNOTATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Fetch</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The feature id for the '<em><b>Fetch</b></em>' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -193,9 +200,10 @@ public interface HbannotationPackage extends EPackage {
 	int COLLECTION_OF_ELEMENTS_FEATURE_COUNT = HB_ANNOTATION_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbMapKeyImpl <em>Hb Map Key</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbMapKeyImpl <em>Hb Map Key</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbMapKeyImpl
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getHbMapKey()
 	 * @generated
@@ -203,44 +211,46 @@ public interface HbannotationPackage extends EPackage {
 	int HB_MAP_KEY = 3;
 
 	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EModel Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_MAP_KEY__EMODEL_ELEMENT = HB_ANNOTATION__EMODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Generated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Generated</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_MAP_KEY__GENERATED = HB_ANNOTATION__GENERATED;
 
 	/**
-	 * The feature id for the '<em><b>Columns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Columns</b></em>' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_MAP_KEY__COLUMNS = HB_ANNOTATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Hb Map Key</em>' class.
-	 * <!-- begin-user-doc -->
+	 * The number of structural features of the '<em>Hb Map Key</em>' class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_MAP_KEY_FEATURE_COUNT = HB_ANNOTATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.ParameterImpl <em>Parameter</em>}' class.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.ParameterImpl <em>Parameter</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.ParameterImpl
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getParameter()
 	 * @generated
@@ -248,53 +258,54 @@ public interface HbannotationPackage extends EPackage {
 	int PARAMETER = 4;
 
 	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EModel Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int PARAMETER__EMODEL_ELEMENT = HB_ANNOTATION__EMODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Generated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Generated</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int PARAMETER__GENERATED = HB_ANNOTATION__GENERATED;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int PARAMETER__NAME = HB_ANNOTATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The feature id for the '<em><b>Value</b></em>' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int PARAMETER__VALUE = HB_ANNOTATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Parameter</em>' class.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Parameter</em>' class. <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int PARAMETER_FEATURE_COUNT = HB_ANNOTATION_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.TypeImpl <em>Type</em>}' class.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The meta object id for the ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.TypeImpl
+	 * <em>Type</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.TypeImpl
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getType()
 	 * @generated
@@ -302,53 +313,55 @@ public interface HbannotationPackage extends EPackage {
 	int TYPE = 5;
 
 	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EModel Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TYPE__EMODEL_ELEMENT = HB_ANNOTATION__EMODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Generated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Generated</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TYPE__GENERATED = HB_ANNOTATION__GENERATED;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The feature id for the '<em><b>Type</b></em>' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TYPE__TYPE = HB_ANNOTATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Parameters</b></em>' reference list.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Parameters</b></em>' reference list. <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TYPE__PARAMETERS = HB_ANNOTATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Type</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TYPE_FEATURE_COUNT = HB_ANNOTATION_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.WhereImpl <em>Where</em>}' class.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.WhereImpl <em>Where</em>}' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.WhereImpl
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getWhere()
 	 * @generated
@@ -356,44 +369,46 @@ public interface HbannotationPackage extends EPackage {
 	int WHERE = 6;
 
 	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EModel Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int WHERE__EMODEL_ELEMENT = HB_ANNOTATION__EMODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Generated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Generated</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int WHERE__GENERATED = HB_ANNOTATION__GENERATED;
 
 	/**
-	 * The feature id for the '<em><b>Clause</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The feature id for the '<em><b>Clause</b></em>' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int WHERE__CLAUSE = HB_ANNOTATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Where</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Where</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int WHERE_FEATURE_COUNT = HB_ANNOTATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.IdBagImpl <em>Id Bag</em>}' class.
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.IdBagImpl <em>Id Bag</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.IdBagImpl
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getIdBag()
 	 * @generated
@@ -401,62 +416,64 @@ public interface HbannotationPackage extends EPackage {
 	int ID_BAG = 7;
 
 	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EModel Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ID_BAG__EMODEL_ELEMENT = HB_ANNOTATION__EMODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Generated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Generated</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ID_BAG__GENERATED = HB_ANNOTATION__GENERATED;
 
 	/**
-	 * The feature id for the '<em><b>Generator</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Generator</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ID_BAG__GENERATOR = HB_ANNOTATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The feature id for the '<em><b>Type</b></em>' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ID_BAG__TYPE = HB_ANNOTATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Table</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The feature id for the '<em><b>Table</b></em>' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ID_BAG__TABLE = HB_ANNOTATION_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of structural features of the '<em>Id Bag</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Id Bag</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ID_BAG_FEATURE_COUNT = HB_ANNOTATION_FEATURE_COUNT + 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.GenericGeneratorImpl <em>Generic Generator</em>}' class.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.GenericGeneratorImpl
+	 * <em>Generic Generator</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.GenericGeneratorImpl
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getGenericGenerator()
 	 * @generated
@@ -464,45 +481,45 @@ public interface HbannotationPackage extends EPackage {
 	int GENERIC_GENERATOR = 8;
 
 	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EModel Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int GENERIC_GENERATOR__EMODEL_ELEMENT = HB_ANNOTATION__EMODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Generated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Generated</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int GENERIC_GENERATOR__GENERATED = HB_ANNOTATION__GENERATED;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int GENERIC_GENERATOR__NAME = HB_ANNOTATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Strategy</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Strategy</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int GENERIC_GENERATOR__STRATEGY = HB_ANNOTATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Parameters</b></em>' reference list.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Parameters</b></em>' reference list. <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -518,8 +535,10 @@ public interface HbannotationPackage extends EPackage {
 	int GENERIC_GENERATOR_FEATURE_COUNT = HB_ANNOTATION_FEATURE_COUNT + 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.CacheImpl <em>Cache</em>}' class.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.CacheImpl <em>Cache</em>}' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.CacheImpl
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getCache()
 	 * @generated
@@ -527,62 +546,64 @@ public interface HbannotationPackage extends EPackage {
 	int CACHE = 9;
 
 	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EModel Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CACHE__EMODEL_ELEMENT = HB_ANNOTATION__EMODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Generated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Generated</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CACHE__GENERATED = HB_ANNOTATION__GENERATED;
 
 	/**
-	 * The feature id for the '<em><b>Usage</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The feature id for the '<em><b>Usage</b></em>' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CACHE__USAGE = HB_ANNOTATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Region</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The feature id for the '<em><b>Region</b></em>' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CACHE__REGION = HB_ANNOTATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Include</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The feature id for the '<em><b>Include</b></em>' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CACHE__INCLUDE = HB_ANNOTATION_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of structural features of the '<em>Cache</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Cache</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CACHE_FEATURE_COUNT = HB_ANNOTATION_FEATURE_COUNT + 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.TypeDefImpl <em>Type Def</em>}' class.
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.TypeDefImpl <em>Type Def</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.TypeDefImpl
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getTypeDef()
 	 * @generated
@@ -590,62 +611,64 @@ public interface HbannotationPackage extends EPackage {
 	int TYPE_DEF = 10;
 
 	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EModel Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TYPE_DEF__EMODEL_ELEMENT = HB_ANNOTATION__EMODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Generated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Generated</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TYPE_DEF__GENERATED = HB_ANNOTATION__GENERATED;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TYPE_DEF__NAME = HB_ANNOTATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Parameters</b></em>' reference list.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Parameters</b></em>' reference list. <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TYPE_DEF__PARAMETERS = HB_ANNOTATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Type Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type Class</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TYPE_DEF__TYPE_CLASS = HB_ANNOTATION_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of structural features of the '<em>Type Def</em>' class.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Type Def</em>' class. <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TYPE_DEF_FEATURE_COUNT = HB_ANNOTATION_FEATURE_COUNT + 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.FetchImpl <em>Fetch</em>}' class.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.FetchImpl <em>Fetch</em>}' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.FetchImpl
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getFetch()
 	 * @generated
@@ -653,44 +676,46 @@ public interface HbannotationPackage extends EPackage {
 	int FETCH = 11;
 
 	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EModel Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FETCH__EMODEL_ELEMENT = HB_ANNOTATION__EMODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Generated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Generated</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FETCH__GENERATED = HB_ANNOTATION__GENERATED;
 
 	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The feature id for the '<em><b>Value</b></em>' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FETCH__VALUE = HB_ANNOTATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Fetch</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Fetch</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FETCH_FEATURE_COUNT = HB_ANNOTATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.OnDeleteImpl <em>On Delete</em>}' class.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.OnDeleteImpl <em>On Delete</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.OnDeleteImpl
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getOnDelete()
 	 * @generated
@@ -698,44 +723,46 @@ public interface HbannotationPackage extends EPackage {
 	int ON_DELETE = 12;
 
 	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EModel Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ON_DELETE__EMODEL_ELEMENT = HB_ANNOTATION__EMODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Generated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Generated</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ON_DELETE__GENERATED = HB_ANNOTATION__GENERATED;
 
 	/**
-	 * The feature id for the '<em><b>Action</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The feature id for the '<em><b>Action</b></em>' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ON_DELETE__ACTION = HB_ANNOTATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>On Delete</em>' class.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
+	 * The number of structural features of the '<em>On Delete</em>' class. <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ON_DELETE_FEATURE_COUNT = HB_ANNOTATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.ProxyImpl <em>Proxy</em>}' class.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.ProxyImpl <em>Proxy</em>}' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.ProxyImpl
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getProxy()
 	 * @generated
@@ -743,53 +770,55 @@ public interface HbannotationPackage extends EPackage {
 	int PROXY = 13;
 
 	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EModel Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int PROXY__EMODEL_ELEMENT = HB_ANNOTATION__EMODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Generated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Generated</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int PROXY__GENERATED = HB_ANNOTATION__GENERATED;
 
 	/**
-	 * The feature id for the '<em><b>Proxy Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Proxy Class</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int PROXY__PROXY_CLASS = HB_ANNOTATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Lazy</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The feature id for the '<em><b>Lazy</b></em>' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int PROXY__LAZY = HB_ANNOTATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Proxy</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Proxy</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int PROXY_FEATURE_COUNT = HB_ANNOTATION_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.IndexImpl <em>Index</em>}' class.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.IndexImpl <em>Index</em>}' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.IndexImpl
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getIndex()
 	 * @generated
@@ -797,45 +826,46 @@ public interface HbannotationPackage extends EPackage {
 	int INDEX = 14;
 
 	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EModel Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int INDEX__EMODEL_ELEMENT = HB_ANNOTATION__EMODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Generated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Generated</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int INDEX__GENERATED = HB_ANNOTATION__GENERATED;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int INDEX__NAME = HB_ANNOTATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Index</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Index</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int INDEX_FEATURE_COUNT = HB_ANNOTATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.GeneratedImpl <em>Generated</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.GeneratedImpl <em>Generated</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.GeneratedImpl
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getGenerated()
 	 * @generated
@@ -843,45 +873,46 @@ public interface HbannotationPackage extends EPackage {
 	int GENERATED = 15;
 
 	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EModel Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int GENERATED__EMODEL_ELEMENT = HB_ANNOTATION__EMODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Generated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Generated</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int GENERATED__GENERATED = HB_ANNOTATION__GENERATED;
 
 	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Value</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int GENERATED__VALUE = HB_ANNOTATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Generated</em>' class.
-	 * <!-- begin-user-doc -->
+	 * The number of structural features of the '<em>Generated</em>' class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int GENERATED_FEATURE_COUNT = HB_ANNOTATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.NamedQueryImpl <em>Named Query</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.NamedQueryImpl <em>Named Query</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.NamedQueryImpl
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getNamedQuery()
 	 * @generated
@@ -889,54 +920,55 @@ public interface HbannotationPackage extends EPackage {
 	int NAMED_QUERY = 16;
 
 	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EModel Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int NAMED_QUERY__EMODEL_ELEMENT = HB_ANNOTATION__EMODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Generated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Generated</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int NAMED_QUERY__GENERATED = HB_ANNOTATION__GENERATED;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int NAMED_QUERY__NAME = HB_ANNOTATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Query</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Query</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int NAMED_QUERY__QUERY = HB_ANNOTATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Named Query</em>' class.
-	 * <!-- begin-user-doc -->
+	 * The number of structural features of the '<em>Named Query</em>' class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int NAMED_QUERY_FEATURE_COUNT = HB_ANNOTATION_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.FilterImpl <em>Filter</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.FilterImpl <em>Filter</em>}' class.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.FilterImpl
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getFilter()
 	 * @generated
@@ -944,54 +976,55 @@ public interface HbannotationPackage extends EPackage {
 	int FILTER = 17;
 
 	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EModel Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FILTER__EMODEL_ELEMENT = HB_ANNOTATION__EMODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Generated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Generated</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FILTER__GENERATED = HB_ANNOTATION__GENERATED;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FILTER__NAME = HB_ANNOTATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Condition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Condition</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FILTER__CONDITION = HB_ANNOTATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Filter</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Filter</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FILTER_FEATURE_COUNT = HB_ANNOTATION_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.ParamDefImpl <em>Param Def</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.ParamDefImpl <em>Param Def</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.ParamDefImpl
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getParamDef()
 	 * @generated
@@ -999,54 +1032,55 @@ public interface HbannotationPackage extends EPackage {
 	int PARAM_DEF = 18;
 
 	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EModel Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int PARAM_DEF__EMODEL_ELEMENT = HB_ANNOTATION__EMODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Generated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Generated</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int PARAM_DEF__GENERATED = HB_ANNOTATION__GENERATED;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int PARAM_DEF__NAME = HB_ANNOTATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int PARAM_DEF__TYPE = HB_ANNOTATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Param Def</em>' class.
-	 * <!-- begin-user-doc -->
+	 * The number of structural features of the '<em>Param Def</em>' class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int PARAM_DEF_FEATURE_COUNT = HB_ANNOTATION_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.FilterDefImpl <em>Filter Def</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.FilterDefImpl <em>Filter Def</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.FilterDefImpl
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getFilterDef()
 	 * @generated
@@ -1054,63 +1088,64 @@ public interface HbannotationPackage extends EPackage {
 	int FILTER_DEF = 19;
 
 	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EModel Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FILTER_DEF__EMODEL_ELEMENT = HB_ANNOTATION__EMODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Generated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Generated</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FILTER_DEF__GENERATED = HB_ANNOTATION__GENERATED;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FILTER_DEF__NAME = HB_ANNOTATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Default Condition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Default Condition</b></em>' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FILTER_DEF__DEFAULT_CONDITION = HB_ANNOTATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Parameters</b></em>' reference list.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Parameters</b></em>' reference list. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FILTER_DEF__PARAMETERS = HB_ANNOTATION_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of structural features of the '<em>Filter Def</em>' class.
-	 * <!-- begin-user-doc -->
+	 * The number of structural features of the '<em>Filter Def</em>' class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FILTER_DEF_FEATURE_COUNT = HB_ANNOTATION_FEATURE_COUNT + 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.DiscriminatorFormulaImpl <em>Discriminator Formula</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.DiscriminatorFormulaImpl
+	 * <em>Discriminator Formula</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.DiscriminatorFormulaImpl
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getDiscriminatorFormula()
 	 * @generated
@@ -1118,45 +1153,46 @@ public interface HbannotationPackage extends EPackage {
 	int DISCRIMINATOR_FORMULA = 20;
 
 	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EModel Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DISCRIMINATOR_FORMULA__EMODEL_ELEMENT = HB_ANNOTATION__EMODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Generated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Generated</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DISCRIMINATOR_FORMULA__GENERATED = HB_ANNOTATION__GENERATED;
 
 	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Value</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DISCRIMINATOR_FORMULA__VALUE = HB_ANNOTATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Discriminator Formula</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Discriminator Formula</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DISCRIMINATOR_FORMULA_FEATURE_COUNT = HB_ANNOTATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.NaturalIdImpl <em>Natural Id</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.NaturalIdImpl <em>Natural Id</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.NaturalIdImpl
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getNaturalId()
 	 * @generated
@@ -1164,45 +1200,46 @@ public interface HbannotationPackage extends EPackage {
 	int NATURAL_ID = 21;
 
 	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EModel Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int NATURAL_ID__EMODEL_ELEMENT = HB_ANNOTATION__EMODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Generated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Generated</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int NATURAL_ID__GENERATED = HB_ANNOTATION__GENERATED;
 
 	/**
-	 * The feature id for the '<em><b>Mutable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mutable</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int NATURAL_ID__MUTABLE = HB_ANNOTATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Natural Id</em>' class.
-	 * <!-- begin-user-doc -->
+	 * The number of structural features of the '<em>Natural Id</em>' class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int NATURAL_ID_FEATURE_COUNT = HB_ANNOTATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.MapKeyManyToManyImpl <em>Map Key Many To Many</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.MapKeyManyToManyImpl
+	 * <em>Map Key Many To Many</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.MapKeyManyToManyImpl
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getMapKeyManyToMany()
 	 * @generated
@@ -1210,54 +1247,55 @@ public interface HbannotationPackage extends EPackage {
 	int MAP_KEY_MANY_TO_MANY = 22;
 
 	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EModel Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MAP_KEY_MANY_TO_MANY__EMODEL_ELEMENT = HB_ANNOTATION__EMODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Generated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Generated</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MAP_KEY_MANY_TO_MANY__GENERATED = HB_ANNOTATION__GENERATED;
 
 	/**
-	 * The feature id for the '<em><b>Join Columns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Join Columns</b></em>' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MAP_KEY_MANY_TO_MANY__JOIN_COLUMNS = HB_ANNOTATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Target Entity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Target Entity</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MAP_KEY_MANY_TO_MANY__TARGET_ENTITY = HB_ANNOTATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Map Key Many To Many</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Map Key Many To Many</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MAP_KEY_MANY_TO_MANY_FEATURE_COUNT = HB_ANNOTATION_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.ForceDiscriminatorImpl <em>Force Discriminator</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.ForceDiscriminatorImpl
+	 * <em>Force Discriminator</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.ForceDiscriminatorImpl
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getForceDiscriminator()
 	 * @generated
@@ -1265,36 +1303,37 @@ public interface HbannotationPackage extends EPackage {
 	int FORCE_DISCRIMINATOR = 23;
 
 	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EModel Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FORCE_DISCRIMINATOR__EMODEL_ELEMENT = HB_ANNOTATION__EMODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Generated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Generated</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FORCE_DISCRIMINATOR__GENERATED = HB_ANNOTATION__GENERATED;
 
 	/**
-	 * The number of structural features of the '<em>Force Discriminator</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Force Discriminator</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FORCE_DISCRIMINATOR_FEATURE_COUNT = HB_ANNOTATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.ImmutableImpl <em>Immutable</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.ImmutableImpl <em>Immutable</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.ImmutableImpl
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getImmutable()
 	 * @generated
@@ -1302,36 +1341,37 @@ public interface HbannotationPackage extends EPackage {
 	int IMMUTABLE = 24;
 
 	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EModel Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int IMMUTABLE__EMODEL_ELEMENT = HB_ANNOTATION__EMODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Generated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Generated</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int IMMUTABLE__GENERATED = HB_ANNOTATION__GENERATED;
 
 	/**
-	 * The number of structural features of the '<em>Immutable</em>' class.
-	 * <!-- begin-user-doc -->
+	 * The number of structural features of the '<em>Immutable</em>' class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int IMMUTABLE_FEATURE_COUNT = HB_ANNOTATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.FormulaImpl <em>Formula</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.FormulaImpl <em>Formula</em>}' class.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.FormulaImpl
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getFormula()
 	 * @generated
@@ -1339,45 +1379,46 @@ public interface HbannotationPackage extends EPackage {
 	int FORMULA = 25;
 
 	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EModel Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FORMULA__EMODEL_ELEMENT = HB_ANNOTATION__EMODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Generated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Generated</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FORMULA__GENERATED = HB_ANNOTATION__GENERATED;
 
 	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Value</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FORMULA__VALUE = HB_ANNOTATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Formula</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Formula</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FORMULA_FEATURE_COUNT = HB_ANNOTATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.NotFoundImpl <em>Not Found</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.NotFoundImpl <em>Not Found</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.NotFoundImpl
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getNotFound()
 	 * @generated
@@ -1385,45 +1426,46 @@ public interface HbannotationPackage extends EPackage {
 	int NOT_FOUND = 26;
 
 	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EModel Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int NOT_FOUND__EMODEL_ELEMENT = HB_ANNOTATION__EMODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Generated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Generated</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int NOT_FOUND__GENERATED = HB_ANNOTATION__GENERATED;
 
 	/**
-	 * The feature id for the '<em><b>Action</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Action</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int NOT_FOUND__ACTION = HB_ANNOTATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Not Found</em>' class.
-	 * <!-- begin-user-doc -->
+	 * The number of structural features of the '<em>Not Found</em>' class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int NOT_FOUND_FEATURE_COUNT = HB_ANNOTATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbEntityImpl <em>Hb Entity</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbEntityImpl <em>Hb Entity</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbEntityImpl
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getHbEntity()
 	 * @generated
@@ -1431,99 +1473,100 @@ public interface HbannotationPackage extends EPackage {
 	int HB_ENTITY = 27;
 
 	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EModel Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ENTITY__EMODEL_ELEMENT = HB_ANNOTATION__EMODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Generated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Generated</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ENTITY__GENERATED = HB_ANNOTATION__GENERATED;
 
 	/**
-	 * The feature id for the '<em><b>Dynamic Insert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dynamic Insert</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ENTITY__DYNAMIC_INSERT = HB_ANNOTATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Dynamic Update</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Dynamic Update</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ENTITY__DYNAMIC_UPDATE = HB_ANNOTATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Select Before Update</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Select Before Update</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ENTITY__SELECT_BEFORE_UPDATE = HB_ANNOTATION_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Mutable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mutable</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ENTITY__MUTABLE = HB_ANNOTATION_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Persister</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Persister</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ENTITY__PERSISTER = HB_ANNOTATION_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Optimistic Lock</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Optimistic Lock</b></em>' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ENTITY__OPTIMISTIC_LOCK = HB_ANNOTATION_FEATURE_COUNT + 5;
 
 	/**
-	 * The feature id for the '<em><b>Polymorphism</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Polymorphism</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ENTITY__POLYMORPHISM = HB_ANNOTATION_FEATURE_COUNT + 6;
 
 	/**
-	 * The number of structural features of the '<em>Hb Entity</em>' class.
-	 * <!-- begin-user-doc -->
+	 * The number of structural features of the '<em>Hb Entity</em>' class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ENTITY_FEATURE_COUNT = HB_ANNOTATION_FEATURE_COUNT + 7;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.BatchSizeImpl <em>Batch Size</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.BatchSizeImpl <em>Batch Size</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.BatchSizeImpl
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getBatchSize()
 	 * @generated
@@ -1531,45 +1574,45 @@ public interface HbannotationPackage extends EPackage {
 	int BATCH_SIZE = 28;
 
 	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EModel Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BATCH_SIZE__EMODEL_ELEMENT = HB_ANNOTATION__EMODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Generated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Generated</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BATCH_SIZE__GENERATED = HB_ANNOTATION__GENERATED;
 
 	/**
-	 * The feature id for the '<em><b>Size</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Size</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BATCH_SIZE__SIZE = HB_ANNOTATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Batch Size</em>' class.
-	 * <!-- begin-user-doc -->
+	 * The number of structural features of the '<em>Batch Size</em>' class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BATCH_SIZE_FEATURE_COUNT = HB_ANNOTATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.AnyImpl <em>Any</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.AnyImpl
+	 * <em>Any</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.AnyImpl
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getAny()
 	 * @generated
@@ -1577,72 +1620,73 @@ public interface HbannotationPackage extends EPackage {
 	int ANY = 29;
 
 	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EModel Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ANY__EMODEL_ELEMENT = HB_ANNOTATION__EMODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Generated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Generated</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ANY__GENERATED = HB_ANNOTATION__GENERATED;
 
 	/**
-	 * The feature id for the '<em><b>Meta Def</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Meta Def</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ANY__META_DEF = HB_ANNOTATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Meta Column</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Meta Column</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ANY__META_COLUMN = HB_ANNOTATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Fetch</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Fetch</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ANY__FETCH = HB_ANNOTATION_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Optional</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ANY__OPTIONAL = HB_ANNOTATION_FEATURE_COUNT + 3;
 
 	/**
-	 * The number of structural features of the '<em>Any</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Any</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ANY_FEATURE_COUNT = HB_ANNOTATION_FEATURE_COUNT + 4;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.MetaValueImpl <em>Meta Value</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.MetaValueImpl <em>Meta Value</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.MetaValueImpl
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getMetaValue()
 	 * @generated
@@ -1650,54 +1694,55 @@ public interface HbannotationPackage extends EPackage {
 	int META_VALUE = 30;
 
 	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EModel Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int META_VALUE__EMODEL_ELEMENT = HB_ANNOTATION__EMODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Generated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Generated</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int META_VALUE__GENERATED = HB_ANNOTATION__GENERATED;
 
 	/**
-	 * The feature id for the '<em><b>Target Entity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Target Entity</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int META_VALUE__TARGET_ENTITY = HB_ANNOTATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Value</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int META_VALUE__VALUE = HB_ANNOTATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Meta Value</em>' class.
-	 * <!-- begin-user-doc -->
+	 * The number of structural features of the '<em>Meta Value</em>' class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int META_VALUE_FEATURE_COUNT = HB_ANNOTATION_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.AnyMetaDefImpl <em>Any Meta Def</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.AnyMetaDefImpl <em>Any Meta Def</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.AnyMetaDefImpl
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getAnyMetaDef()
 	 * @generated
@@ -1705,71 +1750,73 @@ public interface HbannotationPackage extends EPackage {
 	int ANY_META_DEF = 31;
 
 	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>EModel Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ANY_META_DEF__EMODEL_ELEMENT = HB_ANNOTATION__EMODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Generated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Generated</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ANY_META_DEF__GENERATED = HB_ANNOTATION__GENERATED;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ANY_META_DEF__NAME = HB_ANNOTATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Meta Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Meta Type</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ANY_META_DEF__META_TYPE = HB_ANNOTATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Id Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id Type</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ANY_META_DEF__ID_TYPE = HB_ANNOTATION_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Meta Values</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Meta Values</b></em>' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ANY_META_DEF__META_VALUES = HB_ANNOTATION_FEATURE_COUNT + 3;
 
 	/**
-	 * The number of structural features of the '<em>Any Meta Def</em>' class.
-	 * <!-- begin-user-doc -->
+	 * The number of structural features of the '<em>Any Meta Def</em>' class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ANY_META_DEF_FEATURE_COUNT = HB_ANNOTATION_FEATURE_COUNT + 4;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.CacheConcurrencyStrategy <em>Cache Concurrency Strategy</em>}' enum.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.CacheConcurrencyStrategy
+	 * <em>Cache Concurrency Strategy</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.CacheConcurrencyStrategy
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getCacheConcurrencyStrategy()
 	 * @generated
@@ -1777,8 +1824,9 @@ public interface HbannotationPackage extends EPackage {
 	int CACHE_CONCURRENCY_STRATEGY = 32;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.HbFetchType <em>Hb Fetch Type</em>}' enum.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The meta object id for the ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.HbFetchType
+	 * <em>Hb Fetch Type</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbFetchType
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getHbFetchType()
 	 * @generated
@@ -1786,8 +1834,10 @@ public interface HbannotationPackage extends EPackage {
 	int HB_FETCH_TYPE = 33;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.OnDeleteAction <em>On Delete Action</em>}' enum.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.OnDeleteAction <em>On Delete Action</em>}'
+	 * enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.OnDeleteAction
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getOnDeleteAction()
 	 * @generated
@@ -1795,9 +1845,10 @@ public interface HbannotationPackage extends EPackage {
 	int ON_DELETE_ACTION = 34;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.GenerationTime <em>Generation Time</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.GenerationTime <em>Generation Time</em>}'
+	 * enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.GenerationTime
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getGenerationTime()
 	 * @generated
@@ -1805,9 +1856,10 @@ public interface HbannotationPackage extends EPackage {
 	int GENERATION_TIME = 35;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.NotFoundAction <em>Not Found Action</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.NotFoundAction <em>Not Found Action</em>}'
+	 * enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.NotFoundAction
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getNotFoundAction()
 	 * @generated
@@ -1815,9 +1867,10 @@ public interface HbannotationPackage extends EPackage {
 	int NOT_FOUND_ACTION = 36;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.OptimisticLockType <em>Optimistic Lock Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.OptimisticLockType
+	 * <em>Optimistic Lock Type</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.OptimisticLockType
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getOptimisticLockType()
 	 * @generated
@@ -1825,9 +1878,10 @@ public interface HbannotationPackage extends EPackage {
 	int OPTIMISTIC_LOCK_TYPE = 37;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.PolymorphismType <em>Polymorphism Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.PolymorphismType
+	 * <em>Polymorphism Type</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.PolymorphismType
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getPolymorphismType()
 	 * @generated
@@ -1835,9 +1889,9 @@ public interface HbannotationPackage extends EPackage {
 	int POLYMORPHISM_TYPE = 38;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.HbCascadeType <em>Hb Cascade Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.HbCascadeType
+	 * <em>Hb Cascade Type</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbCascadeType
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getHbCascadeType()
 	 * @generated
@@ -1845,8 +1899,10 @@ public interface HbannotationPackage extends EPackage {
 	int HB_CASCADE_TYPE = 39;
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.HbAnnotation <em>Hb Annotation</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.HbAnnotation <em>Hb Annotation</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Hb Annotation</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbAnnotation
 	 * @generated
@@ -1854,8 +1910,10 @@ public interface HbannotationPackage extends EPackage {
 	EClass getHbAnnotation();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Cascade <em>Cascade</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Cascade <em>Cascade</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Cascade</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Cascade
 	 * @generated
@@ -1863,8 +1921,10 @@ public interface HbannotationPackage extends EPackage {
 	EClass getCascade();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Cascade#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for the attribute list '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Cascade#getValue <em>Value</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Value</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Cascade#getValue()
 	 * @see #getCascade()
@@ -1873,8 +1933,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getCascade_Value();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.CollectionOfElements <em>Collection Of Elements</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.CollectionOfElements
+	 * <em>Collection Of Elements</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Collection Of Elements</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.CollectionOfElements
 	 * @generated
@@ -1882,8 +1944,10 @@ public interface HbannotationPackage extends EPackage {
 	EClass getCollectionOfElements();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.CollectionOfElements#getTargetElement <em>Target Element</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.CollectionOfElements#getTargetElement
+	 * <em>Target Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Target Element</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.CollectionOfElements#getTargetElement()
 	 * @see #getCollectionOfElements()
@@ -1892,8 +1956,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getCollectionOfElements_TargetElement();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.CollectionOfElements#getFetch <em>Fetch</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.CollectionOfElements#getFetch
+	 * <em>Fetch</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Fetch</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.CollectionOfElements#getFetch()
 	 * @see #getCollectionOfElements()
@@ -1902,9 +1968,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getCollectionOfElements_Fetch();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.HbMapKey <em>Hb Map Key</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.HbMapKey <em>Hb Map Key</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Hb Map Key</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbMapKey
 	 * @generated
@@ -1912,10 +1979,11 @@ public interface HbannotationPackage extends EPackage {
 	EClass getHbMapKey();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.emf.teneo.hibernate.hbannotation.HbMapKey#getColumns <em>Columns</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Columns</em>'.
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.HbMapKey#getColumns <em>Columns</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the containment reference list ' <em>Columns</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbMapKey#getColumns()
 	 * @see #getHbMapKey()
 	 * @generated
@@ -1923,8 +1991,10 @@ public interface HbannotationPackage extends EPackage {
 	EReference getHbMapKey_Columns();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Parameter <em>Parameter</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Parameter <em>Parameter</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Parameter</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Parameter
 	 * @generated
@@ -1932,8 +2002,10 @@ public interface HbannotationPackage extends EPackage {
 	EClass getParameter();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Parameter#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Parameter#getName <em>Name</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Name</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Parameter#getName()
 	 * @see #getParameter()
@@ -1942,8 +2014,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getParameter_Name();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Parameter#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Parameter#getValue <em>Value</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Value</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Parameter#getValue()
 	 * @see #getParameter()
@@ -1952,8 +2026,9 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getParameter_Value();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Type <em>Type</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for class ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.Type
+	 * <em>Type</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Type</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Type
 	 * @generated
@@ -1961,8 +2036,10 @@ public interface HbannotationPackage extends EPackage {
 	EClass getType();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Type#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Type#getType <em>Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Type</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Type#getType()
 	 * @see #getType()
@@ -1971,8 +2048,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getType_Type();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Type#getParameters <em>Parameters</em>}'.
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Type#getParameters <em>Parameters</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Parameters</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Type#getParameters()
 	 * @see #getType()
@@ -1981,8 +2060,9 @@ public interface HbannotationPackage extends EPackage {
 	EReference getType_Parameters();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Where <em>Where</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for class ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.Where
+	 * <em>Where</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Where</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Where
 	 * @generated
@@ -1990,8 +2070,10 @@ public interface HbannotationPackage extends EPackage {
 	EClass getWhere();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Where#getClause <em>Clause</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Where#getClause <em>Clause</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Clause</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Where#getClause()
 	 * @see #getWhere()
@@ -2000,8 +2082,9 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getWhere_Clause();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.IdBag <em>Id Bag</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for class ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.IdBag
+	 * <em>Id Bag</em>} '. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Id Bag</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.IdBag
 	 * @generated
@@ -2009,8 +2092,10 @@ public interface HbannotationPackage extends EPackage {
 	EClass getIdBag();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.IdBag#getGenerator <em>Generator</em>}'.
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.IdBag#getGenerator <em>Generator</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Generator</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.IdBag#getGenerator()
 	 * @see #getIdBag()
@@ -2019,8 +2104,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getIdBag_Generator();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.IdBag#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.IdBag#getType <em>Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Type</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.IdBag#getType()
 	 * @see #getIdBag()
@@ -2029,8 +2116,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getIdBag_Type();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.IdBag#getTable <em>Table</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.IdBag#getTable <em>Table</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Table</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.IdBag#getTable()
 	 * @see #getIdBag()
@@ -2039,8 +2128,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getIdBag_Table();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator <em>Generic Generator</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator
+	 * <em>Generic Generator</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Generic Generator</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator
 	 * @generated
@@ -2048,8 +2139,10 @@ public interface HbannotationPackage extends EPackage {
 	EClass getGenericGenerator();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator#getName <em>Name</em>}'.
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Name</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator#getName()
 	 * @see #getGenericGenerator()
@@ -2058,8 +2151,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getGenericGenerator_Name();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator#getStrategy <em>Strategy</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator#getStrategy
+	 * <em>Strategy</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Strategy</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator#getStrategy()
 	 * @see #getGenericGenerator()
@@ -2068,8 +2163,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getGenericGenerator_Strategy();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator#getParameters <em>Parameters</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator#getParameters
+	 * <em>Parameters</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Parameters</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator#getParameters()
 	 * @see #getGenericGenerator()
@@ -2078,8 +2175,9 @@ public interface HbannotationPackage extends EPackage {
 	EReference getGenericGenerator_Parameters();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Cache <em>Cache</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for class ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.Cache
+	 * <em>Cache</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Cache</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Cache
 	 * @generated
@@ -2087,8 +2185,10 @@ public interface HbannotationPackage extends EPackage {
 	EClass getCache();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Cache#getUsage <em>Usage</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Cache#getUsage <em>Usage</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Usage</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Cache#getUsage()
 	 * @see #getCache()
@@ -2097,8 +2197,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getCache_Usage();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Cache#getRegion <em>Region</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Cache#getRegion <em>Region</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Region</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Cache#getRegion()
 	 * @see #getCache()
@@ -2107,8 +2209,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getCache_Region();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Cache#getInclude <em>Include</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Cache#getInclude <em>Include</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Include</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Cache#getInclude()
 	 * @see #getCache()
@@ -2117,8 +2221,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getCache_Include();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.TypeDef <em>Type Def</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.TypeDef <em>Type Def</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Type Def</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.TypeDef
 	 * @generated
@@ -2126,8 +2232,10 @@ public interface HbannotationPackage extends EPackage {
 	EClass getTypeDef();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.TypeDef#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.TypeDef#getName <em>Name</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Name</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.TypeDef#getName()
 	 * @see #getTypeDef()
@@ -2136,8 +2244,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getTypeDef_Name();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.emf.teneo.hibernate.hbannotation.TypeDef#getParameters <em>Parameters</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.TypeDef#getParameters <em>Parameters</em>}
+	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Parameters</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.TypeDef#getParameters()
 	 * @see #getTypeDef()
@@ -2146,8 +2256,10 @@ public interface HbannotationPackage extends EPackage {
 	EReference getTypeDef_Parameters();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.TypeDef#getTypeClass <em>Type Class</em>}'.
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.TypeDef#getTypeClass <em>Type Class</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Type Class</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.TypeDef#getTypeClass()
 	 * @see #getTypeDef()
@@ -2156,8 +2268,9 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getTypeDef_TypeClass();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Fetch <em>Fetch</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for class ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.Fetch
+	 * <em>Fetch</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Fetch</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Fetch
 	 * @generated
@@ -2165,8 +2278,10 @@ public interface HbannotationPackage extends EPackage {
 	EClass getFetch();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Fetch#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Fetch#getValue <em>Value</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Value</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Fetch#getValue()
 	 * @see #getFetch()
@@ -2175,8 +2290,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getFetch_Value();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.OnDelete <em>On Delete</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.OnDelete <em>On Delete</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>On Delete</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.OnDelete
 	 * @generated
@@ -2184,8 +2301,10 @@ public interface HbannotationPackage extends EPackage {
 	EClass getOnDelete();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.OnDelete#getAction <em>Action</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.OnDelete#getAction <em>Action</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Action</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.OnDelete#getAction()
 	 * @see #getOnDelete()
@@ -2194,8 +2313,9 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getOnDelete_Action();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Proxy <em>Proxy</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for class ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.Proxy
+	 * <em>Proxy</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Proxy</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Proxy
 	 * @generated
@@ -2203,8 +2323,10 @@ public interface HbannotationPackage extends EPackage {
 	EClass getProxy();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Proxy#getProxyClass <em>Proxy Class</em>}'.
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Proxy#getProxyClass <em>Proxy Class</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Proxy Class</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Proxy#getProxyClass()
 	 * @see #getProxy()
@@ -2213,8 +2335,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getProxy_ProxyClass();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Proxy#isLazy <em>Lazy</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Proxy#isLazy <em>Lazy</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Lazy</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Proxy#isLazy()
 	 * @see #getProxy()
@@ -2223,8 +2347,9 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getProxy_Lazy();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Index <em>Index</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for class ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.Index
+	 * <em>Index</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Index</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Index
 	 * @generated
@@ -2232,8 +2357,10 @@ public interface HbannotationPackage extends EPackage {
 	EClass getIndex();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Index#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Index#getName <em>Name</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Name</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Index#getName()
 	 * @see #getIndex()
@@ -2242,9 +2369,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getIndex_Name();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Generated <em>Generated</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Generated <em>Generated</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Generated</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Generated
 	 * @generated
@@ -2252,9 +2380,10 @@ public interface HbannotationPackage extends EPackage {
 	EClass getGenerated();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Generated#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Generated#getValue <em>Value</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Value</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Generated#getValue()
 	 * @see #getGenerated()
@@ -2263,9 +2392,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getGenerated_Value();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.NamedQuery <em>Named Query</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.NamedQuery <em>Named Query</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Named Query</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.NamedQuery
 	 * @generated
@@ -2273,9 +2403,10 @@ public interface HbannotationPackage extends EPackage {
 	EClass getNamedQuery();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.NamedQuery#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.NamedQuery#getName <em>Name</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Name</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.NamedQuery#getName()
 	 * @see #getNamedQuery()
@@ -2284,9 +2415,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getNamedQuery_Name();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.NamedQuery#getQuery <em>Query</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.NamedQuery#getQuery <em>Query</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Query</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.NamedQuery#getQuery()
 	 * @see #getNamedQuery()
@@ -2295,9 +2427,9 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getNamedQuery_Query();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Filter <em>Filter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.Filter
+	 * <em>Filter</em>} '. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Filter</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Filter
 	 * @generated
@@ -2305,9 +2437,10 @@ public interface HbannotationPackage extends EPackage {
 	EClass getFilter();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Filter#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Filter#getName <em>Name</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Name</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Filter#getName()
 	 * @see #getFilter()
@@ -2316,9 +2449,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getFilter_Name();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Filter#getCondition <em>Condition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Filter#getCondition <em>Condition</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Condition</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Filter#getCondition()
 	 * @see #getFilter()
@@ -2327,9 +2461,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getFilter_Condition();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.ParamDef <em>Param Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.ParamDef <em>Param Def</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Param Def</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.ParamDef
 	 * @generated
@@ -2337,9 +2472,10 @@ public interface HbannotationPackage extends EPackage {
 	EClass getParamDef();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.ParamDef#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.ParamDef#getName <em>Name</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Name</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.ParamDef#getName()
 	 * @see #getParamDef()
@@ -2348,9 +2484,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getParamDef_Name();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.ParamDef#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.ParamDef#getType <em>Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Type</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.ParamDef#getType()
 	 * @see #getParamDef()
@@ -2359,9 +2496,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getParamDef_Type();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.FilterDef <em>Filter Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.FilterDef <em>Filter Def</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Filter Def</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.FilterDef
 	 * @generated
@@ -2369,9 +2507,10 @@ public interface HbannotationPackage extends EPackage {
 	EClass getFilterDef();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.FilterDef#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.FilterDef#getName <em>Name</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Name</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.FilterDef#getName()
 	 * @see #getFilterDef()
@@ -2380,9 +2519,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getFilterDef_Name();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.FilterDef#getDefaultCondition <em>Default Condition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.FilterDef#getDefaultCondition
+	 * <em>Default Condition</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Default Condition</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.FilterDef#getDefaultCondition()
 	 * @see #getFilterDef()
@@ -2391,9 +2531,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getFilterDef_DefaultCondition();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.emf.teneo.hibernate.hbannotation.FilterDef#getParameters <em>Parameters</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.FilterDef#getParameters
+	 * <em>Parameters</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Parameters</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.FilterDef#getParameters()
 	 * @see #getFilterDef()
@@ -2402,9 +2543,10 @@ public interface HbannotationPackage extends EPackage {
 	EReference getFilterDef_Parameters();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.DiscriminatorFormula <em>Discriminator Formula</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.DiscriminatorFormula
+	 * <em>Discriminator Formula</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Discriminator Formula</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.DiscriminatorFormula
 	 * @generated
@@ -2412,9 +2554,10 @@ public interface HbannotationPackage extends EPackage {
 	EClass getDiscriminatorFormula();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.DiscriminatorFormula#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.DiscriminatorFormula#getValue
+	 * <em>Value</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Value</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.DiscriminatorFormula#getValue()
 	 * @see #getDiscriminatorFormula()
@@ -2423,9 +2566,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getDiscriminatorFormula_Value();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.NaturalId <em>Natural Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.NaturalId <em>Natural Id</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Natural Id</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.NaturalId
 	 * @generated
@@ -2433,9 +2577,10 @@ public interface HbannotationPackage extends EPackage {
 	EClass getNaturalId();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.NaturalId#isMutable <em>Mutable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.NaturalId#isMutable <em>Mutable</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Mutable</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.NaturalId#isMutable()
 	 * @see #getNaturalId()
@@ -2444,9 +2589,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getNaturalId_Mutable();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.MapKeyManyToMany <em>Map Key Many To Many</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.MapKeyManyToMany
+	 * <em>Map Key Many To Many</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Map Key Many To Many</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.MapKeyManyToMany
 	 * @generated
@@ -2454,10 +2600,11 @@ public interface HbannotationPackage extends EPackage {
 	EClass getMapKeyManyToMany();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.emf.teneo.hibernate.hbannotation.MapKeyManyToMany#getJoinColumns <em>Join Columns</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Join Columns</em>'.
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.MapKeyManyToMany#getJoinColumns
+	 * <em>Join Columns</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the containment reference list ' <em>Join Columns</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.MapKeyManyToMany#getJoinColumns()
 	 * @see #getMapKeyManyToMany()
 	 * @generated
@@ -2465,9 +2612,10 @@ public interface HbannotationPackage extends EPackage {
 	EReference getMapKeyManyToMany_JoinColumns();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.MapKeyManyToMany#getTargetEntity <em>Target Entity</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.MapKeyManyToMany#getTargetEntity
+	 * <em>Target Entity</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Target Entity</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.MapKeyManyToMany#getTargetEntity()
 	 * @see #getMapKeyManyToMany()
@@ -2476,9 +2624,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getMapKeyManyToMany_TargetEntity();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.ForceDiscriminator <em>Force Discriminator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.ForceDiscriminator
+	 * <em>Force Discriminator</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Force Discriminator</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.ForceDiscriminator
 	 * @generated
@@ -2486,9 +2635,10 @@ public interface HbannotationPackage extends EPackage {
 	EClass getForceDiscriminator();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Immutable <em>Immutable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Immutable <em>Immutable</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Immutable</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Immutable
 	 * @generated
@@ -2496,9 +2646,10 @@ public interface HbannotationPackage extends EPackage {
 	EClass getImmutable();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Formula <em>Formula</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Formula <em>Formula</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Formula</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Formula
 	 * @generated
@@ -2506,9 +2657,10 @@ public interface HbannotationPackage extends EPackage {
 	EClass getFormula();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Formula#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Formula#getValue <em>Value</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Value</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Formula#getValue()
 	 * @see #getFormula()
@@ -2517,9 +2669,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getFormula_Value();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.NotFound <em>Not Found</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.NotFound <em>Not Found</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Not Found</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.NotFound
 	 * @generated
@@ -2527,9 +2680,10 @@ public interface HbannotationPackage extends EPackage {
 	EClass getNotFound();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.NotFound#getAction <em>Action</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.NotFound#getAction <em>Action</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Action</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.NotFound#getAction()
 	 * @see #getNotFound()
@@ -2538,9 +2692,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getNotFound_Action();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity <em>Hb Entity</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity <em>Hb Entity</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Hb Entity</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity
 	 * @generated
@@ -2548,9 +2703,10 @@ public interface HbannotationPackage extends EPackage {
 	EClass getHbEntity();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#isDynamicInsert <em>Dynamic Insert</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#isDynamicInsert
+	 * <em>Dynamic Insert</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Dynamic Insert</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#isDynamicInsert()
 	 * @see #getHbEntity()
@@ -2559,9 +2715,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getHbEntity_DynamicInsert();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#isDynamicUpdate <em>Dynamic Update</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#isDynamicUpdate
+	 * <em>Dynamic Update</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Dynamic Update</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#isDynamicUpdate()
 	 * @see #getHbEntity()
@@ -2570,9 +2727,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getHbEntity_DynamicUpdate();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#isSelectBeforeUpdate <em>Select Before Update</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#isSelectBeforeUpdate
+	 * <em>Select Before Update</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Select Before Update</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#isSelectBeforeUpdate()
 	 * @see #getHbEntity()
@@ -2581,9 +2739,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getHbEntity_SelectBeforeUpdate();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#isMutable <em>Mutable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#isMutable <em>Mutable</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Mutable</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#isMutable()
 	 * @see #getHbEntity()
@@ -2592,9 +2751,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getHbEntity_Mutable();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#getPersister <em>Persister</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#getPersister <em>Persister</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Persister</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#getPersister()
 	 * @see #getHbEntity()
@@ -2603,9 +2763,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getHbEntity_Persister();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#getOptimisticLock <em>Optimistic Lock</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#getOptimisticLock
+	 * <em>Optimistic Lock</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Optimistic Lock</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#getOptimisticLock()
 	 * @see #getHbEntity()
@@ -2614,9 +2775,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getHbEntity_OptimisticLock();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#getPolymorphism <em>Polymorphism</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#getPolymorphism
+	 * <em>Polymorphism</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Polymorphism</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity#getPolymorphism()
 	 * @see #getHbEntity()
@@ -2625,9 +2787,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getHbEntity_Polymorphism();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.BatchSize <em>Batch Size</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.BatchSize <em>Batch Size</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Batch Size</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.BatchSize
 	 * @generated
@@ -2635,9 +2798,10 @@ public interface HbannotationPackage extends EPackage {
 	EClass getBatchSize();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.BatchSize#getSize <em>Size</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.BatchSize#getSize <em>Size</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Size</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.BatchSize#getSize()
 	 * @see #getBatchSize()
@@ -2646,9 +2810,9 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getBatchSize_Size();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Any <em>Any</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.Any
+	 * <em>Any</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Any</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Any
 	 * @generated
@@ -2656,9 +2820,10 @@ public interface HbannotationPackage extends EPackage {
 	EClass getAny();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Any#getMetaDef <em>Meta Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Any#getMetaDef <em>Meta Def</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Meta Def</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Any#getMetaDef()
 	 * @see #getAny()
@@ -2667,10 +2832,11 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getAny_MetaDef();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Any#getMetaColumn <em>Meta Column</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Meta Column</em>'.
+	 * Returns the meta object for the containment reference '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Any#getMetaColumn <em>Meta Column</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the containment reference '<em>Meta Column</em> '.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Any#getMetaColumn()
 	 * @see #getAny()
 	 * @generated
@@ -2678,9 +2844,10 @@ public interface HbannotationPackage extends EPackage {
 	EReference getAny_MetaColumn();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Any#getFetch <em>Fetch</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Any#getFetch <em>Fetch</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Fetch</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Any#getFetch()
 	 * @see #getAny()
@@ -2689,9 +2856,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getAny_Fetch();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Any#isOptional <em>Optional</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Any#isOptional <em>Optional</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Optional</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Any#isOptional()
 	 * @see #getAny()
@@ -2700,9 +2868,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getAny_Optional();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.MetaValue <em>Meta Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.MetaValue <em>Meta Value</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Meta Value</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.MetaValue
 	 * @generated
@@ -2710,9 +2879,10 @@ public interface HbannotationPackage extends EPackage {
 	EClass getMetaValue();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.MetaValue#getTargetEntity <em>Target Entity</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.MetaValue#getTargetEntity
+	 * <em>Target Entity</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Target Entity</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.MetaValue#getTargetEntity()
 	 * @see #getMetaValue()
@@ -2721,9 +2891,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getMetaValue_TargetEntity();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.MetaValue#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.MetaValue#getValue <em>Value</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Value</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.MetaValue#getValue()
 	 * @see #getMetaValue()
@@ -2732,9 +2903,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getMetaValue_Value();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef <em>Any Meta Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef <em>Any Meta Def</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Any Meta Def</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef
 	 * @generated
@@ -2742,9 +2914,10 @@ public interface HbannotationPackage extends EPackage {
 	EClass getAnyMetaDef();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef#getName <em>Name</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Name</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef#getName()
 	 * @see #getAnyMetaDef()
@@ -2753,9 +2926,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getAnyMetaDef_Name();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef#getMetaType <em>Meta Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef#getMetaType <em>Meta Type</em>}
+	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Meta Type</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef#getMetaType()
 	 * @see #getAnyMetaDef()
@@ -2764,9 +2938,10 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getAnyMetaDef_MetaType();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef#getIdType <em>Id Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef#getIdType <em>Id Type</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Id Type</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef#getIdType()
 	 * @see #getAnyMetaDef()
@@ -2775,10 +2950,11 @@ public interface HbannotationPackage extends EPackage {
 	EAttribute getAnyMetaDef_IdType();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef#getMetaValues <em>Meta Values</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Meta Values</em>'.
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef#getMetaValues
+	 * <em>Meta Values</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the containment reference list ' <em>Meta Values</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef#getMetaValues()
 	 * @see #getAnyMetaDef()
 	 * @generated
@@ -2786,8 +2962,10 @@ public interface HbannotationPackage extends EPackage {
 	EReference getAnyMetaDef_MetaValues();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.emf.teneo.hibernate.hbannotation.CacheConcurrencyStrategy <em>Cache Concurrency Strategy</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for enum '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.CacheConcurrencyStrategy
+	 * <em>Cache Concurrency Strategy</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Cache Concurrency Strategy</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.CacheConcurrencyStrategy
 	 * @generated
@@ -2795,8 +2973,10 @@ public interface HbannotationPackage extends EPackage {
 	EEnum getCacheConcurrencyStrategy();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.emf.teneo.hibernate.hbannotation.HbFetchType <em>Hb Fetch Type</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for enum '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.HbFetchType <em>Hb Fetch Type</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Hb Fetch Type</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbFetchType
 	 * @generated
@@ -2804,8 +2984,10 @@ public interface HbannotationPackage extends EPackage {
 	EEnum getHbFetchType();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.emf.teneo.hibernate.hbannotation.OnDeleteAction <em>On Delete Action</em>}'.
+	 * Returns the meta object for enum '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.OnDeleteAction <em>On Delete Action</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>On Delete Action</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.OnDeleteAction
 	 * @generated
@@ -2813,9 +2995,10 @@ public interface HbannotationPackage extends EPackage {
 	EEnum getOnDeleteAction();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.emf.teneo.hibernate.hbannotation.GenerationTime <em>Generation Time</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for enum '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.GenerationTime <em>Generation Time</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Generation Time</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.GenerationTime
 	 * @generated
@@ -2823,9 +3006,10 @@ public interface HbannotationPackage extends EPackage {
 	EEnum getGenerationTime();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.emf.teneo.hibernate.hbannotation.NotFoundAction <em>Not Found Action</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for enum '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.NotFoundAction <em>Not Found Action</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Not Found Action</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.NotFoundAction
 	 * @generated
@@ -2833,9 +3017,10 @@ public interface HbannotationPackage extends EPackage {
 	EEnum getNotFoundAction();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.emf.teneo.hibernate.hbannotation.OptimisticLockType <em>Optimistic Lock Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for enum '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.OptimisticLockType
+	 * <em>Optimistic Lock Type</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Optimistic Lock Type</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.OptimisticLockType
 	 * @generated
@@ -2843,9 +3028,10 @@ public interface HbannotationPackage extends EPackage {
 	EEnum getOptimisticLockType();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.emf.teneo.hibernate.hbannotation.PolymorphismType <em>Polymorphism Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for enum '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.PolymorphismType
+	 * <em>Polymorphism Type</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Polymorphism Type</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.PolymorphismType
 	 * @generated
@@ -2853,9 +3039,10 @@ public interface HbannotationPackage extends EPackage {
 	EEnum getPolymorphismType();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.emf.teneo.hibernate.hbannotation.HbCascadeType <em>Hb Cascade Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for enum '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.HbCascadeType <em>Hb Cascade Type</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Hb Cascade Type</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbCascadeType
 	 * @generated
@@ -2863,9 +3050,9 @@ public interface HbannotationPackage extends EPackage {
 	EEnum getHbCascadeType();
 
 	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc --> <!--
+	 * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
@@ -2880,12 +3067,15 @@ public interface HbannotationPackage extends EPackage {
 	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	interface Literals {
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbAnnotationImpl <em>Hb Annotation</em>}' class.
-		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbAnnotationImpl
+		 * <em>Hb Annotation</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbAnnotationImpl
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getHbAnnotation()
 		 * @generated
@@ -2893,8 +3083,10 @@ public interface HbannotationPackage extends EPackage {
 		EClass HB_ANNOTATION = eINSTANCE.getHbAnnotation();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.CascadeImpl <em>Cascade</em>}' class.
-		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.CascadeImpl <em>Cascade</em>}'
+		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.CascadeImpl
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getCascade()
 		 * @generated
@@ -2910,8 +3102,10 @@ public interface HbannotationPackage extends EPackage {
 		EAttribute CASCADE__VALUE = eINSTANCE.getCascade_Value();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.CollectionOfElementsImpl <em>Collection Of Elements</em>}' class.
-		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.CollectionOfElementsImpl
+		 * <em>Collection Of Elements</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.CollectionOfElementsImpl
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getCollectionOfElements()
 		 * @generated
@@ -2919,11 +3113,13 @@ public interface HbannotationPackage extends EPackage {
 		EClass COLLECTION_OF_ELEMENTS = eINSTANCE.getCollectionOfElements();
 
 		/**
-		 * The meta object literal for the '<em><b>Target Element</b></em>' attribute feature.
-		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Target Element</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
-		EAttribute COLLECTION_OF_ELEMENTS__TARGET_ELEMENT = eINSTANCE.getCollectionOfElements_TargetElement();
+		EAttribute COLLECTION_OF_ELEMENTS__TARGET_ELEMENT = eINSTANCE
+				.getCollectionOfElements_TargetElement();
 
 		/**
 		 * The meta object literal for the '<em><b>Fetch</b></em>' attribute feature. <!--
@@ -2934,9 +3130,10 @@ public interface HbannotationPackage extends EPackage {
 		EAttribute COLLECTION_OF_ELEMENTS__FETCH = eINSTANCE.getCollectionOfElements_Fetch();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbMapKeyImpl <em>Hb Map Key</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbMapKeyImpl <em>Hb Map Key</em>}'
+		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbMapKeyImpl
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getHbMapKey()
 		 * @generated
@@ -2945,15 +3142,17 @@ public interface HbannotationPackage extends EPackage {
 
 		/**
 		 * The meta object literal for the '<em><b>Columns</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HB_MAP_KEY__COLUMNS = eINSTANCE.getHbMapKey_Columns();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.ParameterImpl <em>Parameter</em>}' class.
-		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.ParameterImpl <em>Parameter</em>}'
+		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.ParameterImpl
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getParameter()
 		 * @generated
@@ -2961,8 +3160,8 @@ public interface HbannotationPackage extends EPackage {
 		EClass PARAMETER = eINSTANCE.getParameter();
 
 		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!--
-		 * begin-user-doc --> <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc
+		 * --> <!-- end-user-doc -->
 		 * 
 		 * @generated
 		 */
@@ -2977,8 +3176,10 @@ public interface HbannotationPackage extends EPackage {
 		EAttribute PARAMETER__VALUE = eINSTANCE.getParameter_Value();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.TypeImpl <em>Type</em>}' class.
-		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.TypeImpl <em>Type</em>}' class. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.TypeImpl
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getType()
 		 * @generated
@@ -2986,23 +3187,26 @@ public interface HbannotationPackage extends EPackage {
 		EClass TYPE = eINSTANCE.getType();
 
 		/**
-		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature. <!--
-		 * begin-user-doc --> <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature. <!-- begin-user-doc
+		 * --> <!-- end-user-doc -->
 		 * 
 		 * @generated
 		 */
 		EAttribute TYPE__TYPE = eINSTANCE.getType_Type();
 
 		/**
-		 * The meta object literal for the '<em><b>Parameters</b></em>' reference list feature.
-		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Parameters</b></em>' reference list feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference TYPE__PARAMETERS = eINSTANCE.getType_Parameters();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.WhereImpl <em>Where</em>}' class.
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.WhereImpl <em>Where</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.WhereImpl
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getWhere()
 		 * @generated
@@ -3018,8 +3222,10 @@ public interface HbannotationPackage extends EPackage {
 		EAttribute WHERE__CLAUSE = eINSTANCE.getWhere_Clause();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.IdBagImpl <em>Id Bag</em>}' class.
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.IdBagImpl <em>Id Bag</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.IdBagImpl
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getIdBag()
 		 * @generated
@@ -3035,8 +3241,8 @@ public interface HbannotationPackage extends EPackage {
 		EAttribute ID_BAG__GENERATOR = eINSTANCE.getIdBag_Generator();
 
 		/**
-		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature. <!--
-		 * begin-user-doc --> <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature. <!-- begin-user-doc
+		 * --> <!-- end-user-doc -->
 		 * 
 		 * @generated
 		 */
@@ -3051,8 +3257,10 @@ public interface HbannotationPackage extends EPackage {
 		EAttribute ID_BAG__TABLE = eINSTANCE.getIdBag_Table();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.GenericGeneratorImpl <em>Generic Generator</em>}' class.
-		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.GenericGeneratorImpl
+		 * <em>Generic Generator</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.GenericGeneratorImpl
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getGenericGenerator()
 		 * @generated
@@ -3060,8 +3268,8 @@ public interface HbannotationPackage extends EPackage {
 		EClass GENERIC_GENERATOR = eINSTANCE.getGenericGenerator();
 
 		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!--
-		 * begin-user-doc --> <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc
+		 * --> <!-- end-user-doc -->
 		 * 
 		 * @generated
 		 */
@@ -3076,15 +3284,18 @@ public interface HbannotationPackage extends EPackage {
 		EAttribute GENERIC_GENERATOR__STRATEGY = eINSTANCE.getGenericGenerator_Strategy();
 
 		/**
-		 * The meta object literal for the '<em><b>Parameters</b></em>' reference list feature.
-		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Parameters</b></em>' reference list feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference GENERIC_GENERATOR__PARAMETERS = eINSTANCE.getGenericGenerator_Parameters();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.CacheImpl <em>Cache</em>}' class.
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.CacheImpl <em>Cache</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.CacheImpl
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getCache()
 		 * @generated
@@ -3116,8 +3327,10 @@ public interface HbannotationPackage extends EPackage {
 		EAttribute CACHE__INCLUDE = eINSTANCE.getCache_Include();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.TypeDefImpl <em>Type Def</em>}' class.
-		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.TypeDefImpl <em>Type Def</em>}'
+		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.TypeDefImpl
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getTypeDef()
 		 * @generated
@@ -3125,16 +3338,17 @@ public interface HbannotationPackage extends EPackage {
 		EClass TYPE_DEF = eINSTANCE.getTypeDef();
 
 		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!--
-		 * begin-user-doc --> <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc
+		 * --> <!-- end-user-doc -->
 		 * 
 		 * @generated
 		 */
 		EAttribute TYPE_DEF__NAME = eINSTANCE.getTypeDef_Name();
 
 		/**
-		 * The meta object literal for the '<em><b>Parameters</b></em>' reference list feature.
-		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Parameters</b></em>' reference list feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference TYPE_DEF__PARAMETERS = eINSTANCE.getTypeDef_Parameters();
@@ -3148,8 +3362,10 @@ public interface HbannotationPackage extends EPackage {
 		EAttribute TYPE_DEF__TYPE_CLASS = eINSTANCE.getTypeDef_TypeClass();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.FetchImpl <em>Fetch</em>}' class.
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.FetchImpl <em>Fetch</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.FetchImpl
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getFetch()
 		 * @generated
@@ -3165,8 +3381,10 @@ public interface HbannotationPackage extends EPackage {
 		EAttribute FETCH__VALUE = eINSTANCE.getFetch_Value();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.OnDeleteImpl <em>On Delete</em>}' class.
-		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.OnDeleteImpl <em>On Delete</em>}'
+		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.OnDeleteImpl
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getOnDelete()
 		 * @generated
@@ -3182,8 +3400,10 @@ public interface HbannotationPackage extends EPackage {
 		EAttribute ON_DELETE__ACTION = eINSTANCE.getOnDelete_Action();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.ProxyImpl <em>Proxy</em>}' class.
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.ProxyImpl <em>Proxy</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.ProxyImpl
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getProxy()
 		 * @generated
@@ -3191,23 +3411,26 @@ public interface HbannotationPackage extends EPackage {
 		EClass PROXY = eINSTANCE.getProxy();
 
 		/**
-		 * The meta object literal for the '<em><b>Proxy Class</b></em>' attribute feature.
-		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Proxy Class</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute PROXY__PROXY_CLASS = eINSTANCE.getProxy_ProxyClass();
 
 		/**
-		 * The meta object literal for the '<em><b>Lazy</b></em>' attribute feature. <!--
-		 * begin-user-doc --> <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Lazy</b></em>' attribute feature. <!-- begin-user-doc
+		 * --> <!-- end-user-doc -->
 		 * 
 		 * @generated
 		 */
 		EAttribute PROXY__LAZY = eINSTANCE.getProxy_Lazy();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.IndexImpl <em>Index</em>}' class.
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.IndexImpl <em>Index</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.IndexImpl
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getIndex()
 		 * @generated
@@ -3215,17 +3438,18 @@ public interface HbannotationPackage extends EPackage {
 		EClass INDEX = eINSTANCE.getIndex();
 
 		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!--
-		 * begin-user-doc --> <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc
+		 * --> <!-- end-user-doc -->
 		 * 
 		 * @generated
 		 */
 		EAttribute INDEX__NAME = eINSTANCE.getIndex_Name();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.GeneratedImpl <em>Generated</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.GeneratedImpl <em>Generated</em>}'
+		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.GeneratedImpl
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getGenerated()
 		 * @generated
@@ -3233,17 +3457,18 @@ public interface HbannotationPackage extends EPackage {
 		EClass GENERATED = eINSTANCE.getGenerated();
 
 		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute GENERATED__VALUE = eINSTANCE.getGenerated_Value();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.NamedQueryImpl <em>Named Query</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.NamedQueryImpl <em>Named Query</em>}
+		 * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.NamedQueryImpl
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getNamedQuery()
 		 * @generated
@@ -3251,25 +3476,26 @@ public interface HbannotationPackage extends EPackage {
 		EClass NAMED_QUERY = eINSTANCE.getNamedQuery();
 
 		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc
+		 * --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute NAMED_QUERY__NAME = eINSTANCE.getNamedQuery_Name();
 
 		/**
-		 * The meta object literal for the '<em><b>Query</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Query</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute NAMED_QUERY__QUERY = eINSTANCE.getNamedQuery_Query();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.FilterImpl <em>Filter</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.FilterImpl <em>Filter</em>}' class.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.FilterImpl
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getFilter()
 		 * @generated
@@ -3277,25 +3503,26 @@ public interface HbannotationPackage extends EPackage {
 		EClass FILTER = eINSTANCE.getFilter();
 
 		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc
+		 * --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute FILTER__NAME = eINSTANCE.getFilter_Name();
 
 		/**
-		 * The meta object literal for the '<em><b>Condition</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Condition</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute FILTER__CONDITION = eINSTANCE.getFilter_Condition();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.ParamDefImpl <em>Param Def</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.ParamDefImpl <em>Param Def</em>}'
+		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.ParamDefImpl
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getParamDef()
 		 * @generated
@@ -3303,25 +3530,26 @@ public interface HbannotationPackage extends EPackage {
 		EClass PARAM_DEF = eINSTANCE.getParamDef();
 
 		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc
+		 * --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute PARAM_DEF__NAME = eINSTANCE.getParamDef_Name();
 
 		/**
-		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature. <!-- begin-user-doc
+		 * --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute PARAM_DEF__TYPE = eINSTANCE.getParamDef_Type();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.FilterDefImpl <em>Filter Def</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.FilterDefImpl <em>Filter Def</em>}'
+		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.FilterDefImpl
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getFilterDef()
 		 * @generated
@@ -3329,33 +3557,34 @@ public interface HbannotationPackage extends EPackage {
 		EClass FILTER_DEF = eINSTANCE.getFilterDef();
 
 		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc
+		 * --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute FILTER_DEF__NAME = eINSTANCE.getFilterDef_Name();
 
 		/**
-		 * The meta object literal for the '<em><b>Default Condition</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Default Condition</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute FILTER_DEF__DEFAULT_CONDITION = eINSTANCE.getFilterDef_DefaultCondition();
 
 		/**
-		 * The meta object literal for the '<em><b>Parameters</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Parameters</b></em>' reference list feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference FILTER_DEF__PARAMETERS = eINSTANCE.getFilterDef_Parameters();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.DiscriminatorFormulaImpl <em>Discriminator Formula</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.DiscriminatorFormulaImpl
+		 * <em>Discriminator Formula</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.DiscriminatorFormulaImpl
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getDiscriminatorFormula()
 		 * @generated
@@ -3363,17 +3592,18 @@ public interface HbannotationPackage extends EPackage {
 		EClass DISCRIMINATOR_FORMULA = eINSTANCE.getDiscriminatorFormula();
 
 		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute DISCRIMINATOR_FORMULA__VALUE = eINSTANCE.getDiscriminatorFormula_Value();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.NaturalIdImpl <em>Natural Id</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.NaturalIdImpl <em>Natural Id</em>}'
+		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.NaturalIdImpl
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getNaturalId()
 		 * @generated
@@ -3381,17 +3611,18 @@ public interface HbannotationPackage extends EPackage {
 		EClass NATURAL_ID = eINSTANCE.getNaturalId();
 
 		/**
-		 * The meta object literal for the '<em><b>Mutable</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Mutable</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute NATURAL_ID__MUTABLE = eINSTANCE.getNaturalId_Mutable();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.MapKeyManyToManyImpl <em>Map Key Many To Many</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.MapKeyManyToManyImpl
+		 * <em>Map Key Many To Many</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.MapKeyManyToManyImpl
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getMapKeyManyToMany()
 		 * @generated
@@ -3399,25 +3630,26 @@ public interface HbannotationPackage extends EPackage {
 		EClass MAP_KEY_MANY_TO_MANY = eINSTANCE.getMapKeyManyToMany();
 
 		/**
-		 * The meta object literal for the '<em><b>Join Columns</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Join Columns</b></em>' containment reference list
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference MAP_KEY_MANY_TO_MANY__JOIN_COLUMNS = eINSTANCE.getMapKeyManyToMany_JoinColumns();
 
 		/**
-		 * The meta object literal for the '<em><b>Target Entity</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Target Entity</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute MAP_KEY_MANY_TO_MANY__TARGET_ENTITY = eINSTANCE.getMapKeyManyToMany_TargetEntity();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.ForceDiscriminatorImpl <em>Force Discriminator</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.ForceDiscriminatorImpl
+		 * <em>Force Discriminator</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.ForceDiscriminatorImpl
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getForceDiscriminator()
 		 * @generated
@@ -3425,9 +3657,10 @@ public interface HbannotationPackage extends EPackage {
 		EClass FORCE_DISCRIMINATOR = eINSTANCE.getForceDiscriminator();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.ImmutableImpl <em>Immutable</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.ImmutableImpl <em>Immutable</em>}'
+		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.ImmutableImpl
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getImmutable()
 		 * @generated
@@ -3435,9 +3668,10 @@ public interface HbannotationPackage extends EPackage {
 		EClass IMMUTABLE = eINSTANCE.getImmutable();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.FormulaImpl <em>Formula</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.FormulaImpl <em>Formula</em>}'
+		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.FormulaImpl
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getFormula()
 		 * @generated
@@ -3445,17 +3679,18 @@ public interface HbannotationPackage extends EPackage {
 		EClass FORMULA = eINSTANCE.getFormula();
 
 		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute FORMULA__VALUE = eINSTANCE.getFormula_Value();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.NotFoundImpl <em>Not Found</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.NotFoundImpl <em>Not Found</em>}'
+		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.NotFoundImpl
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getNotFound()
 		 * @generated
@@ -3463,17 +3698,18 @@ public interface HbannotationPackage extends EPackage {
 		EClass NOT_FOUND = eINSTANCE.getNotFound();
 
 		/**
-		 * The meta object literal for the '<em><b>Action</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Action</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute NOT_FOUND__ACTION = eINSTANCE.getNotFound_Action();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbEntityImpl <em>Hb Entity</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbEntityImpl <em>Hb Entity</em>}'
+		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbEntityImpl
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getHbEntity()
 		 * @generated
@@ -3481,65 +3717,66 @@ public interface HbannotationPackage extends EPackage {
 		EClass HB_ENTITY = eINSTANCE.getHbEntity();
 
 		/**
-		 * The meta object literal for the '<em><b>Dynamic Insert</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Dynamic Insert</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute HB_ENTITY__DYNAMIC_INSERT = eINSTANCE.getHbEntity_DynamicInsert();
 
 		/**
-		 * The meta object literal for the '<em><b>Dynamic Update</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Dynamic Update</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute HB_ENTITY__DYNAMIC_UPDATE = eINSTANCE.getHbEntity_DynamicUpdate();
 
 		/**
 		 * The meta object literal for the '<em><b>Select Before Update</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute HB_ENTITY__SELECT_BEFORE_UPDATE = eINSTANCE.getHbEntity_SelectBeforeUpdate();
 
 		/**
-		 * The meta object literal for the '<em><b>Mutable</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Mutable</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute HB_ENTITY__MUTABLE = eINSTANCE.getHbEntity_Mutable();
 
 		/**
-		 * The meta object literal for the '<em><b>Persister</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Persister</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute HB_ENTITY__PERSISTER = eINSTANCE.getHbEntity_Persister();
 
 		/**
-		 * The meta object literal for the '<em><b>Optimistic Lock</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Optimistic Lock</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute HB_ENTITY__OPTIMISTIC_LOCK = eINSTANCE.getHbEntity_OptimisticLock();
 
 		/**
-		 * The meta object literal for the '<em><b>Polymorphism</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Polymorphism</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute HB_ENTITY__POLYMORPHISM = eINSTANCE.getHbEntity_Polymorphism();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.BatchSizeImpl <em>Batch Size</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.BatchSizeImpl <em>Batch Size</em>}'
+		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.BatchSizeImpl
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getBatchSize()
 		 * @generated
@@ -3547,17 +3784,18 @@ public interface HbannotationPackage extends EPackage {
 		EClass BATCH_SIZE = eINSTANCE.getBatchSize();
 
 		/**
-		 * The meta object literal for the '<em><b>Size</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Size</b></em>' attribute feature. <!-- begin-user-doc
+		 * --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute BATCH_SIZE__SIZE = eINSTANCE.getBatchSize_Size();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.AnyImpl <em>Any</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.AnyImpl <em>Any</em>}' class. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.AnyImpl
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getAny()
 		 * @generated
@@ -3565,41 +3803,42 @@ public interface HbannotationPackage extends EPackage {
 		EClass ANY = eINSTANCE.getAny();
 
 		/**
-		 * The meta object literal for the '<em><b>Meta Def</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Meta Def</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ANY__META_DEF = eINSTANCE.getAny_MetaDef();
 
 		/**
 		 * The meta object literal for the '<em><b>Meta Column</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ANY__META_COLUMN = eINSTANCE.getAny_MetaColumn();
 
 		/**
-		 * The meta object literal for the '<em><b>Fetch</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Fetch</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ANY__FETCH = eINSTANCE.getAny_Fetch();
 
 		/**
-		 * The meta object literal for the '<em><b>Optional</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Optional</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ANY__OPTIONAL = eINSTANCE.getAny_Optional();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.MetaValueImpl <em>Meta Value</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.MetaValueImpl <em>Meta Value</em>}'
+		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.MetaValueImpl
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getMetaValue()
 		 * @generated
@@ -3607,25 +3846,26 @@ public interface HbannotationPackage extends EPackage {
 		EClass META_VALUE = eINSTANCE.getMetaValue();
 
 		/**
-		 * The meta object literal for the '<em><b>Target Entity</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Target Entity</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute META_VALUE__TARGET_ENTITY = eINSTANCE.getMetaValue_TargetEntity();
 
 		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute META_VALUE__VALUE = eINSTANCE.getMetaValue_Value();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.AnyMetaDefImpl <em>Any Meta Def</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.AnyMetaDefImpl
+		 * <em>Any Meta Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.AnyMetaDefImpl
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getAnyMetaDef()
 		 * @generated
@@ -3633,40 +3873,42 @@ public interface HbannotationPackage extends EPackage {
 		EClass ANY_META_DEF = eINSTANCE.getAnyMetaDef();
 
 		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc
+		 * --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ANY_META_DEF__NAME = eINSTANCE.getAnyMetaDef_Name();
 
 		/**
-		 * The meta object literal for the '<em><b>Meta Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Meta Type</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ANY_META_DEF__META_TYPE = eINSTANCE.getAnyMetaDef_MetaType();
 
 		/**
-		 * The meta object literal for the '<em><b>Id Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Id Type</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ANY_META_DEF__ID_TYPE = eINSTANCE.getAnyMetaDef_IdType();
 
 		/**
-		 * The meta object literal for the '<em><b>Meta Values</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Meta Values</b></em>' containment reference list
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ANY_META_DEF__META_VALUES = eINSTANCE.getAnyMetaDef_MetaValues();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.CacheConcurrencyStrategy <em>Cache Concurrency Strategy</em>}' enum.
-		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.CacheConcurrencyStrategy
+		 * <em>Cache Concurrency Strategy</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.CacheConcurrencyStrategy
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getCacheConcurrencyStrategy()
 		 * @generated
@@ -3674,8 +3916,10 @@ public interface HbannotationPackage extends EPackage {
 		EEnum CACHE_CONCURRENCY_STRATEGY = eINSTANCE.getCacheConcurrencyStrategy();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.HbFetchType <em>Hb Fetch Type</em>}' enum.
-		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.HbFetchType <em>Hb Fetch Type</em>}'
+		 * enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbFetchType
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getHbFetchType()
 		 * @generated
@@ -3683,8 +3927,10 @@ public interface HbannotationPackage extends EPackage {
 		EEnum HB_FETCH_TYPE = eINSTANCE.getHbFetchType();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.OnDeleteAction <em>On Delete Action</em>}' enum.
-		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.OnDeleteAction <em>On Delete Action</em>}
+		 * ' enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.OnDeleteAction
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getOnDeleteAction()
 		 * @generated
@@ -3692,9 +3938,10 @@ public interface HbannotationPackage extends EPackage {
 		EEnum ON_DELETE_ACTION = eINSTANCE.getOnDeleteAction();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.GenerationTime <em>Generation Time</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.GenerationTime <em>Generation Time</em>}'
+		 * enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.GenerationTime
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getGenerationTime()
 		 * @generated
@@ -3702,9 +3949,10 @@ public interface HbannotationPackage extends EPackage {
 		EEnum GENERATION_TIME = eINSTANCE.getGenerationTime();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.NotFoundAction <em>Not Found Action</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.NotFoundAction <em>Not Found Action</em>}
+		 * ' enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.NotFoundAction
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getNotFoundAction()
 		 * @generated
@@ -3712,9 +3960,10 @@ public interface HbannotationPackage extends EPackage {
 		EEnum NOT_FOUND_ACTION = eINSTANCE.getNotFoundAction();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.OptimisticLockType <em>Optimistic Lock Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.OptimisticLockType
+		 * <em>Optimistic Lock Type</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.OptimisticLockType
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getOptimisticLockType()
 		 * @generated
@@ -3722,9 +3971,10 @@ public interface HbannotationPackage extends EPackage {
 		EEnum OPTIMISTIC_LOCK_TYPE = eINSTANCE.getOptimisticLockType();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.PolymorphismType <em>Polymorphism Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.PolymorphismType
+		 * <em>Polymorphism Type</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.PolymorphismType
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getPolymorphismType()
 		 * @generated
@@ -3732,9 +3982,10 @@ public interface HbannotationPackage extends EPackage {
 		EEnum POLYMORPHISM_TYPE = eINSTANCE.getPolymorphismType();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.HbCascadeType <em>Hb Cascade Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.HbCascadeType <em>Hb Cascade Type</em>}'
+		 * enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbCascadeType
 		 * @see org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbannotationPackageImpl#getHbCascadeType()
 		 * @generated
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/IdBag.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/IdBag.java
index 96d6e94f7..4921f487c 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/IdBag.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/IdBag.java
@@ -7,31 +7,32 @@
 package org.eclipse.emf.teneo.hibernate.hbannotation;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Id Bag</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Id Bag</b></em>'. <!--
+ * end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.IdBag#getGenerator <em>Generator</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.IdBag#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.IdBag#getTable <em>Table</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.IdBag#getGenerator <em>Generator</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.IdBag#getType <em> Type</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.IdBag#getTable <em> Table</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getIdBag()
- * @model annotation="http://annotation.elver.org/internal/Target 0='EStructuralFeature'"
+ * @model annotation= "http://annotation.elver.org/internal/Target 0='EStructuralFeature'"
  * @generated
  */
 public interface IdBag extends HbAnnotation {
 	/**
-	 * Returns the value of the '<em><b>Generator</b></em>' attribute.
-	 * The default value is <code>"increment"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Generator</b></em>' attribute. The default value is
+	 * <code>"increment"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Generator</em>' attribute isn't clear, there really should be more of a
-	 * description here...
+	 * If the meaning of the '<em>Generator</em>' attribute isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Generator</em>' attribute.
 	 * @see #setGenerator(String)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getIdBag_Generator()
@@ -41,20 +42,22 @@ public interface IdBag extends HbAnnotation {
 	String getGenerator();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.IdBag#getGenerator <em>Generator</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Generator</em>' attribute.
+	 * Sets the value of the ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.IdBag#getGenerator
+	 * <em>Generator</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Generator</em>' attribute.
 	 * @see #getGenerator()
 	 * @generated
 	 */
 	void setGenerator(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Type</b></em>' attribute. The default value is <code>"long"</code>. <!--
-	 * begin-user-doc -->
+	 * Returns the value of the '<em><b>Type</b></em>' attribute. The default value is
+	 * <code>"long"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Type</em>' attribute isn't clear, there really should be more of a description
-	 * here...
+	 * If the meaning of the '<em>Type</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * 
@@ -67,22 +70,24 @@ public interface IdBag extends HbAnnotation {
 	String getType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.IdBag#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
+	 * Sets the value of the ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.IdBag#getType
+	 * <em>Type</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Type</em>' attribute.
 	 * @see #getType()
 	 * @generated
 	 */
 	void setType(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Table</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Table</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Table</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Table</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Table</em>' attribute.
 	 * @see #setTable(String)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getIdBag_Table()
@@ -92,10 +97,11 @@ public interface IdBag extends HbAnnotation {
 	String getTable();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.IdBag#getTable <em>Table</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Table</em>' attribute.
+	 * Sets the value of the ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.IdBag#getTable
+	 * <em>Table</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Table</em>' attribute.
 	 * @see #getTable()
 	 * @generated
 	 */
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Immutable.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Immutable.java
index 9dd0befd2..3e12e04f1 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Immutable.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Immutable.java
@@ -6,13 +6,11 @@
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Immutable</b></em>'.
- * <!-- end-user-doc -->
- *
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Immutable</b></em>'. <!--
+ * end-user-doc -->
+ * 
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getImmutable()
  * @model annotation="teneo/internal/Target 0='EClass' 1='EReference'"
  * @generated
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Index.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Index.java
index de5ce7f7e..d24f7aa13 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Index.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Index.java
@@ -6,32 +6,30 @@
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Index</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Index</b></em>'. <!--
+ * end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Index#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Index#getName <em> Name</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getIndex()
- * @model annotation="http://annotation.elver.org/internal/Target 0='EStructuralFeature'"
+ * @model annotation= "http://annotation.elver.org/internal/Target 0='EStructuralFeature'"
  * @generated
  */
 public interface Index extends HbAnnotation {
 	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getIndex_Name()
@@ -41,10 +39,11 @@ public interface Index extends HbAnnotation {
 	String getName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Index#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
+	 * Sets the value of the ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.Index#getName
+	 * <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Name</em>' attribute.
 	 * @see #getName()
 	 * @generated
 	 */
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/MapKey.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/MapKey.java
index 5c11eea92..845847dad 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/MapKey.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/MapKey.java
@@ -10,29 +10,31 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.teneo.annotations.pannotation.Column;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Map Key</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Map Key</b></em>'. <!--
+ * end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.MapKey#getColumns <em>Columns</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.MapKey#getColumns <em>Columns</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getMapKey()
- * @model annotation="http://annotation.elver.org/internal/Target 0='EStructuralFeature'"
+ * @model annotation= "http://annotation.elver.org/internal/Target 0='EStructuralFeature'"
  * @generated
  */
 public interface MapKey extends HbAnnotation {
 	/**
-	 * Returns the value of the '<em><b>Columns</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.emf.teneo.annotations.pannotation.Column}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Columns</b></em>' containment reference list. The list
+	 * contents are of type {@link org.eclipse.emf.teneo.annotations.pannotation.Column}. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Columns</em>' containment reference list isn't clear, there really should be more
-	 * of a description here...
+	 * If the meaning of the '<em>Columns</em>' containment reference list isn't clear, there really
+	 * should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Columns</em>' containment reference list.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getMapKey_Columns()
 	 * @model containment="true" ordered="false"
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/MapKeyManyToMany.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/MapKeyManyToMany.java
index 91bd31698..53784394d 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/MapKeyManyToMany.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/MapKeyManyToMany.java
@@ -10,32 +10,36 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.teneo.annotations.pannotation.JoinColumn;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Map Key Many To Many</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Map Key Many To Many</b></em>'. <!-- end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.MapKeyManyToMany#getJoinColumns <em>Join Columns</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.MapKeyManyToMany#getTargetEntity <em>Target Entity</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.MapKeyManyToMany#getJoinColumns <em>Join
+ * Columns</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.MapKeyManyToMany#getTargetEntity <em>Target
+ * Entity</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getMapKeyManyToMany()
  * @model annotation="http://annotation.elver.org/internal/Target 0='EReference'"
  * @generated
  */
 public interface MapKeyManyToMany extends HbAnnotation {
 	/**
-	 * Returns the value of the '<em><b>Join Columns</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.emf.teneo.annotations.pannotation.JoinColumn}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Join Columns</b></em>' containment reference list. The list
+	 * contents are of type {@link org.eclipse.emf.teneo.annotations.pannotation.JoinColumn}. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Join Columns</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Join Columns</em>' containment reference list isn't clear, there
+	 * really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Join Columns</em>' containment reference list.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getMapKeyManyToMany_JoinColumns()
 	 * @model containment="true" ordered="false"
@@ -44,13 +48,13 @@ public interface MapKeyManyToMany extends HbAnnotation {
 	EList<JoinColumn> getJoinColumns();
 
 	/**
-	 * Returns the value of the '<em><b>Target Entity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Target Entity</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Target Entity</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Target Entity</em>' attribute isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Target Entity</em>' attribute.
 	 * @see #setTargetEntity(String)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getMapKeyManyToMany_TargetEntity()
@@ -60,10 +64,12 @@ public interface MapKeyManyToMany extends HbAnnotation {
 	String getTargetEntity();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.MapKeyManyToMany#getTargetEntity <em>Target Entity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Target Entity</em>' attribute.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.MapKeyManyToMany#getTargetEntity
+	 * <em>Target Entity</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Target Entity</em>' attribute.
 	 * @see #getTargetEntity()
 	 * @generated
 	 */
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/MetaValue.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/MetaValue.java
index 34f831604..7217f5f8b 100644
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/MetaValue.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/MetaValue.java
@@ -6,33 +6,33 @@
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Meta Value</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Meta Value</b></em>'. <!--
+ * end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.MetaValue#getTargetEntity <em>Target Entity</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.MetaValue#getValue <em>Value</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.MetaValue#getTargetEntity <em>Target Entity
+ * </em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.MetaValue#getValue <em>Value</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getMetaValue()
  * @model
  * @generated
  */
 public interface MetaValue extends HbAnnotation {
 	/**
-	 * Returns the value of the '<em><b>Target Entity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Target Entity</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Target Entity</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Target Entity</em>' attribute isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Target Entity</em>' attribute.
 	 * @see #setTargetEntity(String)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getMetaValue_TargetEntity()
@@ -42,23 +42,25 @@ public interface MetaValue extends HbAnnotation {
 	String getTargetEntity();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.MetaValue#getTargetEntity <em>Target Entity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Target Entity</em>' attribute.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.MetaValue#getTargetEntity
+	 * <em>Target Entity</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Target Entity</em>' attribute.
 	 * @see #getTargetEntity()
 	 * @generated
 	 */
 	void setTargetEntity(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Value</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Value</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Value</em>' attribute.
 	 * @see #setValue(String)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getMetaValue_Value()
@@ -68,10 +70,11 @@ public interface MetaValue extends HbAnnotation {
 	String getValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.MetaValue#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
+	 * Sets the value of the ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.MetaValue#getValue
+	 * <em>Value</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Value</em>' attribute.
 	 * @see #getValue()
 	 * @generated
 	 */
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/NamedQuery.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/NamedQuery.java
index 6819a58f0..e960fb98c 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/NamedQuery.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/NamedQuery.java
@@ -6,33 +6,31 @@
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Named Query</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Named Query</b></em>'. <!--
+ * end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.NamedQuery#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.NamedQuery#getQuery <em>Query</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.NamedQuery#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.NamedQuery#getQuery <em>Query</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getNamedQuery()
  * @model annotation="http://annotation.elver.org/internal/Target 0='EClass'"
  * @generated
  */
 public interface NamedQuery extends HbAnnotation {
 	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getNamedQuery_Name()
@@ -42,23 +40,24 @@ public interface NamedQuery extends HbAnnotation {
 	String getName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.NamedQuery#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
+	 * Sets the value of the ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.NamedQuery#getName
+	 * <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Name</em>' attribute.
 	 * @see #getName()
 	 * @generated
 	 */
 	void setName(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Query</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Query</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Query</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Query</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Query</em>' attribute.
 	 * @see #setQuery(String)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getNamedQuery_Query()
@@ -68,10 +67,12 @@ public interface NamedQuery extends HbAnnotation {
 	String getQuery();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.NamedQuery#getQuery <em>Query</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Query</em>' attribute.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.NamedQuery#getQuery <em>Query</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Query</em>' attribute.
 	 * @see #getQuery()
 	 * @generated
 	 */
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/NaturalId.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/NaturalId.java
index d4b41ea95..8321f7332 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/NaturalId.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/NaturalId.java
@@ -6,32 +6,30 @@
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Natural Id</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Natural Id</b></em>'. <!--
+ * end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.NaturalId#isMutable <em>Mutable</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.NaturalId#isMutable <em>Mutable</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getNaturalId()
- * @model annotation="http://annotation.elver.org/internal/Target 0='EStructuralFeature'"
+ * @model annotation= "http://annotation.elver.org/internal/Target 0='EStructuralFeature'"
  * @generated
  */
 public interface NaturalId extends HbAnnotation {
 	/**
-	 * Returns the value of the '<em><b>Mutable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Mutable</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mutable</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mutable</em>' attribute isn't clear, there really should be more of
+	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mutable</em>' attribute.
 	 * @see #setMutable(boolean)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getNaturalId_Mutable()
@@ -41,10 +39,12 @@ public interface NaturalId extends HbAnnotation {
 	boolean isMutable();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.NaturalId#isMutable <em>Mutable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Mutable</em>' attribute.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.NaturalId#isMutable <em>Mutable</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Mutable</em>' attribute.
 	 * @see #isMutable()
 	 * @generated
 	 */
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/NotFound.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/NotFound.java
index 8612d0eec..fbdb0125f 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/NotFound.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/NotFound.java
@@ -6,33 +6,32 @@
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Not Found</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Not Found</b></em>'. <!--
+ * end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.NotFound#getAction <em>Action</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.NotFound#getAction <em>Action</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getNotFound()
  * @model annotation="http://annotation.elver.org/internal/Target 0='EReference'"
  * @generated
  */
 public interface NotFound extends HbAnnotation {
 	/**
-	 * Returns the value of the '<em><b>Action</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.emf.teneo.hibernate.hbannotation.NotFoundAction}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Action</b></em>' attribute. The literals are from the
+	 * enumeration {@link org.eclipse.emf.teneo.hibernate.hbannotation.NotFoundAction}. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Action</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Action</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Action</em>' attribute.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.NotFoundAction
 	 * @see #setAction(NotFoundAction)
@@ -43,10 +42,11 @@ public interface NotFound extends HbAnnotation {
 	NotFoundAction getAction();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.NotFound#getAction <em>Action</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Action</em>' attribute.
+	 * Sets the value of the ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.NotFound#getAction
+	 * <em>Action</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Action</em>' attribute.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.NotFoundAction
 	 * @see #getAction()
 	 * @generated
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/NotFoundAction.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/NotFoundAction.java
index 852a50e69..236eb7e81 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/NotFoundAction.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/NotFoundAction.java
@@ -13,19 +13,18 @@ import java.util.List;
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Not Found Action</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the literals of the enumeration '
+ * <em><b>Not Found Action</b></em>', and utility methods for working with them. <!-- end-user-doc
+ * -->
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getNotFoundAction()
  * @model
  * @generated
  */
 public enum NotFoundAction implements Enumerator {
 	/**
-	 * The '<em><b>EXCEPTION</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>EXCEPTION</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #EXCEPTION_VALUE
 	 * @generated
 	 * @ordered
@@ -33,9 +32,8 @@ public enum NotFoundAction implements Enumerator {
 	EXCEPTION(0, "EXCEPTION", "EXCEPTION"),
 
 	/**
-	 * The '<em><b>IGNORE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>IGNORE</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #IGNORE_VALUE
 	 * @generated
 	 * @ordered
@@ -43,13 +41,13 @@ public enum NotFoundAction implements Enumerator {
 	IGNORE(1, "IGNORE", "IGNORE");
 
 	/**
-	 * The '<em><b>EXCEPTION</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>EXCEPTION</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>EXCEPTION</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>EXCEPTION</b></em>' literal object isn't clear, there really should
+	 * be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #EXCEPTION
 	 * @model
 	 * @generated
@@ -58,13 +56,13 @@ public enum NotFoundAction implements Enumerator {
 	public static final int EXCEPTION_VALUE = 0;
 
 	/**
-	 * The '<em><b>IGNORE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>IGNORE</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>IGNORE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>IGNORE</b></em>' literal object isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #IGNORE
 	 * @model
 	 * @generated
@@ -73,29 +71,26 @@ public enum NotFoundAction implements Enumerator {
 	public static final int IGNORE_VALUE = 1;
 
 	/**
-	 * An array of all the '<em><b>Not Found Action</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
+	 * An array of all the '<em><b>Not Found Action</b></em>' enumerators. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final NotFoundAction[] VALUES_ARRAY =
-		new NotFoundAction[] {
-			EXCEPTION,
-			IGNORE,
-		};
+	private static final NotFoundAction[] VALUES_ARRAY = new NotFoundAction[] { EXCEPTION, IGNORE, };
 
 	/**
-	 * A public read-only list of all the '<em><b>Not Found Action</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * A public read-only list of all the '<em><b>Not Found Action</b></em>' enumerators. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public static final List<NotFoundAction> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+	public static final List<NotFoundAction> VALUES = Collections.unmodifiableList(Arrays
+			.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>Not Found Action</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Not Found Action</b></em>' literal with the specified literal value. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static NotFoundAction get(String literal) {
@@ -109,9 +104,9 @@ public enum NotFoundAction implements Enumerator {
 	}
 
 	/**
-	 * Returns the '<em><b>Not Found Action</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Not Found Action</b></em>' literal with the specified name. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static NotFoundAction getByName(String name) {
@@ -125,44 +120,45 @@ public enum NotFoundAction implements Enumerator {
 	}
 
 	/**
-	 * Returns the '<em><b>Not Found Action</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Not Found Action</b></em>' literal with the specified integer value. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static NotFoundAction get(int value) {
 		switch (value) {
-			case EXCEPTION_VALUE: return EXCEPTION;
-			case IGNORE_VALUE: return IGNORE;
+		case EXCEPTION_VALUE:
+			return EXCEPTION;
+		case IGNORE_VALUE:
+			return IGNORE;
 		}
 		return null;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final int value;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String name;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String literal;
 
 	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Only this class can construct instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private NotFoundAction(int value, String name, String literal) {
@@ -172,41 +168,41 @@ public enum NotFoundAction implements Enumerator {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
-	  return value;
+		return value;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
-	  return name;
+		return name;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-	  return literal;
+		return literal;
 	}
 
 	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the literal value of the enumerator, which is its string representation. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
 		return literal;
 	}
-	
-} //NotFoundAction
+
+} // NotFoundAction
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/OnDelete.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/OnDelete.java
index 1b97611a3..5d1fbfd14 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/OnDelete.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/OnDelete.java
@@ -6,33 +6,32 @@
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>On Delete</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>On Delete</b></em>'. <!--
+ * end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.OnDelete#getAction <em>Action</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.OnDelete#getAction <em>Action</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getOnDelete()
- * @model annotation="http://annotation.elver.org/internal/Target 0='EStructuralFeature'"
+ * @model annotation= "http://annotation.elver.org/internal/Target 0='EStructuralFeature'"
  * @generated
  */
 public interface OnDelete extends HbAnnotation {
 	/**
-	 * Returns the value of the '<em><b>Action</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.emf.teneo.hibernate.hbannotation.OnDeleteAction}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Action</b></em>' attribute. The literals are from the
+	 * enumeration {@link org.eclipse.emf.teneo.hibernate.hbannotation.OnDeleteAction}. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Action</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Action</em>' attribute list isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Action</em>' attribute.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.OnDeleteAction
 	 * @see #setAction(OnDeleteAction)
@@ -43,10 +42,11 @@ public interface OnDelete extends HbAnnotation {
 	OnDeleteAction getAction();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.OnDelete#getAction <em>Action</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Action</em>' attribute.
+	 * Sets the value of the ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.OnDelete#getAction
+	 * <em>Action</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Action</em>' attribute.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.OnDeleteAction
 	 * @see #getAction()
 	 * @generated
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/OnDeleteAction.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/OnDeleteAction.java
index 0d012f671..004a45a37 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/OnDeleteAction.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/OnDeleteAction.java
@@ -13,19 +13,18 @@ import java.util.List;
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>On Delete Action</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the literals of the enumeration '
+ * <em><b>On Delete Action</b></em>', and utility methods for working with them. <!-- end-user-doc
+ * -->
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getOnDeleteAction()
  * @model
  * @generated
  */
 public enum OnDeleteAction implements Enumerator {
 	/**
-	 * The '<em><b>NO ACTION</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>NO ACTION</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #NO_ACTION_VALUE
 	 * @generated
 	 * @ordered
@@ -33,9 +32,8 @@ public enum OnDeleteAction implements Enumerator {
 	NO_ACTION(0, "NO_ACTION", "NO_ACTION"),
 
 	/**
-	 * The '<em><b>CASCADE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>CASCADE</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #CASCADE_VALUE
 	 * @generated
 	 * @ordered
@@ -43,13 +41,13 @@ public enum OnDeleteAction implements Enumerator {
 	CASCADE(1, "CASCADE", "CASCADE");
 
 	/**
-	 * The '<em><b>NO ACTION</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>NO ACTION</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>NO ACTION</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>NO ACTION</b></em>' literal object isn't clear, there really should
+	 * be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #NO_ACTION
 	 * @model
 	 * @generated
@@ -58,13 +56,13 @@ public enum OnDeleteAction implements Enumerator {
 	public static final int NO_ACTION_VALUE = 0;
 
 	/**
-	 * The '<em><b>CASCADE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>CASCADE</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>CASCADE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>CASCADE</b></em>' literal object isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #CASCADE
 	 * @model
 	 * @generated
@@ -73,28 +71,26 @@ public enum OnDeleteAction implements Enumerator {
 	public static final int CASCADE_VALUE = 1;
 
 	/**
-	 * An array of all the '<em><b>On Delete Action</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
+	 * An array of all the '<em><b>On Delete Action</b></em>' enumerators. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final OnDeleteAction[] VALUES_ARRAY = new OnDeleteAction[] {
-			NO_ACTION,
-			CASCADE,
-		};
+	private static final OnDeleteAction[] VALUES_ARRAY = new OnDeleteAction[] { NO_ACTION, CASCADE, };
 
 	/**
-	 * A public read-only list of all the '<em><b>On Delete Action</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * A public read-only list of all the '<em><b>On Delete Action</b></em>' enumerators. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public static final List<OnDeleteAction> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+	public static final List<OnDeleteAction> VALUES = Collections.unmodifiableList(Arrays
+			.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>On Delete Action</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>On Delete Action</b></em>' literal with the specified literal value. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static OnDeleteAction get(String literal) {
@@ -108,9 +104,9 @@ public enum OnDeleteAction implements Enumerator {
 	}
 
 	/**
-	 * Returns the '<em><b>On Delete Action</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>On Delete Action</b></em>' literal with the specified name. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static OnDeleteAction getByName(String name) {
@@ -124,44 +120,45 @@ public enum OnDeleteAction implements Enumerator {
 	}
 
 	/**
-	 * Returns the '<em><b>On Delete Action</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>On Delete Action</b></em>' literal with the specified integer value. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static OnDeleteAction get(int value) {
 		switch (value) {
-			case NO_ACTION_VALUE: return NO_ACTION;
-			case CASCADE_VALUE: return CASCADE;
+		case NO_ACTION_VALUE:
+			return NO_ACTION;
+		case CASCADE_VALUE:
+			return CASCADE;
 		}
 		return null;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final int value;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String name;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String literal;
 
 	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Only this class can construct instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private OnDeleteAction(int value, String name, String literal) {
@@ -171,36 +168,36 @@ public enum OnDeleteAction implements Enumerator {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
-	  return value;
+		return value;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
-	  return name;
+		return name;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-	  return literal;
+		return literal;
 	}
 
 	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the literal value of the enumerator, which is its string representation. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/OptimisticLockType.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/OptimisticLockType.java
index ac4286704..26a669c3c 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/OptimisticLockType.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/OptimisticLockType.java
@@ -13,19 +13,18 @@ import java.util.List;
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Optimistic Lock Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the literals of the enumeration '
+ * <em><b>Optimistic Lock Type</b></em>', and utility methods for working with them. <!--
+ * end-user-doc -->
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getOptimisticLockType()
  * @model
  * @generated
  */
 public enum OptimisticLockType implements Enumerator {
 	/**
-	 * The '<em><b>ALL</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>ALL</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #ALL_VALUE
 	 * @generated
 	 * @ordered
@@ -33,9 +32,8 @@ public enum OptimisticLockType implements Enumerator {
 	ALL(0, "ALL", "ALL"),
 
 	/**
-	 * The '<em><b>DIRTY</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>DIRTY</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #DIRTY_VALUE
 	 * @generated
 	 * @ordered
@@ -43,9 +41,8 @@ public enum OptimisticLockType implements Enumerator {
 	DIRTY(1, "DIRTY", "DIRTY"),
 
 	/**
-	 * The '<em><b>NONE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>NONE</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #NONE_VALUE
 	 * @generated
 	 * @ordered
@@ -53,9 +50,8 @@ public enum OptimisticLockType implements Enumerator {
 	NONE(2, "NONE", "NONE"),
 
 	/**
-	 * The '<em><b>VERSION</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>VERSION</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #VERSION_VALUE
 	 * @generated
 	 * @ordered
@@ -63,13 +59,13 @@ public enum OptimisticLockType implements Enumerator {
 	VERSION(3, "VERSION", "VERSION");
 
 	/**
-	 * The '<em><b>ALL</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>ALL</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>ALL</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>ALL</b></em>' literal object isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #ALL
 	 * @model
 	 * @generated
@@ -78,13 +74,13 @@ public enum OptimisticLockType implements Enumerator {
 	public static final int ALL_VALUE = 0;
 
 	/**
-	 * The '<em><b>DIRTY</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>DIRTY</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>DIRTY</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>DIRTY</b></em>' literal object isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #DIRTY
 	 * @model
 	 * @generated
@@ -93,13 +89,13 @@ public enum OptimisticLockType implements Enumerator {
 	public static final int DIRTY_VALUE = 1;
 
 	/**
-	 * The '<em><b>NONE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>NONE</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>NONE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>NONE</b></em>' literal object isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #NONE
 	 * @model
 	 * @generated
@@ -108,13 +104,13 @@ public enum OptimisticLockType implements Enumerator {
 	public static final int NONE_VALUE = 2;
 
 	/**
-	 * The '<em><b>VERSION</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>VERSION</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>VERSION</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>VERSION</b></em>' literal object isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #VERSION
 	 * @model
 	 * @generated
@@ -123,31 +119,27 @@ public enum OptimisticLockType implements Enumerator {
 	public static final int VERSION_VALUE = 3;
 
 	/**
-	 * An array of all the '<em><b>Optimistic Lock Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
+	 * An array of all the '<em><b>Optimistic Lock Type</b></em>' enumerators. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final OptimisticLockType[] VALUES_ARRAY =
-		new OptimisticLockType[] {
-			ALL,
-			DIRTY,
-			NONE,
-			VERSION,
-		};
+	private static final OptimisticLockType[] VALUES_ARRAY = new OptimisticLockType[] { ALL, DIRTY,
+			NONE, VERSION, };
 
 	/**
-	 * A public read-only list of all the '<em><b>Optimistic Lock Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * A public read-only list of all the '<em><b>Optimistic Lock Type</b></em>' enumerators. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public static final List<OptimisticLockType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+	public static final List<OptimisticLockType> VALUES = Collections.unmodifiableList(Arrays
+			.asList(VALUES_ARRAY));
 
 	/**
 	 * Returns the '<em><b>Optimistic Lock Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static OptimisticLockType get(String literal) {
@@ -161,9 +153,9 @@ public enum OptimisticLockType implements Enumerator {
 	}
 
 	/**
-	 * Returns the '<em><b>Optimistic Lock Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Optimistic Lock Type</b></em>' literal with the specified name. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static OptimisticLockType getByName(String name) {
@@ -178,45 +170,48 @@ public enum OptimisticLockType implements Enumerator {
 
 	/**
 	 * Returns the '<em><b>Optimistic Lock Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static OptimisticLockType get(int value) {
 		switch (value) {
-			case ALL_VALUE: return ALL;
-			case DIRTY_VALUE: return DIRTY;
-			case NONE_VALUE: return NONE;
-			case VERSION_VALUE: return VERSION;
+		case ALL_VALUE:
+			return ALL;
+		case DIRTY_VALUE:
+			return DIRTY;
+		case NONE_VALUE:
+			return NONE;
+		case VERSION_VALUE:
+			return VERSION;
 		}
 		return null;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final int value;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String name;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String literal;
 
 	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Only this class can construct instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private OptimisticLockType(int value, String name, String literal) {
@@ -226,41 +221,41 @@ public enum OptimisticLockType implements Enumerator {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
-	  return value;
+		return value;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
-	  return name;
+		return name;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-	  return literal;
+		return literal;
 	}
 
 	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the literal value of the enumerator, which is its string representation. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
 		return literal;
 	}
-	
-} //OptimisticLockType
+
+} // OptimisticLockType
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/ParamDef.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/ParamDef.java
index ff1530e92..363317880 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/ParamDef.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/ParamDef.java
@@ -6,33 +6,31 @@
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Param Def</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Param Def</b></em>'. <!--
+ * end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.ParamDef#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.ParamDef#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.ParamDef#getName <em> Name</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.ParamDef#getType <em> Type</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getParamDef()
- * @model annotation="http://annotation.elver.org/internal/Target 0='EClass' 1='EReference'"
+ * @model annotation= "http://annotation.elver.org/internal/Target 0='EClass' 1='EReference'"
  * @generated
  */
 public interface ParamDef extends HbAnnotation {
 	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getParamDef_Name()
@@ -42,23 +40,24 @@ public interface ParamDef extends HbAnnotation {
 	String getName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.ParamDef#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
+	 * Sets the value of the ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.ParamDef#getName
+	 * <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Name</em>' attribute.
 	 * @see #getName()
 	 * @generated
 	 */
 	void setName(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Type</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Type</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Type</em>' attribute.
 	 * @see #setType(String)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getParamDef_Type()
@@ -68,10 +67,11 @@ public interface ParamDef extends HbAnnotation {
 	String getType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.ParamDef#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
+	 * Sets the value of the ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.ParamDef#getType
+	 * <em>Type</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Type</em>' attribute.
 	 * @see #getType()
 	 * @generated
 	 */
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Parameter.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Parameter.java
index 7ec6d67da..1b4d7e204 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Parameter.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Parameter.java
@@ -7,30 +7,33 @@
 package org.eclipse.emf.teneo.hibernate.hbannotation;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Parameter</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Parameter</b></em>'. <!--
+ * end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Parameter#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Parameter#getValue <em>Value</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Parameter#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Parameter#getValue <em>Value</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getParameter()
- * @model annotation="http://annotation.elver.org/internal/Collection name='Parameters' packageNS='http://www.eclipse.org/emf/teneo/2006/HbAnnotation'"
- *        annotation="http://annotation.elver.org/internal/Target 0='EStructuralFeature' 1='EClass' 2='EPackage'"
+ * @model annotation=
+ *        "http://annotation.elver.org/internal/Collection name='Parameters' packageNS='http://www.eclipse.org/emf/teneo/2006/HbAnnotation'"
+ *        annotation=
+ *        "http://annotation.elver.org/internal/Target 0='EStructuralFeature' 1='EClass' 2='EPackage'"
  * @generated
  */
 public interface Parameter extends HbAnnotation {
 	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description
-	 * here...
+	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getParameter_Name()
@@ -40,22 +43,24 @@ public interface Parameter extends HbAnnotation {
 	String getName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Parameter#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
+	 * Sets the value of the ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.Parameter#getName
+	 * <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Name</em>' attribute.
 	 * @see #getName()
 	 * @generated
 	 */
 	void setName(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Value</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear, there really should be more of a description
-	 * here...
+	 * If the meaning of the '<em>Value</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Value</em>' attribute.
 	 * @see #setValue(String)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getParameter_Value()
@@ -65,9 +70,11 @@ public interface Parameter extends HbAnnotation {
 	String getValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Parameter#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
+	 * Sets the value of the ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.Parameter#getValue
+	 * <em>Value</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Value</em>' attribute.
 	 * @see #getValue()
 	 * @generated
 	 */
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/PolymorphismType.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/PolymorphismType.java
index 172c39839..93394a919 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/PolymorphismType.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/PolymorphismType.java
@@ -13,19 +13,18 @@ import java.util.List;
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Polymorphism Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the literals of the enumeration '
+ * <em><b>Polymorphism Type</b></em>', and utility methods for working with them. <!-- end-user-doc
+ * -->
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getPolymorphismType()
  * @model
  * @generated
  */
 public enum PolymorphismType implements Enumerator {
 	/**
-	 * The '<em><b>IMPLICIT</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>IMPLICIT</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #IMPLICIT_VALUE
 	 * @generated
 	 * @ordered
@@ -33,9 +32,8 @@ public enum PolymorphismType implements Enumerator {
 	IMPLICIT(0, "IMPLICIT", "IMPLICIT"),
 
 	/**
-	 * The '<em><b>EXPLICIT</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>EXPLICIT</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #EXPLICIT_VALUE
 	 * @generated
 	 * @ordered
@@ -43,13 +41,13 @@ public enum PolymorphismType implements Enumerator {
 	EXPLICIT(1, "EXPLICIT", "EXPLICIT");
 
 	/**
-	 * The '<em><b>IMPLICIT</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>IMPLICIT</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>IMPLICIT</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>IMPLICIT</b></em>' literal object isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #IMPLICIT
 	 * @model
 	 * @generated
@@ -58,13 +56,13 @@ public enum PolymorphismType implements Enumerator {
 	public static final int IMPLICIT_VALUE = 0;
 
 	/**
-	 * The '<em><b>EXPLICIT</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>EXPLICIT</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>EXPLICIT</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>EXPLICIT</b></em>' literal object isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #EXPLICIT
 	 * @model
 	 * @generated
@@ -73,29 +71,27 @@ public enum PolymorphismType implements Enumerator {
 	public static final int EXPLICIT_VALUE = 1;
 
 	/**
-	 * An array of all the '<em><b>Polymorphism Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
+	 * An array of all the '<em><b>Polymorphism Type</b></em>' enumerators. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final PolymorphismType[] VALUES_ARRAY =
-		new PolymorphismType[] {
-			IMPLICIT,
-			EXPLICIT,
-		};
+	private static final PolymorphismType[] VALUES_ARRAY = new PolymorphismType[] { IMPLICIT,
+			EXPLICIT, };
 
 	/**
-	 * A public read-only list of all the '<em><b>Polymorphism Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * A public read-only list of all the '<em><b>Polymorphism Type</b></em>' enumerators. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public static final List<PolymorphismType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+	public static final List<PolymorphismType> VALUES = Collections.unmodifiableList(Arrays
+			.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>Polymorphism Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Polymorphism Type</b></em>' literal with the specified literal value. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static PolymorphismType get(String literal) {
@@ -109,9 +105,9 @@ public enum PolymorphismType implements Enumerator {
 	}
 
 	/**
-	 * Returns the '<em><b>Polymorphism Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Polymorphism Type</b></em>' literal with the specified name. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static PolymorphismType getByName(String name) {
@@ -125,44 +121,45 @@ public enum PolymorphismType implements Enumerator {
 	}
 
 	/**
-	 * Returns the '<em><b>Polymorphism Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the '<em><b>Polymorphism Type</b></em>' literal with the specified integer value. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static PolymorphismType get(int value) {
 		switch (value) {
-			case IMPLICIT_VALUE: return IMPLICIT;
-			case EXPLICIT_VALUE: return EXPLICIT;
+		case IMPLICIT_VALUE:
+			return IMPLICIT;
+		case EXPLICIT_VALUE:
+			return EXPLICIT;
 		}
 		return null;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final int value;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String name;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String literal;
 
 	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Only this class can construct instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private PolymorphismType(int value, String name, String literal) {
@@ -172,41 +169,41 @@ public enum PolymorphismType implements Enumerator {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
-	  return value;
+		return value;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
-	  return name;
+		return name;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-	  return literal;
+		return literal;
 	}
 
 	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the literal value of the enumerator, which is its string representation. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
 		return literal;
 	}
-	
-} //PolymorphismType
+
+} // PolymorphismType
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Proxy.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Proxy.java
index 1be40cf5f..2d48d34d3 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Proxy.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Proxy.java
@@ -6,33 +6,32 @@
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Proxy</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Proxy</b></em>'. <!--
+ * end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Proxy#getProxyClass <em>Proxy Class</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Proxy#isLazy <em>Lazy</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Proxy#getProxyClass <em>Proxy Class</em>}
+ * </li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Proxy#isLazy <em>Lazy </em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getProxy()
  * @model annotation="http://annotation.elver.org/internal/Target 0='EClass'"
  * @generated
  */
 public interface Proxy extends HbAnnotation {
 	/**
-	 * Returns the value of the '<em><b>Proxy Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Proxy Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Proxy Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Proxy Class</em>' attribute isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Proxy Class</em>' attribute.
 	 * @see #setProxyClass(String)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getProxy_ProxyClass()
@@ -42,24 +41,26 @@ public interface Proxy extends HbAnnotation {
 	String getProxyClass();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Proxy#getProxyClass <em>Proxy Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Proxy Class</em>' attribute.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Proxy#getProxyClass <em>Proxy Class</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Proxy Class</em>' attribute.
 	 * @see #getProxyClass()
 	 * @generated
 	 */
 	void setProxyClass(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Lazy</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Lazy</b></em>' attribute. The default value is
+	 * <code>"true"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Lazy</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Lazy</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Lazy</em>' attribute.
 	 * @see #setLazy(boolean)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getProxy_Lazy()
@@ -69,10 +70,11 @@ public interface Proxy extends HbAnnotation {
 	boolean isLazy();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Proxy#isLazy <em>Lazy</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lazy</em>' attribute.
+	 * Sets the value of the ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.Proxy#isLazy
+	 * <em>Lazy</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Lazy</em>' attribute.
 	 * @see #isLazy()
 	 * @generated
 	 */
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Type.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Type.java
index fbcfcee1e..4058829f7 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Type.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Type.java
@@ -9,29 +9,30 @@ package org.eclipse.emf.teneo.hibernate.hbannotation;
 import org.eclipse.emf.common.util.EList;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Type</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Type</b></em>'. <!--
+ * end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Type#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Type#getParameters <em>Parameters</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Type#getType <em>Type </em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Type#getParameters <em>Parameters</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getType()
- * @model annotation="http://annotation.elver.org/internal/Target 0='EStructuralFeature'"
+ * @model annotation= "http://annotation.elver.org/internal/Target 0='EStructuralFeature'"
  * @generated
  */
 public interface Type extends HbAnnotation {
 	/**
-	 * Returns the value of the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Type</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Type</em>' attribute isn't clear, there really should be more of a description
-	 * here...
+	 * If the meaning of the '<em>Type</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Type</em>' attribute.
 	 * @see #setType(String)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getType_Type()
@@ -41,23 +42,25 @@ public interface Type extends HbAnnotation {
 	String getType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Type#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
+	 * Sets the value of the ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.Type#getType
+	 * <em>Type</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Type</em>' attribute.
 	 * @see #getType()
 	 * @generated
 	 */
 	void setType(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Parameters</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.emf.teneo.hibernate.hbannotation.Parameter}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Parameters</b></em>' reference list. The list contents are of
+	 * type {@link org.eclipse.emf.teneo.hibernate.hbannotation.Parameter}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Parameters</em>' reference list isn't clear, there really should be more of a
-	 * description here...
+	 * If the meaning of the '<em>Parameters</em>' reference list isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Parameters</em>' reference list.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getType_Parameters()
 	 * @model
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/TypeDef.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/TypeDef.java
index b7adbee55..5db11f24e 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/TypeDef.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/TypeDef.java
@@ -9,30 +9,34 @@ package org.eclipse.emf.teneo.hibernate.hbannotation;
 import org.eclipse.emf.common.util.EList;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Type Def</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Type Def</b></em>'. <!--
+ * end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.TypeDef#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.TypeDef#getParameters <em>Parameters</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.TypeDef#getTypeClass <em>Type Class</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.TypeDef#getName <em> Name</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.TypeDef#getParameters <em>Parameters</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.TypeDef#getTypeClass <em>Type Class</em>}
+ * </li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getTypeDef()
- * @model annotation="http://annotation.elver.org/internal/Target 0='EStructuralFeature' 1='EClass' 2='EPackage'"
+ * @model annotation=
+ *        "http://annotation.elver.org/internal/Target 0='EStructuralFeature' 1='EClass' 2='EPackage'"
  * @generated
  */
 public interface TypeDef extends HbAnnotation {
 	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description
-	 * here...
+	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getTypeDef_Name()
@@ -42,23 +46,25 @@ public interface TypeDef extends HbAnnotation {
 	String getName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.TypeDef#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
+	 * Sets the value of the ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.TypeDef#getName
+	 * <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Name</em>' attribute.
 	 * @see #getName()
 	 * @generated
 	 */
 	void setName(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Parameters</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.emf.teneo.hibernate.hbannotation.Parameter}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Parameters</b></em>' reference list. The list contents are of
+	 * type {@link org.eclipse.emf.teneo.hibernate.hbannotation.Parameter}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Parameters</em>' reference list isn't clear, there really should be more of a
-	 * description here...
+	 * If the meaning of the '<em>Parameters</em>' reference list isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Parameters</em>' reference list.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getTypeDef_Parameters()
 	 * @model
@@ -67,13 +73,13 @@ public interface TypeDef extends HbAnnotation {
 	EList<Parameter> getParameters();
 
 	/**
-	 * Returns the value of the '<em><b>Type Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Type Class</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Type Class</em>' attribute isn't clear, there really should be more of a
-	 * description here...
+	 * If the meaning of the '<em>Type Class</em>' attribute isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Type Class</em>' attribute.
 	 * @see #setTypeClass(String)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getTypeDef_TypeClass()
@@ -83,9 +89,12 @@ public interface TypeDef extends HbAnnotation {
 	String getTypeClass();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.TypeDef#getTypeClass <em>Type Class</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type Class</em>' attribute.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.TypeDef#getTypeClass <em>Type Class</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Type Class</em>' attribute.
 	 * @see #getTypeClass()
 	 * @generated
 	 */
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Where.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Where.java
index e2706bc00..60d5ce88f 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Where.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/Where.java
@@ -7,28 +7,29 @@
 package org.eclipse.emf.teneo.hibernate.hbannotation;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Where</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Where</b></em>'. <!--
+ * end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Where#getClause <em>Clause</em>}</li>
+ * <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.Where#getClause <em> Clause</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getWhere()
- * @model annotation="http://annotation.elver.org/internal/Target 0='EStructuralFeature'"
+ * @model annotation= "http://annotation.elver.org/internal/Target 0='EStructuralFeature'"
  * @generated
  */
 public interface Where extends HbAnnotation {
 	/**
-	 * Returns the value of the '<em><b>Clause</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Clause</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Clause</em>' attribute isn't clear, there really should be more of a description
-	 * here...
+	 * If the meaning of the '<em>Clause</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Clause</em>' attribute.
 	 * @see #setClause(String)
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#getWhere_Clause()
@@ -38,9 +39,11 @@ public interface Where extends HbAnnotation {
 	String getClause();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Where#getClause <em>Clause</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Clause</em>' attribute.
+	 * Sets the value of the ' {@link org.eclipse.emf.teneo.hibernate.hbannotation.Where#getClause
+	 * <em>Clause</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Clause</em>' attribute.
 	 * @see #getClause()
 	 * @generated
 	 */
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/AnyImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/AnyImpl.java
index 060e76a80..95c2f50e7 100644
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/AnyImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/AnyImpl.java
@@ -17,26 +17,30 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.Any;
 import org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Any</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Any</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.AnyImpl#getMetaDef <em>Meta Def</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.AnyImpl#getMetaColumn <em>Meta Column</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.AnyImpl#getFetch <em>Fetch</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.AnyImpl#isOptional <em>Optional</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.AnyImpl#getMetaDef <em>Meta Def</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.AnyImpl#getMetaColumn <em>Meta Column
+ * </em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.AnyImpl#getFetch <em>Fetch</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.AnyImpl#isOptional <em>Optional</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class AnyImpl extends HbAnnotationImpl implements Any {
 	/**
-	 * The default value of the '{@link #getMetaDef() <em>Meta Def</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMetaDef() <em>Meta Def</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMetaDef()
 	 * @generated
 	 * @ordered
@@ -44,9 +48,9 @@ public class AnyImpl extends HbAnnotationImpl implements Any {
 	protected static final String META_DEF_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getMetaDef() <em>Meta Def</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMetaDef() <em>Meta Def</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMetaDef()
 	 * @generated
 	 * @ordered
@@ -55,8 +59,8 @@ public class AnyImpl extends HbAnnotationImpl implements Any {
 
 	/**
 	 * The cached value of the '{@link #getMetaColumn() <em>Meta Column</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMetaColumn()
 	 * @generated
 	 * @ordered
@@ -64,9 +68,9 @@ public class AnyImpl extends HbAnnotationImpl implements Any {
 	protected Column metaColumn;
 
 	/**
-	 * The default value of the '{@link #getFetch() <em>Fetch</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getFetch() <em>Fetch</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFetch()
 	 * @generated
 	 * @ordered
@@ -74,9 +78,9 @@ public class AnyImpl extends HbAnnotationImpl implements Any {
 	protected static final FetchType FETCH_EDEFAULT = FetchType.EAGER;
 
 	/**
-	 * The cached value of the '{@link #getFetch() <em>Fetch</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getFetch() <em>Fetch</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getFetch()
 	 * @generated
 	 * @ordered
@@ -84,9 +88,9 @@ public class AnyImpl extends HbAnnotationImpl implements Any {
 	protected FetchType fetch = FETCH_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #isOptional() <em>Optional</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #isOptional() <em>Optional</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isOptional()
 	 * @generated
 	 * @ordered
@@ -94,9 +98,9 @@ public class AnyImpl extends HbAnnotationImpl implements Any {
 	protected static final boolean OPTIONAL_EDEFAULT = true;
 
 	/**
-	 * The cached value of the '{@link #isOptional() <em>Optional</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #isOptional() <em>Optional</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isOptional()
 	 * @generated
 	 * @ordered
@@ -104,8 +108,8 @@ public class AnyImpl extends HbAnnotationImpl implements Any {
 	protected boolean optional = OPTIONAL_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AnyImpl() {
@@ -113,8 +117,8 @@ public class AnyImpl extends HbAnnotationImpl implements Any {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -123,8 +127,8 @@ public class AnyImpl extends HbAnnotationImpl implements Any {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getMetaDef() {
@@ -132,20 +136,21 @@ public class AnyImpl extends HbAnnotationImpl implements Any {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setMetaDef(String newMetaDef) {
 		String oldMetaDef = metaDef;
 		metaDef = newMetaDef;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.ANY__META_DEF, oldMetaDef, metaDef));
+			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.ANY__META_DEF,
+					oldMetaDef, metaDef));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Column getMetaColumn() {
@@ -153,42 +158,49 @@ public class AnyImpl extends HbAnnotationImpl implements Any {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetMetaColumn(Column newMetaColumn, NotificationChain msgs) {
 		Column oldMetaColumn = metaColumn;
 		metaColumn = newMetaColumn;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HbannotationPackage.ANY__META_COLUMN, oldMetaColumn, newMetaColumn);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					HbannotationPackage.ANY__META_COLUMN, oldMetaColumn, newMetaColumn);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setMetaColumn(Column newMetaColumn) {
 		if (newMetaColumn != metaColumn) {
 			NotificationChain msgs = null;
 			if (metaColumn != null)
-				msgs = ((InternalEObject)metaColumn).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - HbannotationPackage.ANY__META_COLUMN, null, msgs);
+				msgs = ((InternalEObject) metaColumn).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+						- HbannotationPackage.ANY__META_COLUMN, null, msgs);
 			if (newMetaColumn != null)
-				msgs = ((InternalEObject)newMetaColumn).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - HbannotationPackage.ANY__META_COLUMN, null, msgs);
+				msgs = ((InternalEObject) newMetaColumn).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+						- HbannotationPackage.ANY__META_COLUMN, null, msgs);
 			msgs = basicSetMetaColumn(newMetaColumn, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.ANY__META_COLUMN, newMetaColumn, newMetaColumn));
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.ANY__META_COLUMN,
+					newMetaColumn, newMetaColumn));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FetchType getFetch() {
@@ -196,20 +208,21 @@ public class AnyImpl extends HbAnnotationImpl implements Any {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFetch(FetchType newFetch) {
 		FetchType oldFetch = fetch;
 		fetch = newFetch == null ? FETCH_EDEFAULT : newFetch;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.ANY__FETCH, oldFetch, fetch));
+			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.ANY__FETCH,
+					oldFetch, fetch));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isOptional() {
@@ -217,127 +230,130 @@ public class AnyImpl extends HbAnnotationImpl implements Any {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setOptional(boolean newOptional) {
 		boolean oldOptional = optional;
 		optional = newOptional;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.ANY__OPTIONAL, oldOptional, optional));
+			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.ANY__OPTIONAL,
+					oldOptional, optional));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID,
+			NotificationChain msgs) {
 		switch (featureID) {
-			case HbannotationPackage.ANY__META_COLUMN:
-				return basicSetMetaColumn(null, msgs);
+		case HbannotationPackage.ANY__META_COLUMN:
+			return basicSetMetaColumn(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case HbannotationPackage.ANY__META_DEF:
-				return getMetaDef();
-			case HbannotationPackage.ANY__META_COLUMN:
-				return getMetaColumn();
-			case HbannotationPackage.ANY__FETCH:
-				return getFetch();
-			case HbannotationPackage.ANY__OPTIONAL:
-				return isOptional();
+		case HbannotationPackage.ANY__META_DEF:
+			return getMetaDef();
+		case HbannotationPackage.ANY__META_COLUMN:
+			return getMetaColumn();
+		case HbannotationPackage.ANY__FETCH:
+			return getFetch();
+		case HbannotationPackage.ANY__OPTIONAL:
+			return isOptional();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case HbannotationPackage.ANY__META_DEF:
-				setMetaDef((String)newValue);
-				return;
-			case HbannotationPackage.ANY__META_COLUMN:
-				setMetaColumn((Column)newValue);
-				return;
-			case HbannotationPackage.ANY__FETCH:
-				setFetch((FetchType)newValue);
-				return;
-			case HbannotationPackage.ANY__OPTIONAL:
-				setOptional((Boolean)newValue);
-				return;
+		case HbannotationPackage.ANY__META_DEF:
+			setMetaDef((String) newValue);
+			return;
+		case HbannotationPackage.ANY__META_COLUMN:
+			setMetaColumn((Column) newValue);
+			return;
+		case HbannotationPackage.ANY__FETCH:
+			setFetch((FetchType) newValue);
+			return;
+		case HbannotationPackage.ANY__OPTIONAL:
+			setOptional((Boolean) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.ANY__META_DEF:
-				setMetaDef(META_DEF_EDEFAULT);
-				return;
-			case HbannotationPackage.ANY__META_COLUMN:
-				setMetaColumn((Column)null);
-				return;
-			case HbannotationPackage.ANY__FETCH:
-				setFetch(FETCH_EDEFAULT);
-				return;
-			case HbannotationPackage.ANY__OPTIONAL:
-				setOptional(OPTIONAL_EDEFAULT);
-				return;
+		case HbannotationPackage.ANY__META_DEF:
+			setMetaDef(META_DEF_EDEFAULT);
+			return;
+		case HbannotationPackage.ANY__META_COLUMN:
+			setMetaColumn((Column) null);
+			return;
+		case HbannotationPackage.ANY__FETCH:
+			setFetch(FETCH_EDEFAULT);
+			return;
+		case HbannotationPackage.ANY__OPTIONAL:
+			setOptional(OPTIONAL_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.ANY__META_DEF:
-				return META_DEF_EDEFAULT == null ? metaDef != null : !META_DEF_EDEFAULT.equals(metaDef);
-			case HbannotationPackage.ANY__META_COLUMN:
-				return metaColumn != null;
-			case HbannotationPackage.ANY__FETCH:
-				return fetch != FETCH_EDEFAULT;
-			case HbannotationPackage.ANY__OPTIONAL:
-				return optional != OPTIONAL_EDEFAULT;
+		case HbannotationPackage.ANY__META_DEF:
+			return META_DEF_EDEFAULT == null ? metaDef != null : !META_DEF_EDEFAULT.equals(metaDef);
+		case HbannotationPackage.ANY__META_COLUMN:
+			return metaColumn != null;
+		case HbannotationPackage.ANY__FETCH:
+			return fetch != FETCH_EDEFAULT;
+		case HbannotationPackage.ANY__OPTIONAL:
+			return optional != OPTIONAL_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (metaDef: ");
@@ -350,4 +366,4 @@ public class AnyImpl extends HbAnnotationImpl implements Any {
 		return result.toString();
 	}
 
-} //AnyImpl
+} // AnyImpl
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/AnyMetaDefImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/AnyMetaDefImpl.java
index fd168ef8e..71be4e708 100644
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/AnyMetaDefImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/AnyMetaDefImpl.java
@@ -21,26 +21,32 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage;
 import org.eclipse.emf.teneo.hibernate.hbannotation.MetaValue;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Any Meta Def</b></em>'.
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Any Meta Def</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.AnyMetaDefImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.AnyMetaDefImpl#getMetaType <em>Meta Type</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.AnyMetaDefImpl#getIdType <em>Id Type</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.AnyMetaDefImpl#getMetaValues <em>Meta Values</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.AnyMetaDefImpl#getName <em>Name</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.AnyMetaDefImpl#getMetaType <em>Meta Type
+ * </em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.AnyMetaDefImpl#getIdType <em>Id Type
+ * </em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.AnyMetaDefImpl#getMetaValues <em>Meta
+ * Values</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class AnyMetaDefImpl extends HbAnnotationImpl implements AnyMetaDef {
 	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -48,9 +54,9 @@ public class AnyMetaDefImpl extends HbAnnotationImpl implements AnyMetaDef {
 	protected static final String NAME_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -58,9 +64,9 @@ public class AnyMetaDefImpl extends HbAnnotationImpl implements AnyMetaDef {
 	protected String name = NAME_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getMetaType() <em>Meta Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMetaType() <em>Meta Type</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMetaType()
 	 * @generated
 	 * @ordered
@@ -68,9 +74,9 @@ public class AnyMetaDefImpl extends HbAnnotationImpl implements AnyMetaDef {
 	protected static final String META_TYPE_EDEFAULT = "string";
 
 	/**
-	 * The cached value of the '{@link #getMetaType() <em>Meta Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMetaType() <em>Meta Type</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMetaType()
 	 * @generated
 	 * @ordered
@@ -78,9 +84,9 @@ public class AnyMetaDefImpl extends HbAnnotationImpl implements AnyMetaDef {
 	protected String metaType = META_TYPE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getIdType() <em>Id Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getIdType() <em>Id Type</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getIdType()
 	 * @generated
 	 * @ordered
@@ -88,9 +94,9 @@ public class AnyMetaDefImpl extends HbAnnotationImpl implements AnyMetaDef {
 	protected static final String ID_TYPE_EDEFAULT = "string";
 
 	/**
-	 * The cached value of the '{@link #getIdType() <em>Id Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getIdType() <em>Id Type</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getIdType()
 	 * @generated
 	 * @ordered
@@ -98,9 +104,9 @@ public class AnyMetaDefImpl extends HbAnnotationImpl implements AnyMetaDef {
 	protected String idType = ID_TYPE_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getMetaValues() <em>Meta Values</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMetaValues() <em>Meta Values</em>}' containment reference
+	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMetaValues()
 	 * @generated
 	 * @ordered
@@ -108,8 +114,8 @@ public class AnyMetaDefImpl extends HbAnnotationImpl implements AnyMetaDef {
 	protected EList<MetaValue> metaValues;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AnyMetaDefImpl() {
@@ -117,8 +123,8 @@ public class AnyMetaDefImpl extends HbAnnotationImpl implements AnyMetaDef {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -127,8 +133,8 @@ public class AnyMetaDefImpl extends HbAnnotationImpl implements AnyMetaDef {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
@@ -136,20 +142,21 @@ public class AnyMetaDefImpl extends HbAnnotationImpl implements AnyMetaDef {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setName(String newName) {
 		String oldName = name;
 		name = newName;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.ANY_META_DEF__NAME, oldName, name));
+			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.ANY_META_DEF__NAME,
+					oldName, name));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getMetaType() {
@@ -157,20 +164,21 @@ public class AnyMetaDefImpl extends HbAnnotationImpl implements AnyMetaDef {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setMetaType(String newMetaType) {
 		String oldMetaType = metaType;
 		metaType = newMetaType;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.ANY_META_DEF__META_TYPE, oldMetaType, metaType));
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbannotationPackage.ANY_META_DEF__META_TYPE, oldMetaType, metaType));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getIdType() {
@@ -178,141 +186,145 @@ public class AnyMetaDefImpl extends HbAnnotationImpl implements AnyMetaDef {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setIdType(String newIdType) {
 		String oldIdType = idType;
 		idType = newIdType;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.ANY_META_DEF__ID_TYPE, oldIdType, idType));
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbannotationPackage.ANY_META_DEF__ID_TYPE, oldIdType, idType));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<MetaValue> getMetaValues() {
 		if (metaValues == null) {
-			metaValues = new EObjectContainmentEList<MetaValue>(MetaValue.class, this, HbannotationPackage.ANY_META_DEF__META_VALUES);
+			metaValues = new EObjectContainmentEList<MetaValue>(MetaValue.class, this,
+					HbannotationPackage.ANY_META_DEF__META_VALUES);
 		}
 		return metaValues;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID,
+			NotificationChain msgs) {
 		switch (featureID) {
-			case HbannotationPackage.ANY_META_DEF__META_VALUES:
-				return ((InternalEList<?>)getMetaValues()).basicRemove(otherEnd, msgs);
+		case HbannotationPackage.ANY_META_DEF__META_VALUES:
+			return ((InternalEList<?>) getMetaValues()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case HbannotationPackage.ANY_META_DEF__NAME:
-				return getName();
-			case HbannotationPackage.ANY_META_DEF__META_TYPE:
-				return getMetaType();
-			case HbannotationPackage.ANY_META_DEF__ID_TYPE:
-				return getIdType();
-			case HbannotationPackage.ANY_META_DEF__META_VALUES:
-				return getMetaValues();
+		case HbannotationPackage.ANY_META_DEF__NAME:
+			return getName();
+		case HbannotationPackage.ANY_META_DEF__META_TYPE:
+			return getMetaType();
+		case HbannotationPackage.ANY_META_DEF__ID_TYPE:
+			return getIdType();
+		case HbannotationPackage.ANY_META_DEF__META_VALUES:
+			return getMetaValues();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case HbannotationPackage.ANY_META_DEF__NAME:
-				setName((String)newValue);
-				return;
-			case HbannotationPackage.ANY_META_DEF__META_TYPE:
-				setMetaType((String)newValue);
-				return;
-			case HbannotationPackage.ANY_META_DEF__ID_TYPE:
-				setIdType((String)newValue);
-				return;
-			case HbannotationPackage.ANY_META_DEF__META_VALUES:
-				getMetaValues().clear();
-				getMetaValues().addAll((Collection<? extends MetaValue>)newValue);
-				return;
+		case HbannotationPackage.ANY_META_DEF__NAME:
+			setName((String) newValue);
+			return;
+		case HbannotationPackage.ANY_META_DEF__META_TYPE:
+			setMetaType((String) newValue);
+			return;
+		case HbannotationPackage.ANY_META_DEF__ID_TYPE:
+			setIdType((String) newValue);
+			return;
+		case HbannotationPackage.ANY_META_DEF__META_VALUES:
+			getMetaValues().clear();
+			getMetaValues().addAll((Collection<? extends MetaValue>) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.ANY_META_DEF__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case HbannotationPackage.ANY_META_DEF__META_TYPE:
-				setMetaType(META_TYPE_EDEFAULT);
-				return;
-			case HbannotationPackage.ANY_META_DEF__ID_TYPE:
-				setIdType(ID_TYPE_EDEFAULT);
-				return;
-			case HbannotationPackage.ANY_META_DEF__META_VALUES:
-				getMetaValues().clear();
-				return;
+		case HbannotationPackage.ANY_META_DEF__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case HbannotationPackage.ANY_META_DEF__META_TYPE:
+			setMetaType(META_TYPE_EDEFAULT);
+			return;
+		case HbannotationPackage.ANY_META_DEF__ID_TYPE:
+			setIdType(ID_TYPE_EDEFAULT);
+			return;
+		case HbannotationPackage.ANY_META_DEF__META_VALUES:
+			getMetaValues().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.ANY_META_DEF__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case HbannotationPackage.ANY_META_DEF__META_TYPE:
-				return META_TYPE_EDEFAULT == null ? metaType != null : !META_TYPE_EDEFAULT.equals(metaType);
-			case HbannotationPackage.ANY_META_DEF__ID_TYPE:
-				return ID_TYPE_EDEFAULT == null ? idType != null : !ID_TYPE_EDEFAULT.equals(idType);
-			case HbannotationPackage.ANY_META_DEF__META_VALUES:
-				return metaValues != null && !metaValues.isEmpty();
+		case HbannotationPackage.ANY_META_DEF__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case HbannotationPackage.ANY_META_DEF__META_TYPE:
+			return META_TYPE_EDEFAULT == null ? metaType != null : !META_TYPE_EDEFAULT.equals(metaType);
+		case HbannotationPackage.ANY_META_DEF__ID_TYPE:
+			return ID_TYPE_EDEFAULT == null ? idType != null : !ID_TYPE_EDEFAULT.equals(idType);
+		case HbannotationPackage.ANY_META_DEF__META_VALUES:
+			return metaValues != null && !metaValues.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (name: ");
@@ -325,4 +337,4 @@ public class AnyMetaDefImpl extends HbAnnotationImpl implements AnyMetaDef {
 		return result.toString();
 	}
 
-} //AnyMetaDefImpl
+} // AnyMetaDefImpl
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/BatchSizeImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/BatchSizeImpl.java
index 1a81c4096..aef0fd7b6 100644
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/BatchSizeImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/BatchSizeImpl.java
@@ -13,23 +13,23 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.BatchSize;
 import org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Batch Size</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Batch Size</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.BatchSizeImpl#getSize <em>Size</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.BatchSizeImpl#getSize <em>Size</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class BatchSizeImpl extends HbAnnotationImpl implements BatchSize {
 	/**
-	 * The default value of the '{@link #getSize() <em>Size</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The default value of the '{@link #getSize() <em>Size</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getSize()
 	 * @generated
 	 * @ordered
@@ -37,9 +37,9 @@ public class BatchSizeImpl extends HbAnnotationImpl implements BatchSize {
 	protected static final int SIZE_EDEFAULT = 0;
 
 	/**
-	 * The cached value of the '{@link #getSize() <em>Size</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getSize() <em>Size</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getSize()
 	 * @generated
 	 * @ordered
@@ -47,8 +47,8 @@ public class BatchSizeImpl extends HbAnnotationImpl implements BatchSize {
 	protected int size = SIZE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected BatchSizeImpl() {
@@ -56,8 +56,8 @@ public class BatchSizeImpl extends HbAnnotationImpl implements BatchSize {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -66,8 +66,8 @@ public class BatchSizeImpl extends HbAnnotationImpl implements BatchSize {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getSize() {
@@ -75,83 +75,85 @@ public class BatchSizeImpl extends HbAnnotationImpl implements BatchSize {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSize(int newSize) {
 		int oldSize = size;
 		size = newSize;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.BATCH_SIZE__SIZE, oldSize, size));
+			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.BATCH_SIZE__SIZE,
+					oldSize, size));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case HbannotationPackage.BATCH_SIZE__SIZE:
-				return getSize();
+		case HbannotationPackage.BATCH_SIZE__SIZE:
+			return getSize();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case HbannotationPackage.BATCH_SIZE__SIZE:
-				setSize((Integer)newValue);
-				return;
+		case HbannotationPackage.BATCH_SIZE__SIZE:
+			setSize((Integer) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.BATCH_SIZE__SIZE:
-				setSize(SIZE_EDEFAULT);
-				return;
+		case HbannotationPackage.BATCH_SIZE__SIZE:
+			setSize(SIZE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.BATCH_SIZE__SIZE:
-				return size != SIZE_EDEFAULT;
+		case HbannotationPackage.BATCH_SIZE__SIZE:
+			return size != SIZE_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (size: ");
@@ -160,4 +162,4 @@ public class BatchSizeImpl extends HbAnnotationImpl implements BatchSize {
 		return result.toString();
 	}
 
-} //BatchSizeImpl
+} // BatchSizeImpl
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/CacheImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/CacheImpl.java
index a28cd9ff0..6cedd06e8 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/CacheImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/CacheImpl.java
@@ -14,25 +14,27 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.CacheConcurrencyStrategy;
 import org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Cache</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Cache</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.CacheImpl#getUsage <em>Usage</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.CacheImpl#getRegion <em>Region</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.CacheImpl#getInclude <em>Include</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.CacheImpl#getUsage <em>Usage</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.CacheImpl#getRegion <em>Region</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.CacheImpl#getInclude <em>Include</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class CacheImpl extends HbAnnotationImpl implements Cache {
 	/**
-	 * The default value of the '{@link #getUsage() <em>Usage</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getUsage() <em>Usage</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getUsage()
 	 * @generated
 	 * @ordered
@@ -40,9 +42,9 @@ public class CacheImpl extends HbAnnotationImpl implements Cache {
 	protected static final CacheConcurrencyStrategy USAGE_EDEFAULT = CacheConcurrencyStrategy.NONE;
 
 	/**
-	 * The cached value of the '{@link #getUsage() <em>Usage</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getUsage() <em>Usage</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getUsage()
 	 * @generated
 	 * @ordered
@@ -50,9 +52,9 @@ public class CacheImpl extends HbAnnotationImpl implements Cache {
 	protected CacheConcurrencyStrategy usage = USAGE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getRegion() <em>Region</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getRegion() <em>Region</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getRegion()
 	 * @generated
 	 * @ordered
@@ -60,9 +62,9 @@ public class CacheImpl extends HbAnnotationImpl implements Cache {
 	protected static final String REGION_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getRegion() <em>Region</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getRegion() <em>Region</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getRegion()
 	 * @generated
 	 * @ordered
@@ -70,9 +72,9 @@ public class CacheImpl extends HbAnnotationImpl implements Cache {
 	protected String region = REGION_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getInclude() <em>Include</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getInclude() <em>Include</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getInclude()
 	 * @generated
 	 * @ordered
@@ -80,9 +82,9 @@ public class CacheImpl extends HbAnnotationImpl implements Cache {
 	protected static final String INCLUDE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getInclude() <em>Include</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getInclude() <em>Include</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getInclude()
 	 * @generated
 	 * @ordered
@@ -90,8 +92,8 @@ public class CacheImpl extends HbAnnotationImpl implements Cache {
 	protected String include = INCLUDE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected CacheImpl() {
@@ -99,8 +101,8 @@ public class CacheImpl extends HbAnnotationImpl implements Cache {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -109,8 +111,8 @@ public class CacheImpl extends HbAnnotationImpl implements Cache {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public CacheConcurrencyStrategy getUsage() {
@@ -118,20 +120,21 @@ public class CacheImpl extends HbAnnotationImpl implements Cache {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setUsage(CacheConcurrencyStrategy newUsage) {
 		CacheConcurrencyStrategy oldUsage = usage;
 		usage = newUsage == null ? USAGE_EDEFAULT : newUsage;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.CACHE__USAGE, oldUsage, usage));
+			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.CACHE__USAGE,
+					oldUsage, usage));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getRegion() {
@@ -139,20 +142,21 @@ public class CacheImpl extends HbAnnotationImpl implements Cache {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setRegion(String newRegion) {
 		String oldRegion = region;
 		region = newRegion;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.CACHE__REGION, oldRegion, region));
+			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.CACHE__REGION,
+					oldRegion, region));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getInclude() {
@@ -160,103 +164,105 @@ public class CacheImpl extends HbAnnotationImpl implements Cache {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setInclude(String newInclude) {
 		String oldInclude = include;
 		include = newInclude;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.CACHE__INCLUDE, oldInclude, include));
+			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.CACHE__INCLUDE,
+					oldInclude, include));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case HbannotationPackage.CACHE__USAGE:
-				return getUsage();
-			case HbannotationPackage.CACHE__REGION:
-				return getRegion();
-			case HbannotationPackage.CACHE__INCLUDE:
-				return getInclude();
+		case HbannotationPackage.CACHE__USAGE:
+			return getUsage();
+		case HbannotationPackage.CACHE__REGION:
+			return getRegion();
+		case HbannotationPackage.CACHE__INCLUDE:
+			return getInclude();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case HbannotationPackage.CACHE__USAGE:
-				setUsage((CacheConcurrencyStrategy)newValue);
-				return;
-			case HbannotationPackage.CACHE__REGION:
-				setRegion((String)newValue);
-				return;
-			case HbannotationPackage.CACHE__INCLUDE:
-				setInclude((String)newValue);
-				return;
+		case HbannotationPackage.CACHE__USAGE:
+			setUsage((CacheConcurrencyStrategy) newValue);
+			return;
+		case HbannotationPackage.CACHE__REGION:
+			setRegion((String) newValue);
+			return;
+		case HbannotationPackage.CACHE__INCLUDE:
+			setInclude((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.CACHE__USAGE:
-				setUsage(USAGE_EDEFAULT);
-				return;
-			case HbannotationPackage.CACHE__REGION:
-				setRegion(REGION_EDEFAULT);
-				return;
-			case HbannotationPackage.CACHE__INCLUDE:
-				setInclude(INCLUDE_EDEFAULT);
-				return;
+		case HbannotationPackage.CACHE__USAGE:
+			setUsage(USAGE_EDEFAULT);
+			return;
+		case HbannotationPackage.CACHE__REGION:
+			setRegion(REGION_EDEFAULT);
+			return;
+		case HbannotationPackage.CACHE__INCLUDE:
+			setInclude(INCLUDE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.CACHE__USAGE:
-				return usage != USAGE_EDEFAULT;
-			case HbannotationPackage.CACHE__REGION:
-				return REGION_EDEFAULT == null ? region != null : !REGION_EDEFAULT.equals(region);
-			case HbannotationPackage.CACHE__INCLUDE:
-				return INCLUDE_EDEFAULT == null ? include != null : !INCLUDE_EDEFAULT.equals(include);
+		case HbannotationPackage.CACHE__USAGE:
+			return usage != USAGE_EDEFAULT;
+		case HbannotationPackage.CACHE__REGION:
+			return REGION_EDEFAULT == null ? region != null : !REGION_EDEFAULT.equals(region);
+		case HbannotationPackage.CACHE__INCLUDE:
+			return INCLUDE_EDEFAULT == null ? include != null : !INCLUDE_EDEFAULT.equals(include);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (usage: ");
@@ -269,4 +275,4 @@ public class CacheImpl extends HbAnnotationImpl implements Cache {
 		return result.toString();
 	}
 
-} //CacheImpl
\ No newline at end of file
+} // CacheImpl
\ No newline at end of file
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/CascadeImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/CascadeImpl.java
index ea740b3de..57b70e572 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/CascadeImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/CascadeImpl.java
@@ -16,23 +16,23 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.HbCascadeType;
 import org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Cascade</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Cascade</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.CascadeImpl#getValue <em>Value</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.CascadeImpl#getValue <em>Value</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class CascadeImpl extends HbAnnotationImpl implements Cascade {
 	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -40,8 +40,8 @@ public class CascadeImpl extends HbAnnotationImpl implements Cascade {
 	protected EList<HbCascadeType> value;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected CascadeImpl() {
@@ -49,8 +49,8 @@ public class CascadeImpl extends HbAnnotationImpl implements Cascade {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -59,85 +59,87 @@ public class CascadeImpl extends HbAnnotationImpl implements Cascade {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<HbCascadeType> getValue() {
 		if (value == null) {
-			value = new EDataTypeUniqueEList<HbCascadeType>(HbCascadeType.class, this, HbannotationPackage.CASCADE__VALUE);
+			value = new EDataTypeUniqueEList<HbCascadeType>(HbCascadeType.class, this,
+					HbannotationPackage.CASCADE__VALUE);
 		}
 		return value;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case HbannotationPackage.CASCADE__VALUE:
-				return getValue();
+		case HbannotationPackage.CASCADE__VALUE:
+			return getValue();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
-		@Override
+	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case HbannotationPackage.CASCADE__VALUE:
-				getValue().clear();
-				getValue().addAll((Collection<? extends HbCascadeType>)newValue);
-				return;
+		case HbannotationPackage.CASCADE__VALUE:
+			getValue().clear();
+			getValue().addAll((Collection<? extends HbCascadeType>) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.CASCADE__VALUE:
-				getValue().clear();
-				return;
+		case HbannotationPackage.CASCADE__VALUE:
+			getValue().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.CASCADE__VALUE:
-				return value != null && !value.isEmpty();
+		case HbannotationPackage.CASCADE__VALUE:
+			return value != null && !value.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (value: ");
@@ -146,4 +148,4 @@ public class CascadeImpl extends HbAnnotationImpl implements Cascade {
 		return result.toString();
 	}
 
-} //CascadeImpl
\ No newline at end of file
+} // CascadeImpl
\ No newline at end of file
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/CollectionOfElementsImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/CollectionOfElementsImpl.java
index 6291bfe5c..551ebb41b 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/CollectionOfElementsImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/CollectionOfElementsImpl.java
@@ -14,24 +14,27 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.CollectionOfElements;
 import org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Collection Of Elements</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Collection Of Elements</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.CollectionOfElementsImpl#getTargetElement <em>Target Element</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.CollectionOfElementsImpl#getFetch <em>Fetch</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.CollectionOfElementsImpl#getTargetElement
+ * <em>Target Element</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.CollectionOfElementsImpl#getFetch <em>
+ * Fetch</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class CollectionOfElementsImpl extends HbAnnotationImpl implements CollectionOfElements {
 	/**
-	 * The default value of the '{@link #getTargetElement() <em>Target Element</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTargetElement() <em>Target Element</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getTargetElement()
 	 * @generated
 	 * @ordered
@@ -39,9 +42,9 @@ public class CollectionOfElementsImpl extends HbAnnotationImpl implements Collec
 	protected static final String TARGET_ELEMENT_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTargetElement() <em>Target Element</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTargetElement() <em>Target Element</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getTargetElement()
 	 * @generated
 	 * @ordered
@@ -49,9 +52,9 @@ public class CollectionOfElementsImpl extends HbAnnotationImpl implements Collec
 	protected String targetElement = TARGET_ELEMENT_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getFetch() <em>Fetch</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getFetch() <em>Fetch</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFetch()
 	 * @generated
 	 * @ordered
@@ -59,9 +62,9 @@ public class CollectionOfElementsImpl extends HbAnnotationImpl implements Collec
 	protected static final FetchType FETCH_EDEFAULT = FetchType.LAZY;
 
 	/**
-	 * The cached value of the '{@link #getFetch() <em>Fetch</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getFetch() <em>Fetch</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getFetch()
 	 * @generated
 	 * @ordered
@@ -69,8 +72,8 @@ public class CollectionOfElementsImpl extends HbAnnotationImpl implements Collec
 	protected FetchType fetch = FETCH_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected CollectionOfElementsImpl() {
@@ -78,8 +81,8 @@ public class CollectionOfElementsImpl extends HbAnnotationImpl implements Collec
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -88,8 +91,8 @@ public class CollectionOfElementsImpl extends HbAnnotationImpl implements Collec
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTargetElement() {
@@ -97,20 +100,22 @@ public class CollectionOfElementsImpl extends HbAnnotationImpl implements Collec
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTargetElement(String newTargetElement) {
 		String oldTargetElement = targetElement;
 		targetElement = newTargetElement;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.COLLECTION_OF_ELEMENTS__TARGET_ELEMENT, oldTargetElement, targetElement));
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbannotationPackage.COLLECTION_OF_ELEMENTS__TARGET_ELEMENT, oldTargetElement,
+					targetElement));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FetchType getFetch() {
@@ -118,93 +123,96 @@ public class CollectionOfElementsImpl extends HbAnnotationImpl implements Collec
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFetch(FetchType newFetch) {
 		FetchType oldFetch = fetch;
 		fetch = newFetch == null ? FETCH_EDEFAULT : newFetch;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.COLLECTION_OF_ELEMENTS__FETCH, oldFetch, fetch));
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbannotationPackage.COLLECTION_OF_ELEMENTS__FETCH, oldFetch, fetch));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case HbannotationPackage.COLLECTION_OF_ELEMENTS__TARGET_ELEMENT:
-				return getTargetElement();
-			case HbannotationPackage.COLLECTION_OF_ELEMENTS__FETCH:
-				return getFetch();
+		case HbannotationPackage.COLLECTION_OF_ELEMENTS__TARGET_ELEMENT:
+			return getTargetElement();
+		case HbannotationPackage.COLLECTION_OF_ELEMENTS__FETCH:
+			return getFetch();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case HbannotationPackage.COLLECTION_OF_ELEMENTS__TARGET_ELEMENT:
-				setTargetElement((String)newValue);
-				return;
-			case HbannotationPackage.COLLECTION_OF_ELEMENTS__FETCH:
-				setFetch((FetchType)newValue);
-				return;
+		case HbannotationPackage.COLLECTION_OF_ELEMENTS__TARGET_ELEMENT:
+			setTargetElement((String) newValue);
+			return;
+		case HbannotationPackage.COLLECTION_OF_ELEMENTS__FETCH:
+			setFetch((FetchType) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.COLLECTION_OF_ELEMENTS__TARGET_ELEMENT:
-				setTargetElement(TARGET_ELEMENT_EDEFAULT);
-				return;
-			case HbannotationPackage.COLLECTION_OF_ELEMENTS__FETCH:
-				setFetch(FETCH_EDEFAULT);
-				return;
+		case HbannotationPackage.COLLECTION_OF_ELEMENTS__TARGET_ELEMENT:
+			setTargetElement(TARGET_ELEMENT_EDEFAULT);
+			return;
+		case HbannotationPackage.COLLECTION_OF_ELEMENTS__FETCH:
+			setFetch(FETCH_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.COLLECTION_OF_ELEMENTS__TARGET_ELEMENT:
-				return TARGET_ELEMENT_EDEFAULT == null ? targetElement != null : !TARGET_ELEMENT_EDEFAULT.equals(targetElement);
-			case HbannotationPackage.COLLECTION_OF_ELEMENTS__FETCH:
-				return fetch != FETCH_EDEFAULT;
+		case HbannotationPackage.COLLECTION_OF_ELEMENTS__TARGET_ELEMENT:
+			return TARGET_ELEMENT_EDEFAULT == null ? targetElement != null : !TARGET_ELEMENT_EDEFAULT
+					.equals(targetElement);
+		case HbannotationPackage.COLLECTION_OF_ELEMENTS__FETCH:
+			return fetch != FETCH_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (targetElement: ");
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/DiscriminatorFormulaImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/DiscriminatorFormulaImpl.java
index d8f895bf7..b868f8873 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/DiscriminatorFormulaImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/DiscriminatorFormulaImpl.java
@@ -13,23 +13,24 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.DiscriminatorFormula;
 import org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Discriminator Formula</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Discriminator Formula</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.DiscriminatorFormulaImpl#getValue <em>Value</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.DiscriminatorFormulaImpl#getValue <em>
+ * Value</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class DiscriminatorFormulaImpl extends HbAnnotationImpl implements DiscriminatorFormula {
 	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -37,9 +38,9 @@ public class DiscriminatorFormulaImpl extends HbAnnotationImpl implements Discri
 	protected static final String VALUE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -47,8 +48,8 @@ public class DiscriminatorFormulaImpl extends HbAnnotationImpl implements Discri
 	protected String value = VALUE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DiscriminatorFormulaImpl() {
@@ -56,8 +57,8 @@ public class DiscriminatorFormulaImpl extends HbAnnotationImpl implements Discri
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -66,8 +67,8 @@ public class DiscriminatorFormulaImpl extends HbAnnotationImpl implements Discri
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getValue() {
@@ -75,83 +76,85 @@ public class DiscriminatorFormulaImpl extends HbAnnotationImpl implements Discri
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setValue(String newValue) {
 		String oldValue = value;
 		value = newValue;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.DISCRIMINATOR_FORMULA__VALUE, oldValue, value));
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbannotationPackage.DISCRIMINATOR_FORMULA__VALUE, oldValue, value));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case HbannotationPackage.DISCRIMINATOR_FORMULA__VALUE:
-				return getValue();
+		case HbannotationPackage.DISCRIMINATOR_FORMULA__VALUE:
+			return getValue();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case HbannotationPackage.DISCRIMINATOR_FORMULA__VALUE:
-				setValue((String)newValue);
-				return;
+		case HbannotationPackage.DISCRIMINATOR_FORMULA__VALUE:
+			setValue((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.DISCRIMINATOR_FORMULA__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
+		case HbannotationPackage.DISCRIMINATOR_FORMULA__VALUE:
+			setValue(VALUE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.DISCRIMINATOR_FORMULA__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
+		case HbannotationPackage.DISCRIMINATOR_FORMULA__VALUE:
+			return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (value: ");
@@ -160,4 +163,4 @@ public class DiscriminatorFormulaImpl extends HbAnnotationImpl implements Discri
 		return result.toString();
 	}
 
-} //DiscriminatorFormulaImpl
+} // DiscriminatorFormulaImpl
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/FetchImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/FetchImpl.java
index f0d996877..03d901a70 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/FetchImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/FetchImpl.java
@@ -14,23 +14,23 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.HbFetchType;
 import org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Fetch</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Fetch</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.FetchImpl#getValue <em>Value</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.FetchImpl#getValue <em>Value</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class FetchImpl extends HbAnnotationImpl implements Fetch {
 	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -38,9 +38,9 @@ public class FetchImpl extends HbAnnotationImpl implements Fetch {
 	protected static final HbFetchType VALUE_EDEFAULT = HbFetchType.JOIN;
 
 	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -48,8 +48,8 @@ public class FetchImpl extends HbAnnotationImpl implements Fetch {
 	protected HbFetchType value = VALUE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected FetchImpl() {
@@ -57,8 +57,8 @@ public class FetchImpl extends HbAnnotationImpl implements Fetch {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -67,8 +67,8 @@ public class FetchImpl extends HbAnnotationImpl implements Fetch {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HbFetchType getValue() {
@@ -76,83 +76,85 @@ public class FetchImpl extends HbAnnotationImpl implements Fetch {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setValue(HbFetchType newValue) {
 		HbFetchType oldValue = value;
 		value = newValue == null ? VALUE_EDEFAULT : newValue;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.FETCH__VALUE, oldValue, value));
+			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.FETCH__VALUE,
+					oldValue, value));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case HbannotationPackage.FETCH__VALUE:
-				return getValue();
+		case HbannotationPackage.FETCH__VALUE:
+			return getValue();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case HbannotationPackage.FETCH__VALUE:
-				setValue((HbFetchType)newValue);
-				return;
+		case HbannotationPackage.FETCH__VALUE:
+			setValue((HbFetchType) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.FETCH__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
+		case HbannotationPackage.FETCH__VALUE:
+			setValue(VALUE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.FETCH__VALUE:
-				return value != VALUE_EDEFAULT;
+		case HbannotationPackage.FETCH__VALUE:
+			return value != VALUE_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (value: ");
@@ -161,4 +163,4 @@ public class FetchImpl extends HbAnnotationImpl implements Fetch {
 		return result.toString();
 	}
 
-} //FetchImpl
\ No newline at end of file
+} // FetchImpl
\ No newline at end of file
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/FilterDefImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/FilterDefImpl.java
index c597ffb54..d4d87f0a0 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/FilterDefImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/FilterDefImpl.java
@@ -18,25 +18,29 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage;
 import org.eclipse.emf.teneo.hibernate.hbannotation.ParamDef;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Filter Def</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Filter Def</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.FilterDefImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.FilterDefImpl#getDefaultCondition <em>Default Condition</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.FilterDefImpl#getParameters <em>Parameters</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.FilterDefImpl#getName <em>Name</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.FilterDefImpl#getDefaultCondition <em>
+ * Default Condition</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.FilterDefImpl#getParameters <em>
+ * Parameters</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class FilterDefImpl extends HbAnnotationImpl implements FilterDef {
 	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -44,9 +48,9 @@ public class FilterDefImpl extends HbAnnotationImpl implements FilterDef {
 	protected static final String NAME_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -55,8 +59,8 @@ public class FilterDefImpl extends HbAnnotationImpl implements FilterDef {
 
 	/**
 	 * The default value of the '{@link #getDefaultCondition() <em>Default Condition</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDefaultCondition()
 	 * @generated
 	 * @ordered
@@ -65,8 +69,8 @@ public class FilterDefImpl extends HbAnnotationImpl implements FilterDef {
 
 	/**
 	 * The cached value of the '{@link #getDefaultCondition() <em>Default Condition</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDefaultCondition()
 	 * @generated
 	 * @ordered
@@ -74,9 +78,9 @@ public class FilterDefImpl extends HbAnnotationImpl implements FilterDef {
 	protected String defaultCondition = DEFAULT_CONDITION_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getParameters() <em>Parameters</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getParameters() <em>Parameters</em>}' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getParameters()
 	 * @generated
 	 * @ordered
@@ -84,8 +88,8 @@ public class FilterDefImpl extends HbAnnotationImpl implements FilterDef {
 	protected EList<ParamDef> parameters;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected FilterDefImpl() {
@@ -93,8 +97,8 @@ public class FilterDefImpl extends HbAnnotationImpl implements FilterDef {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -103,8 +107,8 @@ public class FilterDefImpl extends HbAnnotationImpl implements FilterDef {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
@@ -112,20 +116,21 @@ public class FilterDefImpl extends HbAnnotationImpl implements FilterDef {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setName(String newName) {
 		String oldName = name;
 		name = newName;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.FILTER_DEF__NAME, oldName, name));
+			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.FILTER_DEF__NAME,
+					oldName, name));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getDefaultCondition() {
@@ -133,117 +138,121 @@ public class FilterDefImpl extends HbAnnotationImpl implements FilterDef {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDefaultCondition(String newDefaultCondition) {
 		String oldDefaultCondition = defaultCondition;
 		defaultCondition = newDefaultCondition;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.FILTER_DEF__DEFAULT_CONDITION, oldDefaultCondition, defaultCondition));
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbannotationPackage.FILTER_DEF__DEFAULT_CONDITION, oldDefaultCondition, defaultCondition));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<ParamDef> getParameters() {
 		if (parameters == null) {
-			parameters = new EObjectResolvingEList<ParamDef>(ParamDef.class, this, HbannotationPackage.FILTER_DEF__PARAMETERS);
+			parameters = new EObjectResolvingEList<ParamDef>(ParamDef.class, this,
+					HbannotationPackage.FILTER_DEF__PARAMETERS);
 		}
 		return parameters;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case HbannotationPackage.FILTER_DEF__NAME:
-				return getName();
-			case HbannotationPackage.FILTER_DEF__DEFAULT_CONDITION:
-				return getDefaultCondition();
-			case HbannotationPackage.FILTER_DEF__PARAMETERS:
-				return getParameters();
+		case HbannotationPackage.FILTER_DEF__NAME:
+			return getName();
+		case HbannotationPackage.FILTER_DEF__DEFAULT_CONDITION:
+			return getDefaultCondition();
+		case HbannotationPackage.FILTER_DEF__PARAMETERS:
+			return getParameters();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case HbannotationPackage.FILTER_DEF__NAME:
-				setName((String)newValue);
-				return;
-			case HbannotationPackage.FILTER_DEF__DEFAULT_CONDITION:
-				setDefaultCondition((String)newValue);
-				return;
-			case HbannotationPackage.FILTER_DEF__PARAMETERS:
-				getParameters().clear();
-				getParameters().addAll((Collection<? extends ParamDef>)newValue);
-				return;
+		case HbannotationPackage.FILTER_DEF__NAME:
+			setName((String) newValue);
+			return;
+		case HbannotationPackage.FILTER_DEF__DEFAULT_CONDITION:
+			setDefaultCondition((String) newValue);
+			return;
+		case HbannotationPackage.FILTER_DEF__PARAMETERS:
+			getParameters().clear();
+			getParameters().addAll((Collection<? extends ParamDef>) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.FILTER_DEF__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case HbannotationPackage.FILTER_DEF__DEFAULT_CONDITION:
-				setDefaultCondition(DEFAULT_CONDITION_EDEFAULT);
-				return;
-			case HbannotationPackage.FILTER_DEF__PARAMETERS:
-				getParameters().clear();
-				return;
+		case HbannotationPackage.FILTER_DEF__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case HbannotationPackage.FILTER_DEF__DEFAULT_CONDITION:
+			setDefaultCondition(DEFAULT_CONDITION_EDEFAULT);
+			return;
+		case HbannotationPackage.FILTER_DEF__PARAMETERS:
+			getParameters().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.FILTER_DEF__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case HbannotationPackage.FILTER_DEF__DEFAULT_CONDITION:
-				return DEFAULT_CONDITION_EDEFAULT == null ? defaultCondition != null : !DEFAULT_CONDITION_EDEFAULT.equals(defaultCondition);
-			case HbannotationPackage.FILTER_DEF__PARAMETERS:
-				return parameters != null && !parameters.isEmpty();
+		case HbannotationPackage.FILTER_DEF__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case HbannotationPackage.FILTER_DEF__DEFAULT_CONDITION:
+			return DEFAULT_CONDITION_EDEFAULT == null ? defaultCondition != null
+					: !DEFAULT_CONDITION_EDEFAULT.equals(defaultCondition);
+		case HbannotationPackage.FILTER_DEF__PARAMETERS:
+			return parameters != null && !parameters.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (name: ");
@@ -254,4 +263,4 @@ public class FilterDefImpl extends HbAnnotationImpl implements FilterDef {
 		return result.toString();
 	}
 
-} //FilterDefImpl
+} // FilterDefImpl
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/FilterImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/FilterImpl.java
index de27d3b76..b0586d914 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/FilterImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/FilterImpl.java
@@ -13,24 +13,26 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.Filter;
 import org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Filter</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Filter</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.FilterImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.FilterImpl#getCondition <em>Condition</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.FilterImpl#getName <em>Name</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.FilterImpl#getCondition <em>Condition
+ * </em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class FilterImpl extends HbAnnotationImpl implements Filter {
 	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -38,9 +40,9 @@ public class FilterImpl extends HbAnnotationImpl implements Filter {
 	protected static final String NAME_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -48,9 +50,9 @@ public class FilterImpl extends HbAnnotationImpl implements Filter {
 	protected String name = NAME_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getCondition() <em>Condition</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getCondition() <em>Condition</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getCondition()
 	 * @generated
 	 * @ordered
@@ -58,9 +60,9 @@ public class FilterImpl extends HbAnnotationImpl implements Filter {
 	protected static final String CONDITION_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getCondition() <em>Condition</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getCondition() <em>Condition</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getCondition()
 	 * @generated
 	 * @ordered
@@ -68,8 +70,8 @@ public class FilterImpl extends HbAnnotationImpl implements Filter {
 	protected String condition = CONDITION_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected FilterImpl() {
@@ -77,8 +79,8 @@ public class FilterImpl extends HbAnnotationImpl implements Filter {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -87,8 +89,8 @@ public class FilterImpl extends HbAnnotationImpl implements Filter {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
@@ -96,20 +98,21 @@ public class FilterImpl extends HbAnnotationImpl implements Filter {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setName(String newName) {
 		String oldName = name;
 		name = newName;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.FILTER__NAME, oldName, name));
+			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.FILTER__NAME,
+					oldName, name));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getCondition() {
@@ -117,93 +120,95 @@ public class FilterImpl extends HbAnnotationImpl implements Filter {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setCondition(String newCondition) {
 		String oldCondition = condition;
 		condition = newCondition;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.FILTER__CONDITION, oldCondition, condition));
+			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.FILTER__CONDITION,
+					oldCondition, condition));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case HbannotationPackage.FILTER__NAME:
-				return getName();
-			case HbannotationPackage.FILTER__CONDITION:
-				return getCondition();
+		case HbannotationPackage.FILTER__NAME:
+			return getName();
+		case HbannotationPackage.FILTER__CONDITION:
+			return getCondition();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case HbannotationPackage.FILTER__NAME:
-				setName((String)newValue);
-				return;
-			case HbannotationPackage.FILTER__CONDITION:
-				setCondition((String)newValue);
-				return;
+		case HbannotationPackage.FILTER__NAME:
+			setName((String) newValue);
+			return;
+		case HbannotationPackage.FILTER__CONDITION:
+			setCondition((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.FILTER__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case HbannotationPackage.FILTER__CONDITION:
-				setCondition(CONDITION_EDEFAULT);
-				return;
+		case HbannotationPackage.FILTER__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case HbannotationPackage.FILTER__CONDITION:
+			setCondition(CONDITION_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.FILTER__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case HbannotationPackage.FILTER__CONDITION:
-				return CONDITION_EDEFAULT == null ? condition != null : !CONDITION_EDEFAULT.equals(condition);
+		case HbannotationPackage.FILTER__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case HbannotationPackage.FILTER__CONDITION:
+			return CONDITION_EDEFAULT == null ? condition != null : !CONDITION_EDEFAULT.equals(condition);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (name: ");
@@ -214,4 +219,4 @@ public class FilterImpl extends HbAnnotationImpl implements Filter {
 		return result.toString();
 	}
 
-} //FilterImpl
+} // FilterImpl
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/ForceDiscriminatorImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/ForceDiscriminatorImpl.java
index d6c631f89..4d9d07167 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/ForceDiscriminatorImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/ForceDiscriminatorImpl.java
@@ -11,18 +11,17 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.ForceDiscriminator;
 import org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Force Discriminator</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Force Discriminator</b></em>'. <!-- end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public class ForceDiscriminatorImpl extends HbAnnotationImpl implements ForceDiscriminator {
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ForceDiscriminatorImpl() {
@@ -30,8 +29,8 @@ public class ForceDiscriminatorImpl extends HbAnnotationImpl implements ForceDis
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -39,4 +38,4 @@ public class ForceDiscriminatorImpl extends HbAnnotationImpl implements ForceDis
 		return HbannotationPackage.Literals.FORCE_DISCRIMINATOR;
 	}
 
-} //ForceDiscriminatorImpl
+} // ForceDiscriminatorImpl
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/FormulaImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/FormulaImpl.java
index da2fa966a..eb7b28845 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/FormulaImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/FormulaImpl.java
@@ -13,23 +13,23 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.Formula;
 import org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Formula</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Formula</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.FormulaImpl#getValue <em>Value</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.FormulaImpl#getValue <em>Value</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class FormulaImpl extends HbAnnotationImpl implements Formula {
 	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -37,9 +37,9 @@ public class FormulaImpl extends HbAnnotationImpl implements Formula {
 	protected static final String VALUE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -47,8 +47,8 @@ public class FormulaImpl extends HbAnnotationImpl implements Formula {
 	protected String value = VALUE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected FormulaImpl() {
@@ -56,8 +56,8 @@ public class FormulaImpl extends HbAnnotationImpl implements Formula {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -66,8 +66,8 @@ public class FormulaImpl extends HbAnnotationImpl implements Formula {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getValue() {
@@ -75,83 +75,85 @@ public class FormulaImpl extends HbAnnotationImpl implements Formula {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setValue(String newValue) {
 		String oldValue = value;
 		value = newValue;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.FORMULA__VALUE, oldValue, value));
+			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.FORMULA__VALUE,
+					oldValue, value));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case HbannotationPackage.FORMULA__VALUE:
-				return getValue();
+		case HbannotationPackage.FORMULA__VALUE:
+			return getValue();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case HbannotationPackage.FORMULA__VALUE:
-				setValue((String)newValue);
-				return;
+		case HbannotationPackage.FORMULA__VALUE:
+			setValue((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.FORMULA__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
+		case HbannotationPackage.FORMULA__VALUE:
+			setValue(VALUE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.FORMULA__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
+		case HbannotationPackage.FORMULA__VALUE:
+			return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (value: ");
@@ -160,4 +162,4 @@ public class FormulaImpl extends HbAnnotationImpl implements Formula {
 		return result.toString();
 	}
 
-} //FormulaImpl
+} // FormulaImpl
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/GeneratedImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/GeneratedImpl.java
index c34aeace1..11eb65fd6 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/GeneratedImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/GeneratedImpl.java
@@ -14,23 +14,23 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.GenerationTime;
 import org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Generated</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Generated</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.GeneratedImpl#getValue <em>Value</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.GeneratedImpl#getValue <em>Value</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class GeneratedImpl extends HbAnnotationImpl implements Generated {
 	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -38,9 +38,9 @@ public class GeneratedImpl extends HbAnnotationImpl implements Generated {
 	protected static final GenerationTime VALUE_EDEFAULT = GenerationTime.NEVER;
 
 	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -48,8 +48,8 @@ public class GeneratedImpl extends HbAnnotationImpl implements Generated {
 	protected GenerationTime value = VALUE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected GeneratedImpl() {
@@ -57,8 +57,8 @@ public class GeneratedImpl extends HbAnnotationImpl implements Generated {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -67,8 +67,8 @@ public class GeneratedImpl extends HbAnnotationImpl implements Generated {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public GenerationTime getValue() {
@@ -76,83 +76,85 @@ public class GeneratedImpl extends HbAnnotationImpl implements Generated {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setValue(GenerationTime newValue) {
 		GenerationTime oldValue = value;
 		value = newValue == null ? VALUE_EDEFAULT : newValue;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.GENERATED__VALUE, oldValue, value));
+			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.GENERATED__VALUE,
+					oldValue, value));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case HbannotationPackage.GENERATED__VALUE:
-				return getValue();
+		case HbannotationPackage.GENERATED__VALUE:
+			return getValue();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case HbannotationPackage.GENERATED__VALUE:
-				setValue((GenerationTime)newValue);
-				return;
+		case HbannotationPackage.GENERATED__VALUE:
+			setValue((GenerationTime) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.GENERATED__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
+		case HbannotationPackage.GENERATED__VALUE:
+			setValue(VALUE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.GENERATED__VALUE:
-				return value != VALUE_EDEFAULT;
+		case HbannotationPackage.GENERATED__VALUE:
+			return value != VALUE_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (value: ");
@@ -161,4 +163,4 @@ public class GeneratedImpl extends HbAnnotationImpl implements Generated {
 		return result.toString();
 	}
 
-} //GeneratedImpl
+} // GeneratedImpl
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/GenericGeneratorImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/GenericGeneratorImpl.java
index 6fe8e5ccf..265e74c5d 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/GenericGeneratorImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/GenericGeneratorImpl.java
@@ -18,25 +18,30 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage;
 import org.eclipse.emf.teneo.hibernate.hbannotation.Parameter;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Generic Generator</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Generic Generator</b></em>
+ * '. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.GenericGeneratorImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.GenericGeneratorImpl#getStrategy <em>Strategy</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.GenericGeneratorImpl#getParameters <em>Parameters</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.GenericGeneratorImpl#getName <em>Name
+ * </em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.GenericGeneratorImpl#getStrategy <em>
+ * Strategy</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.GenericGeneratorImpl#getParameters <em>
+ * Parameters</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class GenericGeneratorImpl extends HbAnnotationImpl implements GenericGenerator {
 	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -44,9 +49,9 @@ public class GenericGeneratorImpl extends HbAnnotationImpl implements GenericGen
 	protected static final String NAME_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -54,9 +59,9 @@ public class GenericGeneratorImpl extends HbAnnotationImpl implements GenericGen
 	protected String name = NAME_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getStrategy() <em>Strategy</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getStrategy() <em>Strategy</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getStrategy()
 	 * @generated
 	 * @ordered
@@ -64,9 +69,9 @@ public class GenericGeneratorImpl extends HbAnnotationImpl implements GenericGen
 	protected static final String STRATEGY_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStrategy() <em>Strategy</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStrategy() <em>Strategy</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getStrategy()
 	 * @generated
 	 * @ordered
@@ -74,9 +79,9 @@ public class GenericGeneratorImpl extends HbAnnotationImpl implements GenericGen
 	protected String strategy = STRATEGY_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getParameters() <em>Parameters</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getParameters() <em>Parameters</em>}' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getParameters()
 	 * @generated
 	 * @ordered
@@ -84,8 +89,8 @@ public class GenericGeneratorImpl extends HbAnnotationImpl implements GenericGen
 	protected EList<Parameter> parameters;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected GenericGeneratorImpl() {
@@ -93,8 +98,8 @@ public class GenericGeneratorImpl extends HbAnnotationImpl implements GenericGen
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -103,8 +108,8 @@ public class GenericGeneratorImpl extends HbAnnotationImpl implements GenericGen
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
@@ -112,20 +117,21 @@ public class GenericGeneratorImpl extends HbAnnotationImpl implements GenericGen
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setName(String newName) {
 		String oldName = name;
 		name = newName;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.GENERIC_GENERATOR__NAME, oldName, name));
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbannotationPackage.GENERIC_GENERATOR__NAME, oldName, name));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getStrategy() {
@@ -133,117 +139,120 @@ public class GenericGeneratorImpl extends HbAnnotationImpl implements GenericGen
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStrategy(String newStrategy) {
 		String oldStrategy = strategy;
 		strategy = newStrategy;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.GENERIC_GENERATOR__STRATEGY, oldStrategy, strategy));
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbannotationPackage.GENERIC_GENERATOR__STRATEGY, oldStrategy, strategy));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Parameter> getParameters() {
 		if (parameters == null) {
-			parameters = new EObjectResolvingEList<Parameter>(Parameter.class, this, HbannotationPackage.GENERIC_GENERATOR__PARAMETERS);
+			parameters = new EObjectResolvingEList<Parameter>(Parameter.class, this,
+					HbannotationPackage.GENERIC_GENERATOR__PARAMETERS);
 		}
 		return parameters;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case HbannotationPackage.GENERIC_GENERATOR__NAME:
-				return getName();
-			case HbannotationPackage.GENERIC_GENERATOR__STRATEGY:
-				return getStrategy();
-			case HbannotationPackage.GENERIC_GENERATOR__PARAMETERS:
-				return getParameters();
+		case HbannotationPackage.GENERIC_GENERATOR__NAME:
+			return getName();
+		case HbannotationPackage.GENERIC_GENERATOR__STRATEGY:
+			return getStrategy();
+		case HbannotationPackage.GENERIC_GENERATOR__PARAMETERS:
+			return getParameters();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
-		@Override
+	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case HbannotationPackage.GENERIC_GENERATOR__NAME:
-				setName((String)newValue);
-				return;
-			case HbannotationPackage.GENERIC_GENERATOR__STRATEGY:
-				setStrategy((String)newValue);
-				return;
-			case HbannotationPackage.GENERIC_GENERATOR__PARAMETERS:
-				getParameters().clear();
-				getParameters().addAll((Collection<? extends Parameter>)newValue);
-				return;
+		case HbannotationPackage.GENERIC_GENERATOR__NAME:
+			setName((String) newValue);
+			return;
+		case HbannotationPackage.GENERIC_GENERATOR__STRATEGY:
+			setStrategy((String) newValue);
+			return;
+		case HbannotationPackage.GENERIC_GENERATOR__PARAMETERS:
+			getParameters().clear();
+			getParameters().addAll((Collection<? extends Parameter>) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.GENERIC_GENERATOR__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case HbannotationPackage.GENERIC_GENERATOR__STRATEGY:
-				setStrategy(STRATEGY_EDEFAULT);
-				return;
-			case HbannotationPackage.GENERIC_GENERATOR__PARAMETERS:
-				getParameters().clear();
-				return;
+		case HbannotationPackage.GENERIC_GENERATOR__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case HbannotationPackage.GENERIC_GENERATOR__STRATEGY:
+			setStrategy(STRATEGY_EDEFAULT);
+			return;
+		case HbannotationPackage.GENERIC_GENERATOR__PARAMETERS:
+			getParameters().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.GENERIC_GENERATOR__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case HbannotationPackage.GENERIC_GENERATOR__STRATEGY:
-				return STRATEGY_EDEFAULT == null ? strategy != null : !STRATEGY_EDEFAULT.equals(strategy);
-			case HbannotationPackage.GENERIC_GENERATOR__PARAMETERS:
-				return parameters != null && !parameters.isEmpty();
+		case HbannotationPackage.GENERIC_GENERATOR__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case HbannotationPackage.GENERIC_GENERATOR__STRATEGY:
+			return STRATEGY_EDEFAULT == null ? strategy != null : !STRATEGY_EDEFAULT.equals(strategy);
+		case HbannotationPackage.GENERIC_GENERATOR__PARAMETERS:
+			return parameters != null && !parameters.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (name: ");
@@ -254,4 +263,4 @@ public class GenericGeneratorImpl extends HbAnnotationImpl implements GenericGen
 		return result.toString();
 	}
 
-} //GenericGeneratorImpl
\ No newline at end of file
+} // GenericGeneratorImpl
\ No newline at end of file
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/HbAnnotationImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/HbAnnotationImpl.java
index 59a94dd5f..4fc270260 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/HbAnnotationImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/HbAnnotationImpl.java
@@ -19,11 +19,11 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage;
 import org.eclipse.emf.teneo.hibernate.hbannotation.OnDeleteAction;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Hb Annotation</b></em>'.
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Hb Annotation</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public abstract class HbAnnotationImpl extends PAnnotationImpl implements HbAnnotation {
@@ -40,6 +40,7 @@ public abstract class HbAnnotationImpl extends PAnnotationImpl implements HbAnno
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected HbAnnotationImpl() {
@@ -48,6 +49,7 @@ public abstract class HbAnnotationImpl extends PAnnotationImpl implements HbAnno
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/HbEntityImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/HbEntityImpl.java
index 2c301993c..5c47c5feb 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/HbEntityImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/HbEntityImpl.java
@@ -15,29 +15,42 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.OptimisticLockType;
 import org.eclipse.emf.teneo.hibernate.hbannotation.PolymorphismType;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Hb Entity</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Hb Entity</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbEntityImpl#isDynamicInsert <em>Dynamic Insert</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbEntityImpl#isDynamicUpdate <em>Dynamic Update</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbEntityImpl#isSelectBeforeUpdate <em>Select Before Update</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbEntityImpl#isMutable <em>Mutable</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbEntityImpl#getPersister <em>Persister</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbEntityImpl#getOptimisticLock <em>Optimistic Lock</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbEntityImpl#getPolymorphism <em>Polymorphism</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbEntityImpl#isDynamicInsert <em>Dynamic
+ * Insert</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbEntityImpl#isDynamicUpdate <em>Dynamic
+ * Update</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbEntityImpl#isSelectBeforeUpdate <em>
+ * Select Before Update</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbEntityImpl#isMutable <em>Mutable</em>}
+ * </li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbEntityImpl#getPersister <em>Persister
+ * </em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbEntityImpl#getOptimisticLock <em>
+ * Optimistic Lock</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbEntityImpl#getPolymorphism <em>
+ * Polymorphism</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class HbEntityImpl extends HbAnnotationImpl implements HbEntity {
 	/**
-	 * The default value of the '{@link #isDynamicInsert() <em>Dynamic Insert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #isDynamicInsert() <em>Dynamic Insert</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isDynamicInsert()
 	 * @generated
 	 * @ordered
@@ -45,9 +58,9 @@ public class HbEntityImpl extends HbAnnotationImpl implements HbEntity {
 	protected static final boolean DYNAMIC_INSERT_EDEFAULT = false;
 
 	/**
-	 * The cached value of the '{@link #isDynamicInsert() <em>Dynamic Insert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #isDynamicInsert() <em>Dynamic Insert</em>} ' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isDynamicInsert()
 	 * @generated
 	 * @ordered
@@ -55,9 +68,9 @@ public class HbEntityImpl extends HbAnnotationImpl implements HbEntity {
 	protected boolean dynamicInsert = DYNAMIC_INSERT_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #isDynamicUpdate() <em>Dynamic Update</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #isDynamicUpdate() <em>Dynamic Update</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isDynamicUpdate()
 	 * @generated
 	 * @ordered
@@ -65,9 +78,9 @@ public class HbEntityImpl extends HbAnnotationImpl implements HbEntity {
 	protected static final boolean DYNAMIC_UPDATE_EDEFAULT = false;
 
 	/**
-	 * The cached value of the '{@link #isDynamicUpdate() <em>Dynamic Update</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #isDynamicUpdate() <em>Dynamic Update</em>} ' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isDynamicUpdate()
 	 * @generated
 	 * @ordered
@@ -75,9 +88,9 @@ public class HbEntityImpl extends HbAnnotationImpl implements HbEntity {
 	protected boolean dynamicUpdate = DYNAMIC_UPDATE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #isSelectBeforeUpdate() <em>Select Before Update</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #isSelectBeforeUpdate() <em>Select Before Update</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSelectBeforeUpdate()
 	 * @generated
 	 * @ordered
@@ -85,9 +98,9 @@ public class HbEntityImpl extends HbAnnotationImpl implements HbEntity {
 	protected static final boolean SELECT_BEFORE_UPDATE_EDEFAULT = false;
 
 	/**
-	 * The cached value of the '{@link #isSelectBeforeUpdate() <em>Select Before Update</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #isSelectBeforeUpdate() <em>Select Before Update</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSelectBeforeUpdate()
 	 * @generated
 	 * @ordered
@@ -95,9 +108,9 @@ public class HbEntityImpl extends HbAnnotationImpl implements HbEntity {
 	protected boolean selectBeforeUpdate = SELECT_BEFORE_UPDATE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #isMutable() <em>Mutable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #isMutable() <em>Mutable</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #isMutable()
 	 * @generated
 	 * @ordered
@@ -105,9 +118,9 @@ public class HbEntityImpl extends HbAnnotationImpl implements HbEntity {
 	protected static final boolean MUTABLE_EDEFAULT = true;
 
 	/**
-	 * The cached value of the '{@link #isMutable() <em>Mutable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #isMutable() <em>Mutable</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #isMutable()
 	 * @generated
 	 * @ordered
@@ -115,9 +128,9 @@ public class HbEntityImpl extends HbAnnotationImpl implements HbEntity {
 	protected boolean mutable = MUTABLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getPersister() <em>Persister</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getPersister() <em>Persister</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getPersister()
 	 * @generated
 	 * @ordered
@@ -125,9 +138,9 @@ public class HbEntityImpl extends HbAnnotationImpl implements HbEntity {
 	protected static final String PERSISTER_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getPersister() <em>Persister</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getPersister() <em>Persister</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getPersister()
 	 * @generated
 	 * @ordered
@@ -136,8 +149,8 @@ public class HbEntityImpl extends HbAnnotationImpl implements HbEntity {
 
 	/**
 	 * The default value of the '{@link #getOptimisticLock() <em>Optimistic Lock</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getOptimisticLock()
 	 * @generated
 	 * @ordered
@@ -145,9 +158,9 @@ public class HbEntityImpl extends HbAnnotationImpl implements HbEntity {
 	protected static final OptimisticLockType OPTIMISTIC_LOCK_EDEFAULT = OptimisticLockType.VERSION;
 
 	/**
-	 * The cached value of the '{@link #getOptimisticLock() <em>Optimistic Lock</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getOptimisticLock() <em>Optimistic Lock</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getOptimisticLock()
 	 * @generated
 	 * @ordered
@@ -155,9 +168,9 @@ public class HbEntityImpl extends HbAnnotationImpl implements HbEntity {
 	protected OptimisticLockType optimisticLock = OPTIMISTIC_LOCK_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getPolymorphism() <em>Polymorphism</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getPolymorphism() <em>Polymorphism</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getPolymorphism()
 	 * @generated
 	 * @ordered
@@ -165,9 +178,9 @@ public class HbEntityImpl extends HbAnnotationImpl implements HbEntity {
 	protected static final PolymorphismType POLYMORPHISM_EDEFAULT = PolymorphismType.IMPLICIT;
 
 	/**
-	 * The cached value of the '{@link #getPolymorphism() <em>Polymorphism</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getPolymorphism() <em>Polymorphism</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getPolymorphism()
 	 * @generated
 	 * @ordered
@@ -175,8 +188,8 @@ public class HbEntityImpl extends HbAnnotationImpl implements HbEntity {
 	protected PolymorphismType polymorphism = POLYMORPHISM_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected HbEntityImpl() {
@@ -184,8 +197,8 @@ public class HbEntityImpl extends HbAnnotationImpl implements HbEntity {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -194,8 +207,8 @@ public class HbEntityImpl extends HbAnnotationImpl implements HbEntity {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isDynamicInsert() {
@@ -203,20 +216,21 @@ public class HbEntityImpl extends HbAnnotationImpl implements HbEntity {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDynamicInsert(boolean newDynamicInsert) {
 		boolean oldDynamicInsert = dynamicInsert;
 		dynamicInsert = newDynamicInsert;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.HB_ENTITY__DYNAMIC_INSERT, oldDynamicInsert, dynamicInsert));
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbannotationPackage.HB_ENTITY__DYNAMIC_INSERT, oldDynamicInsert, dynamicInsert));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isDynamicUpdate() {
@@ -224,20 +238,21 @@ public class HbEntityImpl extends HbAnnotationImpl implements HbEntity {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDynamicUpdate(boolean newDynamicUpdate) {
 		boolean oldDynamicUpdate = dynamicUpdate;
 		dynamicUpdate = newDynamicUpdate;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.HB_ENTITY__DYNAMIC_UPDATE, oldDynamicUpdate, dynamicUpdate));
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbannotationPackage.HB_ENTITY__DYNAMIC_UPDATE, oldDynamicUpdate, dynamicUpdate));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSelectBeforeUpdate() {
@@ -245,20 +260,22 @@ public class HbEntityImpl extends HbAnnotationImpl implements HbEntity {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSelectBeforeUpdate(boolean newSelectBeforeUpdate) {
 		boolean oldSelectBeforeUpdate = selectBeforeUpdate;
 		selectBeforeUpdate = newSelectBeforeUpdate;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.HB_ENTITY__SELECT_BEFORE_UPDATE, oldSelectBeforeUpdate, selectBeforeUpdate));
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbannotationPackage.HB_ENTITY__SELECT_BEFORE_UPDATE, oldSelectBeforeUpdate,
+					selectBeforeUpdate));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isMutable() {
@@ -266,20 +283,21 @@ public class HbEntityImpl extends HbAnnotationImpl implements HbEntity {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setMutable(boolean newMutable) {
 		boolean oldMutable = mutable;
 		mutable = newMutable;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.HB_ENTITY__MUTABLE, oldMutable, mutable));
+			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.HB_ENTITY__MUTABLE,
+					oldMutable, mutable));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getPersister() {
@@ -287,20 +305,21 @@ public class HbEntityImpl extends HbAnnotationImpl implements HbEntity {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setPersister(String newPersister) {
 		String oldPersister = persister;
 		persister = newPersister;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.HB_ENTITY__PERSISTER, oldPersister, persister));
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbannotationPackage.HB_ENTITY__PERSISTER, oldPersister, persister));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public OptimisticLockType getOptimisticLock() {
@@ -308,20 +327,21 @@ public class HbEntityImpl extends HbAnnotationImpl implements HbEntity {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setOptimisticLock(OptimisticLockType newOptimisticLock) {
 		OptimisticLockType oldOptimisticLock = optimisticLock;
 		optimisticLock = newOptimisticLock == null ? OPTIMISTIC_LOCK_EDEFAULT : newOptimisticLock;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.HB_ENTITY__OPTIMISTIC_LOCK, oldOptimisticLock, optimisticLock));
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbannotationPackage.HB_ENTITY__OPTIMISTIC_LOCK, oldOptimisticLock, optimisticLock));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public PolymorphismType getPolymorphism() {
@@ -329,143 +349,145 @@ public class HbEntityImpl extends HbAnnotationImpl implements HbEntity {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setPolymorphism(PolymorphismType newPolymorphism) {
 		PolymorphismType oldPolymorphism = polymorphism;
 		polymorphism = newPolymorphism == null ? POLYMORPHISM_EDEFAULT : newPolymorphism;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.HB_ENTITY__POLYMORPHISM, oldPolymorphism, polymorphism));
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbannotationPackage.HB_ENTITY__POLYMORPHISM, oldPolymorphism, polymorphism));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case HbannotationPackage.HB_ENTITY__DYNAMIC_INSERT:
-				return isDynamicInsert();
-			case HbannotationPackage.HB_ENTITY__DYNAMIC_UPDATE:
-				return isDynamicUpdate();
-			case HbannotationPackage.HB_ENTITY__SELECT_BEFORE_UPDATE:
-				return isSelectBeforeUpdate();
-			case HbannotationPackage.HB_ENTITY__MUTABLE:
-				return isMutable();
-			case HbannotationPackage.HB_ENTITY__PERSISTER:
-				return getPersister();
-			case HbannotationPackage.HB_ENTITY__OPTIMISTIC_LOCK:
-				return getOptimisticLock();
-			case HbannotationPackage.HB_ENTITY__POLYMORPHISM:
-				return getPolymorphism();
+		case HbannotationPackage.HB_ENTITY__DYNAMIC_INSERT:
+			return isDynamicInsert();
+		case HbannotationPackage.HB_ENTITY__DYNAMIC_UPDATE:
+			return isDynamicUpdate();
+		case HbannotationPackage.HB_ENTITY__SELECT_BEFORE_UPDATE:
+			return isSelectBeforeUpdate();
+		case HbannotationPackage.HB_ENTITY__MUTABLE:
+			return isMutable();
+		case HbannotationPackage.HB_ENTITY__PERSISTER:
+			return getPersister();
+		case HbannotationPackage.HB_ENTITY__OPTIMISTIC_LOCK:
+			return getOptimisticLock();
+		case HbannotationPackage.HB_ENTITY__POLYMORPHISM:
+			return getPolymorphism();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case HbannotationPackage.HB_ENTITY__DYNAMIC_INSERT:
-				setDynamicInsert((Boolean)newValue);
-				return;
-			case HbannotationPackage.HB_ENTITY__DYNAMIC_UPDATE:
-				setDynamicUpdate((Boolean)newValue);
-				return;
-			case HbannotationPackage.HB_ENTITY__SELECT_BEFORE_UPDATE:
-				setSelectBeforeUpdate((Boolean)newValue);
-				return;
-			case HbannotationPackage.HB_ENTITY__MUTABLE:
-				setMutable((Boolean)newValue);
-				return;
-			case HbannotationPackage.HB_ENTITY__PERSISTER:
-				setPersister((String)newValue);
-				return;
-			case HbannotationPackage.HB_ENTITY__OPTIMISTIC_LOCK:
-				setOptimisticLock((OptimisticLockType)newValue);
-				return;
-			case HbannotationPackage.HB_ENTITY__POLYMORPHISM:
-				setPolymorphism((PolymorphismType)newValue);
-				return;
+		case HbannotationPackage.HB_ENTITY__DYNAMIC_INSERT:
+			setDynamicInsert((Boolean) newValue);
+			return;
+		case HbannotationPackage.HB_ENTITY__DYNAMIC_UPDATE:
+			setDynamicUpdate((Boolean) newValue);
+			return;
+		case HbannotationPackage.HB_ENTITY__SELECT_BEFORE_UPDATE:
+			setSelectBeforeUpdate((Boolean) newValue);
+			return;
+		case HbannotationPackage.HB_ENTITY__MUTABLE:
+			setMutable((Boolean) newValue);
+			return;
+		case HbannotationPackage.HB_ENTITY__PERSISTER:
+			setPersister((String) newValue);
+			return;
+		case HbannotationPackage.HB_ENTITY__OPTIMISTIC_LOCK:
+			setOptimisticLock((OptimisticLockType) newValue);
+			return;
+		case HbannotationPackage.HB_ENTITY__POLYMORPHISM:
+			setPolymorphism((PolymorphismType) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.HB_ENTITY__DYNAMIC_INSERT:
-				setDynamicInsert(DYNAMIC_INSERT_EDEFAULT);
-				return;
-			case HbannotationPackage.HB_ENTITY__DYNAMIC_UPDATE:
-				setDynamicUpdate(DYNAMIC_UPDATE_EDEFAULT);
-				return;
-			case HbannotationPackage.HB_ENTITY__SELECT_BEFORE_UPDATE:
-				setSelectBeforeUpdate(SELECT_BEFORE_UPDATE_EDEFAULT);
-				return;
-			case HbannotationPackage.HB_ENTITY__MUTABLE:
-				setMutable(MUTABLE_EDEFAULT);
-				return;
-			case HbannotationPackage.HB_ENTITY__PERSISTER:
-				setPersister(PERSISTER_EDEFAULT);
-				return;
-			case HbannotationPackage.HB_ENTITY__OPTIMISTIC_LOCK:
-				setOptimisticLock(OPTIMISTIC_LOCK_EDEFAULT);
-				return;
-			case HbannotationPackage.HB_ENTITY__POLYMORPHISM:
-				setPolymorphism(POLYMORPHISM_EDEFAULT);
-				return;
+		case HbannotationPackage.HB_ENTITY__DYNAMIC_INSERT:
+			setDynamicInsert(DYNAMIC_INSERT_EDEFAULT);
+			return;
+		case HbannotationPackage.HB_ENTITY__DYNAMIC_UPDATE:
+			setDynamicUpdate(DYNAMIC_UPDATE_EDEFAULT);
+			return;
+		case HbannotationPackage.HB_ENTITY__SELECT_BEFORE_UPDATE:
+			setSelectBeforeUpdate(SELECT_BEFORE_UPDATE_EDEFAULT);
+			return;
+		case HbannotationPackage.HB_ENTITY__MUTABLE:
+			setMutable(MUTABLE_EDEFAULT);
+			return;
+		case HbannotationPackage.HB_ENTITY__PERSISTER:
+			setPersister(PERSISTER_EDEFAULT);
+			return;
+		case HbannotationPackage.HB_ENTITY__OPTIMISTIC_LOCK:
+			setOptimisticLock(OPTIMISTIC_LOCK_EDEFAULT);
+			return;
+		case HbannotationPackage.HB_ENTITY__POLYMORPHISM:
+			setPolymorphism(POLYMORPHISM_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.HB_ENTITY__DYNAMIC_INSERT:
-				return dynamicInsert != DYNAMIC_INSERT_EDEFAULT;
-			case HbannotationPackage.HB_ENTITY__DYNAMIC_UPDATE:
-				return dynamicUpdate != DYNAMIC_UPDATE_EDEFAULT;
-			case HbannotationPackage.HB_ENTITY__SELECT_BEFORE_UPDATE:
-				return selectBeforeUpdate != SELECT_BEFORE_UPDATE_EDEFAULT;
-			case HbannotationPackage.HB_ENTITY__MUTABLE:
-				return mutable != MUTABLE_EDEFAULT;
-			case HbannotationPackage.HB_ENTITY__PERSISTER:
-				return PERSISTER_EDEFAULT == null ? persister != null : !PERSISTER_EDEFAULT.equals(persister);
-			case HbannotationPackage.HB_ENTITY__OPTIMISTIC_LOCK:
-				return optimisticLock != OPTIMISTIC_LOCK_EDEFAULT;
-			case HbannotationPackage.HB_ENTITY__POLYMORPHISM:
-				return polymorphism != POLYMORPHISM_EDEFAULT;
+		case HbannotationPackage.HB_ENTITY__DYNAMIC_INSERT:
+			return dynamicInsert != DYNAMIC_INSERT_EDEFAULT;
+		case HbannotationPackage.HB_ENTITY__DYNAMIC_UPDATE:
+			return dynamicUpdate != DYNAMIC_UPDATE_EDEFAULT;
+		case HbannotationPackage.HB_ENTITY__SELECT_BEFORE_UPDATE:
+			return selectBeforeUpdate != SELECT_BEFORE_UPDATE_EDEFAULT;
+		case HbannotationPackage.HB_ENTITY__MUTABLE:
+			return mutable != MUTABLE_EDEFAULT;
+		case HbannotationPackage.HB_ENTITY__PERSISTER:
+			return PERSISTER_EDEFAULT == null ? persister != null : !PERSISTER_EDEFAULT.equals(persister);
+		case HbannotationPackage.HB_ENTITY__OPTIMISTIC_LOCK:
+			return optimisticLock != OPTIMISTIC_LOCK_EDEFAULT;
+		case HbannotationPackage.HB_ENTITY__POLYMORPHISM:
+			return polymorphism != POLYMORPHISM_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (dynamicInsert: ");
@@ -486,4 +508,4 @@ public class HbEntityImpl extends HbAnnotationImpl implements HbEntity {
 		return result.toString();
 	}
 
-} //HbEntityImpl
+} // HbEntityImpl
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/HbMapKeyImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/HbMapKeyImpl.java
index 3b031a9e8..3e7acbb1d 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/HbMapKeyImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/HbMapKeyImpl.java
@@ -19,23 +19,24 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.HbMapKey;
 import org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Hb Map Key</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Hb Map Key</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbMapKeyImpl#getColumns <em>Columns</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.HbMapKeyImpl#getColumns <em>Columns
+ * </em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class HbMapKeyImpl extends HbAnnotationImpl implements HbMapKey {
 	/**
 	 * The cached value of the '{@link #getColumns() <em>Columns</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getColumns()
 	 * @generated
 	 * @ordered
@@ -43,8 +44,8 @@ public class HbMapKeyImpl extends HbAnnotationImpl implements HbMapKey {
 	protected EList<Column> columns;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected HbMapKeyImpl() {
@@ -52,8 +53,8 @@ public class HbMapKeyImpl extends HbAnnotationImpl implements HbMapKey {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -62,89 +63,91 @@ public class HbMapKeyImpl extends HbAnnotationImpl implements HbMapKey {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Column> getColumns() {
 		if (columns == null) {
-			columns = new EObjectContainmentEList<Column>(Column.class, this, HbannotationPackage.HB_MAP_KEY__COLUMNS);
+			columns = new EObjectContainmentEList<Column>(Column.class, this,
+					HbannotationPackage.HB_MAP_KEY__COLUMNS);
 		}
 		return columns;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID,
+			NotificationChain msgs) {
 		switch (featureID) {
-			case HbannotationPackage.HB_MAP_KEY__COLUMNS:
-				return ((InternalEList<?>)getColumns()).basicRemove(otherEnd, msgs);
+		case HbannotationPackage.HB_MAP_KEY__COLUMNS:
+			return ((InternalEList<?>) getColumns()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case HbannotationPackage.HB_MAP_KEY__COLUMNS:
-				return getColumns();
+		case HbannotationPackage.HB_MAP_KEY__COLUMNS:
+			return getColumns();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case HbannotationPackage.HB_MAP_KEY__COLUMNS:
-				getColumns().clear();
-				getColumns().addAll((Collection<? extends Column>)newValue);
-				return;
+		case HbannotationPackage.HB_MAP_KEY__COLUMNS:
+			getColumns().clear();
+			getColumns().addAll((Collection<? extends Column>) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.HB_MAP_KEY__COLUMNS:
-				getColumns().clear();
-				return;
+		case HbannotationPackage.HB_MAP_KEY__COLUMNS:
+			getColumns().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.HB_MAP_KEY__COLUMNS:
-				return columns != null && !columns.isEmpty();
+		case HbannotationPackage.HB_MAP_KEY__COLUMNS:
+			return columns != null && !columns.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
 
-} //HbMapKeyImpl
+} // HbMapKeyImpl
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/HbannotationFactoryImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/HbannotationFactoryImpl.java
index 7e7bba0bf..4c2ea8c59 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/HbannotationFactoryImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/HbannotationFactoryImpl.java
@@ -12,7 +12,6 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.emf.teneo.hibernate.hbannotation.*;
 import org.eclipse.emf.teneo.hibernate.hbannotation.Any;
 import org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef;
 import org.eclipse.emf.teneo.hibernate.hbannotation.BatchSize;
@@ -57,30 +56,31 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.Where;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class HbannotationFactoryImpl extends EFactoryImpl implements HbannotationFactory {
 	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static HbannotationFactory init() {
 		try {
-			HbannotationFactory theHbannotationFactory = (HbannotationFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/teneo/2006/HbAnnotation"); 
+			HbannotationFactory theHbannotationFactory = (HbannotationFactory) EPackage.Registry.INSTANCE
+					.getEFactory("http://www.eclipse.org/emf/teneo/2006/HbAnnotation");
 			if (theHbannotationFactory != null) {
 				return theHbannotationFactory;
 			}
-		}
-		catch (Exception exception) {
+		} catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new HbannotationFactoryImpl();
 	}
 
 	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HbannotationFactoryImpl() {
@@ -89,105 +89,143 @@ public class HbannotationFactoryImpl extends EFactoryImpl implements Hbannotatio
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public EObject create(EClass eClass) {
 		switch (eClass.getClassifierID()) {
-			case HbannotationPackage.CASCADE: return createCascade();
-			case HbannotationPackage.COLLECTION_OF_ELEMENTS: return createCollectionOfElements();
-			case HbannotationPackage.HB_MAP_KEY: return createHbMapKey();
-			case HbannotationPackage.PARAMETER: return createParameter();
-			case HbannotationPackage.TYPE: return createType();
-			case HbannotationPackage.WHERE: return createWhere();
-			case HbannotationPackage.ID_BAG: return createIdBag();
-			case HbannotationPackage.GENERIC_GENERATOR: return createGenericGenerator();
-			case HbannotationPackage.CACHE: return createCache();
-			case HbannotationPackage.TYPE_DEF: return createTypeDef();
-			case HbannotationPackage.FETCH: return createFetch();
-			case HbannotationPackage.ON_DELETE: return createOnDelete();
-			case HbannotationPackage.PROXY: return createProxy();
-			case HbannotationPackage.INDEX: return createIndex();
-			case HbannotationPackage.GENERATED: return createGenerated();
-			case HbannotationPackage.NAMED_QUERY: return createNamedQuery();
-			case HbannotationPackage.FILTER: return createFilter();
-			case HbannotationPackage.PARAM_DEF: return createParamDef();
-			case HbannotationPackage.FILTER_DEF: return createFilterDef();
-			case HbannotationPackage.DISCRIMINATOR_FORMULA: return createDiscriminatorFormula();
-			case HbannotationPackage.NATURAL_ID: return createNaturalId();
-			case HbannotationPackage.MAP_KEY_MANY_TO_MANY: return createMapKeyManyToMany();
-			case HbannotationPackage.FORCE_DISCRIMINATOR: return createForceDiscriminator();
-			case HbannotationPackage.IMMUTABLE: return createImmutable();
-			case HbannotationPackage.FORMULA: return createFormula();
-			case HbannotationPackage.NOT_FOUND: return createNotFound();
-			case HbannotationPackage.HB_ENTITY: return createHbEntity();
-			case HbannotationPackage.BATCH_SIZE: return createBatchSize();
-			case HbannotationPackage.ANY: return createAny();
-			case HbannotationPackage.META_VALUE: return createMetaValue();
-			case HbannotationPackage.ANY_META_DEF: return createAnyMetaDef();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		case HbannotationPackage.CASCADE:
+			return createCascade();
+		case HbannotationPackage.COLLECTION_OF_ELEMENTS:
+			return createCollectionOfElements();
+		case HbannotationPackage.HB_MAP_KEY:
+			return createHbMapKey();
+		case HbannotationPackage.PARAMETER:
+			return createParameter();
+		case HbannotationPackage.TYPE:
+			return createType();
+		case HbannotationPackage.WHERE:
+			return createWhere();
+		case HbannotationPackage.ID_BAG:
+			return createIdBag();
+		case HbannotationPackage.GENERIC_GENERATOR:
+			return createGenericGenerator();
+		case HbannotationPackage.CACHE:
+			return createCache();
+		case HbannotationPackage.TYPE_DEF:
+			return createTypeDef();
+		case HbannotationPackage.FETCH:
+			return createFetch();
+		case HbannotationPackage.ON_DELETE:
+			return createOnDelete();
+		case HbannotationPackage.PROXY:
+			return createProxy();
+		case HbannotationPackage.INDEX:
+			return createIndex();
+		case HbannotationPackage.GENERATED:
+			return createGenerated();
+		case HbannotationPackage.NAMED_QUERY:
+			return createNamedQuery();
+		case HbannotationPackage.FILTER:
+			return createFilter();
+		case HbannotationPackage.PARAM_DEF:
+			return createParamDef();
+		case HbannotationPackage.FILTER_DEF:
+			return createFilterDef();
+		case HbannotationPackage.DISCRIMINATOR_FORMULA:
+			return createDiscriminatorFormula();
+		case HbannotationPackage.NATURAL_ID:
+			return createNaturalId();
+		case HbannotationPackage.MAP_KEY_MANY_TO_MANY:
+			return createMapKeyManyToMany();
+		case HbannotationPackage.FORCE_DISCRIMINATOR:
+			return createForceDiscriminator();
+		case HbannotationPackage.IMMUTABLE:
+			return createImmutable();
+		case HbannotationPackage.FORMULA:
+			return createFormula();
+		case HbannotationPackage.NOT_FOUND:
+			return createNotFound();
+		case HbannotationPackage.HB_ENTITY:
+			return createHbEntity();
+		case HbannotationPackage.BATCH_SIZE:
+			return createBatchSize();
+		case HbannotationPackage.ANY:
+			return createAny();
+		case HbannotationPackage.META_VALUE:
+			return createMetaValue();
+		case HbannotationPackage.ANY_META_DEF:
+			return createAnyMetaDef();
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName()
+					+ "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object createFromString(EDataType eDataType, String initialValue) {
 		switch (eDataType.getClassifierID()) {
-			case HbannotationPackage.CACHE_CONCURRENCY_STRATEGY:
-				return createCacheConcurrencyStrategyFromString(eDataType, initialValue);
-			case HbannotationPackage.HB_FETCH_TYPE:
-				return createHbFetchTypeFromString(eDataType, initialValue);
-			case HbannotationPackage.ON_DELETE_ACTION:
-				return createOnDeleteActionFromString(eDataType, initialValue);
-			case HbannotationPackage.GENERATION_TIME:
-				return createGenerationTimeFromString(eDataType, initialValue);
-			case HbannotationPackage.NOT_FOUND_ACTION:
-				return createNotFoundActionFromString(eDataType, initialValue);
-			case HbannotationPackage.OPTIMISTIC_LOCK_TYPE:
-				return createOptimisticLockTypeFromString(eDataType, initialValue);
-			case HbannotationPackage.POLYMORPHISM_TYPE:
-				return createPolymorphismTypeFromString(eDataType, initialValue);
-			case HbannotationPackage.HB_CASCADE_TYPE:
-				return createHbCascadeTypeFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		case HbannotationPackage.CACHE_CONCURRENCY_STRATEGY:
+			return createCacheConcurrencyStrategyFromString(eDataType, initialValue);
+		case HbannotationPackage.HB_FETCH_TYPE:
+			return createHbFetchTypeFromString(eDataType, initialValue);
+		case HbannotationPackage.ON_DELETE_ACTION:
+			return createOnDeleteActionFromString(eDataType, initialValue);
+		case HbannotationPackage.GENERATION_TIME:
+			return createGenerationTimeFromString(eDataType, initialValue);
+		case HbannotationPackage.NOT_FOUND_ACTION:
+			return createNotFoundActionFromString(eDataType, initialValue);
+		case HbannotationPackage.OPTIMISTIC_LOCK_TYPE:
+			return createOptimisticLockTypeFromString(eDataType, initialValue);
+		case HbannotationPackage.POLYMORPHISM_TYPE:
+			return createPolymorphismTypeFromString(eDataType, initialValue);
+		case HbannotationPackage.HB_CASCADE_TYPE:
+			return createHbCascadeTypeFromString(eDataType, initialValue);
+		default:
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName()
+					+ "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String convertToString(EDataType eDataType, Object instanceValue) {
 		switch (eDataType.getClassifierID()) {
-			case HbannotationPackage.CACHE_CONCURRENCY_STRATEGY:
-				return convertCacheConcurrencyStrategyToString(eDataType, instanceValue);
-			case HbannotationPackage.HB_FETCH_TYPE:
-				return convertHbFetchTypeToString(eDataType, instanceValue);
-			case HbannotationPackage.ON_DELETE_ACTION:
-				return convertOnDeleteActionToString(eDataType, instanceValue);
-			case HbannotationPackage.GENERATION_TIME:
-				return convertGenerationTimeToString(eDataType, instanceValue);
-			case HbannotationPackage.NOT_FOUND_ACTION:
-				return convertNotFoundActionToString(eDataType, instanceValue);
-			case HbannotationPackage.OPTIMISTIC_LOCK_TYPE:
-				return convertOptimisticLockTypeToString(eDataType, instanceValue);
-			case HbannotationPackage.POLYMORPHISM_TYPE:
-				return convertPolymorphismTypeToString(eDataType, instanceValue);
-			case HbannotationPackage.HB_CASCADE_TYPE:
-				return convertHbCascadeTypeToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		case HbannotationPackage.CACHE_CONCURRENCY_STRATEGY:
+			return convertCacheConcurrencyStrategyToString(eDataType, instanceValue);
+		case HbannotationPackage.HB_FETCH_TYPE:
+			return convertHbFetchTypeToString(eDataType, instanceValue);
+		case HbannotationPackage.ON_DELETE_ACTION:
+			return convertOnDeleteActionToString(eDataType, instanceValue);
+		case HbannotationPackage.GENERATION_TIME:
+			return convertGenerationTimeToString(eDataType, instanceValue);
+		case HbannotationPackage.NOT_FOUND_ACTION:
+			return convertNotFoundActionToString(eDataType, instanceValue);
+		case HbannotationPackage.OPTIMISTIC_LOCK_TYPE:
+			return convertOptimisticLockTypeToString(eDataType, instanceValue);
+		case HbannotationPackage.POLYMORPHISM_TYPE:
+			return convertPolymorphismTypeToString(eDataType, instanceValue);
+		case HbannotationPackage.HB_CASCADE_TYPE:
+			return convertHbCascadeTypeToString(eDataType, instanceValue);
+		default:
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName()
+					+ "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Cascade createCascade() {
@@ -197,6 +235,7 @@ public class HbannotationFactoryImpl extends EFactoryImpl implements Hbannotatio
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public CollectionOfElements createCollectionOfElements() {
@@ -205,8 +244,8 @@ public class HbannotationFactoryImpl extends EFactoryImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HbMapKey createHbMapKey() {
@@ -216,6 +255,7 @@ public class HbannotationFactoryImpl extends EFactoryImpl implements Hbannotatio
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Parameter createParameter() {
@@ -225,6 +265,7 @@ public class HbannotationFactoryImpl extends EFactoryImpl implements Hbannotatio
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Type createType() {
@@ -234,6 +275,7 @@ public class HbannotationFactoryImpl extends EFactoryImpl implements Hbannotatio
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Where createWhere() {
@@ -243,6 +285,7 @@ public class HbannotationFactoryImpl extends EFactoryImpl implements Hbannotatio
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public IdBag createIdBag() {
@@ -252,6 +295,7 @@ public class HbannotationFactoryImpl extends EFactoryImpl implements Hbannotatio
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public GenericGenerator createGenericGenerator() {
@@ -261,6 +305,7 @@ public class HbannotationFactoryImpl extends EFactoryImpl implements Hbannotatio
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Cache createCache() {
@@ -270,6 +315,7 @@ public class HbannotationFactoryImpl extends EFactoryImpl implements Hbannotatio
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TypeDef createTypeDef() {
@@ -279,6 +325,7 @@ public class HbannotationFactoryImpl extends EFactoryImpl implements Hbannotatio
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Fetch createFetch() {
@@ -288,6 +335,7 @@ public class HbannotationFactoryImpl extends EFactoryImpl implements Hbannotatio
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public OnDelete createOnDelete() {
@@ -297,6 +345,7 @@ public class HbannotationFactoryImpl extends EFactoryImpl implements Hbannotatio
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Proxy createProxy() {
@@ -306,6 +355,7 @@ public class HbannotationFactoryImpl extends EFactoryImpl implements Hbannotatio
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Index createIndex() {
@@ -314,8 +364,8 @@ public class HbannotationFactoryImpl extends EFactoryImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Generated createGenerated() {
@@ -324,8 +374,8 @@ public class HbannotationFactoryImpl extends EFactoryImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NamedQuery createNamedQuery() {
@@ -334,8 +384,8 @@ public class HbannotationFactoryImpl extends EFactoryImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Filter createFilter() {
@@ -344,8 +394,8 @@ public class HbannotationFactoryImpl extends EFactoryImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ParamDef createParamDef() {
@@ -354,8 +404,8 @@ public class HbannotationFactoryImpl extends EFactoryImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FilterDef createFilterDef() {
@@ -364,8 +414,8 @@ public class HbannotationFactoryImpl extends EFactoryImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DiscriminatorFormula createDiscriminatorFormula() {
@@ -374,8 +424,8 @@ public class HbannotationFactoryImpl extends EFactoryImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NaturalId createNaturalId() {
@@ -384,8 +434,8 @@ public class HbannotationFactoryImpl extends EFactoryImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public MapKeyManyToMany createMapKeyManyToMany() {
@@ -394,8 +444,8 @@ public class HbannotationFactoryImpl extends EFactoryImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ForceDiscriminator createForceDiscriminator() {
@@ -404,8 +454,8 @@ public class HbannotationFactoryImpl extends EFactoryImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Immutable createImmutable() {
@@ -414,8 +464,8 @@ public class HbannotationFactoryImpl extends EFactoryImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Formula createFormula() {
@@ -424,8 +474,8 @@ public class HbannotationFactoryImpl extends EFactoryImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotFound createNotFound() {
@@ -434,8 +484,8 @@ public class HbannotationFactoryImpl extends EFactoryImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HbEntity createHbEntity() {
@@ -444,8 +494,8 @@ public class HbannotationFactoryImpl extends EFactoryImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public BatchSize createBatchSize() {
@@ -454,8 +504,8 @@ public class HbannotationFactoryImpl extends EFactoryImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Any createAny() {
@@ -464,8 +514,8 @@ public class HbannotationFactoryImpl extends EFactoryImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public MetaValue createMetaValue() {
@@ -474,8 +524,8 @@ public class HbannotationFactoryImpl extends EFactoryImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AnyMetaDef createAnyMetaDef() {
@@ -485,16 +535,21 @@ public class HbannotationFactoryImpl extends EFactoryImpl implements Hbannotatio
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public CacheConcurrencyStrategy createCacheConcurrencyStrategyFromString(EDataType eDataType, String initialValue) {
+	public CacheConcurrencyStrategy createCacheConcurrencyStrategyFromString(EDataType eDataType,
+			String initialValue) {
 		CacheConcurrencyStrategy result = CacheConcurrencyStrategy.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		if (result == null)
+			throw new IllegalArgumentException("The value '" + initialValue
+					+ "' is not a valid enumerator of '" + eDataType.getName() + "'");
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertCacheConcurrencyStrategyToString(EDataType eDataType, Object instanceValue) {
@@ -503,16 +558,20 @@ public class HbannotationFactoryImpl extends EFactoryImpl implements Hbannotatio
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HbFetchType createHbFetchTypeFromString(EDataType eDataType, String initialValue) {
 		HbFetchType result = HbFetchType.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		if (result == null)
+			throw new IllegalArgumentException("The value '" + initialValue
+					+ "' is not a valid enumerator of '" + eDataType.getName() + "'");
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertHbFetchTypeToString(EDataType eDataType, Object instanceValue) {
@@ -521,16 +580,20 @@ public class HbannotationFactoryImpl extends EFactoryImpl implements Hbannotatio
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public OnDeleteAction createOnDeleteActionFromString(EDataType eDataType, String initialValue) {
 		OnDeleteAction result = OnDeleteAction.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		if (result == null)
+			throw new IllegalArgumentException("The value '" + initialValue
+					+ "' is not a valid enumerator of '" + eDataType.getName() + "'");
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertOnDeleteActionToString(EDataType eDataType, Object instanceValue) {
@@ -538,19 +601,21 @@ public class HbannotationFactoryImpl extends EFactoryImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public GenerationTime createGenerationTimeFromString(EDataType eDataType, String initialValue) {
 		GenerationTime result = GenerationTime.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		if (result == null)
+			throw new IllegalArgumentException("The value '" + initialValue
+					+ "' is not a valid enumerator of '" + eDataType.getName() + "'");
 		return result;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertGenerationTimeToString(EDataType eDataType, Object instanceValue) {
@@ -558,19 +623,21 @@ public class HbannotationFactoryImpl extends EFactoryImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotFoundAction createNotFoundActionFromString(EDataType eDataType, String initialValue) {
 		NotFoundAction result = NotFoundAction.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		if (result == null)
+			throw new IllegalArgumentException("The value '" + initialValue
+					+ "' is not a valid enumerator of '" + eDataType.getName() + "'");
 		return result;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertNotFoundActionToString(EDataType eDataType, Object instanceValue) {
@@ -578,19 +645,22 @@ public class HbannotationFactoryImpl extends EFactoryImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public OptimisticLockType createOptimisticLockTypeFromString(EDataType eDataType, String initialValue) {
+	public OptimisticLockType createOptimisticLockTypeFromString(EDataType eDataType,
+			String initialValue) {
 		OptimisticLockType result = OptimisticLockType.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		if (result == null)
+			throw new IllegalArgumentException("The value '" + initialValue
+					+ "' is not a valid enumerator of '" + eDataType.getName() + "'");
 		return result;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertOptimisticLockTypeToString(EDataType eDataType, Object instanceValue) {
@@ -598,19 +668,21 @@ public class HbannotationFactoryImpl extends EFactoryImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public PolymorphismType createPolymorphismTypeFromString(EDataType eDataType, String initialValue) {
 		PolymorphismType result = PolymorphismType.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		if (result == null)
+			throw new IllegalArgumentException("The value '" + initialValue
+					+ "' is not a valid enumerator of '" + eDataType.getName() + "'");
 		return result;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertPolymorphismTypeToString(EDataType eDataType, Object instanceValue) {
@@ -618,19 +690,21 @@ public class HbannotationFactoryImpl extends EFactoryImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HbCascadeType createHbCascadeTypeFromString(EDataType eDataType, String initialValue) {
 		HbCascadeType result = HbCascadeType.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		if (result == null)
+			throw new IllegalArgumentException("The value '" + initialValue
+					+ "' is not a valid enumerator of '" + eDataType.getName() + "'");
 		return result;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertHbCascadeTypeToString(EDataType eDataType, Object instanceValue) {
@@ -639,14 +713,16 @@ public class HbannotationFactoryImpl extends EFactoryImpl implements Hbannotatio
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HbannotationPackage getHbannotationPackage() {
-		return (HbannotationPackage)getEPackage();
+		return (HbannotationPackage) getEPackage();
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @deprecated
 	 * @generated
 	 */
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/HbannotationPackageImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/HbannotationPackageImpl.java
index 8eaf38db7..60c267e7f 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/HbannotationPackageImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/HbannotationPackageImpl.java
@@ -63,281 +63,299 @@ import org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbmodelPackageImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class HbannotationPackageImpl extends EPackageImpl implements HbannotationPackage {
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass hbAnnotationEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass cascadeEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass collectionOfElementsEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass hbMapKeyEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass parameterEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass typeEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass whereEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass idBagEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass genericGeneratorEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass cacheEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass typeDefEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass fetchEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass onDeleteEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass proxyEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass indexEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass generatedEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass namedQueryEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass filterEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass paramDefEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass filterDefEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass discriminatorFormulaEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass naturalIdEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass mapKeyManyToManyEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass forceDiscriminatorEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass immutableEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass formulaEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass notFoundEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass hbEntityEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass batchSizeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass anyEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass metaValueEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass anyMetaDefEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum cacheConcurrencyStrategyEEnum = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum hbFetchTypeEEnum = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum onDeleteActionEEnum = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum generationTimeEEnum = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum notFoundActionEEnum = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum optimisticLockTypeEEnum = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum polymorphismTypeEEnum = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum hbCascadeTypeEEnum = null;
 
 	/**
 	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package package URI
+	 * value.
+	 * <p>
+	 * Note: the correct way to create the package is via the static factory method {@link #init
+	 * init()}, which also performs initialization of the package, or returns the registered package,
+	 * if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage#eNS_URI
 	 * @see #init()
@@ -349,26 +367,34 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private static boolean isInited = false;
 
 	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon
+	 * which it depends.
+	 * 
+	 * <p>
+	 * This method is used to initialize {@link HbannotationPackage#eINSTANCE} when that field is
+	 * accessed. Clients should not invoke it directly. Instead, they should simply access that field
+	 * to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
-	 * <p>This method is used to initialize {@link HbannotationPackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #eNS_URI
 	 * @see #createPackageContents()
 	 * @see #initializePackageContents()
 	 * @generated
 	 */
 	public static HbannotationPackage init() {
-		if (isInited) return (HbannotationPackage)EPackage.Registry.INSTANCE.getEPackage(HbannotationPackage.eNS_URI);
+		if (isInited)
+			return (HbannotationPackage) EPackage.Registry.INSTANCE
+					.getEPackage(HbannotationPackage.eNS_URI);
 
 		// Obtain or create and register package
-		HbannotationPackageImpl theHbannotationPackage = (HbannotationPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof HbannotationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new HbannotationPackageImpl());
+		HbannotationPackageImpl theHbannotationPackage = (HbannotationPackageImpl) (EPackage.Registry.INSTANCE
+				.get(eNS_URI) instanceof HbannotationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+				: new HbannotationPackageImpl());
 
 		isInited = true;
 
@@ -377,7 +403,9 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 		PannotationPackage.eINSTANCE.eClass();
 
 		// Obtain or create and register interdependencies
-		HbmodelPackageImpl theHbmodelPackage = (HbmodelPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(HbmodelPackage.eNS_URI) instanceof HbmodelPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(HbmodelPackage.eNS_URI) : HbmodelPackage.eINSTANCE);
+		HbmodelPackageImpl theHbmodelPackage = (HbmodelPackageImpl) (EPackage.Registry.INSTANCE
+				.getEPackage(HbmodelPackage.eNS_URI) instanceof HbmodelPackageImpl ? EPackage.Registry.INSTANCE
+				.getEPackage(HbmodelPackage.eNS_URI) : HbmodelPackage.eINSTANCE);
 
 		// Create package meta-data objects
 		theHbannotationPackage.createPackageContents();
@@ -388,18 +416,15 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 		theHbmodelPackage.initializePackageContents();
 
 		// Register package validator
-		EValidator.Registry.INSTANCE.put
-			(theHbannotationPackage, 
-			 new EValidator.Descriptor() {
-				 public EValidator getEValidator() {
-					 return HbannotationValidator.INSTANCE;
-				 }
-			 });
+		EValidator.Registry.INSTANCE.put(theHbannotationPackage, new EValidator.Descriptor() {
+			public EValidator getEValidator() {
+				return HbannotationValidator.INSTANCE;
+			}
+		});
 
 		// Mark meta-data to indicate it can't be changed
 		theHbannotationPackage.freeze();
 
-  
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(HbannotationPackage.eNS_URI, theHbannotationPackage);
 		return theHbannotationPackage;
@@ -407,6 +432,7 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getHbAnnotation() {
@@ -415,6 +441,7 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getCascade() {
@@ -423,14 +450,16 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getCascade_Value() {
-		return (EAttribute)cascadeEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) cascadeEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getCollectionOfElements() {
@@ -439,23 +468,25 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getCollectionOfElements_TargetElement() {
-		return (EAttribute)collectionOfElementsEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) collectionOfElementsEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getCollectionOfElements_Fetch() {
-		return (EAttribute)collectionOfElementsEClass.getEStructuralFeatures().get(1);
+		return (EAttribute) collectionOfElementsEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getHbMapKey() {
@@ -463,16 +494,17 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbMapKey_Columns() {
-		return (EReference)hbMapKeyEClass.getEStructuralFeatures().get(0);
+		return (EReference) hbMapKeyEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getParameter() {
@@ -481,22 +513,25 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getParameter_Name() {
-		return (EAttribute)parameterEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) parameterEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getParameter_Value() {
-		return (EAttribute)parameterEClass.getEStructuralFeatures().get(1);
+		return (EAttribute) parameterEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getType() {
@@ -505,22 +540,25 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getType_Type() {
-		return (EAttribute)typeEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) typeEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getType_Parameters() {
-		return (EReference)typeEClass.getEStructuralFeatures().get(1);
+		return (EReference) typeEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getWhere() {
@@ -529,14 +567,16 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getWhere_Clause() {
-		return (EAttribute)whereEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) whereEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getIdBag() {
@@ -545,30 +585,34 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getIdBag_Generator() {
-		return (EAttribute)idBagEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) idBagEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getIdBag_Type() {
-		return (EAttribute)idBagEClass.getEStructuralFeatures().get(1);
+		return (EAttribute) idBagEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getIdBag_Table() {
-		return (EAttribute)idBagEClass.getEStructuralFeatures().get(2);
+		return (EAttribute) idBagEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getGenericGenerator() {
@@ -577,30 +621,34 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getGenericGenerator_Name() {
-		return (EAttribute)genericGeneratorEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) genericGeneratorEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getGenericGenerator_Strategy() {
-		return (EAttribute)genericGeneratorEClass.getEStructuralFeatures().get(1);
+		return (EAttribute) genericGeneratorEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getGenericGenerator_Parameters() {
-		return (EReference)genericGeneratorEClass.getEStructuralFeatures().get(2);
+		return (EReference) genericGeneratorEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getCache() {
@@ -609,30 +657,34 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getCache_Usage() {
-		return (EAttribute)cacheEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) cacheEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getCache_Region() {
-		return (EAttribute)cacheEClass.getEStructuralFeatures().get(1);
+		return (EAttribute) cacheEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getCache_Include() {
-		return (EAttribute)cacheEClass.getEStructuralFeatures().get(2);
+		return (EAttribute) cacheEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getTypeDef() {
@@ -641,30 +693,34 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getTypeDef_Name() {
-		return (EAttribute)typeDefEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) typeDefEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getTypeDef_Parameters() {
-		return (EReference)typeDefEClass.getEStructuralFeatures().get(1);
+		return (EReference) typeDefEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getTypeDef_TypeClass() {
-		return (EAttribute)typeDefEClass.getEStructuralFeatures().get(2);
+		return (EAttribute) typeDefEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getFetch() {
@@ -673,14 +729,16 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getFetch_Value() {
-		return (EAttribute)fetchEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) fetchEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getOnDelete() {
@@ -689,14 +747,16 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getOnDelete_Action() {
-		return (EAttribute)onDeleteEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) onDeleteEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getProxy() {
@@ -705,22 +765,25 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getProxy_ProxyClass() {
-		return (EAttribute)proxyEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) proxyEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getProxy_Lazy() {
-		return (EAttribute)proxyEClass.getEStructuralFeatures().get(1);
+		return (EAttribute) proxyEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getIndex() {
@@ -729,15 +792,16 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getIndex_Name() {
-		return (EAttribute)indexEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) indexEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getGenerated() {
@@ -745,17 +809,17 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getGenerated_Value() {
-		return (EAttribute)generatedEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) generatedEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getNamedQuery() {
@@ -763,26 +827,26 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getNamedQuery_Name() {
-		return (EAttribute)namedQueryEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) namedQueryEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getNamedQuery_Query() {
-		return (EAttribute)namedQueryEClass.getEStructuralFeatures().get(1);
+		return (EAttribute) namedQueryEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getFilter() {
@@ -790,26 +854,26 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getFilter_Name() {
-		return (EAttribute)filterEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) filterEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getFilter_Condition() {
-		return (EAttribute)filterEClass.getEStructuralFeatures().get(1);
+		return (EAttribute) filterEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getParamDef() {
@@ -817,26 +881,26 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getParamDef_Name() {
-		return (EAttribute)paramDefEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) paramDefEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getParamDef_Type() {
-		return (EAttribute)paramDefEClass.getEStructuralFeatures().get(1);
+		return (EAttribute) paramDefEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getFilterDef() {
@@ -844,35 +908,35 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getFilterDef_Name() {
-		return (EAttribute)filterDefEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) filterDefEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getFilterDef_DefaultCondition() {
-		return (EAttribute)filterDefEClass.getEStructuralFeatures().get(1);
+		return (EAttribute) filterDefEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getFilterDef_Parameters() {
-		return (EReference)filterDefEClass.getEStructuralFeatures().get(2);
+		return (EReference) filterDefEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getDiscriminatorFormula() {
@@ -880,17 +944,17 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getDiscriminatorFormula_Value() {
-		return (EAttribute)discriminatorFormulaEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) discriminatorFormulaEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getNaturalId() {
@@ -898,17 +962,17 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getNaturalId_Mutable() {
-		return (EAttribute)naturalIdEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) naturalIdEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getMapKeyManyToMany() {
@@ -916,26 +980,26 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getMapKeyManyToMany_JoinColumns() {
-		return (EReference)mapKeyManyToManyEClass.getEStructuralFeatures().get(0);
+		return (EReference) mapKeyManyToManyEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getMapKeyManyToMany_TargetEntity() {
-		return (EAttribute)mapKeyManyToManyEClass.getEStructuralFeatures().get(1);
+		return (EAttribute) mapKeyManyToManyEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getForceDiscriminator() {
@@ -943,8 +1007,8 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getImmutable() {
@@ -952,8 +1016,8 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getFormula() {
@@ -961,17 +1025,17 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getFormula_Value() {
-		return (EAttribute)formulaEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) formulaEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getNotFound() {
@@ -979,17 +1043,17 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getNotFound_Action() {
-		return (EAttribute)notFoundEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) notFoundEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getHbEntity() {
@@ -997,71 +1061,71 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getHbEntity_DynamicInsert() {
-		return (EAttribute)hbEntityEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) hbEntityEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getHbEntity_DynamicUpdate() {
-		return (EAttribute)hbEntityEClass.getEStructuralFeatures().get(1);
+		return (EAttribute) hbEntityEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getHbEntity_SelectBeforeUpdate() {
-		return (EAttribute)hbEntityEClass.getEStructuralFeatures().get(2);
+		return (EAttribute) hbEntityEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getHbEntity_Mutable() {
-		return (EAttribute)hbEntityEClass.getEStructuralFeatures().get(3);
+		return (EAttribute) hbEntityEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getHbEntity_Persister() {
-		return (EAttribute)hbEntityEClass.getEStructuralFeatures().get(4);
+		return (EAttribute) hbEntityEClass.getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getHbEntity_OptimisticLock() {
-		return (EAttribute)hbEntityEClass.getEStructuralFeatures().get(5);
+		return (EAttribute) hbEntityEClass.getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getHbEntity_Polymorphism() {
-		return (EAttribute)hbEntityEClass.getEStructuralFeatures().get(6);
+		return (EAttribute) hbEntityEClass.getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getBatchSize() {
@@ -1069,17 +1133,17 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getBatchSize_Size() {
-		return (EAttribute)batchSizeEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) batchSizeEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getAny() {
@@ -1087,44 +1151,44 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getAny_MetaDef() {
-		return (EAttribute)anyEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) anyEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getAny_MetaColumn() {
-		return (EReference)anyEClass.getEStructuralFeatures().get(1);
+		return (EReference) anyEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getAny_Fetch() {
-		return (EAttribute)anyEClass.getEStructuralFeatures().get(2);
+		return (EAttribute) anyEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getAny_Optional() {
-		return (EAttribute)anyEClass.getEStructuralFeatures().get(3);
+		return (EAttribute) anyEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getMetaValue() {
@@ -1132,26 +1196,26 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getMetaValue_TargetEntity() {
-		return (EAttribute)metaValueEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) metaValueEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getMetaValue_Value() {
-		return (EAttribute)metaValueEClass.getEStructuralFeatures().get(1);
+		return (EAttribute) metaValueEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getAnyMetaDef() {
@@ -1159,43 +1223,44 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getAnyMetaDef_Name() {
-		return (EAttribute)anyMetaDefEClass.getEStructuralFeatures().get(0);
+		return (EAttribute) anyMetaDefEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getAnyMetaDef_MetaType() {
-		return (EAttribute)anyMetaDefEClass.getEStructuralFeatures().get(1);
+		return (EAttribute) anyMetaDefEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getAnyMetaDef_IdType() {
-		return (EAttribute)anyMetaDefEClass.getEStructuralFeatures().get(2);
+		return (EAttribute) anyMetaDefEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getAnyMetaDef_MetaValues() {
-		return (EReference)anyMetaDefEClass.getEStructuralFeatures().get(3);
+		return (EReference) anyMetaDefEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getCacheConcurrencyStrategy() {
@@ -1204,6 +1269,7 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getHbFetchType() {
@@ -1212,6 +1278,7 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getOnDeleteAction() {
@@ -1219,8 +1286,8 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getGenerationTime() {
@@ -1228,8 +1295,8 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getNotFoundAction() {
@@ -1237,8 +1304,8 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getOptimisticLockType() {
@@ -1246,8 +1313,8 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getPolymorphismType() {
@@ -1255,8 +1322,8 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getHbCascadeType() {
@@ -1265,26 +1332,29 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HbannotationFactory getHbannotationFactory() {
-		return (HbannotationFactory)getEFactoryInstance();
+		return (HbannotationFactory) getEFactoryInstance();
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isCreated = false;
 
 	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Creates the meta-model objects for the package. This method is guarded to have no affect on any
+	 * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated) return;
+		if (isCreated)
+			return;
 		isCreated = true;
 
 		// Create classes and their features
@@ -1425,18 +1495,20 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isInitialized = false;
 
 	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Complete the initialization of the package and its meta-model. This method is guarded to have
+	 * no affect on any invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized) return;
+		if (isInitialized)
+			return;
 		isInitialized = true;
 
 		// Initialize package
@@ -1445,7 +1517,8 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 		setNsURI(eNS_URI);
 
 		// Obtain other dependent packages
-		PannotationPackage thePannotationPackage = (PannotationPackage)EPackage.Registry.INSTANCE.getEPackage(PannotationPackage.eNS_URI);
+		PannotationPackage thePannotationPackage = (PannotationPackage) EPackage.Registry.INSTANCE
+				.getEPackage(PannotationPackage.eNS_URI);
 
 		// Create type parameters
 
@@ -1486,132 +1559,286 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 		anyMetaDefEClass.getESuperTypes().add(this.getHbAnnotation());
 
 		// Initialize classes and features; add operations and parameters
-		initEClass(hbAnnotationEClass, HbAnnotation.class, "HbAnnotation", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(cascadeEClass, Cascade.class, "Cascade", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getCascade_Value(), this.getHbCascadeType(), "value", null, 0, -1, Cascade.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(collectionOfElementsEClass, CollectionOfElements.class, "CollectionOfElements", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getCollectionOfElements_TargetElement(), ecorePackage.getEString(), "targetElement", null, 0, 1, CollectionOfElements.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getCollectionOfElements_Fetch(), thePannotationPackage.getFetchType(), "fetch", "LAZY", 0, 1, CollectionOfElements.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(hbMapKeyEClass, HbMapKey.class, "HbMapKey", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getHbMapKey_Columns(), thePannotationPackage.getColumn(), null, "columns", null, 0, -1, HbMapKey.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(parameterEClass, Parameter.class, "Parameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getParameter_Name(), ecorePackage.getEString(), "name", null, 1, 1, Parameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getParameter_Value(), ecorePackage.getEString(), "value", null, 1, 1, Parameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(typeEClass, Type.class, "Type", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getType_Type(), ecorePackage.getEString(), "type", null, 1, 1, Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getType_Parameters(), this.getParameter(), null, "parameters", null, 0, -1, Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(whereEClass, Where.class, "Where", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getWhere_Clause(), ecorePackage.getEString(), "clause", null, 0, 1, Where.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(idBagEClass, IdBag.class, "IdBag", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getIdBag_Generator(), ecorePackage.getEString(), "generator", "increment", 0, 1, IdBag.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getIdBag_Type(), ecorePackage.getEString(), "type", "long", 0, 1, IdBag.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getIdBag_Table(), ecorePackage.getEString(), "table", null, 0, 1, IdBag.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(genericGeneratorEClass, GenericGenerator.class, "GenericGenerator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getGenericGenerator_Name(), ecorePackage.getEString(), "name", null, 1, 1, GenericGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getGenericGenerator_Strategy(), ecorePackage.getEString(), "strategy", null, 1, 1, GenericGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getGenericGenerator_Parameters(), this.getParameter(), null, "parameters", null, 0, -1, GenericGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(cacheEClass, Cache.class, "Cache", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getCache_Usage(), this.getCacheConcurrencyStrategy(), "usage", null, 0, 1, Cache.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getCache_Region(), ecorePackage.getEString(), "region", null, 0, 1, Cache.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getCache_Include(), ecorePackage.getEString(), "include", null, 0, 1, Cache.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(typeDefEClass, TypeDef.class, "TypeDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getTypeDef_Name(), ecorePackage.getEString(), "name", null, 1, 1, TypeDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getTypeDef_Parameters(), this.getParameter(), null, "parameters", null, 0, -1, TypeDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTypeDef_TypeClass(), ecorePackage.getEString(), "typeClass", null, 1, 1, TypeDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(fetchEClass, Fetch.class, "Fetch", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getFetch_Value(), this.getHbFetchType(), "value", null, 0, 1, Fetch.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(onDeleteEClass, OnDelete.class, "OnDelete", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getOnDelete_Action(), this.getOnDeleteAction(), "action", null, 0, 1, OnDelete.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(proxyEClass, Proxy.class, "Proxy", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getProxy_ProxyClass(), ecorePackage.getEString(), "proxyClass", null, 0, 1, Proxy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getProxy_Lazy(), ecorePackage.getEBoolean(), "lazy", "true", 0, 1, Proxy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(indexEClass, Index.class, "Index", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getIndex_Name(), ecorePackage.getEString(), "name", null, 0, 1, Index.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(generatedEClass, Generated.class, "Generated", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getGenerated_Value(), this.getGenerationTime(), "value", null, 0, 1, Generated.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(namedQueryEClass, NamedQuery.class, "NamedQuery", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getNamedQuery_Name(), ecorePackage.getEString(), "name", null, 0, 1, NamedQuery.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getNamedQuery_Query(), ecorePackage.getEString(), "query", null, 0, 1, NamedQuery.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(filterEClass, Filter.class, "Filter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getFilter_Name(), ecorePackage.getEString(), "name", null, 1, 1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFilter_Condition(), ecorePackage.getEString(), "condition", null, 0, 1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(paramDefEClass, ParamDef.class, "ParamDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getParamDef_Name(), ecorePackage.getEString(), "name", null, 1, 1, ParamDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getParamDef_Type(), ecorePackage.getEString(), "type", null, 1, 1, ParamDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(filterDefEClass, FilterDef.class, "FilterDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getFilterDef_Name(), ecorePackage.getEString(), "name", null, 1, 1, FilterDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFilterDef_DefaultCondition(), ecorePackage.getEString(), "defaultCondition", null, 0, 1, FilterDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getFilterDef_Parameters(), this.getParamDef(), null, "parameters", null, 0, -1, FilterDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(discriminatorFormulaEClass, DiscriminatorFormula.class, "DiscriminatorFormula", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getDiscriminatorFormula_Value(), ecorePackage.getEString(), "value", null, 0, 1, DiscriminatorFormula.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(naturalIdEClass, NaturalId.class, "NaturalId", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getNaturalId_Mutable(), ecorePackage.getEBoolean(), "mutable", null, 1, 1, NaturalId.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(mapKeyManyToManyEClass, MapKeyManyToMany.class, "MapKeyManyToMany", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getMapKeyManyToMany_JoinColumns(), thePannotationPackage.getJoinColumn(), null, "joinColumns", null, 0, -1, MapKeyManyToMany.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getMapKeyManyToMany_TargetEntity(), ecorePackage.getEString(), "targetEntity", null, 0, 1, MapKeyManyToMany.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(forceDiscriminatorEClass, ForceDiscriminator.class, "ForceDiscriminator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(immutableEClass, Immutable.class, "Immutable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(formulaEClass, Formula.class, "Formula", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getFormula_Value(), ecorePackage.getEString(), "value", null, 0, 1, Formula.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(notFoundEClass, NotFound.class, "NotFound", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getNotFound_Action(), this.getNotFoundAction(), "action", null, 1, 1, NotFound.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(hbEntityEClass, HbEntity.class, "HbEntity", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getHbEntity_DynamicInsert(), ecorePackage.getEBoolean(), "dynamicInsert", null, 0, 1, HbEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getHbEntity_DynamicUpdate(), ecorePackage.getEBoolean(), "dynamicUpdate", null, 0, 1, HbEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getHbEntity_SelectBeforeUpdate(), ecorePackage.getEBoolean(), "selectBeforeUpdate", null, 0, 1, HbEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getHbEntity_Mutable(), ecorePackage.getEBoolean(), "mutable", "true", 0, 1, HbEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getHbEntity_Persister(), ecorePackage.getEString(), "persister", null, 0, 1, HbEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getHbEntity_OptimisticLock(), this.getOptimisticLockType(), "optimisticLock", "VERSION", 0, 1, HbEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getHbEntity_Polymorphism(), this.getPolymorphismType(), "polymorphism", "IMPLICIT", 0, 1, HbEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(batchSizeEClass, BatchSize.class, "BatchSize", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getBatchSize_Size(), ecorePackage.getEInt(), "size", null, 1, 1, BatchSize.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(anyEClass, Any.class, "Any", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getAny_MetaDef(), ecorePackage.getEString(), "metaDef", null, 0, 1, Any.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getAny_MetaColumn(), thePannotationPackage.getColumn(), null, "metaColumn", null, 0, 1, Any.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getAny_Fetch(), thePannotationPackage.getFetchType(), "fetch", "EAGER", 0, 1, Any.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getAny_Optional(), ecorePackage.getEBoolean(), "optional", "true", 0, 1, Any.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(metaValueEClass, MetaValue.class, "MetaValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getMetaValue_TargetEntity(), ecorePackage.getEString(), "targetEntity", null, 0, 1, MetaValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMetaValue_Value(), ecorePackage.getEString(), "value", null, 0, 1, MetaValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(anyMetaDefEClass, AnyMetaDef.class, "AnyMetaDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getAnyMetaDef_Name(), ecorePackage.getEString(), "name", null, 0, 1, AnyMetaDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getAnyMetaDef_MetaType(), ecorePackage.getEString(), "metaType", "string", 0, 1, AnyMetaDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getAnyMetaDef_IdType(), ecorePackage.getEString(), "idType", "string", 1, 1, AnyMetaDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getAnyMetaDef_MetaValues(), this.getMetaValue(), null, "metaValues", null, 0, -1, AnyMetaDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEClass(hbAnnotationEClass, HbAnnotation.class, "HbAnnotation", IS_ABSTRACT, !IS_INTERFACE,
+				IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(cascadeEClass, Cascade.class, "Cascade", !IS_ABSTRACT, !IS_INTERFACE,
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCascade_Value(), this.getHbCascadeType(), "value", null, 0, -1,
+				Cascade.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(collectionOfElementsEClass, CollectionOfElements.class, "CollectionOfElements",
+				!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCollectionOfElements_TargetElement(), ecorePackage.getEString(),
+				"targetElement", null, 0, 1, CollectionOfElements.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCollectionOfElements_Fetch(), thePannotationPackage.getFetchType(), "fetch",
+				"LAZY", 0, 1, CollectionOfElements.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+				!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(hbMapKeyEClass, HbMapKey.class, "HbMapKey", !IS_ABSTRACT, !IS_INTERFACE,
+				IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getHbMapKey_Columns(), thePannotationPackage.getColumn(), null, "columns", null,
+				0, -1, HbMapKey.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		initEClass(parameterEClass, Parameter.class, "Parameter", !IS_ABSTRACT, !IS_INTERFACE,
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getParameter_Name(), ecorePackage.getEString(), "name", null, 1, 1,
+				Parameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getParameter_Value(), ecorePackage.getEString(), "value", null, 1, 1,
+				Parameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(typeEClass, Type.class, "Type", !IS_ABSTRACT, !IS_INTERFACE,
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getType_Type(), ecorePackage.getEString(), "type", null, 1, 1, Type.class,
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEReference(getType_Parameters(), this.getParameter(), null, "parameters", null, 0, -1,
+				Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(whereEClass, Where.class, "Where", !IS_ABSTRACT, !IS_INTERFACE,
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getWhere_Clause(), ecorePackage.getEString(), "clause", null, 0, 1, Where.class,
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+
+		initEClass(idBagEClass, IdBag.class, "IdBag", !IS_ABSTRACT, !IS_INTERFACE,
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getIdBag_Generator(), ecorePackage.getEString(), "generator", "increment", 0, 1,
+				IdBag.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getIdBag_Type(), ecorePackage.getEString(), "type", "long", 0, 1, IdBag.class,
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEAttribute(getIdBag_Table(), ecorePackage.getEString(), "table", null, 0, 1, IdBag.class,
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+
+		initEClass(genericGeneratorEClass, GenericGenerator.class, "GenericGenerator", !IS_ABSTRACT,
+				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getGenericGenerator_Name(), ecorePackage.getEString(), "name", null, 1, 1,
+				GenericGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getGenericGenerator_Strategy(), ecorePackage.getEString(), "strategy", null, 1,
+				1, GenericGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+				!IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getGenericGenerator_Parameters(), this.getParameter(), null, "parameters", null,
+				0, -1, GenericGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+				IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(cacheEClass, Cache.class, "Cache", !IS_ABSTRACT, !IS_INTERFACE,
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCache_Usage(), this.getCacheConcurrencyStrategy(), "usage", null, 0, 1,
+				Cache.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCache_Region(), ecorePackage.getEString(), "region", null, 0, 1, Cache.class,
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEAttribute(getCache_Include(), ecorePackage.getEString(), "include", null, 0, 1,
+				Cache.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+
+		initEClass(typeDefEClass, TypeDef.class, "TypeDef", !IS_ABSTRACT, !IS_INTERFACE,
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getTypeDef_Name(), ecorePackage.getEString(), "name", null, 1, 1, TypeDef.class,
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEReference(getTypeDef_Parameters(), this.getParameter(), null, "parameters", null, 0, -1,
+				TypeDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+				IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTypeDef_TypeClass(), ecorePackage.getEString(), "typeClass", null, 1, 1,
+				TypeDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(fetchEClass, Fetch.class, "Fetch", !IS_ABSTRACT, !IS_INTERFACE,
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getFetch_Value(), this.getHbFetchType(), "value", null, 0, 1, Fetch.class,
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+
+		initEClass(onDeleteEClass, OnDelete.class, "OnDelete", !IS_ABSTRACT, !IS_INTERFACE,
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getOnDelete_Action(), this.getOnDeleteAction(), "action", null, 0, 1,
+				OnDelete.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(proxyEClass, Proxy.class, "Proxy", !IS_ABSTRACT, !IS_INTERFACE,
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getProxy_ProxyClass(), ecorePackage.getEString(), "proxyClass", null, 0, 1,
+				Proxy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getProxy_Lazy(), ecorePackage.getEBoolean(), "lazy", "true", 0, 1, Proxy.class,
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+
+		initEClass(indexEClass, Index.class, "Index", !IS_ABSTRACT, !IS_INTERFACE,
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getIndex_Name(), ecorePackage.getEString(), "name", null, 0, 1, Index.class,
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+
+		initEClass(generatedEClass, Generated.class, "Generated", !IS_ABSTRACT, !IS_INTERFACE,
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getGenerated_Value(), this.getGenerationTime(), "value", null, 0, 1,
+				Generated.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(namedQueryEClass, NamedQuery.class, "NamedQuery", !IS_ABSTRACT, !IS_INTERFACE,
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getNamedQuery_Name(), ecorePackage.getEString(), "name", null, 0, 1,
+				NamedQuery.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getNamedQuery_Query(), ecorePackage.getEString(), "query", null, 0, 1,
+				NamedQuery.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(filterEClass, Filter.class, "Filter", !IS_ABSTRACT, !IS_INTERFACE,
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getFilter_Name(), ecorePackage.getEString(), "name", null, 1, 1, Filter.class,
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEAttribute(getFilter_Condition(), ecorePackage.getEString(), "condition", null, 0, 1,
+				Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(paramDefEClass, ParamDef.class, "ParamDef", !IS_ABSTRACT, !IS_INTERFACE,
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getParamDef_Name(), ecorePackage.getEString(), "name", null, 1, 1,
+				ParamDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getParamDef_Type(), ecorePackage.getEString(), "type", null, 1, 1,
+				ParamDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(filterDefEClass, FilterDef.class, "FilterDef", !IS_ABSTRACT, !IS_INTERFACE,
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getFilterDef_Name(), ecorePackage.getEString(), "name", null, 1, 1,
+				FilterDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getFilterDef_DefaultCondition(), ecorePackage.getEString(), "defaultCondition",
+				null, 0, 1, FilterDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+				!IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getFilterDef_Parameters(), this.getParamDef(), null, "parameters", null, 0, -1,
+				FilterDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+				IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(discriminatorFormulaEClass, DiscriminatorFormula.class, "DiscriminatorFormula",
+				!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getDiscriminatorFormula_Value(), ecorePackage.getEString(), "value", null, 0, 1,
+				DiscriminatorFormula.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+				!IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(naturalIdEClass, NaturalId.class, "NaturalId", !IS_ABSTRACT, !IS_INTERFACE,
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getNaturalId_Mutable(), ecorePackage.getEBoolean(), "mutable", null, 1, 1,
+				NaturalId.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(mapKeyManyToManyEClass, MapKeyManyToMany.class, "MapKeyManyToMany", !IS_ABSTRACT,
+				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getMapKeyManyToMany_JoinColumns(), thePannotationPackage.getJoinColumn(), null,
+				"joinColumns", null, 0, -1, MapKeyManyToMany.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				!IS_ORDERED);
+		initEAttribute(getMapKeyManyToMany_TargetEntity(), ecorePackage.getEString(), "targetEntity",
+				null, 0, 1, MapKeyManyToMany.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+				!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(forceDiscriminatorEClass, ForceDiscriminator.class, "ForceDiscriminator",
+				!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(immutableEClass, Immutable.class, "Immutable", !IS_ABSTRACT, !IS_INTERFACE,
+				IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(formulaEClass, Formula.class, "Formula", !IS_ABSTRACT, !IS_INTERFACE,
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getFormula_Value(), ecorePackage.getEString(), "value", null, 0, 1,
+				Formula.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(notFoundEClass, NotFound.class, "NotFound", !IS_ABSTRACT, !IS_INTERFACE,
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getNotFound_Action(), this.getNotFoundAction(), "action", null, 1, 1,
+				NotFound.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(hbEntityEClass, HbEntity.class, "HbEntity", !IS_ABSTRACT, !IS_INTERFACE,
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getHbEntity_DynamicInsert(), ecorePackage.getEBoolean(), "dynamicInsert", null,
+				0, 1, HbEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getHbEntity_DynamicUpdate(), ecorePackage.getEBoolean(), "dynamicUpdate", null,
+				0, 1, HbEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getHbEntity_SelectBeforeUpdate(), ecorePackage.getEBoolean(),
+				"selectBeforeUpdate", null, 0, 1, HbEntity.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getHbEntity_Mutable(), ecorePackage.getEBoolean(), "mutable", "true", 0, 1,
+				HbEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getHbEntity_Persister(), ecorePackage.getEString(), "persister", null, 0, 1,
+				HbEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getHbEntity_OptimisticLock(), this.getOptimisticLockType(), "optimisticLock",
+				"VERSION", 0, 1, HbEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+				!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getHbEntity_Polymorphism(), this.getPolymorphismType(), "polymorphism",
+				"IMPLICIT", 0, 1, HbEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+				!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(batchSizeEClass, BatchSize.class, "BatchSize", !IS_ABSTRACT, !IS_INTERFACE,
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getBatchSize_Size(), ecorePackage.getEInt(), "size", null, 1, 1,
+				BatchSize.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(anyEClass, Any.class, "Any", !IS_ABSTRACT, !IS_INTERFACE,
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getAny_MetaDef(), ecorePackage.getEString(), "metaDef", null, 0, 1, Any.class,
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEReference(getAny_MetaColumn(), thePannotationPackage.getColumn(), null, "metaColumn",
+				null, 0, 1, Any.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getAny_Fetch(), thePannotationPackage.getFetchType(), "fetch", "EAGER", 0, 1,
+				Any.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getAny_Optional(), ecorePackage.getEBoolean(), "optional", "true", 0, 1,
+				Any.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+
+		initEClass(metaValueEClass, MetaValue.class, "MetaValue", !IS_ABSTRACT, !IS_INTERFACE,
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getMetaValue_TargetEntity(), ecorePackage.getEString(), "targetEntity", null, 0,
+				1, MetaValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getMetaValue_Value(), ecorePackage.getEString(), "value", null, 0, 1,
+				MetaValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(anyMetaDefEClass, AnyMetaDef.class, "AnyMetaDef", !IS_ABSTRACT, !IS_INTERFACE,
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getAnyMetaDef_Name(), ecorePackage.getEString(), "name", null, 0, 1,
+				AnyMetaDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getAnyMetaDef_MetaType(), ecorePackage.getEString(), "metaType", "string", 0, 1,
+				AnyMetaDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getAnyMetaDef_IdType(), ecorePackage.getEString(), "idType", "string", 1, 1,
+				AnyMetaDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getAnyMetaDef_MetaValues(), this.getMetaValue(), null, "metaValues", null, 0,
+				-1, AnyMetaDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		// Initialize enums and add enum literals
-		initEEnum(cacheConcurrencyStrategyEEnum, CacheConcurrencyStrategy.class, "CacheConcurrencyStrategy");
+		initEEnum(cacheConcurrencyStrategyEEnum, CacheConcurrencyStrategy.class,
+				"CacheConcurrencyStrategy");
 		addEEnumLiteral(cacheConcurrencyStrategyEEnum, CacheConcurrencyStrategy.NONE);
 		addEEnumLiteral(cacheConcurrencyStrategyEEnum, CacheConcurrencyStrategy.READ_ONLY);
 		addEEnumLiteral(cacheConcurrencyStrategyEEnum, CacheConcurrencyStrategy.NONSTRICT_READ_WRITE);
@@ -1676,19 +1903,14 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 	}
 
 	/**
-	 * Initializes the annotations for <b>teneo.mapping.source</b>.
-	 * <!-- begin-user-doc --> <!--
+	 * Initializes the annotations for <b>teneo.mapping.source</b>. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void createTeneoAnnotations() {
-		String source = "teneo.mapping.source";		
-		addAnnotation
-		  (this, 
-		   source, 
-		   new String[] {
-			 "1", "http://hibernate.elver.org/"
-		   });																																	
+		String source = "teneo.mapping.source";
+		addAnnotation(this, source, new String[] { "1", "http://hibernate.elver.org/" });
 	}
 
 	/**
@@ -1698,13 +1920,9 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 	 * @generated
 	 */
 	protected void createEcoreAnnotations() {
-		String source = "http://www.eclipse.org/emf/2002/Ecore";			
-		addAnnotation
-		  (hbAnnotationEClass, 
-		   source, 
-		   new String[] {
-			 "constraints", "CompatibleEModelElementType AnnotationIsSupported"
-		   });																																
+		String source = "http://www.eclipse.org/emf/2002/Ecore";
+		addAnnotation(hbAnnotationEClass, source, new String[] { "constraints",
+				"CompatibleEModelElementType AnnotationIsSupported" });
 	}
 
 	/**
@@ -1714,169 +1932,36 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 	 * @generated
 	 */
 	protected void createTargetAnnotations() {
-		String source = "http://annotation.elver.org/internal/Target";				
-		addAnnotation
-		  (cascadeEClass, 
-		   source, 
-		   new String[] {
-			 "0", "EStructuralFeature"
-		   });		
-		addAnnotation
-		  (collectionOfElementsEClass, 
-		   source, 
-		   new String[] {
-			 "0", "EStructuralFeature"
-		   });		
-		addAnnotation
-		  (hbMapKeyEClass, 
-		   source, 
-		   new String[] {
-			 "0", "EStructuralFeature"
-		   });			
-		addAnnotation
-		  (parameterEClass, 
-		   source, 
-		   new String[] {
-			 "0", "EStructuralFeature",
-			 "1", "EClass",
-			 "2", "EPackage"
-		   });		
-		addAnnotation
-		  (typeEClass, 
-		   source, 
-		   new String[] {
-			 "0", "EStructuralFeature"
-		   });		
-		addAnnotation
-		  (whereEClass, 
-		   source, 
-		   new String[] {
-			 "0", "EStructuralFeature"
-		   });		
-		addAnnotation
-		  (idBagEClass, 
-		   source, 
-		   new String[] {
-			 "0", "EStructuralFeature"
-		   });		
-		addAnnotation
-		  (genericGeneratorEClass, 
-		   source, 
-		   new String[] {
-			 "0", "EStructuralFeature",
-			 "1", "EClass",
-			 "2", "EPackage"
-		   });			
-		addAnnotation
-		  (cacheEClass, 
-		   source, 
-		   new String[] {
-			 "0", "EReference",
-			 "1", "EClass"
-		   });		
-		addAnnotation
-		  (typeDefEClass, 
-		   source, 
-		   new String[] {
-			 "0", "EStructuralFeature",
-			 "1", "EClass",
-			 "2", "EPackage"
-		   });		
-		addAnnotation
-		  (fetchEClass, 
-		   source, 
-		   new String[] {
-			 "0", "EStructuralFeature"
-		   });		
-		addAnnotation
-		  (onDeleteEClass, 
-		   source, 
-		   new String[] {
-			 "0", "EStructuralFeature"
-		   });		
-		addAnnotation
-		  (proxyEClass, 
-		   source, 
-		   new String[] {
-			 "0", "EClass"
-		   });		
-		addAnnotation
-		  (indexEClass, 
-		   source, 
-		   new String[] {
-			 "0", "EStructuralFeature"
-		   });		
-		addAnnotation
-		  (generatedEClass, 
-		   source, 
-		   new String[] {
-			 "0", "EAttribute"
-		   });		
-		addAnnotation
-		  (namedQueryEClass, 
-		   source, 
-		   new String[] {
-			 "0", "EClass"
-		   });		
-		addAnnotation
-		  (filterEClass, 
-		   source, 
-		   new String[] {
-			 "0", "EClass",
-			 "1", "EReference"
-		   });		
-		addAnnotation
-		  (paramDefEClass, 
-		   source, 
-		   new String[] {
-			 "0", "EClass",
-			 "1", "EReference"
-		   });		
-		addAnnotation
-		  (filterDefEClass, 
-		   source, 
-		   new String[] {
-			 "0", "EClass",
-			 "1", "EReference"
-		   });			
-		addAnnotation
-		  (naturalIdEClass, 
-		   source, 
-		   new String[] {
-			 "0", "EStructuralFeature"
-		   });		
-		addAnnotation
-		  (mapKeyManyToManyEClass, 
-		   source, 
-		   new String[] {
-			 "0", "EReference"
-		   });					
-		addAnnotation
-		  (notFoundEClass, 
-		   source, 
-		   new String[] {
-			 "0", "EReference"
-		   });		
-		addAnnotation
-		  (hbEntityEClass, 
-		   source, 
-		   new String[] {
-			 "0", "EStructuralFeature"
-		   });			
-		addAnnotation
-		  (anyEClass, 
-		   source, 
-		   new String[] {
-			 "0", "EStructuralFeature"
-		   });		
-		addAnnotation
-		  (anyMetaDefEClass, 
-		   source, 
-		   new String[] {
-			 "0", "EStructuralFeature",
-			 "1", "EClass",
-			 "2", "EPackage"
-		   });
+		String source = "http://annotation.elver.org/internal/Target";
+		addAnnotation(cascadeEClass, source, new String[] { "0", "EStructuralFeature" });
+		addAnnotation(collectionOfElementsEClass, source, new String[] { "0", "EStructuralFeature" });
+		addAnnotation(hbMapKeyEClass, source, new String[] { "0", "EStructuralFeature" });
+		addAnnotation(parameterEClass, source, new String[] { "0", "EStructuralFeature", "1", "EClass",
+				"2", "EPackage" });
+		addAnnotation(typeEClass, source, new String[] { "0", "EStructuralFeature" });
+		addAnnotation(whereEClass, source, new String[] { "0", "EStructuralFeature" });
+		addAnnotation(idBagEClass, source, new String[] { "0", "EStructuralFeature" });
+		addAnnotation(genericGeneratorEClass, source, new String[] { "0", "EStructuralFeature", "1",
+				"EClass", "2", "EPackage" });
+		addAnnotation(cacheEClass, source, new String[] { "0", "EReference", "1", "EClass" });
+		addAnnotation(typeDefEClass, source, new String[] { "0", "EStructuralFeature", "1", "EClass",
+				"2", "EPackage" });
+		addAnnotation(fetchEClass, source, new String[] { "0", "EStructuralFeature" });
+		addAnnotation(onDeleteEClass, source, new String[] { "0", "EStructuralFeature" });
+		addAnnotation(proxyEClass, source, new String[] { "0", "EClass" });
+		addAnnotation(indexEClass, source, new String[] { "0", "EStructuralFeature" });
+		addAnnotation(generatedEClass, source, new String[] { "0", "EAttribute" });
+		addAnnotation(namedQueryEClass, source, new String[] { "0", "EClass" });
+		addAnnotation(filterEClass, source, new String[] { "0", "EClass", "1", "EReference" });
+		addAnnotation(paramDefEClass, source, new String[] { "0", "EClass", "1", "EReference" });
+		addAnnotation(filterDefEClass, source, new String[] { "0", "EClass", "1", "EReference" });
+		addAnnotation(naturalIdEClass, source, new String[] { "0", "EStructuralFeature" });
+		addAnnotation(mapKeyManyToManyEClass, source, new String[] { "0", "EReference" });
+		addAnnotation(notFoundEClass, source, new String[] { "0", "EReference" });
+		addAnnotation(hbEntityEClass, source, new String[] { "0", "EStructuralFeature" });
+		addAnnotation(anyEClass, source, new String[] { "0", "EStructuralFeature" });
+		addAnnotation(anyMetaDefEClass, source, new String[] { "0", "EStructuralFeature", "1",
+				"EClass", "2", "EPackage" });
 	}
 
 	/**
@@ -1886,63 +1971,26 @@ public class HbannotationPackageImpl extends EPackageImpl implements Hbannotatio
 	 * @generated
 	 */
 	protected void createCollectionAnnotations() {
-		String source = "http://annotation.elver.org/internal/Collection";							
-		addAnnotation
-		  (parameterEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Parameters",
-			 "packageNS", "http://www.eclipse.org/emf/teneo/2006/HbAnnotation"
-		   });							
-		addAnnotation
-		  (genericGeneratorEClass, 
-		   source, 
-		   new String[] {
-			 "name", "GenericGenerators",
-			 "packageNS", "http://www.eclipse.org/emf/teneo/2006/HbAnnotation"
-		   });																						
+		String source = "http://annotation.elver.org/internal/Collection";
+		addAnnotation(parameterEClass, source, new String[] { "name", "Parameters", "packageNS",
+				"http://www.eclipse.org/emf/teneo/2006/HbAnnotation" });
+		addAnnotation(genericGeneratorEClass, source, new String[] { "name", "GenericGenerators",
+				"packageNS", "http://www.eclipse.org/emf/teneo/2006/HbAnnotation" });
 	}
 
 	/**
-	 * Initializes the annotations for <b>teneo/internal/Target</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Initializes the annotations for <b>teneo/internal/Target</b>. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void createTarget_1Annotations() {
-		String source = "teneo/internal/Target";																									
-		addAnnotation
-		  (discriminatorFormulaEClass, 
-		   source, 
-		   new String[] {
-			 "0", "EClass"
-		   });				
-		addAnnotation
-		  (forceDiscriminatorEClass, 
-		   source, 
-		   new String[] {
-			 "0", "EClass"
-		   });		
-		addAnnotation
-		  (immutableEClass, 
-		   source, 
-		   new String[] {
-			 "0", "EClass",
-			 "1", "EReference"
-		   });		
-		addAnnotation
-		  (formulaEClass, 
-		   source, 
-		   new String[] {
-			 "0", "EAttribute"
-		   });				
-		addAnnotation
-		  (batchSizeEClass, 
-		   source, 
-		   new String[] {
-			 "0", "EClass",
-			 "1", "EReference"
-		   });		
+		String source = "teneo/internal/Target";
+		addAnnotation(discriminatorFormulaEClass, source, new String[] { "0", "EClass" });
+		addAnnotation(forceDiscriminatorEClass, source, new String[] { "0", "EClass" });
+		addAnnotation(immutableEClass, source, new String[] { "0", "EClass", "1", "EReference" });
+		addAnnotation(formulaEClass, source, new String[] { "0", "EAttribute" });
+		addAnnotation(batchSizeEClass, source, new String[] { "0", "EClass", "1", "EReference" });
 	}
 
 } // HbannotationPackageImpl
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/IdBagImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/IdBagImpl.java
index dd635791f..3aeb545c3 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/IdBagImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/IdBagImpl.java
@@ -13,25 +13,28 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage;
 import org.eclipse.emf.teneo.hibernate.hbannotation.IdBag;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Id Bag</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Id Bag</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.IdBagImpl#getGenerator <em>Generator</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.IdBagImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.IdBagImpl#getTable <em>Table</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.IdBagImpl#getGenerator <em>Generator
+ * </em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.IdBagImpl#getType <em>Type</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.IdBagImpl#getTable <em>Table</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class IdBagImpl extends HbAnnotationImpl implements IdBag {
 	/**
-	 * The default value of the '{@link #getGenerator() <em>Generator</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getGenerator() <em>Generator</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getGenerator()
 	 * @generated
 	 * @ordered
@@ -39,9 +42,9 @@ public class IdBagImpl extends HbAnnotationImpl implements IdBag {
 	protected static final String GENERATOR_EDEFAULT = "increment";
 
 	/**
-	 * The cached value of the '{@link #getGenerator() <em>Generator</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getGenerator() <em>Generator</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getGenerator()
 	 * @generated
 	 * @ordered
@@ -49,9 +52,9 @@ public class IdBagImpl extends HbAnnotationImpl implements IdBag {
 	protected String generator = GENERATOR_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The default value of the '{@link #getType() <em>Type</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -59,9 +62,9 @@ public class IdBagImpl extends HbAnnotationImpl implements IdBag {
 	protected static final String TYPE_EDEFAULT = "long";
 
 	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -69,9 +72,9 @@ public class IdBagImpl extends HbAnnotationImpl implements IdBag {
 	protected String type = TYPE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTable() <em>Table</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTable() <em>Table</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getTable()
 	 * @generated
 	 * @ordered
@@ -79,9 +82,9 @@ public class IdBagImpl extends HbAnnotationImpl implements IdBag {
 	protected static final String TABLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTable() <em>Table</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getTable() <em>Table</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getTable()
 	 * @generated
 	 * @ordered
@@ -89,8 +92,8 @@ public class IdBagImpl extends HbAnnotationImpl implements IdBag {
 	protected String table = TABLE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected IdBagImpl() {
@@ -98,8 +101,8 @@ public class IdBagImpl extends HbAnnotationImpl implements IdBag {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -108,8 +111,8 @@ public class IdBagImpl extends HbAnnotationImpl implements IdBag {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getGenerator() {
@@ -117,20 +120,21 @@ public class IdBagImpl extends HbAnnotationImpl implements IdBag {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setGenerator(String newGenerator) {
 		String oldGenerator = generator;
 		generator = newGenerator;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.ID_BAG__GENERATOR, oldGenerator, generator));
+			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.ID_BAG__GENERATOR,
+					oldGenerator, generator));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getType() {
@@ -138,20 +142,21 @@ public class IdBagImpl extends HbAnnotationImpl implements IdBag {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setType(String newType) {
 		String oldType = type;
 		type = newType;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.ID_BAG__TYPE, oldType, type));
+			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.ID_BAG__TYPE,
+					oldType, type));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTable() {
@@ -159,103 +164,105 @@ public class IdBagImpl extends HbAnnotationImpl implements IdBag {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTable(String newTable) {
 		String oldTable = table;
 		table = newTable;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.ID_BAG__TABLE, oldTable, table));
+			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.ID_BAG__TABLE,
+					oldTable, table));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case HbannotationPackage.ID_BAG__GENERATOR:
-				return getGenerator();
-			case HbannotationPackage.ID_BAG__TYPE:
-				return getType();
-			case HbannotationPackage.ID_BAG__TABLE:
-				return getTable();
+		case HbannotationPackage.ID_BAG__GENERATOR:
+			return getGenerator();
+		case HbannotationPackage.ID_BAG__TYPE:
+			return getType();
+		case HbannotationPackage.ID_BAG__TABLE:
+			return getTable();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case HbannotationPackage.ID_BAG__GENERATOR:
-				setGenerator((String)newValue);
-				return;
-			case HbannotationPackage.ID_BAG__TYPE:
-				setType((String)newValue);
-				return;
-			case HbannotationPackage.ID_BAG__TABLE:
-				setTable((String)newValue);
-				return;
+		case HbannotationPackage.ID_BAG__GENERATOR:
+			setGenerator((String) newValue);
+			return;
+		case HbannotationPackage.ID_BAG__TYPE:
+			setType((String) newValue);
+			return;
+		case HbannotationPackage.ID_BAG__TABLE:
+			setTable((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.ID_BAG__GENERATOR:
-				setGenerator(GENERATOR_EDEFAULT);
-				return;
-			case HbannotationPackage.ID_BAG__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case HbannotationPackage.ID_BAG__TABLE:
-				setTable(TABLE_EDEFAULT);
-				return;
+		case HbannotationPackage.ID_BAG__GENERATOR:
+			setGenerator(GENERATOR_EDEFAULT);
+			return;
+		case HbannotationPackage.ID_BAG__TYPE:
+			setType(TYPE_EDEFAULT);
+			return;
+		case HbannotationPackage.ID_BAG__TABLE:
+			setTable(TABLE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.ID_BAG__GENERATOR:
-				return GENERATOR_EDEFAULT == null ? generator != null : !GENERATOR_EDEFAULT.equals(generator);
-			case HbannotationPackage.ID_BAG__TYPE:
-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-			case HbannotationPackage.ID_BAG__TABLE:
-				return TABLE_EDEFAULT == null ? table != null : !TABLE_EDEFAULT.equals(table);
+		case HbannotationPackage.ID_BAG__GENERATOR:
+			return GENERATOR_EDEFAULT == null ? generator != null : !GENERATOR_EDEFAULT.equals(generator);
+		case HbannotationPackage.ID_BAG__TYPE:
+			return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
+		case HbannotationPackage.ID_BAG__TABLE:
+			return TABLE_EDEFAULT == null ? table != null : !TABLE_EDEFAULT.equals(table);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (generator: ");
@@ -268,4 +275,4 @@ public class IdBagImpl extends HbAnnotationImpl implements IdBag {
 		return result.toString();
 	}
 
-} //IdBagImpl
\ No newline at end of file
+} // IdBagImpl
\ No newline at end of file
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/ImmutableImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/ImmutableImpl.java
index 9ee3a24c0..518e887a6 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/ImmutableImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/ImmutableImpl.java
@@ -11,18 +11,17 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage;
 import org.eclipse.emf.teneo.hibernate.hbannotation.Immutable;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Immutable</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Immutable</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public class ImmutableImpl extends HbAnnotationImpl implements Immutable {
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ImmutableImpl() {
@@ -30,8 +29,8 @@ public class ImmutableImpl extends HbAnnotationImpl implements Immutable {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -39,4 +38,4 @@ public class ImmutableImpl extends HbAnnotationImpl implements Immutable {
 		return HbannotationPackage.Literals.IMMUTABLE;
 	}
 
-} //ImmutableImpl
+} // ImmutableImpl
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/IndexImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/IndexImpl.java
index 15aa130ff..af4e3a376 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/IndexImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/IndexImpl.java
@@ -13,23 +13,23 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage;
 import org.eclipse.emf.teneo.hibernate.hbannotation.Index;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Index</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Index</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.IndexImpl#getName <em>Name</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.IndexImpl#getName <em>Name</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class IndexImpl extends HbAnnotationImpl implements Index {
 	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -37,9 +37,9 @@ public class IndexImpl extends HbAnnotationImpl implements Index {
 	protected static final String NAME_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -47,8 +47,8 @@ public class IndexImpl extends HbAnnotationImpl implements Index {
 	protected String name = NAME_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected IndexImpl() {
@@ -56,8 +56,8 @@ public class IndexImpl extends HbAnnotationImpl implements Index {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -66,8 +66,8 @@ public class IndexImpl extends HbAnnotationImpl implements Index {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
@@ -75,83 +75,85 @@ public class IndexImpl extends HbAnnotationImpl implements Index {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setName(String newName) {
 		String oldName = name;
 		name = newName;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.INDEX__NAME, oldName, name));
+			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.INDEX__NAME,
+					oldName, name));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case HbannotationPackage.INDEX__NAME:
-				return getName();
+		case HbannotationPackage.INDEX__NAME:
+			return getName();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case HbannotationPackage.INDEX__NAME:
-				setName((String)newValue);
-				return;
+		case HbannotationPackage.INDEX__NAME:
+			setName((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.INDEX__NAME:
-				setName(NAME_EDEFAULT);
-				return;
+		case HbannotationPackage.INDEX__NAME:
+			setName(NAME_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.INDEX__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case HbannotationPackage.INDEX__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (name: ");
@@ -160,4 +162,4 @@ public class IndexImpl extends HbAnnotationImpl implements Index {
 		return result.toString();
 	}
 
-} //IndexImpl
+} // IndexImpl
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/MapKeyManyToManyImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/MapKeyManyToManyImpl.java
index 510f2e2a3..60549429a 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/MapKeyManyToManyImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/MapKeyManyToManyImpl.java
@@ -21,24 +21,27 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage;
 import org.eclipse.emf.teneo.hibernate.hbannotation.MapKeyManyToMany;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Map Key Many To Many</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Map Key Many To Many</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.MapKeyManyToManyImpl#getJoinColumns <em>Join Columns</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.MapKeyManyToManyImpl#getTargetEntity <em>Target Entity</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.MapKeyManyToManyImpl#getJoinColumns <em>
+ * Join Columns</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.MapKeyManyToManyImpl#getTargetEntity
+ * <em>Target Entity</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class MapKeyManyToManyImpl extends HbAnnotationImpl implements MapKeyManyToMany {
 	/**
-	 * The cached value of the '{@link #getJoinColumns() <em>Join Columns</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getJoinColumns() <em>Join Columns</em>}' containment reference
+	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getJoinColumns()
 	 * @generated
 	 * @ordered
@@ -46,9 +49,9 @@ public class MapKeyManyToManyImpl extends HbAnnotationImpl implements MapKeyMany
 	protected EList<JoinColumn> joinColumns;
 
 	/**
-	 * The default value of the '{@link #getTargetEntity() <em>Target Entity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTargetEntity() <em>Target Entity</em>} ' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getTargetEntity()
 	 * @generated
 	 * @ordered
@@ -56,9 +59,9 @@ public class MapKeyManyToManyImpl extends HbAnnotationImpl implements MapKeyMany
 	protected static final String TARGET_ENTITY_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTargetEntity() <em>Target Entity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTargetEntity() <em>Target Entity</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getTargetEntity()
 	 * @generated
 	 * @ordered
@@ -66,8 +69,8 @@ public class MapKeyManyToManyImpl extends HbAnnotationImpl implements MapKeyMany
 	protected String targetEntity = TARGET_ENTITY_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected MapKeyManyToManyImpl() {
@@ -75,8 +78,8 @@ public class MapKeyManyToManyImpl extends HbAnnotationImpl implements MapKeyMany
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -85,20 +88,21 @@ public class MapKeyManyToManyImpl extends HbAnnotationImpl implements MapKeyMany
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<JoinColumn> getJoinColumns() {
 		if (joinColumns == null) {
-			joinColumns = new EObjectContainmentEList<JoinColumn>(JoinColumn.class, this, HbannotationPackage.MAP_KEY_MANY_TO_MANY__JOIN_COLUMNS);
+			joinColumns = new EObjectContainmentEList<JoinColumn>(JoinColumn.class, this,
+					HbannotationPackage.MAP_KEY_MANY_TO_MANY__JOIN_COLUMNS);
 		}
 		return joinColumns;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTargetEntity() {
@@ -106,109 +110,113 @@ public class MapKeyManyToManyImpl extends HbAnnotationImpl implements MapKeyMany
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTargetEntity(String newTargetEntity) {
 		String oldTargetEntity = targetEntity;
 		targetEntity = newTargetEntity;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.MAP_KEY_MANY_TO_MANY__TARGET_ENTITY, oldTargetEntity, targetEntity));
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbannotationPackage.MAP_KEY_MANY_TO_MANY__TARGET_ENTITY, oldTargetEntity, targetEntity));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID,
+			NotificationChain msgs) {
 		switch (featureID) {
-			case HbannotationPackage.MAP_KEY_MANY_TO_MANY__JOIN_COLUMNS:
-				return ((InternalEList<?>)getJoinColumns()).basicRemove(otherEnd, msgs);
+		case HbannotationPackage.MAP_KEY_MANY_TO_MANY__JOIN_COLUMNS:
+			return ((InternalEList<?>) getJoinColumns()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case HbannotationPackage.MAP_KEY_MANY_TO_MANY__JOIN_COLUMNS:
-				return getJoinColumns();
-			case HbannotationPackage.MAP_KEY_MANY_TO_MANY__TARGET_ENTITY:
-				return getTargetEntity();
+		case HbannotationPackage.MAP_KEY_MANY_TO_MANY__JOIN_COLUMNS:
+			return getJoinColumns();
+		case HbannotationPackage.MAP_KEY_MANY_TO_MANY__TARGET_ENTITY:
+			return getTargetEntity();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case HbannotationPackage.MAP_KEY_MANY_TO_MANY__JOIN_COLUMNS:
-				getJoinColumns().clear();
-				getJoinColumns().addAll((Collection<? extends JoinColumn>)newValue);
-				return;
-			case HbannotationPackage.MAP_KEY_MANY_TO_MANY__TARGET_ENTITY:
-				setTargetEntity((String)newValue);
-				return;
+		case HbannotationPackage.MAP_KEY_MANY_TO_MANY__JOIN_COLUMNS:
+			getJoinColumns().clear();
+			getJoinColumns().addAll((Collection<? extends JoinColumn>) newValue);
+			return;
+		case HbannotationPackage.MAP_KEY_MANY_TO_MANY__TARGET_ENTITY:
+			setTargetEntity((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.MAP_KEY_MANY_TO_MANY__JOIN_COLUMNS:
-				getJoinColumns().clear();
-				return;
-			case HbannotationPackage.MAP_KEY_MANY_TO_MANY__TARGET_ENTITY:
-				setTargetEntity(TARGET_ENTITY_EDEFAULT);
-				return;
+		case HbannotationPackage.MAP_KEY_MANY_TO_MANY__JOIN_COLUMNS:
+			getJoinColumns().clear();
+			return;
+		case HbannotationPackage.MAP_KEY_MANY_TO_MANY__TARGET_ENTITY:
+			setTargetEntity(TARGET_ENTITY_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.MAP_KEY_MANY_TO_MANY__JOIN_COLUMNS:
-				return joinColumns != null && !joinColumns.isEmpty();
-			case HbannotationPackage.MAP_KEY_MANY_TO_MANY__TARGET_ENTITY:
-				return TARGET_ENTITY_EDEFAULT == null ? targetEntity != null : !TARGET_ENTITY_EDEFAULT.equals(targetEntity);
+		case HbannotationPackage.MAP_KEY_MANY_TO_MANY__JOIN_COLUMNS:
+			return joinColumns != null && !joinColumns.isEmpty();
+		case HbannotationPackage.MAP_KEY_MANY_TO_MANY__TARGET_ENTITY:
+			return TARGET_ENTITY_EDEFAULT == null ? targetEntity != null : !TARGET_ENTITY_EDEFAULT
+					.equals(targetEntity);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (targetEntity: ");
@@ -217,4 +225,4 @@ public class MapKeyManyToManyImpl extends HbAnnotationImpl implements MapKeyMany
 		return result.toString();
 	}
 
-} //MapKeyManyToManyImpl
+} // MapKeyManyToManyImpl
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/MetaValueImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/MetaValueImpl.java
index b81b5c9d3..4ead2a8c9 100644
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/MetaValueImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/MetaValueImpl.java
@@ -13,24 +13,26 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage;
 import org.eclipse.emf.teneo.hibernate.hbannotation.MetaValue;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Meta Value</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Meta Value</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.MetaValueImpl#getTargetEntity <em>Target Entity</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.MetaValueImpl#getValue <em>Value</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.MetaValueImpl#getTargetEntity <em>Target
+ * Entity</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.MetaValueImpl#getValue <em>Value</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class MetaValueImpl extends HbAnnotationImpl implements MetaValue {
 	/**
-	 * The default value of the '{@link #getTargetEntity() <em>Target Entity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTargetEntity() <em>Target Entity</em>} ' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getTargetEntity()
 	 * @generated
 	 * @ordered
@@ -38,9 +40,9 @@ public class MetaValueImpl extends HbAnnotationImpl implements MetaValue {
 	protected static final String TARGET_ENTITY_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTargetEntity() <em>Target Entity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTargetEntity() <em>Target Entity</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getTargetEntity()
 	 * @generated
 	 * @ordered
@@ -48,9 +50,9 @@ public class MetaValueImpl extends HbAnnotationImpl implements MetaValue {
 	protected String targetEntity = TARGET_ENTITY_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -58,9 +60,9 @@ public class MetaValueImpl extends HbAnnotationImpl implements MetaValue {
 	protected static final String VALUE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -68,8 +70,8 @@ public class MetaValueImpl extends HbAnnotationImpl implements MetaValue {
 	protected String value = VALUE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected MetaValueImpl() {
@@ -77,8 +79,8 @@ public class MetaValueImpl extends HbAnnotationImpl implements MetaValue {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -87,8 +89,8 @@ public class MetaValueImpl extends HbAnnotationImpl implements MetaValue {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTargetEntity() {
@@ -96,20 +98,21 @@ public class MetaValueImpl extends HbAnnotationImpl implements MetaValue {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTargetEntity(String newTargetEntity) {
 		String oldTargetEntity = targetEntity;
 		targetEntity = newTargetEntity;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.META_VALUE__TARGET_ENTITY, oldTargetEntity, targetEntity));
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbannotationPackage.META_VALUE__TARGET_ENTITY, oldTargetEntity, targetEntity));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getValue() {
@@ -117,93 +120,96 @@ public class MetaValueImpl extends HbAnnotationImpl implements MetaValue {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setValue(String newValue) {
 		String oldValue = value;
 		value = newValue;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.META_VALUE__VALUE, oldValue, value));
+			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.META_VALUE__VALUE,
+					oldValue, value));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case HbannotationPackage.META_VALUE__TARGET_ENTITY:
-				return getTargetEntity();
-			case HbannotationPackage.META_VALUE__VALUE:
-				return getValue();
+		case HbannotationPackage.META_VALUE__TARGET_ENTITY:
+			return getTargetEntity();
+		case HbannotationPackage.META_VALUE__VALUE:
+			return getValue();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case HbannotationPackage.META_VALUE__TARGET_ENTITY:
-				setTargetEntity((String)newValue);
-				return;
-			case HbannotationPackage.META_VALUE__VALUE:
-				setValue((String)newValue);
-				return;
+		case HbannotationPackage.META_VALUE__TARGET_ENTITY:
+			setTargetEntity((String) newValue);
+			return;
+		case HbannotationPackage.META_VALUE__VALUE:
+			setValue((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.META_VALUE__TARGET_ENTITY:
-				setTargetEntity(TARGET_ENTITY_EDEFAULT);
-				return;
-			case HbannotationPackage.META_VALUE__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
+		case HbannotationPackage.META_VALUE__TARGET_ENTITY:
+			setTargetEntity(TARGET_ENTITY_EDEFAULT);
+			return;
+		case HbannotationPackage.META_VALUE__VALUE:
+			setValue(VALUE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.META_VALUE__TARGET_ENTITY:
-				return TARGET_ENTITY_EDEFAULT == null ? targetEntity != null : !TARGET_ENTITY_EDEFAULT.equals(targetEntity);
-			case HbannotationPackage.META_VALUE__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
+		case HbannotationPackage.META_VALUE__TARGET_ENTITY:
+			return TARGET_ENTITY_EDEFAULT == null ? targetEntity != null : !TARGET_ENTITY_EDEFAULT
+					.equals(targetEntity);
+		case HbannotationPackage.META_VALUE__VALUE:
+			return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (targetEntity: ");
@@ -214,4 +220,4 @@ public class MetaValueImpl extends HbAnnotationImpl implements MetaValue {
 		return result.toString();
 	}
 
-} //MetaValueImpl
+} // MetaValueImpl
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/NamedQueryImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/NamedQueryImpl.java
index 58863acc4..1ac10fdbb 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/NamedQueryImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/NamedQueryImpl.java
@@ -13,24 +13,25 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage;
 import org.eclipse.emf.teneo.hibernate.hbannotation.NamedQuery;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Named Query</b></em>'.
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Named Query</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.NamedQueryImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.NamedQueryImpl#getQuery <em>Query</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.NamedQueryImpl#getName <em>Name</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.NamedQueryImpl#getQuery <em>Query</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class NamedQueryImpl extends HbAnnotationImpl implements NamedQuery {
 	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -38,9 +39,9 @@ public class NamedQueryImpl extends HbAnnotationImpl implements NamedQuery {
 	protected static final String NAME_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -48,9 +49,9 @@ public class NamedQueryImpl extends HbAnnotationImpl implements NamedQuery {
 	protected String name = NAME_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getQuery() <em>Query</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getQuery() <em>Query</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getQuery()
 	 * @generated
 	 * @ordered
@@ -58,9 +59,9 @@ public class NamedQueryImpl extends HbAnnotationImpl implements NamedQuery {
 	protected static final String QUERY_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getQuery() <em>Query</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getQuery() <em>Query</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getQuery()
 	 * @generated
 	 * @ordered
@@ -68,8 +69,8 @@ public class NamedQueryImpl extends HbAnnotationImpl implements NamedQuery {
 	protected String query = QUERY_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected NamedQueryImpl() {
@@ -77,8 +78,8 @@ public class NamedQueryImpl extends HbAnnotationImpl implements NamedQuery {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -87,8 +88,8 @@ public class NamedQueryImpl extends HbAnnotationImpl implements NamedQuery {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
@@ -96,20 +97,21 @@ public class NamedQueryImpl extends HbAnnotationImpl implements NamedQuery {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setName(String newName) {
 		String oldName = name;
 		name = newName;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.NAMED_QUERY__NAME, oldName, name));
+			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.NAMED_QUERY__NAME,
+					oldName, name));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getQuery() {
@@ -117,93 +119,95 @@ public class NamedQueryImpl extends HbAnnotationImpl implements NamedQuery {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setQuery(String newQuery) {
 		String oldQuery = query;
 		query = newQuery;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.NAMED_QUERY__QUERY, oldQuery, query));
+			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.NAMED_QUERY__QUERY,
+					oldQuery, query));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case HbannotationPackage.NAMED_QUERY__NAME:
-				return getName();
-			case HbannotationPackage.NAMED_QUERY__QUERY:
-				return getQuery();
+		case HbannotationPackage.NAMED_QUERY__NAME:
+			return getName();
+		case HbannotationPackage.NAMED_QUERY__QUERY:
+			return getQuery();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case HbannotationPackage.NAMED_QUERY__NAME:
-				setName((String)newValue);
-				return;
-			case HbannotationPackage.NAMED_QUERY__QUERY:
-				setQuery((String)newValue);
-				return;
+		case HbannotationPackage.NAMED_QUERY__NAME:
+			setName((String) newValue);
+			return;
+		case HbannotationPackage.NAMED_QUERY__QUERY:
+			setQuery((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.NAMED_QUERY__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case HbannotationPackage.NAMED_QUERY__QUERY:
-				setQuery(QUERY_EDEFAULT);
-				return;
+		case HbannotationPackage.NAMED_QUERY__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case HbannotationPackage.NAMED_QUERY__QUERY:
+			setQuery(QUERY_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.NAMED_QUERY__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case HbannotationPackage.NAMED_QUERY__QUERY:
-				return QUERY_EDEFAULT == null ? query != null : !QUERY_EDEFAULT.equals(query);
+		case HbannotationPackage.NAMED_QUERY__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case HbannotationPackage.NAMED_QUERY__QUERY:
+			return QUERY_EDEFAULT == null ? query != null : !QUERY_EDEFAULT.equals(query);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (name: ");
@@ -214,4 +218,4 @@ public class NamedQueryImpl extends HbAnnotationImpl implements NamedQuery {
 		return result.toString();
 	}
 
-} //NamedQueryImpl
+} // NamedQueryImpl
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/NaturalIdImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/NaturalIdImpl.java
index 9eb4e60cc..130d78ef4 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/NaturalIdImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/NaturalIdImpl.java
@@ -13,23 +13,24 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage;
 import org.eclipse.emf.teneo.hibernate.hbannotation.NaturalId;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Natural Id</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Natural Id</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.NaturalIdImpl#isMutable <em>Mutable</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.NaturalIdImpl#isMutable <em>Mutable
+ * </em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class NaturalIdImpl extends HbAnnotationImpl implements NaturalId {
 	/**
-	 * The default value of the '{@link #isMutable() <em>Mutable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #isMutable() <em>Mutable</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #isMutable()
 	 * @generated
 	 * @ordered
@@ -37,9 +38,9 @@ public class NaturalIdImpl extends HbAnnotationImpl implements NaturalId {
 	protected static final boolean MUTABLE_EDEFAULT = false;
 
 	/**
-	 * The cached value of the '{@link #isMutable() <em>Mutable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #isMutable() <em>Mutable</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #isMutable()
 	 * @generated
 	 * @ordered
@@ -47,8 +48,8 @@ public class NaturalIdImpl extends HbAnnotationImpl implements NaturalId {
 	protected boolean mutable = MUTABLE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected NaturalIdImpl() {
@@ -56,8 +57,8 @@ public class NaturalIdImpl extends HbAnnotationImpl implements NaturalId {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -66,8 +67,8 @@ public class NaturalIdImpl extends HbAnnotationImpl implements NaturalId {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isMutable() {
@@ -75,83 +76,85 @@ public class NaturalIdImpl extends HbAnnotationImpl implements NaturalId {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setMutable(boolean newMutable) {
 		boolean oldMutable = mutable;
 		mutable = newMutable;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.NATURAL_ID__MUTABLE, oldMutable, mutable));
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbannotationPackage.NATURAL_ID__MUTABLE, oldMutable, mutable));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case HbannotationPackage.NATURAL_ID__MUTABLE:
-				return isMutable();
+		case HbannotationPackage.NATURAL_ID__MUTABLE:
+			return isMutable();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case HbannotationPackage.NATURAL_ID__MUTABLE:
-				setMutable((Boolean)newValue);
-				return;
+		case HbannotationPackage.NATURAL_ID__MUTABLE:
+			setMutable((Boolean) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.NATURAL_ID__MUTABLE:
-				setMutable(MUTABLE_EDEFAULT);
-				return;
+		case HbannotationPackage.NATURAL_ID__MUTABLE:
+			setMutable(MUTABLE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.NATURAL_ID__MUTABLE:
-				return mutable != MUTABLE_EDEFAULT;
+		case HbannotationPackage.NATURAL_ID__MUTABLE:
+			return mutable != MUTABLE_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (mutable: ");
@@ -160,4 +163,4 @@ public class NaturalIdImpl extends HbAnnotationImpl implements NaturalId {
 		return result.toString();
 	}
 
-} //NaturalIdImpl
+} // NaturalIdImpl
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/NotFoundImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/NotFoundImpl.java
index 9576f1d7c..564ae7b67 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/NotFoundImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/NotFoundImpl.java
@@ -14,23 +14,23 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.NotFound;
 import org.eclipse.emf.teneo.hibernate.hbannotation.NotFoundAction;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Not Found</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Not Found</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.NotFoundImpl#getAction <em>Action</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.NotFoundImpl#getAction <em>Action</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class NotFoundImpl extends HbAnnotationImpl implements NotFound {
 	/**
-	 * The default value of the '{@link #getAction() <em>Action</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getAction() <em>Action</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getAction()
 	 * @generated
 	 * @ordered
@@ -38,9 +38,9 @@ public class NotFoundImpl extends HbAnnotationImpl implements NotFound {
 	protected static final NotFoundAction ACTION_EDEFAULT = NotFoundAction.EXCEPTION;
 
 	/**
-	 * The cached value of the '{@link #getAction() <em>Action</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getAction() <em>Action</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getAction()
 	 * @generated
 	 * @ordered
@@ -48,8 +48,8 @@ public class NotFoundImpl extends HbAnnotationImpl implements NotFound {
 	protected NotFoundAction action = ACTION_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected NotFoundImpl() {
@@ -57,8 +57,8 @@ public class NotFoundImpl extends HbAnnotationImpl implements NotFound {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -67,8 +67,8 @@ public class NotFoundImpl extends HbAnnotationImpl implements NotFound {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotFoundAction getAction() {
@@ -76,83 +76,85 @@ public class NotFoundImpl extends HbAnnotationImpl implements NotFound {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setAction(NotFoundAction newAction) {
 		NotFoundAction oldAction = action;
 		action = newAction == null ? ACTION_EDEFAULT : newAction;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.NOT_FOUND__ACTION, oldAction, action));
+			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.NOT_FOUND__ACTION,
+					oldAction, action));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case HbannotationPackage.NOT_FOUND__ACTION:
-				return getAction();
+		case HbannotationPackage.NOT_FOUND__ACTION:
+			return getAction();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case HbannotationPackage.NOT_FOUND__ACTION:
-				setAction((NotFoundAction)newValue);
-				return;
+		case HbannotationPackage.NOT_FOUND__ACTION:
+			setAction((NotFoundAction) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.NOT_FOUND__ACTION:
-				setAction(ACTION_EDEFAULT);
-				return;
+		case HbannotationPackage.NOT_FOUND__ACTION:
+			setAction(ACTION_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.NOT_FOUND__ACTION:
-				return action != ACTION_EDEFAULT;
+		case HbannotationPackage.NOT_FOUND__ACTION:
+			return action != ACTION_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (action: ");
@@ -161,4 +163,4 @@ public class NotFoundImpl extends HbAnnotationImpl implements NotFound {
 		return result.toString();
 	}
 
-} //NotFoundImpl
+} // NotFoundImpl
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/OnDeleteImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/OnDeleteImpl.java
index 1be199960..c0b1ca18d 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/OnDeleteImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/OnDeleteImpl.java
@@ -14,23 +14,23 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.OnDelete;
 import org.eclipse.emf.teneo.hibernate.hbannotation.OnDeleteAction;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>On Delete</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>On Delete</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.OnDeleteImpl#getAction <em>Action</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.OnDeleteImpl#getAction <em>Action</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class OnDeleteImpl extends HbAnnotationImpl implements OnDelete {
 	/**
-	 * The default value of the '{@link #getAction() <em>Action</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getAction() <em>Action</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getAction()
 	 * @generated
 	 * @ordered
@@ -38,9 +38,9 @@ public class OnDeleteImpl extends HbAnnotationImpl implements OnDelete {
 	protected static final OnDeleteAction ACTION_EDEFAULT = OnDeleteAction.NO_ACTION;
 
 	/**
-	 * The cached value of the '{@link #getAction() <em>Action</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getAction() <em>Action</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getAction()
 	 * @generated
 	 * @ordered
@@ -48,8 +48,8 @@ public class OnDeleteImpl extends HbAnnotationImpl implements OnDelete {
 	protected OnDeleteAction action = ACTION_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected OnDeleteImpl() {
@@ -57,8 +57,8 @@ public class OnDeleteImpl extends HbAnnotationImpl implements OnDelete {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -67,8 +67,8 @@ public class OnDeleteImpl extends HbAnnotationImpl implements OnDelete {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public OnDeleteAction getAction() {
@@ -76,83 +76,85 @@ public class OnDeleteImpl extends HbAnnotationImpl implements OnDelete {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setAction(OnDeleteAction newAction) {
 		OnDeleteAction oldAction = action;
 		action = newAction == null ? ACTION_EDEFAULT : newAction;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.ON_DELETE__ACTION, oldAction, action));
+			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.ON_DELETE__ACTION,
+					oldAction, action));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case HbannotationPackage.ON_DELETE__ACTION:
-				return getAction();
+		case HbannotationPackage.ON_DELETE__ACTION:
+			return getAction();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case HbannotationPackage.ON_DELETE__ACTION:
-				setAction((OnDeleteAction)newValue);
-				return;
+		case HbannotationPackage.ON_DELETE__ACTION:
+			setAction((OnDeleteAction) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.ON_DELETE__ACTION:
-				setAction(ACTION_EDEFAULT);
-				return;
+		case HbannotationPackage.ON_DELETE__ACTION:
+			setAction(ACTION_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.ON_DELETE__ACTION:
-				return action != ACTION_EDEFAULT;
+		case HbannotationPackage.ON_DELETE__ACTION:
+			return action != ACTION_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (action: ");
@@ -161,4 +163,4 @@ public class OnDeleteImpl extends HbAnnotationImpl implements OnDelete {
 		return result.toString();
 	}
 
-} //OnDeleteImpl
+} // OnDeleteImpl
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/ParamDefImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/ParamDefImpl.java
index 158737963..b9672a8d1 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/ParamDefImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/ParamDefImpl.java
@@ -13,24 +13,25 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage;
 import org.eclipse.emf.teneo.hibernate.hbannotation.ParamDef;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Param Def</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Param Def</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.ParamDefImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.ParamDefImpl#getType <em>Type</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.ParamDefImpl#getName <em>Name</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.ParamDefImpl#getType <em>Type</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class ParamDefImpl extends HbAnnotationImpl implements ParamDef {
 	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -38,9 +39,9 @@ public class ParamDefImpl extends HbAnnotationImpl implements ParamDef {
 	protected static final String NAME_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -48,9 +49,9 @@ public class ParamDefImpl extends HbAnnotationImpl implements ParamDef {
 	protected String name = NAME_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The default value of the '{@link #getType() <em>Type</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -58,9 +59,9 @@ public class ParamDefImpl extends HbAnnotationImpl implements ParamDef {
 	protected static final String TYPE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -68,8 +69,8 @@ public class ParamDefImpl extends HbAnnotationImpl implements ParamDef {
 	protected String type = TYPE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ParamDefImpl() {
@@ -77,8 +78,8 @@ public class ParamDefImpl extends HbAnnotationImpl implements ParamDef {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -87,8 +88,8 @@ public class ParamDefImpl extends HbAnnotationImpl implements ParamDef {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
@@ -96,20 +97,21 @@ public class ParamDefImpl extends HbAnnotationImpl implements ParamDef {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setName(String newName) {
 		String oldName = name;
 		name = newName;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.PARAM_DEF__NAME, oldName, name));
+			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.PARAM_DEF__NAME,
+					oldName, name));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getType() {
@@ -117,93 +119,95 @@ public class ParamDefImpl extends HbAnnotationImpl implements ParamDef {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setType(String newType) {
 		String oldType = type;
 		type = newType;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.PARAM_DEF__TYPE, oldType, type));
+			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.PARAM_DEF__TYPE,
+					oldType, type));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case HbannotationPackage.PARAM_DEF__NAME:
-				return getName();
-			case HbannotationPackage.PARAM_DEF__TYPE:
-				return getType();
+		case HbannotationPackage.PARAM_DEF__NAME:
+			return getName();
+		case HbannotationPackage.PARAM_DEF__TYPE:
+			return getType();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case HbannotationPackage.PARAM_DEF__NAME:
-				setName((String)newValue);
-				return;
-			case HbannotationPackage.PARAM_DEF__TYPE:
-				setType((String)newValue);
-				return;
+		case HbannotationPackage.PARAM_DEF__NAME:
+			setName((String) newValue);
+			return;
+		case HbannotationPackage.PARAM_DEF__TYPE:
+			setType((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.PARAM_DEF__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case HbannotationPackage.PARAM_DEF__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
+		case HbannotationPackage.PARAM_DEF__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case HbannotationPackage.PARAM_DEF__TYPE:
+			setType(TYPE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.PARAM_DEF__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case HbannotationPackage.PARAM_DEF__TYPE:
-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
+		case HbannotationPackage.PARAM_DEF__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case HbannotationPackage.PARAM_DEF__TYPE:
+			return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (name: ");
@@ -214,4 +218,4 @@ public class ParamDefImpl extends HbAnnotationImpl implements ParamDef {
 		return result.toString();
 	}
 
-} //ParamDefImpl
+} // ParamDefImpl
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/ParameterImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/ParameterImpl.java
index 12345cf09..31abd8656 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/ParameterImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/ParameterImpl.java
@@ -13,24 +13,25 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage;
 import org.eclipse.emf.teneo.hibernate.hbannotation.Parameter;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Parameter</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Parameter</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.ParameterImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.ParameterImpl#getValue <em>Value</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.ParameterImpl#getName <em>Name</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.ParameterImpl#getValue <em>Value</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class ParameterImpl extends HbAnnotationImpl implements Parameter {
 	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -38,9 +39,9 @@ public class ParameterImpl extends HbAnnotationImpl implements Parameter {
 	protected static final String NAME_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -48,9 +49,9 @@ public class ParameterImpl extends HbAnnotationImpl implements Parameter {
 	protected String name = NAME_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -58,9 +59,9 @@ public class ParameterImpl extends HbAnnotationImpl implements Parameter {
 	protected static final String VALUE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -68,8 +69,8 @@ public class ParameterImpl extends HbAnnotationImpl implements Parameter {
 	protected String value = VALUE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ParameterImpl() {
@@ -77,8 +78,8 @@ public class ParameterImpl extends HbAnnotationImpl implements Parameter {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -87,8 +88,8 @@ public class ParameterImpl extends HbAnnotationImpl implements Parameter {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
@@ -96,20 +97,21 @@ public class ParameterImpl extends HbAnnotationImpl implements Parameter {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setName(String newName) {
 		String oldName = name;
 		name = newName;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.PARAMETER__NAME, oldName, name));
+			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.PARAMETER__NAME,
+					oldName, name));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getValue() {
@@ -117,93 +119,95 @@ public class ParameterImpl extends HbAnnotationImpl implements Parameter {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setValue(String newValue) {
 		String oldValue = value;
 		value = newValue;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.PARAMETER__VALUE, oldValue, value));
+			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.PARAMETER__VALUE,
+					oldValue, value));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case HbannotationPackage.PARAMETER__NAME:
-				return getName();
-			case HbannotationPackage.PARAMETER__VALUE:
-				return getValue();
+		case HbannotationPackage.PARAMETER__NAME:
+			return getName();
+		case HbannotationPackage.PARAMETER__VALUE:
+			return getValue();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case HbannotationPackage.PARAMETER__NAME:
-				setName((String)newValue);
-				return;
-			case HbannotationPackage.PARAMETER__VALUE:
-				setValue((String)newValue);
-				return;
+		case HbannotationPackage.PARAMETER__NAME:
+			setName((String) newValue);
+			return;
+		case HbannotationPackage.PARAMETER__VALUE:
+			setValue((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.PARAMETER__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case HbannotationPackage.PARAMETER__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
+		case HbannotationPackage.PARAMETER__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case HbannotationPackage.PARAMETER__VALUE:
+			setValue(VALUE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.PARAMETER__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case HbannotationPackage.PARAMETER__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
+		case HbannotationPackage.PARAMETER__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case HbannotationPackage.PARAMETER__VALUE:
+			return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (name: ");
@@ -214,4 +218,4 @@ public class ParameterImpl extends HbAnnotationImpl implements Parameter {
 		return result.toString();
 	}
 
-} //ParameterImpl
\ No newline at end of file
+} // ParameterImpl
\ No newline at end of file
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/ProxyImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/ProxyImpl.java
index d72556ef8..9e696f527 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/ProxyImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/ProxyImpl.java
@@ -13,24 +13,26 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage;
 import org.eclipse.emf.teneo.hibernate.hbannotation.Proxy;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Proxy</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Proxy</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.ProxyImpl#getProxyClass <em>Proxy Class</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.ProxyImpl#isLazy <em>Lazy</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.ProxyImpl#getProxyClass <em>Proxy Class
+ * </em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.ProxyImpl#isLazy <em>Lazy</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class ProxyImpl extends HbAnnotationImpl implements Proxy {
 	/**
-	 * The default value of the '{@link #getProxyClass() <em>Proxy Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getProxyClass() <em>Proxy Class</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getProxyClass()
 	 * @generated
 	 * @ordered
@@ -38,9 +40,9 @@ public class ProxyImpl extends HbAnnotationImpl implements Proxy {
 	protected static final String PROXY_CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getProxyClass() <em>Proxy Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getProxyClass() <em>Proxy Class</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getProxyClass()
 	 * @generated
 	 * @ordered
@@ -48,19 +50,21 @@ public class ProxyImpl extends HbAnnotationImpl implements Proxy {
 	protected String proxyClass = PROXY_CLASS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #isLazy() <em>Lazy</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The default value of the '{@link #isLazy() <em>Lazy</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #isLazy()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final boolean LAZY_EDEFAULT = true; // TODO The default value literal "" is not valid.
+	protected static final boolean LAZY_EDEFAULT = true; // TODO The default value
+																												// literal "" is not
+																												// valid.
 
 	/**
-	 * The cached value of the '{@link #isLazy() <em>Lazy</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #isLazy() <em>Lazy</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #isLazy()
 	 * @generated
 	 * @ordered
@@ -68,8 +72,8 @@ public class ProxyImpl extends HbAnnotationImpl implements Proxy {
 	protected boolean lazy = LAZY_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ProxyImpl() {
@@ -77,8 +81,8 @@ public class ProxyImpl extends HbAnnotationImpl implements Proxy {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -87,8 +91,8 @@ public class ProxyImpl extends HbAnnotationImpl implements Proxy {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getProxyClass() {
@@ -96,20 +100,21 @@ public class ProxyImpl extends HbAnnotationImpl implements Proxy {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setProxyClass(String newProxyClass) {
 		String oldProxyClass = proxyClass;
 		proxyClass = newProxyClass;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.PROXY__PROXY_CLASS, oldProxyClass, proxyClass));
+			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.PROXY__PROXY_CLASS,
+					oldProxyClass, proxyClass));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isLazy() {
@@ -117,93 +122,96 @@ public class ProxyImpl extends HbAnnotationImpl implements Proxy {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLazy(boolean newLazy) {
 		boolean oldLazy = lazy;
 		lazy = newLazy;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.PROXY__LAZY, oldLazy, lazy));
+			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.PROXY__LAZY,
+					oldLazy, lazy));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case HbannotationPackage.PROXY__PROXY_CLASS:
-				return getProxyClass();
-			case HbannotationPackage.PROXY__LAZY:
-				return isLazy();
+		case HbannotationPackage.PROXY__PROXY_CLASS:
+			return getProxyClass();
+		case HbannotationPackage.PROXY__LAZY:
+			return isLazy();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case HbannotationPackage.PROXY__PROXY_CLASS:
-				setProxyClass((String)newValue);
-				return;
-			case HbannotationPackage.PROXY__LAZY:
-				setLazy((Boolean)newValue);
-				return;
+		case HbannotationPackage.PROXY__PROXY_CLASS:
+			setProxyClass((String) newValue);
+			return;
+		case HbannotationPackage.PROXY__LAZY:
+			setLazy((Boolean) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.PROXY__PROXY_CLASS:
-				setProxyClass(PROXY_CLASS_EDEFAULT);
-				return;
-			case HbannotationPackage.PROXY__LAZY:
-				setLazy(LAZY_EDEFAULT);
-				return;
+		case HbannotationPackage.PROXY__PROXY_CLASS:
+			setProxyClass(PROXY_CLASS_EDEFAULT);
+			return;
+		case HbannotationPackage.PROXY__LAZY:
+			setLazy(LAZY_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.PROXY__PROXY_CLASS:
-				return PROXY_CLASS_EDEFAULT == null ? proxyClass != null : !PROXY_CLASS_EDEFAULT.equals(proxyClass);
-			case HbannotationPackage.PROXY__LAZY:
-				return lazy != LAZY_EDEFAULT;
+		case HbannotationPackage.PROXY__PROXY_CLASS:
+			return PROXY_CLASS_EDEFAULT == null ? proxyClass != null : !PROXY_CLASS_EDEFAULT
+					.equals(proxyClass);
+		case HbannotationPackage.PROXY__LAZY:
+			return lazy != LAZY_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (proxyClass: ");
@@ -214,4 +222,4 @@ public class ProxyImpl extends HbAnnotationImpl implements Proxy {
 		return result.toString();
 	}
 
-} //ProxyImpl
+} // ProxyImpl
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/TypeDefImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/TypeDefImpl.java
index 54912c068..dd58508c4 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/TypeDefImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/TypeDefImpl.java
@@ -18,25 +18,29 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.Parameter;
 import org.eclipse.emf.teneo.hibernate.hbannotation.TypeDef;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Type Def</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Type Def</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.TypeDefImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.TypeDefImpl#getParameters <em>Parameters</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.TypeDefImpl#getTypeClass <em>Type Class</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.TypeDefImpl#getName <em>Name</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.TypeDefImpl#getParameters <em>Parameters
+ * </em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.TypeDefImpl#getTypeClass <em>Type Class
+ * </em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class TypeDefImpl extends HbAnnotationImpl implements TypeDef {
 	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -44,9 +48,9 @@ public class TypeDefImpl extends HbAnnotationImpl implements TypeDef {
 	protected static final String NAME_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -54,9 +58,9 @@ public class TypeDefImpl extends HbAnnotationImpl implements TypeDef {
 	protected String name = NAME_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getParameters() <em>Parameters</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getParameters() <em>Parameters</em>}' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getParameters()
 	 * @generated
 	 * @ordered
@@ -64,9 +68,9 @@ public class TypeDefImpl extends HbAnnotationImpl implements TypeDef {
 	protected EList<Parameter> parameters;
 
 	/**
-	 * The default value of the '{@link #getTypeClass() <em>Type Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getTypeClass() <em>Type Class</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getTypeClass()
 	 * @generated
 	 * @ordered
@@ -74,9 +78,9 @@ public class TypeDefImpl extends HbAnnotationImpl implements TypeDef {
 	protected static final String TYPE_CLASS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTypeClass() <em>Type Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getTypeClass() <em>Type Class</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getTypeClass()
 	 * @generated
 	 * @ordered
@@ -84,8 +88,8 @@ public class TypeDefImpl extends HbAnnotationImpl implements TypeDef {
 	protected String typeClass = TYPE_CLASS_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected TypeDefImpl() {
@@ -93,8 +97,8 @@ public class TypeDefImpl extends HbAnnotationImpl implements TypeDef {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -103,8 +107,8 @@ public class TypeDefImpl extends HbAnnotationImpl implements TypeDef {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
@@ -112,32 +116,34 @@ public class TypeDefImpl extends HbAnnotationImpl implements TypeDef {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setName(String newName) {
 		String oldName = name;
 		name = newName;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.TYPE_DEF__NAME, oldName, name));
+			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.TYPE_DEF__NAME,
+					oldName, name));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Parameter> getParameters() {
 		if (parameters == null) {
-			parameters = new EObjectResolvingEList<Parameter>(Parameter.class, this, HbannotationPackage.TYPE_DEF__PARAMETERS);
+			parameters = new EObjectResolvingEList<Parameter>(Parameter.class, this,
+					HbannotationPackage.TYPE_DEF__PARAMETERS);
 		}
 		return parameters;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getTypeClass() {
@@ -145,105 +151,108 @@ public class TypeDefImpl extends HbAnnotationImpl implements TypeDef {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTypeClass(String newTypeClass) {
 		String oldTypeClass = typeClass;
 		typeClass = newTypeClass;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.TYPE_DEF__TYPE_CLASS, oldTypeClass, typeClass));
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbannotationPackage.TYPE_DEF__TYPE_CLASS, oldTypeClass, typeClass));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case HbannotationPackage.TYPE_DEF__NAME:
-				return getName();
-			case HbannotationPackage.TYPE_DEF__PARAMETERS:
-				return getParameters();
-			case HbannotationPackage.TYPE_DEF__TYPE_CLASS:
-				return getTypeClass();
+		case HbannotationPackage.TYPE_DEF__NAME:
+			return getName();
+		case HbannotationPackage.TYPE_DEF__PARAMETERS:
+			return getParameters();
+		case HbannotationPackage.TYPE_DEF__TYPE_CLASS:
+			return getTypeClass();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
-		@Override
+	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case HbannotationPackage.TYPE_DEF__NAME:
-				setName((String)newValue);
-				return;
-			case HbannotationPackage.TYPE_DEF__PARAMETERS:
-				getParameters().clear();
-				getParameters().addAll((Collection<? extends Parameter>)newValue);
-				return;
-			case HbannotationPackage.TYPE_DEF__TYPE_CLASS:
-				setTypeClass((String)newValue);
-				return;
+		case HbannotationPackage.TYPE_DEF__NAME:
+			setName((String) newValue);
+			return;
+		case HbannotationPackage.TYPE_DEF__PARAMETERS:
+			getParameters().clear();
+			getParameters().addAll((Collection<? extends Parameter>) newValue);
+			return;
+		case HbannotationPackage.TYPE_DEF__TYPE_CLASS:
+			setTypeClass((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.TYPE_DEF__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case HbannotationPackage.TYPE_DEF__PARAMETERS:
-				getParameters().clear();
-				return;
-			case HbannotationPackage.TYPE_DEF__TYPE_CLASS:
-				setTypeClass(TYPE_CLASS_EDEFAULT);
-				return;
+		case HbannotationPackage.TYPE_DEF__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case HbannotationPackage.TYPE_DEF__PARAMETERS:
+			getParameters().clear();
+			return;
+		case HbannotationPackage.TYPE_DEF__TYPE_CLASS:
+			setTypeClass(TYPE_CLASS_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.TYPE_DEF__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case HbannotationPackage.TYPE_DEF__PARAMETERS:
-				return parameters != null && !parameters.isEmpty();
-			case HbannotationPackage.TYPE_DEF__TYPE_CLASS:
-				return TYPE_CLASS_EDEFAULT == null ? typeClass != null : !TYPE_CLASS_EDEFAULT.equals(typeClass);
+		case HbannotationPackage.TYPE_DEF__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case HbannotationPackage.TYPE_DEF__PARAMETERS:
+			return parameters != null && !parameters.isEmpty();
+		case HbannotationPackage.TYPE_DEF__TYPE_CLASS:
+			return TYPE_CLASS_EDEFAULT == null ? typeClass != null : !TYPE_CLASS_EDEFAULT
+					.equals(typeClass);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (name: ");
@@ -254,4 +263,4 @@ public class TypeDefImpl extends HbAnnotationImpl implements TypeDef {
 		return result.toString();
 	}
 
-} //TypeDefImpl
\ No newline at end of file
+} // TypeDefImpl
\ No newline at end of file
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/TypeImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/TypeImpl.java
index b0379beb3..9af84ca55 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/TypeImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/TypeImpl.java
@@ -18,24 +18,26 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.Parameter;
 import org.eclipse.emf.teneo.hibernate.hbannotation.Type;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Type</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.TypeImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.TypeImpl#getParameters <em>Parameters</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.TypeImpl#getType <em>Type</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.TypeImpl#getParameters <em>Parameters
+ * </em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class TypeImpl extends HbAnnotationImpl implements Type {
 	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The default value of the '{@link #getType() <em>Type</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -43,9 +45,9 @@ public class TypeImpl extends HbAnnotationImpl implements Type {
 	protected static final String TYPE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -53,9 +55,9 @@ public class TypeImpl extends HbAnnotationImpl implements Type {
 	protected String type = TYPE_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getParameters() <em>Parameters</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getParameters() <em>Parameters</em>}' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getParameters()
 	 * @generated
 	 * @ordered
@@ -63,8 +65,8 @@ public class TypeImpl extends HbAnnotationImpl implements Type {
 	protected EList<Parameter> parameters;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected TypeImpl() {
@@ -72,8 +74,8 @@ public class TypeImpl extends HbAnnotationImpl implements Type {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -82,8 +84,8 @@ public class TypeImpl extends HbAnnotationImpl implements Type {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getType() {
@@ -91,107 +93,110 @@ public class TypeImpl extends HbAnnotationImpl implements Type {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setType(String newType) {
 		String oldType = type;
 		type = newType;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.TYPE__TYPE, oldType, type));
+			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.TYPE__TYPE,
+					oldType, type));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Parameter> getParameters() {
 		if (parameters == null) {
-			parameters = new EObjectResolvingEList<Parameter>(Parameter.class, this, HbannotationPackage.TYPE__PARAMETERS);
+			parameters = new EObjectResolvingEList<Parameter>(Parameter.class, this,
+					HbannotationPackage.TYPE__PARAMETERS);
 		}
 		return parameters;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case HbannotationPackage.TYPE__TYPE:
-				return getType();
-			case HbannotationPackage.TYPE__PARAMETERS:
-				return getParameters();
+		case HbannotationPackage.TYPE__TYPE:
+			return getType();
+		case HbannotationPackage.TYPE__PARAMETERS:
+			return getParameters();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
-		@Override
+	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case HbannotationPackage.TYPE__TYPE:
-				setType((String)newValue);
-				return;
-			case HbannotationPackage.TYPE__PARAMETERS:
-				getParameters().clear();
-				getParameters().addAll((Collection<? extends Parameter>)newValue);
-				return;
+		case HbannotationPackage.TYPE__TYPE:
+			setType((String) newValue);
+			return;
+		case HbannotationPackage.TYPE__PARAMETERS:
+			getParameters().clear();
+			getParameters().addAll((Collection<? extends Parameter>) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.TYPE__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case HbannotationPackage.TYPE__PARAMETERS:
-				getParameters().clear();
-				return;
+		case HbannotationPackage.TYPE__TYPE:
+			setType(TYPE_EDEFAULT);
+			return;
+		case HbannotationPackage.TYPE__PARAMETERS:
+			getParameters().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.TYPE__TYPE:
-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-			case HbannotationPackage.TYPE__PARAMETERS:
-				return parameters != null && !parameters.isEmpty();
+		case HbannotationPackage.TYPE__TYPE:
+			return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
+		case HbannotationPackage.TYPE__PARAMETERS:
+			return parameters != null && !parameters.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (type: ");
@@ -200,4 +205,4 @@ public class TypeImpl extends HbAnnotationImpl implements Type {
 		return result.toString();
 	}
 
-} //TypeImpl
\ No newline at end of file
+} // TypeImpl
\ No newline at end of file
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/WhereImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/WhereImpl.java
index 11cdbef04..1292d4c92 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/WhereImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/impl/WhereImpl.java
@@ -13,23 +13,23 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage;
 import org.eclipse.emf.teneo.hibernate.hbannotation.Where;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Where</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Where</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.WhereImpl#getClause <em>Clause</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.impl.WhereImpl#getClause <em>Clause</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class WhereImpl extends HbAnnotationImpl implements Where {
 	/**
-	 * The default value of the '{@link #getClause() <em>Clause</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getClause() <em>Clause</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getClause()
 	 * @generated
 	 * @ordered
@@ -37,9 +37,9 @@ public class WhereImpl extends HbAnnotationImpl implements Where {
 	protected static final String CLAUSE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getClause() <em>Clause</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getClause() <em>Clause</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getClause()
 	 * @generated
 	 * @ordered
@@ -47,8 +47,8 @@ public class WhereImpl extends HbAnnotationImpl implements Where {
 	protected String clause = CLAUSE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected WhereImpl() {
@@ -56,8 +56,8 @@ public class WhereImpl extends HbAnnotationImpl implements Where {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -66,8 +66,8 @@ public class WhereImpl extends HbAnnotationImpl implements Where {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getClause() {
@@ -75,83 +75,85 @@ public class WhereImpl extends HbAnnotationImpl implements Where {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClause(String newClause) {
 		String oldClause = clause;
 		clause = newClause;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.WHERE__CLAUSE, oldClause, clause));
+			eNotify(new ENotificationImpl(this, Notification.SET, HbannotationPackage.WHERE__CLAUSE,
+					oldClause, clause));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case HbannotationPackage.WHERE__CLAUSE:
-				return getClause();
+		case HbannotationPackage.WHERE__CLAUSE:
+			return getClause();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case HbannotationPackage.WHERE__CLAUSE:
-				setClause((String)newValue);
-				return;
+		case HbannotationPackage.WHERE__CLAUSE:
+			setClause((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.WHERE__CLAUSE:
-				setClause(CLAUSE_EDEFAULT);
-				return;
+		case HbannotationPackage.WHERE__CLAUSE:
+			setClause(CLAUSE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case HbannotationPackage.WHERE__CLAUSE:
-				return CLAUSE_EDEFAULT == null ? clause != null : !CLAUSE_EDEFAULT.equals(clause);
+		case HbannotationPackage.WHERE__CLAUSE:
+			return CLAUSE_EDEFAULT == null ? clause != null : !CLAUSE_EDEFAULT.equals(clause);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+		if (eIsProxy())
+			return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (clause: ");
@@ -160,4 +162,4 @@ public class WhereImpl extends HbAnnotationImpl implements Where {
 		return result.toString();
 	}
 
-} //WhereImpl
\ No newline at end of file
+} // WhereImpl
\ No newline at end of file
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbannotationAdapterFactory.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbannotationAdapterFactory.java
index f9c8c2641..28aeb8eef 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbannotationAdapterFactory.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbannotationAdapterFactory.java
@@ -11,7 +11,6 @@ import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.teneo.annotations.pannotation.PAnnotation;
-import org.eclipse.emf.teneo.hibernate.hbannotation.*;
 import org.eclipse.emf.teneo.hibernate.hbannotation.Any;
 import org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef;
 import org.eclipse.emf.teneo.hibernate.hbannotation.BatchSize;
@@ -47,26 +46,23 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.TypeDef;
 import org.eclipse.emf.teneo.hibernate.hbannotation.Where;
 
 /**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter
+ * <code>createXXX</code> method for each class of the model. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage
  * @generated
  */
 public class HbannotationAdapterFactory extends AdapterFactoryImpl {
 	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static HbannotationPackage modelPackage;
 
 	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HbannotationAdapterFactory() {
@@ -76,10 +72,10 @@ public class HbannotationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
+	 * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is
+	 * an instance object of the model. <!-- end-user-doc -->
+	 * 
 	 * @return whether this factory is applicable for the type of the object.
 	 * @generated
 	 */
@@ -89,177 +85,209 @@ public class HbannotationAdapterFactory extends AdapterFactoryImpl {
 			return true;
 		}
 		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
+			return ((EObject) object).eClass().getEPackage() == modelPackage;
 		}
 		return false;
 	}
 
 	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected HbannotationSwitch<Adapter> modelSwitch =
-		new HbannotationSwitch<Adapter>() {
-			@Override
-			public Adapter caseHbAnnotation(HbAnnotation object) {
-				return createHbAnnotationAdapter();
-			}
-			@Override
-			public Adapter caseCascade(Cascade object) {
-				return createCascadeAdapter();
-			}
-			@Override
-			public Adapter caseCollectionOfElements(CollectionOfElements object) {
-				return createCollectionOfElementsAdapter();
-			}
-			@Override
-			public Adapter caseHbMapKey(HbMapKey object) {
-				return createHbMapKeyAdapter();
-			}
-			@Override
-			public Adapter caseParameter(Parameter object) {
-				return createParameterAdapter();
-			}
-			@Override
-			public Adapter caseType(Type object) {
-				return createTypeAdapter();
-			}
-			@Override
-			public Adapter caseWhere(Where object) {
-				return createWhereAdapter();
-			}
-			@Override
-			public Adapter caseIdBag(IdBag object) {
-				return createIdBagAdapter();
-			}
-			@Override
-			public Adapter caseGenericGenerator(GenericGenerator object) {
-				return createGenericGeneratorAdapter();
-			}
-			@Override
-			public Adapter caseCache(Cache object) {
-				return createCacheAdapter();
-			}
-			@Override
-			public Adapter caseTypeDef(TypeDef object) {
-				return createTypeDefAdapter();
-			}
-			@Override
-			public Adapter caseFetch(Fetch object) {
-				return createFetchAdapter();
-			}
-			@Override
-			public Adapter caseOnDelete(OnDelete object) {
-				return createOnDeleteAdapter();
-			}
-			@Override
-			public Adapter caseProxy(Proxy object) {
-				return createProxyAdapter();
-			}
-			@Override
-			public Adapter caseIndex(Index object) {
-				return createIndexAdapter();
-			}
-			@Override
-			public Adapter caseGenerated(Generated object) {
-				return createGeneratedAdapter();
-			}
-			@Override
-			public Adapter caseNamedQuery(NamedQuery object) {
-				return createNamedQueryAdapter();
-			}
-			@Override
-			public Adapter caseFilter(Filter object) {
-				return createFilterAdapter();
-			}
-			@Override
-			public Adapter caseParamDef(ParamDef object) {
-				return createParamDefAdapter();
-			}
-			@Override
-			public Adapter caseFilterDef(FilterDef object) {
-				return createFilterDefAdapter();
-			}
-			@Override
-			public Adapter caseDiscriminatorFormula(DiscriminatorFormula object) {
-				return createDiscriminatorFormulaAdapter();
-			}
-			@Override
-			public Adapter caseNaturalId(NaturalId object) {
-				return createNaturalIdAdapter();
-			}
-			@Override
-			public Adapter caseMapKeyManyToMany(MapKeyManyToMany object) {
-				return createMapKeyManyToManyAdapter();
-			}
-			@Override
-			public Adapter caseForceDiscriminator(ForceDiscriminator object) {
-				return createForceDiscriminatorAdapter();
-			}
-			@Override
-			public Adapter caseImmutable(Immutable object) {
-				return createImmutableAdapter();
-			}
-			@Override
-			public Adapter caseFormula(Formula object) {
-				return createFormulaAdapter();
-			}
-			@Override
-			public Adapter caseNotFound(NotFound object) {
-				return createNotFoundAdapter();
-			}
-			@Override
-			public Adapter caseHbEntity(HbEntity object) {
-				return createHbEntityAdapter();
-			}
-			@Override
-			public Adapter caseBatchSize(BatchSize object) {
-				return createBatchSizeAdapter();
-			}
-			@Override
-			public Adapter caseAny(Any object) {
-				return createAnyAdapter();
-			}
-			@Override
-			public Adapter caseMetaValue(MetaValue object) {
-				return createMetaValueAdapter();
-			}
-			@Override
-			public Adapter caseAnyMetaDef(AnyMetaDef object) {
-				return createAnyMetaDefAdapter();
-			}
-			@Override
-			public Adapter casePAnnotation(PAnnotation object) {
-				return createPAnnotationAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
+	 * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	protected HbannotationSwitch<Adapter> modelSwitch = new HbannotationSwitch<Adapter>() {
+		@Override
+		public Adapter caseHbAnnotation(HbAnnotation object) {
+			return createHbAnnotationAdapter();
+		}
+
+		@Override
+		public Adapter caseCascade(Cascade object) {
+			return createCascadeAdapter();
+		}
+
+		@Override
+		public Adapter caseCollectionOfElements(CollectionOfElements object) {
+			return createCollectionOfElementsAdapter();
+		}
+
+		@Override
+		public Adapter caseHbMapKey(HbMapKey object) {
+			return createHbMapKeyAdapter();
+		}
+
+		@Override
+		public Adapter caseParameter(Parameter object) {
+			return createParameterAdapter();
+		}
+
+		@Override
+		public Adapter caseType(Type object) {
+			return createTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseWhere(Where object) {
+			return createWhereAdapter();
+		}
+
+		@Override
+		public Adapter caseIdBag(IdBag object) {
+			return createIdBagAdapter();
+		}
+
+		@Override
+		public Adapter caseGenericGenerator(GenericGenerator object) {
+			return createGenericGeneratorAdapter();
+		}
+
+		@Override
+		public Adapter caseCache(Cache object) {
+			return createCacheAdapter();
+		}
+
+		@Override
+		public Adapter caseTypeDef(TypeDef object) {
+			return createTypeDefAdapter();
+		}
+
+		@Override
+		public Adapter caseFetch(Fetch object) {
+			return createFetchAdapter();
+		}
+
+		@Override
+		public Adapter caseOnDelete(OnDelete object) {
+			return createOnDeleteAdapter();
+		}
+
+		@Override
+		public Adapter caseProxy(Proxy object) {
+			return createProxyAdapter();
+		}
+
+		@Override
+		public Adapter caseIndex(Index object) {
+			return createIndexAdapter();
+		}
+
+		@Override
+		public Adapter caseGenerated(Generated object) {
+			return createGeneratedAdapter();
+		}
+
+		@Override
+		public Adapter caseNamedQuery(NamedQuery object) {
+			return createNamedQueryAdapter();
+		}
+
+		@Override
+		public Adapter caseFilter(Filter object) {
+			return createFilterAdapter();
+		}
+
+		@Override
+		public Adapter caseParamDef(ParamDef object) {
+			return createParamDefAdapter();
+		}
+
+		@Override
+		public Adapter caseFilterDef(FilterDef object) {
+			return createFilterDefAdapter();
+		}
+
+		@Override
+		public Adapter caseDiscriminatorFormula(DiscriminatorFormula object) {
+			return createDiscriminatorFormulaAdapter();
+		}
+
+		@Override
+		public Adapter caseNaturalId(NaturalId object) {
+			return createNaturalIdAdapter();
+		}
+
+		@Override
+		public Adapter caseMapKeyManyToMany(MapKeyManyToMany object) {
+			return createMapKeyManyToManyAdapter();
+		}
+
+		@Override
+		public Adapter caseForceDiscriminator(ForceDiscriminator object) {
+			return createForceDiscriminatorAdapter();
+		}
+
+		@Override
+		public Adapter caseImmutable(Immutable object) {
+			return createImmutableAdapter();
+		}
+
+		@Override
+		public Adapter caseFormula(Formula object) {
+			return createFormulaAdapter();
+		}
+
+		@Override
+		public Adapter caseNotFound(NotFound object) {
+			return createNotFoundAdapter();
+		}
+
+		@Override
+		public Adapter caseHbEntity(HbEntity object) {
+			return createHbEntityAdapter();
+		}
+
+		@Override
+		public Adapter caseBatchSize(BatchSize object) {
+			return createBatchSizeAdapter();
+		}
+
+		@Override
+		public Adapter caseAny(Any object) {
+			return createAnyAdapter();
+		}
+
+		@Override
+		public Adapter caseMetaValue(MetaValue object) {
+			return createMetaValueAdapter();
+		}
+
+		@Override
+		public Adapter caseAnyMetaDef(AnyMetaDef object) {
+			return createAnyMetaDefAdapter();
+		}
+
+		@Override
+		public Adapter casePAnnotation(PAnnotation object) {
+			return createPAnnotationAdapter();
+		}
+
+		@Override
+		public Adapter defaultCase(EObject object) {
+			return createEObjectAdapter();
+		}
+	};
+
+	/**
+	 * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param target
+	 *          the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
 	 */
 	@Override
 	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
+		return modelSwitch.doSwitch((EObject) target);
 	}
 
-
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.HbAnnotation <em>Hb Annotation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.HbAnnotation <em>Hb Annotation</em>}'. <!--
+	 * begin-user-doc --> This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbAnnotation
 	 * @generated
@@ -269,11 +297,12 @@ public class HbannotationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Cascade <em>Cascade</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Cascade <em>Cascade</em>}'. <!--
+	 * begin-user-doc --> This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Cascade
 	 * @generated
@@ -283,11 +312,12 @@ public class HbannotationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.CollectionOfElements <em>Collection Of Elements</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.CollectionOfElements
+	 * <em>Collection Of Elements</em>}'. <!-- begin-user-doc --> This default implementation returns
+	 * null so that we can easily ignore cases; it's useful to ignore a case when inheritance will
+	 * catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.CollectionOfElements
 	 * @generated
@@ -297,11 +327,12 @@ public class HbannotationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.HbMapKey <em>Hb Map Key</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.HbMapKey <em>Hb Map Key</em>}'. <!--
+	 * begin-user-doc --> This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbMapKey
 	 * @generated
@@ -311,11 +342,12 @@ public class HbannotationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Parameter <em>Parameter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Parameter <em>Parameter</em>}'. <!--
+	 * begin-user-doc --> This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Parameter
 	 * @generated
@@ -325,11 +357,11 @@ public class HbannotationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Type <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Type <em>Type</em>}'. <!-- begin-user-doc
+	 * --> This default implementation returns null so that we can easily ignore cases; it's useful to
+	 * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Type
 	 * @generated
@@ -339,11 +371,11 @@ public class HbannotationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Where <em>Where</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Where <em>Where</em>}'. <!-- begin-user-doc
+	 * --> This default implementation returns null so that we can easily ignore cases; it's useful to
+	 * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Where
 	 * @generated
@@ -353,11 +385,12 @@ public class HbannotationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.IdBag <em>Id Bag</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.IdBag <em>Id Bag</em>} '. <!--
+	 * begin-user-doc --> This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.IdBag
 	 * @generated
@@ -367,11 +400,12 @@ public class HbannotationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator <em>Generic Generator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator
+	 * <em>Generic Generator</em>}'. <!-- begin-user-doc --> This default implementation returns null
+	 * so that we can easily ignore cases; it's useful to ignore a case when inheritance will catch
+	 * all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator
 	 * @generated
@@ -381,11 +415,11 @@ public class HbannotationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Cache <em>Cache</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Cache <em>Cache</em>}'. <!-- begin-user-doc
+	 * --> This default implementation returns null so that we can easily ignore cases; it's useful to
+	 * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Cache
 	 * @generated
@@ -395,11 +429,12 @@ public class HbannotationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.TypeDef <em>Type Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.TypeDef <em>Type Def</em>}'. <!--
+	 * begin-user-doc --> This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.TypeDef
 	 * @generated
@@ -409,11 +444,11 @@ public class HbannotationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Fetch <em>Fetch</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Fetch <em>Fetch</em>}'. <!-- begin-user-doc
+	 * --> This default implementation returns null so that we can easily ignore cases; it's useful to
+	 * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Fetch
 	 * @generated
@@ -423,11 +458,12 @@ public class HbannotationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.OnDelete <em>On Delete</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.OnDelete <em>On Delete</em>}'. <!--
+	 * begin-user-doc --> This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.OnDelete
 	 * @generated
@@ -437,11 +473,11 @@ public class HbannotationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Proxy <em>Proxy</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Proxy <em>Proxy</em>}'. <!-- begin-user-doc
+	 * --> This default implementation returns null so that we can easily ignore cases; it's useful to
+	 * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Proxy
 	 * @generated
@@ -451,11 +487,11 @@ public class HbannotationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Index <em>Index</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Index <em>Index</em>}'. <!-- begin-user-doc
+	 * --> This default implementation returns null so that we can easily ignore cases; it's useful to
+	 * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Index
 	 * @generated
@@ -465,11 +501,12 @@ public class HbannotationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Generated <em>Generated</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Generated <em>Generated</em>}'. <!--
+	 * begin-user-doc --> This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Generated
 	 * @generated
@@ -479,11 +516,12 @@ public class HbannotationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.NamedQuery <em>Named Query</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.NamedQuery <em>Named Query</em>}'. <!--
+	 * begin-user-doc --> This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.NamedQuery
 	 * @generated
@@ -493,11 +531,12 @@ public class HbannotationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Filter <em>Filter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Filter <em>Filter</em>} '. <!--
+	 * begin-user-doc --> This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Filter
 	 * @generated
@@ -507,11 +546,12 @@ public class HbannotationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.ParamDef <em>Param Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.ParamDef <em>Param Def</em>}'. <!--
+	 * begin-user-doc --> This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.ParamDef
 	 * @generated
@@ -521,11 +561,12 @@ public class HbannotationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.FilterDef <em>Filter Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.FilterDef <em>Filter Def</em>}'. <!--
+	 * begin-user-doc --> This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.FilterDef
 	 * @generated
@@ -535,11 +576,12 @@ public class HbannotationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.DiscriminatorFormula <em>Discriminator Formula</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.DiscriminatorFormula
+	 * <em>Discriminator Formula</em>}'. <!-- begin-user-doc --> This default implementation returns
+	 * null so that we can easily ignore cases; it's useful to ignore a case when inheritance will
+	 * catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.DiscriminatorFormula
 	 * @generated
@@ -549,11 +591,12 @@ public class HbannotationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.NaturalId <em>Natural Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.NaturalId <em>Natural Id</em>}'. <!--
+	 * begin-user-doc --> This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.NaturalId
 	 * @generated
@@ -563,11 +606,12 @@ public class HbannotationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.MapKeyManyToMany <em>Map Key Many To Many</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.MapKeyManyToMany
+	 * <em>Map Key Many To Many</em>}'. <!-- begin-user-doc --> This default implementation returns
+	 * null so that we can easily ignore cases; it's useful to ignore a case when inheritance will
+	 * catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.MapKeyManyToMany
 	 * @generated
@@ -577,11 +621,12 @@ public class HbannotationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.ForceDiscriminator <em>Force Discriminator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.ForceDiscriminator
+	 * <em>Force Discriminator</em>}'. <!-- begin-user-doc --> This default implementation returns
+	 * null so that we can easily ignore cases; it's useful to ignore a case when inheritance will
+	 * catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.ForceDiscriminator
 	 * @generated
@@ -591,11 +636,12 @@ public class HbannotationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Immutable <em>Immutable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Immutable <em>Immutable</em>}'. <!--
+	 * begin-user-doc --> This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Immutable
 	 * @generated
@@ -605,11 +651,12 @@ public class HbannotationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Formula <em>Formula</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Formula <em>Formula</em>}'. <!--
+	 * begin-user-doc --> This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Formula
 	 * @generated
@@ -619,11 +666,12 @@ public class HbannotationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.NotFound <em>Not Found</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.NotFound <em>Not Found</em>}'. <!--
+	 * begin-user-doc --> This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.NotFound
 	 * @generated
@@ -633,11 +681,12 @@ public class HbannotationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity <em>Hb Entity</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity <em>Hb Entity</em>}'. <!--
+	 * begin-user-doc --> This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbEntity
 	 * @generated
@@ -647,11 +696,12 @@ public class HbannotationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.BatchSize <em>Batch Size</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.BatchSize <em>Batch Size</em>}'. <!--
+	 * begin-user-doc --> This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.BatchSize
 	 * @generated
@@ -661,11 +711,11 @@ public class HbannotationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.Any <em>Any</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Any <em>Any</em>}'. <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases; it's useful to
+	 * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.Any
 	 * @generated
@@ -675,11 +725,12 @@ public class HbannotationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.MetaValue <em>Meta Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.MetaValue <em>Meta Value</em>}'. <!--
+	 * begin-user-doc --> This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.MetaValue
 	 * @generated
@@ -689,11 +740,12 @@ public class HbannotationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef <em>Any Meta Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef <em>Any Meta Def</em>}'. <!--
+	 * begin-user-doc --> This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef
 	 * @generated
@@ -703,11 +755,12 @@ public class HbannotationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.annotations.pannotation.PAnnotation <em>PAnnotation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.annotations.pannotation.PAnnotation <em>PAnnotation</em>}'. <!--
+	 * begin-user-doc --> This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.annotations.pannotation.PAnnotation
 	 * @generated
@@ -717,10 +770,9 @@ public class HbannotationAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation
+	 * returns null. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @generated
 	 */
@@ -728,4 +780,4 @@ public class HbannotationAdapterFactory extends AdapterFactoryImpl {
 		return null;
 	}
 
-} //HbannotationAdapterFactory
+} // HbannotationAdapterFactory
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbannotationSwitch.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbannotationSwitch.java
index 48037159b..00957c33b 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbannotationSwitch.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbannotationSwitch.java
@@ -51,20 +51,21 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.Where;
  * each class of the model, starting with the actual class of the object and proceeding up the
  * inheritance hierarchy until a non-null result is returned, which is the result of the switch.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage
  * @generated
  */
 public class HbannotationSwitch<T> {
 	/**
-	 * The cached model package
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static HbannotationPackage modelPackage;
 
 	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HbannotationSwitch() {
@@ -74,9 +75,9 @@ public class HbannotationSwitch<T> {
 	}
 
 	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it
+	 * yields that result. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
@@ -85,298 +86,394 @@ public class HbannotationSwitch<T> {
 	}
 
 	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it
+	 * yields that result. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
 	protected T doSwitch(EClass theEClass, EObject theEObject) {
 		if (theEClass.eContainer() == modelPackage) {
 			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
+		} else {
 			List<EClass> eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch(eSuperTypes.get(0), theEObject);
+			return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0),
+					theEObject);
 		}
 	}
 
 	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it
+	 * yields that result. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
 	protected T doSwitch(int classifierID, EObject theEObject) {
 		switch (classifierID) {
-			case HbannotationPackage.HB_ANNOTATION: {
-				HbAnnotation hbAnnotation = (HbAnnotation)theEObject;
-				T result = caseHbAnnotation(hbAnnotation);
-				if (result == null) result = casePAnnotation(hbAnnotation);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HbannotationPackage.CASCADE: {
-				Cascade cascade = (Cascade)theEObject;
-				T result = caseCascade(cascade);
-				if (result == null) result = caseHbAnnotation(cascade);
-				if (result == null) result = casePAnnotation(cascade);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HbannotationPackage.COLLECTION_OF_ELEMENTS: {
-				CollectionOfElements collectionOfElements = (CollectionOfElements)theEObject;
-				T result = caseCollectionOfElements(collectionOfElements);
-				if (result == null) result = caseHbAnnotation(collectionOfElements);
-				if (result == null) result = casePAnnotation(collectionOfElements);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HbannotationPackage.HB_MAP_KEY: {
-				HbMapKey hbMapKey = (HbMapKey)theEObject;
-				T result = caseHbMapKey(hbMapKey);
-				if (result == null) result = caseHbAnnotation(hbMapKey);
-				if (result == null) result = casePAnnotation(hbMapKey);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HbannotationPackage.PARAMETER: {
-				Parameter parameter = (Parameter)theEObject;
-				T result = caseParameter(parameter);
-				if (result == null) result = caseHbAnnotation(parameter);
-				if (result == null) result = casePAnnotation(parameter);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HbannotationPackage.TYPE: {
-				Type type = (Type)theEObject;
-				T result = caseType(type);
-				if (result == null) result = caseHbAnnotation(type);
-				if (result == null) result = casePAnnotation(type);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HbannotationPackage.WHERE: {
-				Where where = (Where)theEObject;
-				T result = caseWhere(where);
-				if (result == null) result = caseHbAnnotation(where);
-				if (result == null) result = casePAnnotation(where);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HbannotationPackage.ID_BAG: {
-				IdBag idBag = (IdBag)theEObject;
-				T result = caseIdBag(idBag);
-				if (result == null) result = caseHbAnnotation(idBag);
-				if (result == null) result = casePAnnotation(idBag);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HbannotationPackage.GENERIC_GENERATOR: {
-				GenericGenerator genericGenerator = (GenericGenerator)theEObject;
-				T result = caseGenericGenerator(genericGenerator);
-				if (result == null) result = caseHbAnnotation(genericGenerator);
-				if (result == null) result = casePAnnotation(genericGenerator);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HbannotationPackage.CACHE: {
-				Cache cache = (Cache)theEObject;
-				T result = caseCache(cache);
-				if (result == null) result = caseHbAnnotation(cache);
-				if (result == null) result = casePAnnotation(cache);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HbannotationPackage.TYPE_DEF: {
-				TypeDef typeDef = (TypeDef)theEObject;
-				T result = caseTypeDef(typeDef);
-				if (result == null) result = caseHbAnnotation(typeDef);
-				if (result == null) result = casePAnnotation(typeDef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HbannotationPackage.FETCH: {
-				Fetch fetch = (Fetch)theEObject;
-				T result = caseFetch(fetch);
-				if (result == null) result = caseHbAnnotation(fetch);
-				if (result == null) result = casePAnnotation(fetch);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HbannotationPackage.ON_DELETE: {
-				OnDelete onDelete = (OnDelete)theEObject;
-				T result = caseOnDelete(onDelete);
-				if (result == null) result = caseHbAnnotation(onDelete);
-				if (result == null) result = casePAnnotation(onDelete);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HbannotationPackage.PROXY: {
-				Proxy proxy = (Proxy)theEObject;
-				T result = caseProxy(proxy);
-				if (result == null) result = caseHbAnnotation(proxy);
-				if (result == null) result = casePAnnotation(proxy);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HbannotationPackage.INDEX: {
-				Index index = (Index)theEObject;
-				T result = caseIndex(index);
-				if (result == null) result = caseHbAnnotation(index);
-				if (result == null) result = casePAnnotation(index);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HbannotationPackage.GENERATED: {
-				Generated generated = (Generated)theEObject;
-				T result = caseGenerated(generated);
-				if (result == null) result = caseHbAnnotation(generated);
-				if (result == null) result = casePAnnotation(generated);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HbannotationPackage.NAMED_QUERY: {
-				NamedQuery namedQuery = (NamedQuery)theEObject;
-				T result = caseNamedQuery(namedQuery);
-				if (result == null) result = caseHbAnnotation(namedQuery);
-				if (result == null) result = casePAnnotation(namedQuery);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HbannotationPackage.FILTER: {
-				Filter filter = (Filter)theEObject;
-				T result = caseFilter(filter);
-				if (result == null) result = caseHbAnnotation(filter);
-				if (result == null) result = casePAnnotation(filter);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HbannotationPackage.PARAM_DEF: {
-				ParamDef paramDef = (ParamDef)theEObject;
-				T result = caseParamDef(paramDef);
-				if (result == null) result = caseHbAnnotation(paramDef);
-				if (result == null) result = casePAnnotation(paramDef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HbannotationPackage.FILTER_DEF: {
-				FilterDef filterDef = (FilterDef)theEObject;
-				T result = caseFilterDef(filterDef);
-				if (result == null) result = caseHbAnnotation(filterDef);
-				if (result == null) result = casePAnnotation(filterDef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HbannotationPackage.DISCRIMINATOR_FORMULA: {
-				DiscriminatorFormula discriminatorFormula = (DiscriminatorFormula)theEObject;
-				T result = caseDiscriminatorFormula(discriminatorFormula);
-				if (result == null) result = caseHbAnnotation(discriminatorFormula);
-				if (result == null) result = casePAnnotation(discriminatorFormula);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HbannotationPackage.NATURAL_ID: {
-				NaturalId naturalId = (NaturalId)theEObject;
-				T result = caseNaturalId(naturalId);
-				if (result == null) result = caseHbAnnotation(naturalId);
-				if (result == null) result = casePAnnotation(naturalId);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HbannotationPackage.MAP_KEY_MANY_TO_MANY: {
-				MapKeyManyToMany mapKeyManyToMany = (MapKeyManyToMany)theEObject;
-				T result = caseMapKeyManyToMany(mapKeyManyToMany);
-				if (result == null) result = caseHbAnnotation(mapKeyManyToMany);
-				if (result == null) result = casePAnnotation(mapKeyManyToMany);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HbannotationPackage.FORCE_DISCRIMINATOR: {
-				ForceDiscriminator forceDiscriminator = (ForceDiscriminator)theEObject;
-				T result = caseForceDiscriminator(forceDiscriminator);
-				if (result == null) result = caseHbAnnotation(forceDiscriminator);
-				if (result == null) result = casePAnnotation(forceDiscriminator);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HbannotationPackage.IMMUTABLE: {
-				Immutable immutable = (Immutable)theEObject;
-				T result = caseImmutable(immutable);
-				if (result == null) result = caseHbAnnotation(immutable);
-				if (result == null) result = casePAnnotation(immutable);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HbannotationPackage.FORMULA: {
-				Formula formula = (Formula)theEObject;
-				T result = caseFormula(formula);
-				if (result == null) result = caseHbAnnotation(formula);
-				if (result == null) result = casePAnnotation(formula);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HbannotationPackage.NOT_FOUND: {
-				NotFound notFound = (NotFound)theEObject;
-				T result = caseNotFound(notFound);
-				if (result == null) result = caseHbAnnotation(notFound);
-				if (result == null) result = casePAnnotation(notFound);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HbannotationPackage.HB_ENTITY: {
-				HbEntity hbEntity = (HbEntity)theEObject;
-				T result = caseHbEntity(hbEntity);
-				if (result == null) result = caseHbAnnotation(hbEntity);
-				if (result == null) result = casePAnnotation(hbEntity);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HbannotationPackage.BATCH_SIZE: {
-				BatchSize batchSize = (BatchSize)theEObject;
-				T result = caseBatchSize(batchSize);
-				if (result == null) result = caseHbAnnotation(batchSize);
-				if (result == null) result = casePAnnotation(batchSize);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HbannotationPackage.ANY: {
-				Any any = (Any)theEObject;
-				T result = caseAny(any);
-				if (result == null) result = caseHbAnnotation(any);
-				if (result == null) result = casePAnnotation(any);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HbannotationPackage.META_VALUE: {
-				MetaValue metaValue = (MetaValue)theEObject;
-				T result = caseMetaValue(metaValue);
-				if (result == null) result = caseHbAnnotation(metaValue);
-				if (result == null) result = casePAnnotation(metaValue);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HbannotationPackage.ANY_META_DEF: {
-				AnyMetaDef anyMetaDef = (AnyMetaDef)theEObject;
-				T result = caseAnyMetaDef(anyMetaDef);
-				if (result == null) result = caseHbAnnotation(anyMetaDef);
-				if (result == null) result = casePAnnotation(anyMetaDef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Hb Annotation</em>'.
-	 * <!-- begin-user-doc --> This implementation returns null; returning a non-null result will
-	 * terminate the switch. <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Hb Annotation</em>'.
+		case HbannotationPackage.HB_ANNOTATION: {
+			HbAnnotation hbAnnotation = (HbAnnotation) theEObject;
+			T result = caseHbAnnotation(hbAnnotation);
+			if (result == null)
+				result = casePAnnotation(hbAnnotation);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HbannotationPackage.CASCADE: {
+			Cascade cascade = (Cascade) theEObject;
+			T result = caseCascade(cascade);
+			if (result == null)
+				result = caseHbAnnotation(cascade);
+			if (result == null)
+				result = casePAnnotation(cascade);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HbannotationPackage.COLLECTION_OF_ELEMENTS: {
+			CollectionOfElements collectionOfElements = (CollectionOfElements) theEObject;
+			T result = caseCollectionOfElements(collectionOfElements);
+			if (result == null)
+				result = caseHbAnnotation(collectionOfElements);
+			if (result == null)
+				result = casePAnnotation(collectionOfElements);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HbannotationPackage.HB_MAP_KEY: {
+			HbMapKey hbMapKey = (HbMapKey) theEObject;
+			T result = caseHbMapKey(hbMapKey);
+			if (result == null)
+				result = caseHbAnnotation(hbMapKey);
+			if (result == null)
+				result = casePAnnotation(hbMapKey);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HbannotationPackage.PARAMETER: {
+			Parameter parameter = (Parameter) theEObject;
+			T result = caseParameter(parameter);
+			if (result == null)
+				result = caseHbAnnotation(parameter);
+			if (result == null)
+				result = casePAnnotation(parameter);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HbannotationPackage.TYPE: {
+			Type type = (Type) theEObject;
+			T result = caseType(type);
+			if (result == null)
+				result = caseHbAnnotation(type);
+			if (result == null)
+				result = casePAnnotation(type);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HbannotationPackage.WHERE: {
+			Where where = (Where) theEObject;
+			T result = caseWhere(where);
+			if (result == null)
+				result = caseHbAnnotation(where);
+			if (result == null)
+				result = casePAnnotation(where);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HbannotationPackage.ID_BAG: {
+			IdBag idBag = (IdBag) theEObject;
+			T result = caseIdBag(idBag);
+			if (result == null)
+				result = caseHbAnnotation(idBag);
+			if (result == null)
+				result = casePAnnotation(idBag);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HbannotationPackage.GENERIC_GENERATOR: {
+			GenericGenerator genericGenerator = (GenericGenerator) theEObject;
+			T result = caseGenericGenerator(genericGenerator);
+			if (result == null)
+				result = caseHbAnnotation(genericGenerator);
+			if (result == null)
+				result = casePAnnotation(genericGenerator);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HbannotationPackage.CACHE: {
+			Cache cache = (Cache) theEObject;
+			T result = caseCache(cache);
+			if (result == null)
+				result = caseHbAnnotation(cache);
+			if (result == null)
+				result = casePAnnotation(cache);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HbannotationPackage.TYPE_DEF: {
+			TypeDef typeDef = (TypeDef) theEObject;
+			T result = caseTypeDef(typeDef);
+			if (result == null)
+				result = caseHbAnnotation(typeDef);
+			if (result == null)
+				result = casePAnnotation(typeDef);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HbannotationPackage.FETCH: {
+			Fetch fetch = (Fetch) theEObject;
+			T result = caseFetch(fetch);
+			if (result == null)
+				result = caseHbAnnotation(fetch);
+			if (result == null)
+				result = casePAnnotation(fetch);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HbannotationPackage.ON_DELETE: {
+			OnDelete onDelete = (OnDelete) theEObject;
+			T result = caseOnDelete(onDelete);
+			if (result == null)
+				result = caseHbAnnotation(onDelete);
+			if (result == null)
+				result = casePAnnotation(onDelete);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HbannotationPackage.PROXY: {
+			Proxy proxy = (Proxy) theEObject;
+			T result = caseProxy(proxy);
+			if (result == null)
+				result = caseHbAnnotation(proxy);
+			if (result == null)
+				result = casePAnnotation(proxy);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HbannotationPackage.INDEX: {
+			Index index = (Index) theEObject;
+			T result = caseIndex(index);
+			if (result == null)
+				result = caseHbAnnotation(index);
+			if (result == null)
+				result = casePAnnotation(index);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HbannotationPackage.GENERATED: {
+			Generated generated = (Generated) theEObject;
+			T result = caseGenerated(generated);
+			if (result == null)
+				result = caseHbAnnotation(generated);
+			if (result == null)
+				result = casePAnnotation(generated);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HbannotationPackage.NAMED_QUERY: {
+			NamedQuery namedQuery = (NamedQuery) theEObject;
+			T result = caseNamedQuery(namedQuery);
+			if (result == null)
+				result = caseHbAnnotation(namedQuery);
+			if (result == null)
+				result = casePAnnotation(namedQuery);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HbannotationPackage.FILTER: {
+			Filter filter = (Filter) theEObject;
+			T result = caseFilter(filter);
+			if (result == null)
+				result = caseHbAnnotation(filter);
+			if (result == null)
+				result = casePAnnotation(filter);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HbannotationPackage.PARAM_DEF: {
+			ParamDef paramDef = (ParamDef) theEObject;
+			T result = caseParamDef(paramDef);
+			if (result == null)
+				result = caseHbAnnotation(paramDef);
+			if (result == null)
+				result = casePAnnotation(paramDef);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HbannotationPackage.FILTER_DEF: {
+			FilterDef filterDef = (FilterDef) theEObject;
+			T result = caseFilterDef(filterDef);
+			if (result == null)
+				result = caseHbAnnotation(filterDef);
+			if (result == null)
+				result = casePAnnotation(filterDef);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HbannotationPackage.DISCRIMINATOR_FORMULA: {
+			DiscriminatorFormula discriminatorFormula = (DiscriminatorFormula) theEObject;
+			T result = caseDiscriminatorFormula(discriminatorFormula);
+			if (result == null)
+				result = caseHbAnnotation(discriminatorFormula);
+			if (result == null)
+				result = casePAnnotation(discriminatorFormula);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HbannotationPackage.NATURAL_ID: {
+			NaturalId naturalId = (NaturalId) theEObject;
+			T result = caseNaturalId(naturalId);
+			if (result == null)
+				result = caseHbAnnotation(naturalId);
+			if (result == null)
+				result = casePAnnotation(naturalId);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HbannotationPackage.MAP_KEY_MANY_TO_MANY: {
+			MapKeyManyToMany mapKeyManyToMany = (MapKeyManyToMany) theEObject;
+			T result = caseMapKeyManyToMany(mapKeyManyToMany);
+			if (result == null)
+				result = caseHbAnnotation(mapKeyManyToMany);
+			if (result == null)
+				result = casePAnnotation(mapKeyManyToMany);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HbannotationPackage.FORCE_DISCRIMINATOR: {
+			ForceDiscriminator forceDiscriminator = (ForceDiscriminator) theEObject;
+			T result = caseForceDiscriminator(forceDiscriminator);
+			if (result == null)
+				result = caseHbAnnotation(forceDiscriminator);
+			if (result == null)
+				result = casePAnnotation(forceDiscriminator);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HbannotationPackage.IMMUTABLE: {
+			Immutable immutable = (Immutable) theEObject;
+			T result = caseImmutable(immutable);
+			if (result == null)
+				result = caseHbAnnotation(immutable);
+			if (result == null)
+				result = casePAnnotation(immutable);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HbannotationPackage.FORMULA: {
+			Formula formula = (Formula) theEObject;
+			T result = caseFormula(formula);
+			if (result == null)
+				result = caseHbAnnotation(formula);
+			if (result == null)
+				result = casePAnnotation(formula);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HbannotationPackage.NOT_FOUND: {
+			NotFound notFound = (NotFound) theEObject;
+			T result = caseNotFound(notFound);
+			if (result == null)
+				result = caseHbAnnotation(notFound);
+			if (result == null)
+				result = casePAnnotation(notFound);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HbannotationPackage.HB_ENTITY: {
+			HbEntity hbEntity = (HbEntity) theEObject;
+			T result = caseHbEntity(hbEntity);
+			if (result == null)
+				result = caseHbAnnotation(hbEntity);
+			if (result == null)
+				result = casePAnnotation(hbEntity);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HbannotationPackage.BATCH_SIZE: {
+			BatchSize batchSize = (BatchSize) theEObject;
+			T result = caseBatchSize(batchSize);
+			if (result == null)
+				result = caseHbAnnotation(batchSize);
+			if (result == null)
+				result = casePAnnotation(batchSize);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HbannotationPackage.ANY: {
+			Any any = (Any) theEObject;
+			T result = caseAny(any);
+			if (result == null)
+				result = caseHbAnnotation(any);
+			if (result == null)
+				result = casePAnnotation(any);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HbannotationPackage.META_VALUE: {
+			MetaValue metaValue = (MetaValue) theEObject;
+			T result = caseMetaValue(metaValue);
+			if (result == null)
+				result = caseHbAnnotation(metaValue);
+			if (result == null)
+				result = casePAnnotation(metaValue);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HbannotationPackage.ANY_META_DEF: {
+			AnyMetaDef anyMetaDef = (AnyMetaDef) theEObject;
+			T result = caseAnyMetaDef(anyMetaDef);
+			if (result == null)
+				result = caseHbAnnotation(anyMetaDef);
+			if (result == null)
+				result = casePAnnotation(anyMetaDef);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of ' <em>Hb Annotation</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>Hb Annotation</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -385,13 +482,13 @@ public class HbannotationSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Cascade</em>'. <!--
-	 * begin-user-doc --> This implementation returns null; returning a non-null result will
-	 * terminate the switch. <!-- end-user-doc -->
+	 * Returns the result of interpreting the object as an instance of ' <em>Cascade</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
 	 * 
 	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Cascade</em>'.
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>Cascade</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -400,11 +497,14 @@ public class HbannotationSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Collection Of Elements</em>'.
-	 * <!-- begin-user-doc --> This implementation returns null; returning a non-null result will
-	 * terminate the switch. <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Collection Of Elements</em>'.
+	 * Returns the result of interpreting the object as an instance of '
+	 * <em>Collection Of Elements</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of '
+	 *         <em>Collection Of Elements</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -413,13 +513,13 @@ public class HbannotationSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Hb Map Key</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Hb Map Key</em>'.
+	 * Returns the result of interpreting the object as an instance of ' <em>Hb Map Key</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>Hb Map Key</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -428,11 +528,13 @@ public class HbannotationSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Parameter</em>'.
-	 * <!-- begin-user-doc --> This implementation returns null; returning a non-null result will
-	 * terminate the switch. <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Parameter</em>'.
+	 * Returns the result of interpreting the object as an instance of ' <em>Parameter</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>Parameter</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -441,13 +543,13 @@ public class HbannotationSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Type</em>'. <!--
-	 * begin-user-doc --> This implementation returns null; returning a non-null result will
-	 * terminate the switch. <!-- end-user-doc -->
+	 * Returns the result of interpreting the object as an instance of ' <em>Type</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
 	 * 
 	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Type</em>'.
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -456,13 +558,13 @@ public class HbannotationSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Where</em>'. <!--
-	 * begin-user-doc --> This implementation returns null; returning a non-null result will
-	 * terminate the switch. <!-- end-user-doc -->
+	 * Returns the result of interpreting the object as an instance of ' <em>Where</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
 	 * 
 	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Where</em>'.
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>Where</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -471,13 +573,13 @@ public class HbannotationSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Id Bag</em>'. <!--
-	 * begin-user-doc --> This implementation returns null; returning a non-null result will
-	 * terminate the switch. <!-- end-user-doc -->
+	 * Returns the result of interpreting the object as an instance of ' <em>Id Bag</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
 	 * 
 	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Id Bag</em>'.
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>Id Bag</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -486,11 +588,13 @@ public class HbannotationSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Generic Generator</em>'.
+	 * Returns the result of interpreting the object as an instance of ' <em>Generic Generator</em>'.
 	 * <!-- begin-user-doc --> This implementation returns null; returning a non-null result will
 	 * terminate the switch. <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Generic Generator</em>'.
+	 * 
+	 * @param object
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>Generic Generator</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -499,13 +603,13 @@ public class HbannotationSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Cache</em>'. <!--
-	 * begin-user-doc --> This implementation returns null; returning a non-null result will
-	 * terminate the switch. <!-- end-user-doc -->
+	 * Returns the result of interpreting the object as an instance of ' <em>Cache</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
 	 * 
 	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Cache</em>'.
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>Cache</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -514,13 +618,13 @@ public class HbannotationSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Type Def</em>'. <!--
-	 * begin-user-doc --> This implementation returns null; returning a non-null result will
-	 * terminate the switch. <!-- end-user-doc -->
+	 * Returns the result of interpreting the object as an instance of ' <em>Type Def</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
 	 * 
 	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Type Def</em>'.
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>Type Def</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -529,13 +633,13 @@ public class HbannotationSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Fetch</em>'. <!--
-	 * begin-user-doc --> This implementation returns null; returning a non-null result will
-	 * terminate the switch. <!-- end-user-doc -->
+	 * Returns the result of interpreting the object as an instance of ' <em>Fetch</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
 	 * 
 	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Fetch</em>'.
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>Fetch</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -544,11 +648,13 @@ public class HbannotationSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>On Delete</em>'.
-	 * <!-- begin-user-doc --> This implementation returns null; returning a non-null result will
-	 * terminate the switch. <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>On Delete</em>'.
+	 * Returns the result of interpreting the object as an instance of ' <em>On Delete</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>On Delete</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -557,13 +663,13 @@ public class HbannotationSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Proxy</em>'. <!--
-	 * begin-user-doc --> This implementation returns null; returning a non-null result will
-	 * terminate the switch. <!-- end-user-doc -->
+	 * Returns the result of interpreting the object as an instance of ' <em>Proxy</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
 	 * 
 	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Proxy</em>'.
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>Proxy</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -572,13 +678,13 @@ public class HbannotationSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Index</em>'. <!--
-	 * begin-user-doc --> This implementation returns null; returning a non-null result will
-	 * terminate the switch. <!-- end-user-doc -->
+	 * Returns the result of interpreting the object as an instance of ' <em>Index</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
 	 * 
 	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Index</em>'.
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>Index</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -587,13 +693,13 @@ public class HbannotationSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Generated</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Generated</em>'.
+	 * Returns the result of interpreting the object as an instance of ' <em>Generated</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>Generated</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -602,13 +708,13 @@ public class HbannotationSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Named Query</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Named Query</em>'.
+	 * Returns the result of interpreting the object as an instance of ' <em>Named Query</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>Named Query</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -617,13 +723,13 @@ public class HbannotationSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Filter</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Filter</em>'.
+	 * Returns the result of interpreting the object as an instance of ' <em>Filter</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>Filter</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -632,13 +738,13 @@ public class HbannotationSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Param Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Param Def</em>'.
+	 * Returns the result of interpreting the object as an instance of ' <em>Param Def</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>Param Def</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -647,13 +753,13 @@ public class HbannotationSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Filter Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Filter Def</em>'.
+	 * Returns the result of interpreting the object as an instance of ' <em>Filter Def</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>Filter Def</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -662,13 +768,14 @@ public class HbannotationSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Discriminator Formula</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Discriminator Formula</em>'.
+	 * Returns the result of interpreting the object as an instance of '
+	 * <em>Discriminator Formula</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of '
+	 *         <em>Discriminator Formula</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -677,13 +784,13 @@ public class HbannotationSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Natural Id</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Natural Id</em>'.
+	 * Returns the result of interpreting the object as an instance of ' <em>Natural Id</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>Natural Id</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -692,13 +799,14 @@ public class HbannotationSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Map Key Many To Many</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Map Key Many To Many</em>'.
+	 * Returns the result of interpreting the object as an instance of ' <em>Map Key Many To Many</em>
+	 * '. <!-- begin-user-doc --> This implementation returns null; returning a non-null result will
+	 * terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>Map Key Many To Many</em>
+	 *         '.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -707,13 +815,14 @@ public class HbannotationSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Force Discriminator</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Force Discriminator</em>'.
+	 * Returns the result of interpreting the object as an instance of ' <em>Force Discriminator</em>
+	 * '. <!-- begin-user-doc --> This implementation returns null; returning a non-null result will
+	 * terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>Force Discriminator</em>
+	 *         '.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -722,13 +831,13 @@ public class HbannotationSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Immutable</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Immutable</em>'.
+	 * Returns the result of interpreting the object as an instance of ' <em>Immutable</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>Immutable</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -737,13 +846,13 @@ public class HbannotationSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Formula</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Formula</em>'.
+	 * Returns the result of interpreting the object as an instance of ' <em>Formula</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>Formula</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -752,13 +861,13 @@ public class HbannotationSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Not Found</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Not Found</em>'.
+	 * Returns the result of interpreting the object as an instance of ' <em>Not Found</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>Not Found</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -767,13 +876,13 @@ public class HbannotationSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Hb Entity</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Hb Entity</em>'.
+	 * Returns the result of interpreting the object as an instance of ' <em>Hb Entity</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>Hb Entity</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -782,13 +891,13 @@ public class HbannotationSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Batch Size</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Batch Size</em>'.
+	 * Returns the result of interpreting the object as an instance of ' <em>Batch Size</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>Batch Size</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -797,13 +906,13 @@ public class HbannotationSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Any</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Any</em>'.
+	 * Returns the result of interpreting the object as an instance of ' <em>Any</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>Any</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -812,13 +921,13 @@ public class HbannotationSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Meta Value</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Meta Value</em>'.
+	 * Returns the result of interpreting the object as an instance of ' <em>Meta Value</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>Meta Value</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -827,13 +936,13 @@ public class HbannotationSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Any Meta Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Any Meta Def</em>'.
+	 * Returns the result of interpreting the object as an instance of ' <em>Any Meta Def</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>Any Meta Def</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -842,11 +951,13 @@ public class HbannotationSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>PAnnotation</em>'.
-	 * <!-- begin-user-doc --> This implementation returns null; returning a non-null result will
-	 * terminate the switch. <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>PAnnotation</em>'.
+	 * Returns the result of interpreting the object as an instance of ' <em>PAnnotation</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate
+	 * the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>PAnnotation</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -855,13 +966,13 @@ public class HbannotationSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!--
-	 * begin-user-doc --> This implementation returns null; returning a non-null result will
-	 * terminate the switch, but this is the last case anyway. <!-- end-user-doc -->
+	 * Returns the result of interpreting the object as an instance of ' <em>EObject</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate
+	 * the switch, but this is the last case anyway. <!-- end-user-doc -->
 	 * 
 	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
 	 */
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbannotationValidator.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbannotationValidator.java
index 037272ed5..0aa04f012 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbannotationValidator.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/util/HbannotationValidator.java
@@ -8,13 +8,11 @@ package org.eclipse.emf.teneo.hibernate.hbannotation.util;
 
 import java.util.Map;
 
-import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.emf.common.util.ResourceLocator;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.EObjectValidator;
 import org.eclipse.emf.teneo.annotations.pannotation.util.PannotationValidator;
-import org.eclipse.emf.teneo.hibernate.hbannotation.*;
 import org.eclipse.emf.teneo.hibernate.hbannotation.Any;
 import org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef;
 import org.eclipse.emf.teneo.hibernate.hbannotation.BatchSize;
@@ -58,23 +56,24 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.TypeDef;
 import org.eclipse.emf.teneo.hibernate.hbannotation.Where;
 
 /**
- * <!-- begin-user-doc --> The <b>Validator</b> for the model. <!-- end-user-doc
- * -->
+ * <!-- begin-user-doc --> The <b>Validator</b> for the model. <!-- end-user-doc -->
  * 
  * @see org.eclipse.emf.teneo.hibernate.hbannotation.HbannotationPackage
  * @generated
  */
 public class HbannotationValidator extends EObjectValidator {
 	/**
-	 * The cached model package
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final HbannotationValidator INSTANCE = new HbannotationValidator();
 
 	/**
-	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.
+	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of
+	 * diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.common.util.Diagnostic#getSource()
 	 * @see org.eclipse.emf.common.util.Diagnostic#getCode()
 	 * @generated
@@ -82,33 +81,31 @@ public class HbannotationValidator extends EObjectValidator {
 	public static final String DIAGNOSTIC_SOURCE = "org.eclipse.emf.teneo.hibernate.hbannotation";
 
 	/**
-	 * A constant with a fixed name that can be used as the base value for additional hand written constants.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
+	 * A constant with a fixed name that can be used as the base value for additional hand written
+	 * constants. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 0;
 
 	/**
-	 * A constant with a fixed name that can be used as the base value for additional hand written constants in a derived class.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
+	 * A constant with a fixed name that can be used as the base value for additional hand written
+	 * constants in a derived class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static final int DIAGNOSTIC_CODE_COUNT = GENERATED_DIAGNOSTIC_CODE_COUNT;
 
 	/**
-	 * The cached base package validator.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
+	 * The cached base package validator. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected PannotationValidator pannotationValidator;
 
 	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
+	 * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HbannotationValidator() {
@@ -117,871 +114,1219 @@ public class HbannotationValidator extends EObjectValidator {
 	}
 
 	/**
-	 * Returns the package of this validator switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the package of this validator switch. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EPackage getEPackage() {
-	  return HbannotationPackage.eINSTANCE;
+		return HbannotationPackage.eINSTANCE;
 	}
 
 	/**
-	 * Calls <code>validateXXX</code> for the corresponding classifier of the model.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Calls <code>validateXXX</code> for the corresponding classifier of the model. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	protected boolean validate(int classifierID, Object value,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
 		switch (classifierID) {
-			case HbannotationPackage.HB_ANNOTATION:
-				return validateHbAnnotation((HbAnnotation)value, diagnostics, context);
-			case HbannotationPackage.CASCADE:
-				return validateCascade((Cascade)value, diagnostics, context);
-			case HbannotationPackage.COLLECTION_OF_ELEMENTS:
-				return validateCollectionOfElements((CollectionOfElements)value, diagnostics, context);
-			case HbannotationPackage.HB_MAP_KEY:
-				return validateHbMapKey((HbMapKey)value, diagnostics, context);
-			case HbannotationPackage.PARAMETER:
-				return validateParameter((Parameter)value, diagnostics, context);
-			case HbannotationPackage.TYPE:
-				return validateType((Type)value, diagnostics, context);
-			case HbannotationPackage.WHERE:
-				return validateWhere((Where)value, diagnostics, context);
-			case HbannotationPackage.ID_BAG:
-				return validateIdBag((IdBag)value, diagnostics, context);
-			case HbannotationPackage.GENERIC_GENERATOR:
-				return validateGenericGenerator((GenericGenerator)value, diagnostics, context);
-			case HbannotationPackage.CACHE:
-				return validateCache((Cache)value, diagnostics, context);
-			case HbannotationPackage.TYPE_DEF:
-				return validateTypeDef((TypeDef)value, diagnostics, context);
-			case HbannotationPackage.FETCH:
-				return validateFetch((Fetch)value, diagnostics, context);
-			case HbannotationPackage.ON_DELETE:
-				return validateOnDelete((OnDelete)value, diagnostics, context);
-			case HbannotationPackage.PROXY:
-				return validateProxy((Proxy)value, diagnostics, context);
-			case HbannotationPackage.INDEX:
-				return validateIndex((Index)value, diagnostics, context);
-			case HbannotationPackage.GENERATED:
-				return validateGenerated((Generated)value, diagnostics, context);
-			case HbannotationPackage.NAMED_QUERY:
-				return validateNamedQuery((NamedQuery)value, diagnostics, context);
-			case HbannotationPackage.FILTER:
-				return validateFilter((Filter)value, diagnostics, context);
-			case HbannotationPackage.PARAM_DEF:
-				return validateParamDef((ParamDef)value, diagnostics, context);
-			case HbannotationPackage.FILTER_DEF:
-				return validateFilterDef((FilterDef)value, diagnostics, context);
-			case HbannotationPackage.DISCRIMINATOR_FORMULA:
-				return validateDiscriminatorFormula((DiscriminatorFormula)value, diagnostics, context);
-			case HbannotationPackage.NATURAL_ID:
-				return validateNaturalId((NaturalId)value, diagnostics, context);
-			case HbannotationPackage.MAP_KEY_MANY_TO_MANY:
-				return validateMapKeyManyToMany((MapKeyManyToMany)value, diagnostics, context);
-			case HbannotationPackage.FORCE_DISCRIMINATOR:
-				return validateForceDiscriminator((ForceDiscriminator)value, diagnostics, context);
-			case HbannotationPackage.IMMUTABLE:
-				return validateImmutable((Immutable)value, diagnostics, context);
-			case HbannotationPackage.FORMULA:
-				return validateFormula((Formula)value, diagnostics, context);
-			case HbannotationPackage.NOT_FOUND:
-				return validateNotFound((NotFound)value, diagnostics, context);
-			case HbannotationPackage.HB_ENTITY:
-				return validateHbEntity((HbEntity)value, diagnostics, context);
-			case HbannotationPackage.BATCH_SIZE:
-				return validateBatchSize((BatchSize)value, diagnostics, context);
-			case HbannotationPackage.ANY:
-				return validateAny((Any)value, diagnostics, context);
-			case HbannotationPackage.META_VALUE:
-				return validateMetaValue((MetaValue)value, diagnostics, context);
-			case HbannotationPackage.ANY_META_DEF:
-				return validateAnyMetaDef((AnyMetaDef)value, diagnostics, context);
-			case HbannotationPackage.CACHE_CONCURRENCY_STRATEGY:
-				return validateCacheConcurrencyStrategy((CacheConcurrencyStrategy)value, diagnostics, context);
-			case HbannotationPackage.HB_FETCH_TYPE:
-				return validateHbFetchType((HbFetchType)value, diagnostics, context);
-			case HbannotationPackage.ON_DELETE_ACTION:
-				return validateOnDeleteAction((OnDeleteAction)value, diagnostics, context);
-			case HbannotationPackage.GENERATION_TIME:
-				return validateGenerationTime((GenerationTime)value, diagnostics, context);
-			case HbannotationPackage.NOT_FOUND_ACTION:
-				return validateNotFoundAction((NotFoundAction)value, diagnostics, context);
-			case HbannotationPackage.OPTIMISTIC_LOCK_TYPE:
-				return validateOptimisticLockType((OptimisticLockType)value, diagnostics, context);
-			case HbannotationPackage.POLYMORPHISM_TYPE:
-				return validatePolymorphismType((PolymorphismType)value, diagnostics, context);
-			case HbannotationPackage.HB_CASCADE_TYPE:
-				return validateHbCascadeType((HbCascadeType)value, diagnostics, context);
-			default:
-				return true;
+		case HbannotationPackage.HB_ANNOTATION:
+			return validateHbAnnotation((HbAnnotation) value, diagnostics, context);
+		case HbannotationPackage.CASCADE:
+			return validateCascade((Cascade) value, diagnostics, context);
+		case HbannotationPackage.COLLECTION_OF_ELEMENTS:
+			return validateCollectionOfElements((CollectionOfElements) value, diagnostics, context);
+		case HbannotationPackage.HB_MAP_KEY:
+			return validateHbMapKey((HbMapKey) value, diagnostics, context);
+		case HbannotationPackage.PARAMETER:
+			return validateParameter((Parameter) value, diagnostics, context);
+		case HbannotationPackage.TYPE:
+			return validateType((Type) value, diagnostics, context);
+		case HbannotationPackage.WHERE:
+			return validateWhere((Where) value, diagnostics, context);
+		case HbannotationPackage.ID_BAG:
+			return validateIdBag((IdBag) value, diagnostics, context);
+		case HbannotationPackage.GENERIC_GENERATOR:
+			return validateGenericGenerator((GenericGenerator) value, diagnostics, context);
+		case HbannotationPackage.CACHE:
+			return validateCache((Cache) value, diagnostics, context);
+		case HbannotationPackage.TYPE_DEF:
+			return validateTypeDef((TypeDef) value, diagnostics, context);
+		case HbannotationPackage.FETCH:
+			return validateFetch((Fetch) value, diagnostics, context);
+		case HbannotationPackage.ON_DELETE:
+			return validateOnDelete((OnDelete) value, diagnostics, context);
+		case HbannotationPackage.PROXY:
+			return validateProxy((Proxy) value, diagnostics, context);
+		case HbannotationPackage.INDEX:
+			return validateIndex((Index) value, diagnostics, context);
+		case HbannotationPackage.GENERATED:
+			return validateGenerated((Generated) value, diagnostics, context);
+		case HbannotationPackage.NAMED_QUERY:
+			return validateNamedQuery((NamedQuery) value, diagnostics, context);
+		case HbannotationPackage.FILTER:
+			return validateFilter((Filter) value, diagnostics, context);
+		case HbannotationPackage.PARAM_DEF:
+			return validateParamDef((ParamDef) value, diagnostics, context);
+		case HbannotationPackage.FILTER_DEF:
+			return validateFilterDef((FilterDef) value, diagnostics, context);
+		case HbannotationPackage.DISCRIMINATOR_FORMULA:
+			return validateDiscriminatorFormula((DiscriminatorFormula) value, diagnostics, context);
+		case HbannotationPackage.NATURAL_ID:
+			return validateNaturalId((NaturalId) value, diagnostics, context);
+		case HbannotationPackage.MAP_KEY_MANY_TO_MANY:
+			return validateMapKeyManyToMany((MapKeyManyToMany) value, diagnostics, context);
+		case HbannotationPackage.FORCE_DISCRIMINATOR:
+			return validateForceDiscriminator((ForceDiscriminator) value, diagnostics, context);
+		case HbannotationPackage.IMMUTABLE:
+			return validateImmutable((Immutable) value, diagnostics, context);
+		case HbannotationPackage.FORMULA:
+			return validateFormula((Formula) value, diagnostics, context);
+		case HbannotationPackage.NOT_FOUND:
+			return validateNotFound((NotFound) value, diagnostics, context);
+		case HbannotationPackage.HB_ENTITY:
+			return validateHbEntity((HbEntity) value, diagnostics, context);
+		case HbannotationPackage.BATCH_SIZE:
+			return validateBatchSize((BatchSize) value, diagnostics, context);
+		case HbannotationPackage.ANY:
+			return validateAny((Any) value, diagnostics, context);
+		case HbannotationPackage.META_VALUE:
+			return validateMetaValue((MetaValue) value, diagnostics, context);
+		case HbannotationPackage.ANY_META_DEF:
+			return validateAnyMetaDef((AnyMetaDef) value, diagnostics, context);
+		case HbannotationPackage.CACHE_CONCURRENCY_STRATEGY:
+			return validateCacheConcurrencyStrategy((CacheConcurrencyStrategy) value, diagnostics,
+					context);
+		case HbannotationPackage.HB_FETCH_TYPE:
+			return validateHbFetchType((HbFetchType) value, diagnostics, context);
+		case HbannotationPackage.ON_DELETE_ACTION:
+			return validateOnDeleteAction((OnDeleteAction) value, diagnostics, context);
+		case HbannotationPackage.GENERATION_TIME:
+			return validateGenerationTime((GenerationTime) value, diagnostics, context);
+		case HbannotationPackage.NOT_FOUND_ACTION:
+			return validateNotFoundAction((NotFoundAction) value, diagnostics, context);
+		case HbannotationPackage.OPTIMISTIC_LOCK_TYPE:
+			return validateOptimisticLockType((OptimisticLockType) value, diagnostics, context);
+		case HbannotationPackage.POLYMORPHISM_TYPE:
+			return validatePolymorphismType((PolymorphismType) value, diagnostics, context);
+		case HbannotationPackage.HB_CASCADE_TYPE:
+			return validateHbCascadeType((HbCascadeType) value, diagnostics, context);
+		default:
+			return true;
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateHbAnnotation(HbAnnotation hbAnnotation,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(hbAnnotation, diagnostics, context)) return false;
+	public boolean validateHbAnnotation(HbAnnotation hbAnnotation, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
+		if (!validate_NoCircularContainment(hbAnnotation, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(hbAnnotation, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(hbAnnotation, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(hbAnnotation, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(hbAnnotation, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(hbAnnotation, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(hbAnnotation, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(hbAnnotation, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(hbAnnotation, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_CompatibleEModelElementType(hbAnnotation, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_AnnotationIsSupported(hbAnnotation, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(hbAnnotation, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(hbAnnotation, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(hbAnnotation, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryProxyResolves(hbAnnotation, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_UniqueID(hbAnnotation, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryKeyUnique(hbAnnotation, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(hbAnnotation, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_CompatibleEModelElementType(hbAnnotation, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_AnnotationIsSupported(hbAnnotation, diagnostics, context);
 		return result;
 	}
 
 	/**
-	 * Validates the CompatibleEModelElementType constraint of '<em>Hb Annotation</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
+	 * Validates the CompatibleEModelElementType constraint of ' <em>Hb Annotation</em>'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generatedNOT
 	 */
-	public boolean validateHbAnnotation_CompatibleEModelElementType(
-			HbAnnotation hbAnnotation, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
+	public boolean validateHbAnnotation_CompatibleEModelElementType(HbAnnotation hbAnnotation,
+			DiagnosticChain diagnostics, Map<Object, Object> context) {
 		// TODO override the constraint, if desired
 		// -> uncomment the scaffolding
 		// -> specify the condition that violates the constraint
 		// -> verify the diagnostic details, including severity, code, and message
 		// Ensure that you remove @generated or mark it @generated NOT
-		if (false) {
-			if (diagnostics != null) {
-				diagnostics.add
-					(createDiagnostic
-						(Diagnostic.ERROR,
-						 DIAGNOSTIC_SOURCE,
-						 0,
-						 "_UI_GenericConstraint_diagnostic",
-						 new Object[] { "CompatibleEModelElementType", getObjectLabel(hbAnnotation, context) },
-						 new Object[] { hbAnnotation },
-						 context));
-			}
-			return false;
-		}
-		return pannotationValidator.validatePAnnotation_CompatibleEModelElementType(hbAnnotation, diagnostics, context);
+		// if (false) {
+		// if (diagnostics != null) {
+		// diagnostics.add(createDiagnostic(Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0,
+		// "_UI_GenericConstraint_diagnostic", new Object[] { "CompatibleEModelElementType",
+		// getObjectLabel(hbAnnotation, context) }, new Object[] { hbAnnotation }, context));
+		// }
+		// return false;
+		// }
+		return pannotationValidator.validatePAnnotation_CompatibleEModelElementType(hbAnnotation,
+				diagnostics, context);
 	}
 
 	/**
-	 * Validates the AnnotationIsSupported constraint of '<em>Hb Annotation</em>'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
+	 * Validates the AnnotationIsSupported constraint of '<em>Hb Annotation</em>'. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
+	 * @generatedNOT
 	 */
-	public boolean validateHbAnnotation_AnnotationIsSupported(
-			HbAnnotation hbAnnotation, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
+	public boolean validateHbAnnotation_AnnotationIsSupported(HbAnnotation hbAnnotation,
+			DiagnosticChain diagnostics, Map<Object, Object> context) {
 		// TODO override the constraint, if desired
 		// -> uncomment the scaffolding
 		// -> specify the condition that violates the constraint
 		// -> verify the diagnostic details, including severity, code, and message
 		// Ensure that you remove @generated or mark it @generated NOT
-		if (false) {
-			if (diagnostics != null) {
-				diagnostics.add
-					(createDiagnostic
-						(Diagnostic.ERROR,
-						 DIAGNOSTIC_SOURCE,
-						 0,
-						 "_UI_GenericConstraint_diagnostic",
-						 new Object[] { "AnnotationIsSupported", getObjectLabel(hbAnnotation, context) },
-						 new Object[] { hbAnnotation },
-						 context));
-			}
-			return false;
-		}
-		return pannotationValidator.validatePAnnotation_AnnotationIsSupported(hbAnnotation, diagnostics, context);
+		// if (false) {
+		// if (diagnostics != null) {
+		// diagnostics.add(createDiagnostic(Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0,
+		// "_UI_GenericConstraint_diagnostic", new Object[] { "AnnotationIsSupported",
+		// getObjectLabel(hbAnnotation, context) }, new Object[] { hbAnnotation }, context));
+		// }
+		// return false;
+		// }
+		return pannotationValidator.validatePAnnotation_AnnotationIsSupported(hbAnnotation,
+				diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateCascade(Cascade cascade,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(cascade, diagnostics, context)) return false;
+	public boolean validateCascade(Cascade cascade, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
+		if (!validate_NoCircularContainment(cascade, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(cascade, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(cascade, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(cascade, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(cascade, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(cascade, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(cascade, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(cascade, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(cascade, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_CompatibleEModelElementType(cascade, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_AnnotationIsSupported(cascade, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(cascade, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(cascade, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(cascade, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryProxyResolves(cascade, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_UniqueID(cascade, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryKeyUnique(cascade, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(cascade, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_CompatibleEModelElementType(cascade, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_AnnotationIsSupported(cascade, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateCollectionOfElements(
-			CollectionOfElements collectionOfElements,
+	public boolean validateCollectionOfElements(CollectionOfElements collectionOfElements,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(collectionOfElements, diagnostics, context)) return false;
+		if (!validate_NoCircularContainment(collectionOfElements, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(collectionOfElements, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(collectionOfElements, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(collectionOfElements, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(collectionOfElements, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(collectionOfElements, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(collectionOfElements, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(collectionOfElements, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(collectionOfElements, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_CompatibleEModelElementType(collectionOfElements, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_AnnotationIsSupported(collectionOfElements, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(collectionOfElements, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(collectionOfElements, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(collectionOfElements, diagnostics,
+					context);
+		if (result || diagnostics != null)
+			result &= validate_EveryProxyResolves(collectionOfElements, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_UniqueID(collectionOfElements, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryKeyUnique(collectionOfElements, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(collectionOfElements, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_CompatibleEModelElementType(collectionOfElements, diagnostics,
+					context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_AnnotationIsSupported(collectionOfElements, diagnostics,
+					context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateHbMapKey(HbMapKey hbMapKey,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(hbMapKey, diagnostics, context)) return false;
+	public boolean validateHbMapKey(HbMapKey hbMapKey, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
+		if (!validate_NoCircularContainment(hbMapKey, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(hbMapKey, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(hbMapKey, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(hbMapKey, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(hbMapKey, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(hbMapKey, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(hbMapKey, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(hbMapKey, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(hbMapKey, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_CompatibleEModelElementType(hbMapKey, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_AnnotationIsSupported(hbMapKey, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(hbMapKey, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(hbMapKey, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(hbMapKey, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryProxyResolves(hbMapKey, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_UniqueID(hbMapKey, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryKeyUnique(hbMapKey, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(hbMapKey, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_CompatibleEModelElementType(hbMapKey, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_AnnotationIsSupported(hbMapKey, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateParameter(Parameter parameter,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(parameter, diagnostics, context)) return false;
+	public boolean validateParameter(Parameter parameter, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
+		if (!validate_NoCircularContainment(parameter, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(parameter, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(parameter, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(parameter, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(parameter, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(parameter, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(parameter, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(parameter, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(parameter, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_CompatibleEModelElementType(parameter, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_AnnotationIsSupported(parameter, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(parameter, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(parameter, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(parameter, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryProxyResolves(parameter, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_UniqueID(parameter, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryKeyUnique(parameter, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(parameter, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_CompatibleEModelElementType(parameter, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_AnnotationIsSupported(parameter, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateType(Type type, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(type, diagnostics, context)) return false;
+	public boolean validateType(Type type, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if (!validate_NoCircularContainment(type, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(type, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(type, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(type, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(type, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(type, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(type, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(type, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(type, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_CompatibleEModelElementType(type, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_AnnotationIsSupported(type, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(type, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(type, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(type, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryProxyResolves(type, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_UniqueID(type, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryKeyUnique(type, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(type, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_CompatibleEModelElementType(type, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_AnnotationIsSupported(type, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateWhere(Where where, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(where, diagnostics, context)) return false;
+	public boolean validateWhere(Where where, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if (!validate_NoCircularContainment(where, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(where, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(where, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(where, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(where, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(where, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(where, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(where, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(where, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_CompatibleEModelElementType(where, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_AnnotationIsSupported(where, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(where, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(where, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(where, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryProxyResolves(where, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_UniqueID(where, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryKeyUnique(where, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(where, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_CompatibleEModelElementType(where, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_AnnotationIsSupported(where, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateIdBag(IdBag idBag, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(idBag, diagnostics, context)) return false;
+	public boolean validateIdBag(IdBag idBag, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if (!validate_NoCircularContainment(idBag, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(idBag, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(idBag, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(idBag, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(idBag, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(idBag, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(idBag, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(idBag, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(idBag, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_CompatibleEModelElementType(idBag, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_AnnotationIsSupported(idBag, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(idBag, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(idBag, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(idBag, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryProxyResolves(idBag, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_UniqueID(idBag, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryKeyUnique(idBag, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(idBag, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_CompatibleEModelElementType(idBag, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_AnnotationIsSupported(idBag, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateGenericGenerator(GenericGenerator genericGenerator,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(genericGenerator, diagnostics, context)) return false;
+		if (!validate_NoCircularContainment(genericGenerator, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(genericGenerator, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(genericGenerator, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(genericGenerator, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(genericGenerator, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(genericGenerator, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(genericGenerator, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(genericGenerator, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(genericGenerator, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_CompatibleEModelElementType(genericGenerator, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_AnnotationIsSupported(genericGenerator, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(genericGenerator, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(genericGenerator, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(genericGenerator, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryProxyResolves(genericGenerator, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_UniqueID(genericGenerator, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryKeyUnique(genericGenerator, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(genericGenerator, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_CompatibleEModelElementType(genericGenerator, diagnostics,
+					context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_AnnotationIsSupported(genericGenerator, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateCache(Cache cache, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(cache, diagnostics, context)) return false;
+	public boolean validateCache(Cache cache, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if (!validate_NoCircularContainment(cache, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(cache, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(cache, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(cache, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(cache, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(cache, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(cache, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(cache, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(cache, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_CompatibleEModelElementType(cache, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_AnnotationIsSupported(cache, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(cache, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(cache, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(cache, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryProxyResolves(cache, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_UniqueID(cache, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryKeyUnique(cache, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(cache, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_CompatibleEModelElementType(cache, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_AnnotationIsSupported(cache, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateTypeDef(TypeDef typeDef,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(typeDef, diagnostics, context)) return false;
+	public boolean validateTypeDef(TypeDef typeDef, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
+		if (!validate_NoCircularContainment(typeDef, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(typeDef, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(typeDef, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(typeDef, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(typeDef, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(typeDef, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(typeDef, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(typeDef, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(typeDef, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_CompatibleEModelElementType(typeDef, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_AnnotationIsSupported(typeDef, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(typeDef, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(typeDef, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(typeDef, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryProxyResolves(typeDef, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_UniqueID(typeDef, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryKeyUnique(typeDef, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(typeDef, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_CompatibleEModelElementType(typeDef, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_AnnotationIsSupported(typeDef, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateFetch(Fetch fetch, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(fetch, diagnostics, context)) return false;
+	public boolean validateFetch(Fetch fetch, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if (!validate_NoCircularContainment(fetch, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(fetch, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(fetch, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(fetch, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(fetch, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(fetch, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(fetch, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(fetch, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(fetch, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_CompatibleEModelElementType(fetch, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_AnnotationIsSupported(fetch, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(fetch, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(fetch, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(fetch, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryProxyResolves(fetch, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_UniqueID(fetch, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryKeyUnique(fetch, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(fetch, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_CompatibleEModelElementType(fetch, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_AnnotationIsSupported(fetch, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateOnDelete(OnDelete onDelete,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(onDelete, diagnostics, context)) return false;
+	public boolean validateOnDelete(OnDelete onDelete, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
+		if (!validate_NoCircularContainment(onDelete, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(onDelete, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(onDelete, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(onDelete, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(onDelete, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(onDelete, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(onDelete, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(onDelete, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(onDelete, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_CompatibleEModelElementType(onDelete, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_AnnotationIsSupported(onDelete, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(onDelete, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(onDelete, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(onDelete, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryProxyResolves(onDelete, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_UniqueID(onDelete, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryKeyUnique(onDelete, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(onDelete, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_CompatibleEModelElementType(onDelete, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_AnnotationIsSupported(onDelete, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateProxy(Proxy proxy, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(proxy, diagnostics, context)) return false;
+	public boolean validateProxy(Proxy proxy, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if (!validate_NoCircularContainment(proxy, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(proxy, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(proxy, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(proxy, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(proxy, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(proxy, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(proxy, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(proxy, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(proxy, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_CompatibleEModelElementType(proxy, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_AnnotationIsSupported(proxy, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(proxy, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(proxy, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(proxy, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryProxyResolves(proxy, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_UniqueID(proxy, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryKeyUnique(proxy, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(proxy, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_CompatibleEModelElementType(proxy, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_AnnotationIsSupported(proxy, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateNamedQuery(NamedQuery namedQuery,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(namedQuery, diagnostics, context)) return false;
+	public boolean validateNamedQuery(NamedQuery namedQuery, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
+		if (!validate_NoCircularContainment(namedQuery, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(namedQuery, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(namedQuery, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(namedQuery, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(namedQuery, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(namedQuery, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(namedQuery, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(namedQuery, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(namedQuery, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_CompatibleEModelElementType(namedQuery, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_AnnotationIsSupported(namedQuery, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(namedQuery, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(namedQuery, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(namedQuery, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryProxyResolves(namedQuery, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_UniqueID(namedQuery, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryKeyUnique(namedQuery, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(namedQuery, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_CompatibleEModelElementType(namedQuery, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_AnnotationIsSupported(namedQuery, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateFilter(Filter filter, DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(filter, diagnostics, context)) return false;
+		if (!validate_NoCircularContainment(filter, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(filter, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(filter, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(filter, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(filter, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(filter, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(filter, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(filter, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(filter, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_CompatibleEModelElementType(filter, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_AnnotationIsSupported(filter, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(filter, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(filter, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(filter, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryProxyResolves(filter, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_UniqueID(filter, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryKeyUnique(filter, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(filter, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_CompatibleEModelElementType(filter, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_AnnotationIsSupported(filter, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateParamDef(ParamDef paramDef,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(paramDef, diagnostics, context)) return false;
+	public boolean validateParamDef(ParamDef paramDef, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
+		if (!validate_NoCircularContainment(paramDef, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(paramDef, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(paramDef, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(paramDef, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(paramDef, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(paramDef, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(paramDef, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(paramDef, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(paramDef, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_CompatibleEModelElementType(paramDef, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_AnnotationIsSupported(paramDef, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(paramDef, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(paramDef, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(paramDef, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryProxyResolves(paramDef, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_UniqueID(paramDef, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryKeyUnique(paramDef, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(paramDef, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_CompatibleEModelElementType(paramDef, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_AnnotationIsSupported(paramDef, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateFilterDef(FilterDef filterDef,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(filterDef, diagnostics, context)) return false;
+	public boolean validateFilterDef(FilterDef filterDef, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
+		if (!validate_NoCircularContainment(filterDef, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(filterDef, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(filterDef, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(filterDef, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(filterDef, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(filterDef, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(filterDef, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(filterDef, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(filterDef, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_CompatibleEModelElementType(filterDef, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_AnnotationIsSupported(filterDef, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(filterDef, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(filterDef, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(filterDef, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryProxyResolves(filterDef, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_UniqueID(filterDef, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryKeyUnique(filterDef, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(filterDef, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_CompatibleEModelElementType(filterDef, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_AnnotationIsSupported(filterDef, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateDiscriminatorFormula(
-			DiscriminatorFormula discriminatorFormula,
+	public boolean validateDiscriminatorFormula(DiscriminatorFormula discriminatorFormula,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(discriminatorFormula, diagnostics, context)) return false;
+		if (!validate_NoCircularContainment(discriminatorFormula, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(discriminatorFormula, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(discriminatorFormula, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(discriminatorFormula, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(discriminatorFormula, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(discriminatorFormula, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(discriminatorFormula, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(discriminatorFormula, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(discriminatorFormula, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_CompatibleEModelElementType(discriminatorFormula, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_AnnotationIsSupported(discriminatorFormula, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(discriminatorFormula, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(discriminatorFormula, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(discriminatorFormula, diagnostics,
+					context);
+		if (result || diagnostics != null)
+			result &= validate_EveryProxyResolves(discriminatorFormula, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_UniqueID(discriminatorFormula, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryKeyUnique(discriminatorFormula, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(discriminatorFormula, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_CompatibleEModelElementType(discriminatorFormula, diagnostics,
+					context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_AnnotationIsSupported(discriminatorFormula, diagnostics,
+					context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateNaturalId(NaturalId naturalId,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(naturalId, diagnostics, context)) return false;
+	public boolean validateNaturalId(NaturalId naturalId, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
+		if (!validate_NoCircularContainment(naturalId, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(naturalId, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(naturalId, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(naturalId, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(naturalId, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(naturalId, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(naturalId, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(naturalId, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(naturalId, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_CompatibleEModelElementType(naturalId, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_AnnotationIsSupported(naturalId, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(naturalId, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(naturalId, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(naturalId, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryProxyResolves(naturalId, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_UniqueID(naturalId, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryKeyUnique(naturalId, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(naturalId, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_CompatibleEModelElementType(naturalId, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_AnnotationIsSupported(naturalId, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateMapKeyManyToMany(MapKeyManyToMany mapKeyManyToMany,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(mapKeyManyToMany, diagnostics, context)) return false;
+		if (!validate_NoCircularContainment(mapKeyManyToMany, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(mapKeyManyToMany, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(mapKeyManyToMany, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(mapKeyManyToMany, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(mapKeyManyToMany, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(mapKeyManyToMany, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(mapKeyManyToMany, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(mapKeyManyToMany, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(mapKeyManyToMany, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_CompatibleEModelElementType(mapKeyManyToMany, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_AnnotationIsSupported(mapKeyManyToMany, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(mapKeyManyToMany, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(mapKeyManyToMany, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(mapKeyManyToMany, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryProxyResolves(mapKeyManyToMany, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_UniqueID(mapKeyManyToMany, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryKeyUnique(mapKeyManyToMany, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(mapKeyManyToMany, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_CompatibleEModelElementType(mapKeyManyToMany, diagnostics,
+					context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_AnnotationIsSupported(mapKeyManyToMany, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateForceDiscriminator(
-			ForceDiscriminator forceDiscriminator, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(forceDiscriminator, diagnostics, context)) return false;
+	public boolean validateForceDiscriminator(ForceDiscriminator forceDiscriminator,
+			DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if (!validate_NoCircularContainment(forceDiscriminator, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(forceDiscriminator, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(forceDiscriminator, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(forceDiscriminator, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(forceDiscriminator, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(forceDiscriminator, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(forceDiscriminator, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(forceDiscriminator, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(forceDiscriminator, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_CompatibleEModelElementType(forceDiscriminator, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_AnnotationIsSupported(forceDiscriminator, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(forceDiscriminator, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(forceDiscriminator, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(forceDiscriminator, diagnostics,
+					context);
+		if (result || diagnostics != null)
+			result &= validate_EveryProxyResolves(forceDiscriminator, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_UniqueID(forceDiscriminator, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryKeyUnique(forceDiscriminator, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(forceDiscriminator, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_CompatibleEModelElementType(forceDiscriminator, diagnostics,
+					context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_AnnotationIsSupported(forceDiscriminator, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateImmutable(Immutable immutable,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(immutable, diagnostics, context)) return false;
+	public boolean validateImmutable(Immutable immutable, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
+		if (!validate_NoCircularContainment(immutable, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(immutable, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(immutable, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(immutable, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(immutable, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(immutable, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(immutable, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(immutable, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(immutable, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_CompatibleEModelElementType(immutable, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_AnnotationIsSupported(immutable, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(immutable, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(immutable, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(immutable, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryProxyResolves(immutable, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_UniqueID(immutable, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryKeyUnique(immutable, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(immutable, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_CompatibleEModelElementType(immutable, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_AnnotationIsSupported(immutable, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateFormula(Formula formula,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(formula, diagnostics, context)) return false;
+	public boolean validateFormula(Formula formula, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
+		if (!validate_NoCircularContainment(formula, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(formula, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(formula, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(formula, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(formula, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(formula, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(formula, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(formula, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(formula, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_CompatibleEModelElementType(formula, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_AnnotationIsSupported(formula, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(formula, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(formula, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(formula, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryProxyResolves(formula, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_UniqueID(formula, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryKeyUnique(formula, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(formula, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_CompatibleEModelElementType(formula, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_AnnotationIsSupported(formula, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateNotFound(NotFound notFound,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(notFound, diagnostics, context)) return false;
+	public boolean validateNotFound(NotFound notFound, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
+		if (!validate_NoCircularContainment(notFound, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(notFound, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(notFound, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(notFound, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(notFound, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(notFound, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(notFound, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(notFound, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(notFound, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_CompatibleEModelElementType(notFound, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_AnnotationIsSupported(notFound, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(notFound, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(notFound, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(notFound, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryProxyResolves(notFound, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_UniqueID(notFound, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryKeyUnique(notFound, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(notFound, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_CompatibleEModelElementType(notFound, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_AnnotationIsSupported(notFound, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateHbEntity(HbEntity hbEntity,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(hbEntity, diagnostics, context)) return false;
+	public boolean validateHbEntity(HbEntity hbEntity, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
+		if (!validate_NoCircularContainment(hbEntity, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(hbEntity, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(hbEntity, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(hbEntity, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(hbEntity, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(hbEntity, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(hbEntity, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(hbEntity, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(hbEntity, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_CompatibleEModelElementType(hbEntity, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_AnnotationIsSupported(hbEntity, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(hbEntity, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(hbEntity, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(hbEntity, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryProxyResolves(hbEntity, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_UniqueID(hbEntity, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryKeyUnique(hbEntity, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(hbEntity, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_CompatibleEModelElementType(hbEntity, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_AnnotationIsSupported(hbEntity, diagnostics, context);
 		return result;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateBatchSize(BatchSize batchSize, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(batchSize, diagnostics, context)) return false;
+	public boolean validateBatchSize(BatchSize batchSize, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
+		if (!validate_NoCircularContainment(batchSize, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(batchSize, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(batchSize, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(batchSize, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(batchSize, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(batchSize, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(batchSize, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(batchSize, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(batchSize, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_CompatibleEModelElementType(batchSize, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_AnnotationIsSupported(batchSize, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(batchSize, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(batchSize, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(batchSize, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryProxyResolves(batchSize, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_UniqueID(batchSize, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryKeyUnique(batchSize, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(batchSize, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_CompatibleEModelElementType(batchSize, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_AnnotationIsSupported(batchSize, diagnostics, context);
 		return result;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateAny(Any any, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(any, diagnostics, context)) return false;
+		if (!validate_NoCircularContainment(any, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(any, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(any, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(any, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(any, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(any, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(any, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(any, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(any, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_CompatibleEModelElementType(any, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_AnnotationIsSupported(any, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(any, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(any, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(any, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryProxyResolves(any, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_UniqueID(any, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryKeyUnique(any, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(any, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_CompatibleEModelElementType(any, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_AnnotationIsSupported(any, diagnostics, context);
 		return result;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateMetaValue(MetaValue metaValue, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(metaValue, diagnostics, context)) return false;
+	public boolean validateMetaValue(MetaValue metaValue, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
+		if (!validate_NoCircularContainment(metaValue, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(metaValue, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(metaValue, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(metaValue, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(metaValue, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(metaValue, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(metaValue, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(metaValue, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(metaValue, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_CompatibleEModelElementType(metaValue, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_AnnotationIsSupported(metaValue, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(metaValue, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(metaValue, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(metaValue, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryProxyResolves(metaValue, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_UniqueID(metaValue, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryKeyUnique(metaValue, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(metaValue, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_CompatibleEModelElementType(metaValue, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_AnnotationIsSupported(metaValue, diagnostics, context);
 		return result;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateAnyMetaDef(AnyMetaDef anyMetaDef, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(anyMetaDef, diagnostics, context)) return false;
+	public boolean validateAnyMetaDef(AnyMetaDef anyMetaDef, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
+		if (!validate_NoCircularContainment(anyMetaDef, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(anyMetaDef, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(anyMetaDef, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(anyMetaDef, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(anyMetaDef, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(anyMetaDef, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(anyMetaDef, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(anyMetaDef, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(anyMetaDef, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_CompatibleEModelElementType(anyMetaDef, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_AnnotationIsSupported(anyMetaDef, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(anyMetaDef, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(anyMetaDef, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(anyMetaDef, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryProxyResolves(anyMetaDef, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_UniqueID(anyMetaDef, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryKeyUnique(anyMetaDef, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(anyMetaDef, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_CompatibleEModelElementType(anyMetaDef, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_AnnotationIsSupported(anyMetaDef, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateIndex(Index index, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(index, diagnostics, context)) return false;
+	public boolean validateIndex(Index index, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if (!validate_NoCircularContainment(index, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(index, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(index, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(index, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(index, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(index, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(index, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(index, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(index, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_CompatibleEModelElementType(index, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_AnnotationIsSupported(index, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(index, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(index, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(index, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryProxyResolves(index, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_UniqueID(index, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryKeyUnique(index, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(index, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_CompatibleEModelElementType(index, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_AnnotationIsSupported(index, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateGenerated(Generated generated,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(generated, diagnostics, context)) return false;
+	public boolean validateGenerated(Generated generated, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
+		if (!validate_NoCircularContainment(generated, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(generated, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(generated, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(generated, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(generated, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(generated, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(generated, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(generated, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(generated, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_CompatibleEModelElementType(generated, diagnostics, context);
-		if (result || diagnostics != null) result &= validateHbAnnotation_AnnotationIsSupported(generated, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(generated, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(generated, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(generated, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryProxyResolves(generated, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_UniqueID(generated, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryKeyUnique(generated, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(generated, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_CompatibleEModelElementType(generated, diagnostics, context);
+		if (result || diagnostics != null)
+			result &= validateHbAnnotation_AnnotationIsSupported(generated, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateCacheConcurrencyStrategy(
-			CacheConcurrencyStrategy cacheConcurrencyStrategy,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+			CacheConcurrencyStrategy cacheConcurrencyStrategy, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
 		return true;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateHbFetchType(HbFetchType hbFetchType,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateHbFetchType(HbFetchType hbFetchType, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
 		return true;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateOnDeleteAction(OnDeleteAction onDeleteAction,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateOnDeleteAction(OnDeleteAction onDeleteAction, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
 		return true;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateGenerationTime(GenerationTime generationTime,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateGenerationTime(GenerationTime generationTime, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
 		return true;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateNotFoundAction(NotFoundAction notFoundAction,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateNotFoundAction(NotFoundAction notFoundAction, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
 		return true;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateOptimisticLockType(
-			OptimisticLockType optimisticLockType, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
+	public boolean validateOptimisticLockType(OptimisticLockType optimisticLockType,
+			DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return true;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validatePolymorphismType(PolymorphismType polymorphismType,
@@ -991,22 +1336,25 @@ public class HbannotationValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateHbCascadeType(HbCascadeType hbCascadeType,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateHbCascadeType(HbCascadeType hbCascadeType, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
 		return true;
 	}
 
 	/**
-	 * Returns the resource locator that will be used to fetch messages for this validator's diagnostics.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the resource locator that will be used to fetch messages for this validator's
+	 * diagnostics. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public ResourceLocator getResourceLocator() {
 		// TODO
-		// Specialize this to return a resource locator for messages specific to this validator.
+		// Specialize this to return a resource locator for messages specific to
+		// this validator.
 		// Ensure that you remove @generated or mark it @generated NOT
 		return super.getResourceLocator();
 	}
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/CacheValidator.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/CacheValidator.java
index 82dcb2c73..2e8c30ee1 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/CacheValidator.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/CacheValidator.java
@@ -9,15 +9,18 @@ package org.eclipse.emf.teneo.hibernate.hbannotation.validation;
 import org.eclipse.emf.teneo.hibernate.hbannotation.CacheConcurrencyStrategy;
 
 /**
- * A sample validator interface for {@link org.eclipse.emf.teneo.hibernate.hbannotation.Cache}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ * A sample validator interface for {@link org.eclipse.emf.teneo.hibernate.hbannotation.Cache}. This
+ * doesn't really do anything, and it's not a real EMF artifact. It was generated by the
+ * org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can
+ * be extended. This can be disabled with -vmargs
+ * -Dorg.eclipse.emf.examples.generator.validator=false.
  */
 public interface CacheValidator {
 	boolean validate();
 
 	boolean validateUsage(CacheConcurrencyStrategy value);
+
 	boolean validateRegion(String value);
+
 	boolean validateInclude(String value);
 }
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/CascadeValidator.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/CascadeValidator.java
index 2c72d989e..8c676037c 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/CascadeValidator.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/CascadeValidator.java
@@ -12,9 +12,10 @@ import org.eclipse.emf.teneo.annotations.pannotation.CascadeType;
 
 /**
  * A sample validator interface for {@link org.eclipse.emf.teneo.hibernate.hbannotation.Cascade}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ * This doesn't really do anything, and it's not a real EMF artifact. It was generated by the
+ * org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can
+ * be extended. This can be disabled with -vmargs
+ * -Dorg.eclipse.emf.examples.generator.validator=false.
  */
 public interface CascadeValidator {
 	boolean validate();
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/CollectionOfElementsValidator.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/CollectionOfElementsValidator.java
index 584319e50..2d2fa34e0 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/CollectionOfElementsValidator.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/CollectionOfElementsValidator.java
@@ -9,14 +9,17 @@ package org.eclipse.emf.teneo.hibernate.hbannotation.validation;
 import org.eclipse.emf.teneo.annotations.pannotation.FetchType;
 
 /**
- * A sample validator interface for {@link org.eclipse.emf.teneo.hibernate.hbannotation.CollectionOfElements}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ * A sample validator interface for
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.CollectionOfElements}. This doesn't really do
+ * anything, and it's not a real EMF artifact. It was generated by the
+ * org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can
+ * be extended. This can be disabled with -vmargs
+ * -Dorg.eclipse.emf.examples.generator.validator=false.
  */
 public interface CollectionOfElementsValidator {
 	boolean validate();
 
 	boolean validateTargetElement(String value);
+
 	boolean validateFetch(FetchType value);
 }
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/FetchValidator.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/FetchValidator.java
index 1c787c8ab..66685b190 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/FetchValidator.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/FetchValidator.java
@@ -9,10 +9,11 @@ package org.eclipse.emf.teneo.hibernate.hbannotation.validation;
 import org.eclipse.emf.teneo.hibernate.hbannotation.HbFetchType;
 
 /**
- * A sample validator interface for {@link org.eclipse.emf.teneo.hibernate.hbannotation.Fetch}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ * A sample validator interface for {@link org.eclipse.emf.teneo.hibernate.hbannotation.Fetch}. This
+ * doesn't really do anything, and it's not a real EMF artifact. It was generated by the
+ * org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can
+ * be extended. This can be disabled with -vmargs
+ * -Dorg.eclipse.emf.examples.generator.validator=false.
  */
 public interface FetchValidator {
 	boolean validate();
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/FilterDefValidator.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/FilterDefValidator.java
index d3771bec7..a43c9b165 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/FilterDefValidator.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/FilterDefValidator.java
@@ -12,14 +12,17 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.ParamDef;
 
 /**
  * A sample validator interface for {@link org.eclipse.emf.teneo.hibernate.hbannotation.FilterDef}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ * This doesn't really do anything, and it's not a real EMF artifact. It was generated by the
+ * org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can
+ * be extended. This can be disabled with -vmargs
+ * -Dorg.eclipse.emf.examples.generator.validator=false.
  */
 public interface FilterDefValidator {
 	boolean validate();
 
 	boolean validateName(String value);
+
 	boolean validateDefaultCondition(String value);
+
 	boolean validateParameters(EList<ParamDef> value);
 }
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/FilterDefsValidator.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/FilterDefsValidator.java
index 991128d91..85adb00ff 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/FilterDefsValidator.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/FilterDefsValidator.java
@@ -12,9 +12,10 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.ParamDef;
 
 /**
  * A sample validator interface for {@link org.eclipse.emf.teneo.hibernate.hbannotation.FilterDefs}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ * This doesn't really do anything, and it's not a real EMF artifact. It was generated by the
+ * org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can
+ * be extended. This can be disabled with -vmargs
+ * -Dorg.eclipse.emf.examples.generator.validator=false.
  */
 public interface FilterDefsValidator {
 	boolean validate();
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/FilterValidator.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/FilterValidator.java
index 59453985a..ebcc54039 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/FilterValidator.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/FilterValidator.java
@@ -6,16 +6,17 @@
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation.validation;
 
-
 /**
  * A sample validator interface for {@link org.eclipse.emf.teneo.hibernate.hbannotation.Filter}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ * This doesn't really do anything, and it's not a real EMF artifact. It was generated by the
+ * org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can
+ * be extended. This can be disabled with -vmargs
+ * -Dorg.eclipse.emf.examples.generator.validator=false.
  */
 public interface FilterValidator {
 	boolean validate();
 
 	boolean validateName(String value);
+
 	boolean validateCondition(String value);
 }
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/FiltersValidator.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/FiltersValidator.java
index 7ab88a038..1f44f1c98 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/FiltersValidator.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/FiltersValidator.java
@@ -12,9 +12,10 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.Filter;
 
 /**
  * A sample validator interface for {@link org.eclipse.emf.teneo.hibernate.hbannotation.Filters}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ * This doesn't really do anything, and it's not a real EMF artifact. It was generated by the
+ * org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can
+ * be extended. This can be disabled with -vmargs
+ * -Dorg.eclipse.emf.examples.generator.validator=false.
  */
 public interface FiltersValidator {
 	boolean validate();
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/GeneratedValidator.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/GeneratedValidator.java
index 1cb0d0fda..4f65e54d8 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/GeneratedValidator.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/GeneratedValidator.java
@@ -10,9 +10,10 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.GenerationTime;
 
 /**
  * A sample validator interface for {@link org.eclipse.emf.teneo.hibernate.hbannotation.Generated}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ * This doesn't really do anything, and it's not a real EMF artifact. It was generated by the
+ * org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can
+ * be extended. This can be disabled with -vmargs
+ * -Dorg.eclipse.emf.examples.generator.validator=false.
  */
 public interface GeneratedValidator {
 	boolean validate();
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/GenericGeneratorValidator.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/GenericGeneratorValidator.java
index 17e036cba..72340c330 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/GenericGeneratorValidator.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/GenericGeneratorValidator.java
@@ -11,15 +11,19 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.teneo.hibernate.hbannotation.Parameter;
 
 /**
- * A sample validator interface for {@link org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ * A sample validator interface for
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator}. This doesn't really do
+ * anything, and it's not a real EMF artifact. It was generated by the
+ * org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can
+ * be extended. This can be disabled with -vmargs
+ * -Dorg.eclipse.emf.examples.generator.validator=false.
  */
 public interface GenericGeneratorValidator {
 	boolean validate();
 
 	boolean validateName(String value);
+
 	boolean validateStrategy(String value);
+
 	boolean validateParameters(EList<Parameter> value);
 }
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/HbAnnotationValidator.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/HbAnnotationValidator.java
index 4cb6f07f4..b237ae52a 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/HbAnnotationValidator.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/HbAnnotationValidator.java
@@ -6,12 +6,13 @@
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation.validation;
 
-
 /**
- * A sample validator interface for {@link org.eclipse.emf.teneo.hibernate.hbannotation.HbAnnotation}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ * A sample validator interface for
+ * {@link org.eclipse.emf.teneo.hibernate.hbannotation.HbAnnotation}. This doesn't really do
+ * anything, and it's not a real EMF artifact. It was generated by the
+ * org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can
+ * be extended. This can be disabled with -vmargs
+ * -Dorg.eclipse.emf.examples.generator.validator=false.
  */
 public interface HbAnnotationValidator {
 	boolean validate();
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/IdBagValidator.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/IdBagValidator.java
index 87bf36f89..c161a81c8 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/IdBagValidator.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/IdBagValidator.java
@@ -6,17 +6,18 @@
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation.validation;
 
-
 /**
- * A sample validator interface for {@link org.eclipse.emf.teneo.hibernate.hbannotation.IdBag}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ * A sample validator interface for {@link org.eclipse.emf.teneo.hibernate.hbannotation.IdBag}. This
+ * doesn't really do anything, and it's not a real EMF artifact. It was generated by the
+ * org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can
+ * be extended. This can be disabled with -vmargs
+ * -Dorg.eclipse.emf.examples.generator.validator=false.
  */
 public interface IdBagValidator {
 	boolean validate();
 
 	boolean validateGenerator(String value);
+
 	boolean validateType(String value);
 
 	boolean validateTable(String value);
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/IndexValidator.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/IndexValidator.java
index 968edeb9d..be79fc01f 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/IndexValidator.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/IndexValidator.java
@@ -6,12 +6,12 @@
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation.validation;
 
-
 /**
- * A sample validator interface for {@link org.eclipse.emf.teneo.hibernate.hbannotation.Index}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ * A sample validator interface for {@link org.eclipse.emf.teneo.hibernate.hbannotation.Index}. This
+ * doesn't really do anything, and it's not a real EMF artifact. It was generated by the
+ * org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can
+ * be extended. This can be disabled with -vmargs
+ * -Dorg.eclipse.emf.examples.generator.validator=false.
  */
 public interface IndexValidator {
 	boolean validate();
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/MapKeyValidator.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/MapKeyValidator.java
index b52b0a239..ef01183bf 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/MapKeyValidator.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/MapKeyValidator.java
@@ -12,9 +12,10 @@ import org.eclipse.emf.teneo.annotations.pannotation.Column;
 
 /**
  * A sample validator interface for {@link org.eclipse.emf.teneo.hibernate.hbannotation.MapKey}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ * This doesn't really do anything, and it's not a real EMF artifact. It was generated by the
+ * org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can
+ * be extended. This can be disabled with -vmargs
+ * -Dorg.eclipse.emf.examples.generator.validator=false.
  */
 public interface MapKeyValidator {
 	boolean validate();
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/NamedQueryValidator.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/NamedQueryValidator.java
index 07c0ae666..9aab2b3cc 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/NamedQueryValidator.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/NamedQueryValidator.java
@@ -6,16 +6,17 @@
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation.validation;
 
-
 /**
  * A sample validator interface for {@link org.eclipse.emf.teneo.hibernate.hbannotation.NamedQuery}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ * This doesn't really do anything, and it's not a real EMF artifact. It was generated by the
+ * org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can
+ * be extended. This can be disabled with -vmargs
+ * -Dorg.eclipse.emf.examples.generator.validator=false.
  */
 public interface NamedQueryValidator {
 	boolean validate();
 
 	boolean validateName(String value);
+
 	boolean validateQuery(String value);
 }
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/OnDeleteValidator.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/OnDeleteValidator.java
index 8159507ed..5a4449d5d 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/OnDeleteValidator.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/OnDeleteValidator.java
@@ -12,9 +12,10 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.OnDeleteAction;
 
 /**
  * A sample validator interface for {@link org.eclipse.emf.teneo.hibernate.hbannotation.OnDelete}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ * This doesn't really do anything, and it's not a real EMF artifact. It was generated by the
+ * org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can
+ * be extended. This can be disabled with -vmargs
+ * -Dorg.eclipse.emf.examples.generator.validator=false.
  */
 public interface OnDeleteValidator {
 	boolean validate();
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/ParamDefValidator.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/ParamDefValidator.java
index b935c561e..47ef876c0 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/ParamDefValidator.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/ParamDefValidator.java
@@ -6,16 +6,17 @@
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation.validation;
 
-
 /**
  * A sample validator interface for {@link org.eclipse.emf.teneo.hibernate.hbannotation.ParamDef}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ * This doesn't really do anything, and it's not a real EMF artifact. It was generated by the
+ * org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can
+ * be extended. This can be disabled with -vmargs
+ * -Dorg.eclipse.emf.examples.generator.validator=false.
  */
 public interface ParamDefValidator {
 	boolean validate();
 
 	boolean validateName(String value);
+
 	boolean validateType(String value);
 }
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/ParameterValidator.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/ParameterValidator.java
index 1fed7b48d..a63d1986f 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/ParameterValidator.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/ParameterValidator.java
@@ -6,16 +6,17 @@
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation.validation;
 
-
 /**
  * A sample validator interface for {@link org.eclipse.emf.teneo.hibernate.hbannotation.Parameter}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ * This doesn't really do anything, and it's not a real EMF artifact. It was generated by the
+ * org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can
+ * be extended. This can be disabled with -vmargs
+ * -Dorg.eclipse.emf.examples.generator.validator=false.
  */
 public interface ParameterValidator {
 	boolean validate();
 
 	boolean validateName(String value);
+
 	boolean validateValue(String value);
 }
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/ProxyValidator.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/ProxyValidator.java
index 686a45fbc..2f638b4f0 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/ProxyValidator.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/ProxyValidator.java
@@ -9,10 +9,11 @@ package org.eclipse.emf.teneo.hibernate.hbannotation.validation;
 import org.eclipse.emf.teneo.hibernate.hbannotation.CacheConcurrencyStrategy;
 
 /**
- * A sample validator interface for {@link org.eclipse.emf.teneo.hibernate.hbannotation.Proxy}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ * A sample validator interface for {@link org.eclipse.emf.teneo.hibernate.hbannotation.Proxy}. This
+ * doesn't really do anything, and it's not a real EMF artifact. It was generated by the
+ * org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can
+ * be extended. This can be disabled with -vmargs
+ * -Dorg.eclipse.emf.examples.generator.validator=false.
  */
 public interface ProxyValidator {
 	boolean validate();
@@ -22,5 +23,6 @@ public interface ProxyValidator {
 	boolean validateLazy(boolean value);
 
 	boolean validateProxyClass(CacheConcurrencyStrategy value);
+
 	boolean validateLazy(Boolean value);
 }
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/TypeDefValidator.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/TypeDefValidator.java
index 101c18817..69a90f51e 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/TypeDefValidator.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/TypeDefValidator.java
@@ -12,14 +12,17 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.Parameter;
 
 /**
  * A sample validator interface for {@link org.eclipse.emf.teneo.hibernate.hbannotation.TypeDef}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ * This doesn't really do anything, and it's not a real EMF artifact. It was generated by the
+ * org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can
+ * be extended. This can be disabled with -vmargs
+ * -Dorg.eclipse.emf.examples.generator.validator=false.
  */
 public interface TypeDefValidator {
 	boolean validate();
 
 	boolean validateName(String value);
+
 	boolean validateParameters(EList<Parameter> value);
+
 	boolean validateTypeClass(String value);
 }
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/TypeValidator.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/TypeValidator.java
index abf37e40c..aeb83c6e7 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/TypeValidator.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/TypeValidator.java
@@ -11,14 +11,16 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.teneo.hibernate.hbannotation.Parameter;
 
 /**
- * A sample validator interface for {@link org.eclipse.emf.teneo.hibernate.hbannotation.Type}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ * A sample validator interface for {@link org.eclipse.emf.teneo.hibernate.hbannotation.Type}. This
+ * doesn't really do anything, and it's not a real EMF artifact. It was generated by the
+ * org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can
+ * be extended. This can be disabled with -vmargs
+ * -Dorg.eclipse.emf.examples.generator.validator=false.
  */
 public interface TypeValidator {
 	boolean validate();
 
 	boolean validateType(String value);
+
 	boolean validateParameters(EList<Parameter> value);
 }
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/WhereValidator.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/WhereValidator.java
index edb28189f..fbffd5432 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/WhereValidator.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbannotation/validation/WhereValidator.java
@@ -6,12 +6,12 @@
  */
 package org.eclipse.emf.teneo.hibernate.hbannotation.validation;
 
-
 /**
- * A sample validator interface for {@link org.eclipse.emf.teneo.hibernate.hbannotation.Where}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ * A sample validator interface for {@link org.eclipse.emf.teneo.hibernate.hbannotation.Where}. This
+ * doesn't really do anything, and it's not a real EMF artifact. It was generated by the
+ * org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can
+ * be extended. This can be disabled with -vmargs
+ * -Dorg.eclipse.emf.examples.generator.validator=false.
  */
 public interface WhereValidator {
 	boolean validate();
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEAttribute.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEAttribute.java
index 85d667641..09f524db7 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEAttribute.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEAttribute.java
@@ -14,33 +14,42 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.NaturalId;
 import org.eclipse.emf.teneo.hibernate.hbannotation.Type;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Hb Annotated EAttribute</b></em>'. <!--
- * end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Hb Annotated EAttribute</b></em>'. <!-- end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute#getHbType <em>Hb Type</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute#getGenerated <em>Generated</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute#getNaturalId <em>Natural Id</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute#getAny <em>Any</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute#getAnyMetaDef <em>Any Meta Def</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute#getHbType <em>Hb Type</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute#getGenerated <em>Generated
+ * </em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute#getNaturalId <em>Natural Id
+ * </em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute#getAny <em>Any</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute#getAnyMetaDef <em>Any Meta
+ * Def</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEAttribute()
  * @model
  * @generated
  */
 public interface HbAnnotatedEAttribute extends PAnnotatedEAttribute, HbAnnotatedETypeElement {
 	/**
-	 * Returns the value of the '<em><b>Hb Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Hb Type</b></em>' containment reference. <!-- begin-user-doc
+	 * -->
 	 * <p>
-	 * If the meaning of the '<em>Hb Type</em>' containment reference isn't clear, there really should be more of a
-	 * description here...
+	 * If the meaning of the '<em>Hb Type</em>' containment reference isn't clear, there really should
+	 * be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hb Type</em>' containment reference.
 	 * @see #setHbType(Type)
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEAttribute_HbType()
@@ -50,22 +59,26 @@ public interface HbAnnotatedEAttribute extends PAnnotatedEAttribute, HbAnnotated
 	Type getHbType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute#getHbType <em>Hb Type</em>}' containment reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hb Type</em>' containment reference.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute#getHbType
+	 * <em>Hb Type</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Hb Type</em>' containment reference.
 	 * @see #getHbType()
 	 * @generated
 	 */
 	void setHbType(Type value);
 
 	/**
-	 * Returns the value of the '<em><b>Generated</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Generated</b></em>' containment reference. <!-- begin-user-doc
+	 * -->
 	 * <p>
-	 * If the meaning of the '<em>Generated</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Generated</em>' containment reference isn't clear, there really
+	 * should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Generated</em>' containment reference.
 	 * @see #setGenerated(Generated)
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEAttribute_Generated()
@@ -75,23 +88,26 @@ public interface HbAnnotatedEAttribute extends PAnnotatedEAttribute, HbAnnotated
 	Generated getGenerated();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute#getGenerated <em>Generated</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Generated</em>' containment reference.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute#getGenerated
+	 * <em>Generated</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Generated</em>' containment reference.
 	 * @see #getGenerated()
 	 * @generated
 	 */
 	void setGenerated(Generated value);
 
 	/**
-	 * Returns the value of the '<em><b>Natural Id</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Natural Id</b></em>' containment reference. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Natural Id</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Natural Id</em>' containment reference isn't clear, there really
+	 * should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Natural Id</em>' containment reference.
 	 * @see #setNaturalId(NaturalId)
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEAttribute_NaturalId()
@@ -101,23 +117,25 @@ public interface HbAnnotatedEAttribute extends PAnnotatedEAttribute, HbAnnotated
 	NaturalId getNaturalId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute#getNaturalId <em>Natural Id</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Natural Id</em>' containment reference.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute#getNaturalId
+	 * <em>Natural Id</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Natural Id</em>' containment reference.
 	 * @see #getNaturalId()
 	 * @generated
 	 */
 	void setNaturalId(NaturalId value);
 
 	/**
-	 * Returns the value of the '<em><b>Any</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Any</b></em>' reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Any</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Any</em>' reference isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Any</em>' reference.
 	 * @see #setAny(Any)
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEAttribute_Any()
@@ -127,23 +145,25 @@ public interface HbAnnotatedEAttribute extends PAnnotatedEAttribute, HbAnnotated
 	Any getAny();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute#getAny <em>Any</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Any</em>' reference.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute#getAny <em>Any</em>}'
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Any</em>' reference.
 	 * @see #getAny()
 	 * @generated
 	 */
 	void setAny(Any value);
 
 	/**
-	 * Returns the value of the '<em><b>Any Meta Def</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Any Meta Def</b></em>' reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Any Meta Def</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Any Meta Def</em>' reference isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Any Meta Def</em>' reference.
 	 * @see #setAnyMetaDef(AnyMetaDef)
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEAttribute_AnyMetaDef()
@@ -153,10 +173,12 @@ public interface HbAnnotatedEAttribute extends PAnnotatedEAttribute, HbAnnotated
 	AnyMetaDef getAnyMetaDef();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute#getAnyMetaDef <em>Any Meta Def</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Any Meta Def</em>' reference.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute#getAnyMetaDef
+	 * <em>Any Meta Def</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Any Meta Def</em>' reference.
 	 * @see #getAnyMetaDef()
 	 * @generated
 	 */
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEClass.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEClass.java
index d6e6540c6..becbf4977 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEClass.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEClass.java
@@ -23,41 +23,62 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.Type;
 import org.eclipse.emf.teneo.hibernate.hbannotation.Where;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Hb Annotated EClass</b></em>'. <!--
- * end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Hb Annotated EClass</b></em>'. <!-- end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbCache <em>Hb Cache</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbOnDelete <em>Hb On Delete</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbWhere <em>Hb Where</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbProxy <em>Hb Proxy</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbNamedQuery <em>Hb Named Query</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getFilterDef <em>Filter Def</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getFilter <em>Filter</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getDiscriminatorFormula <em>Discriminator Formula</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getForceDiscriminator <em>Force Discriminator</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getImmutable <em>Immutable</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbEntity <em>Hb Entity</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getBatchSize <em>Batch Size</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbType <em>Hb Type</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbCache <em>Hb Cache</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbOnDelete <em>Hb On Delete
+ * </em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbWhere <em>Hb Where</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbProxy <em>Hb Proxy</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbNamedQuery <em>Hb Named
+ * Query</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getFilterDef <em>Filter Def
+ * </em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getFilter <em>Filter</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getDiscriminatorFormula <em>
+ * Discriminator Formula</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getForceDiscriminator <em>Force
+ * Discriminator</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getImmutable <em>Immutable</em>}
+ * </li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbEntity <em>Hb Entity</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getBatchSize <em>Batch Size
+ * </em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbType <em>Hb Type</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEClass()
  * @model
  * @generated
  */
 public interface HbAnnotatedEClass extends PAnnotatedEClass {
 	/**
-	 * Returns the value of the '<em><b>Hb Cache</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Hb Cache</b></em>' containment reference. <!-- begin-user-doc
+	 * -->
 	 * <p>
-	 * If the meaning of the '<em>Hb Cache</em>' containment reference isn't clear, there really should be more of a
-	 * description here...
+	 * If the meaning of the '<em>Hb Cache</em>' containment reference isn't clear, there really
+	 * should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hb Cache</em>' containment reference.
 	 * @see #setHbCache(Cache)
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEClass_HbCache()
@@ -67,22 +88,25 @@ public interface HbAnnotatedEClass extends PAnnotatedEClass {
 	Cache getHbCache();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbCache <em>Hb Cache</em>}' containment reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hb Cache</em>' containment reference.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbCache <em>Hb Cache</em>}'
+	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Hb Cache</em>' containment reference.
 	 * @see #getHbCache()
 	 * @generated
 	 */
 	void setHbCache(Cache value);
 
 	/**
-	 * Returns the value of the '<em><b>Hb On Delete</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Hb On Delete</b></em>' reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Hb On Delete</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Hb On Delete</em>' reference isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hb On Delete</em>' reference.
 	 * @see #setHbOnDelete(OnDelete)
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEClass_HbOnDelete()
@@ -92,23 +116,26 @@ public interface HbAnnotatedEClass extends PAnnotatedEClass {
 	OnDelete getHbOnDelete();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbOnDelete <em>Hb On Delete</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hb On Delete</em>' reference.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbOnDelete
+	 * <em>Hb On Delete</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Hb On Delete</em>' reference.
 	 * @see #getHbOnDelete()
 	 * @generated
 	 */
 	void setHbOnDelete(OnDelete value);
 
 	/**
-	 * Returns the value of the '<em><b>Hb Where</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Hb Where</b></em>' containment reference. <!-- begin-user-doc
+	 * -->
 	 * <p>
-	 * If the meaning of the '<em>Hb Where</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Hb Where</em>' containment reference isn't clear, there really
+	 * should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hb Where</em>' containment reference.
 	 * @see #setHbWhere(Where)
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEClass_HbWhere()
@@ -118,23 +145,25 @@ public interface HbAnnotatedEClass extends PAnnotatedEClass {
 	Where getHbWhere();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbWhere <em>Hb Where</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hb Where</em>' containment reference.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbWhere <em>Hb Where</em>}'
+	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Hb Where</em>' containment reference.
 	 * @see #getHbWhere()
 	 * @generated
 	 */
 	void setHbWhere(Where value);
 
 	/**
-	 * Returns the value of the '<em><b>Hb Proxy</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Hb Proxy</b></em>' reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Hb Proxy</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Hb Proxy</em>' reference isn't clear, there really should be more of
+	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hb Proxy</em>' reference.
 	 * @see #setHbProxy(Proxy)
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEClass_HbProxy()
@@ -144,24 +173,27 @@ public interface HbAnnotatedEClass extends PAnnotatedEClass {
 	Proxy getHbProxy();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbProxy <em>Hb Proxy</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hb Proxy</em>' reference.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbProxy <em>Hb Proxy</em>}'
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Hb Proxy</em>' reference.
 	 * @see #getHbProxy()
 	 * @generated
 	 */
 	void setHbProxy(Proxy value);
 
 	/**
-	 * Returns the value of the '<em><b>Hb Named Query</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.emf.teneo.hibernate.hbannotation.NamedQuery}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Hb Named Query</b></em>' reference list. The list contents are
+	 * of type {@link org.eclipse.emf.teneo.hibernate.hbannotation.NamedQuery}. <!-- begin-user-doc
+	 * -->
 	 * <p>
-	 * If the meaning of the '<em>Hb Named Query</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Hb Named Query</em>' reference list isn't clear, there really should
+	 * be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hb Named Query</em>' reference list.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEClass_HbNamedQuery()
 	 * @model
@@ -170,14 +202,14 @@ public interface HbAnnotatedEClass extends PAnnotatedEClass {
 	EList<NamedQuery> getHbNamedQuery();
 
 	/**
-	 * Returns the value of the '<em><b>Filter Def</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.emf.teneo.hibernate.hbannotation.FilterDef}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Filter Def</b></em>' reference list. The list contents are of
+	 * type {@link org.eclipse.emf.teneo.hibernate.hbannotation.FilterDef}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Filter Def</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Filter Def</em>' reference list isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Filter Def</em>' reference list.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEClass_FilterDef()
 	 * @model
@@ -186,14 +218,14 @@ public interface HbAnnotatedEClass extends PAnnotatedEClass {
 	EList<FilterDef> getFilterDef();
 
 	/**
-	 * Returns the value of the '<em><b>Filter</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.emf.teneo.hibernate.hbannotation.Filter}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Filter</b></em>' reference list. The list contents are of type
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Filter}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Filter</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Filter</em>' reference list isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Filter</em>' reference list.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEClass_Filter()
 	 * @model
@@ -202,13 +234,14 @@ public interface HbAnnotatedEClass extends PAnnotatedEClass {
 	EList<Filter> getFilter();
 
 	/**
-	 * Returns the value of the '<em><b>Discriminator Formula</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Discriminator Formula</b></em>' containment reference. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Discriminator Formula</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Discriminator Formula</em>' containment reference isn't clear, there
+	 * really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Discriminator Formula</em>' containment reference.
 	 * @see #setDiscriminatorFormula(DiscriminatorFormula)
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEClass_DiscriminatorFormula()
@@ -218,23 +251,27 @@ public interface HbAnnotatedEClass extends PAnnotatedEClass {
 	DiscriminatorFormula getDiscriminatorFormula();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getDiscriminatorFormula <em>Discriminator Formula</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Discriminator Formula</em>' containment reference.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getDiscriminatorFormula
+	 * <em>Discriminator Formula</em>}' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Discriminator Formula</em>' containment reference.
 	 * @see #getDiscriminatorFormula()
 	 * @generated
 	 */
 	void setDiscriminatorFormula(DiscriminatorFormula value);
 
 	/**
-	 * Returns the value of the '<em><b>Force Discriminator</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Force Discriminator</b></em>' containment reference. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Force Discriminator</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Force Discriminator</em>' containment reference isn't clear, there
+	 * really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Force Discriminator</em>' containment reference.
 	 * @see #setForceDiscriminator(ForceDiscriminator)
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEClass_ForceDiscriminator()
@@ -244,23 +281,27 @@ public interface HbAnnotatedEClass extends PAnnotatedEClass {
 	ForceDiscriminator getForceDiscriminator();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getForceDiscriminator <em>Force Discriminator</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Force Discriminator</em>' containment reference.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getForceDiscriminator
+	 * <em>Force Discriminator</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Force Discriminator</em>' containment reference.
 	 * @see #getForceDiscriminator()
 	 * @generated
 	 */
 	void setForceDiscriminator(ForceDiscriminator value);
 
 	/**
-	 * Returns the value of the '<em><b>Immutable</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Immutable</b></em>' containment reference. <!-- begin-user-doc
+	 * -->
 	 * <p>
-	 * If the meaning of the '<em>Immutable</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Immutable</em>' containment reference isn't clear, there really
+	 * should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Immutable</em>' containment reference.
 	 * @see #setImmutable(Immutable)
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEClass_Immutable()
@@ -270,23 +311,25 @@ public interface HbAnnotatedEClass extends PAnnotatedEClass {
 	Immutable getImmutable();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getImmutable <em>Immutable</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Immutable</em>' containment reference.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getImmutable
+	 * <em>Immutable</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Immutable</em>' containment reference.
 	 * @see #getImmutable()
 	 * @generated
 	 */
 	void setImmutable(Immutable value);
 
 	/**
-	 * Returns the value of the '<em><b>Hb Entity</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Hb Entity</b></em>' reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Hb Entity</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Hb Entity</em>' reference isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hb Entity</em>' reference.
 	 * @see #setHbEntity(HbEntity)
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEClass_HbEntity()
@@ -296,23 +339,25 @@ public interface HbAnnotatedEClass extends PAnnotatedEClass {
 	HbEntity getHbEntity();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbEntity <em>Hb Entity</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hb Entity</em>' reference.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbEntity
+	 * <em>Hb Entity</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Hb Entity</em>' reference.
 	 * @see #getHbEntity()
 	 * @generated
 	 */
 	void setHbEntity(HbEntity value);
 
 	/**
-	 * Returns the value of the '<em><b>Batch Size</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Batch Size</b></em>' reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Batch Size</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Batch Size</em>' reference isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Batch Size</em>' reference.
 	 * @see #setBatchSize(BatchSize)
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEClass_BatchSize()
@@ -322,23 +367,26 @@ public interface HbAnnotatedEClass extends PAnnotatedEClass {
 	BatchSize getBatchSize();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getBatchSize <em>Batch Size</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Batch Size</em>' reference.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getBatchSize
+	 * <em>Batch Size</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Batch Size</em>' reference.
 	 * @see #getBatchSize()
 	 * @generated
 	 */
 	void setBatchSize(BatchSize value);
 
 	/**
-	 * Returns the value of the '<em><b>Hb Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Hb Type</b></em>' containment reference. <!-- begin-user-doc
+	 * -->
 	 * <p>
-	 * If the meaning of the '<em>Hb Type</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Hb Type</em>' containment reference isn't clear, there really should
+	 * be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hb Type</em>' containment reference.
 	 * @see #setHbType(Type)
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEClass_HbType()
@@ -348,10 +396,12 @@ public interface HbAnnotatedEClass extends PAnnotatedEClass {
 	Type getHbType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbType <em>Hb Type</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hb Type</em>' containment reference.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbType <em>Hb Type</em>}'
+	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Hb Type</em>' containment reference.
 	 * @see #getHbType()
 	 * @generated
 	 */
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEDataType.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEDataType.java
index 7a97ef49b..dbcae09fe 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEDataType.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEDataType.java
@@ -16,34 +16,46 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.TypeDef;
 import org.eclipse.emf.teneo.hibernate.hbannotation.Where;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Hb Annotated EData Type</b></em>'. <!--
- * end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Hb Annotated EData Type</b></em>'. <!-- end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType#getHbTypeDef <em>Hb Type Def</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType#getHbWhere <em>Hb Where</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType#getHbColumns <em>Hb Columns</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType#getHbIdBag <em>Hb Id Bag</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType#getHbIndex <em>Hb Index</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType#getHbType <em>Hb Type</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType#getHbTypeDef <em>Hb Type Def
+ * </em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType#getHbWhere <em>Hb Where</em>}
+ * </li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType#getHbColumns <em>Hb Columns
+ * </em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType#getHbIdBag <em>Hb Id Bag
+ * </em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType#getHbIndex <em>Hb Index</em>}
+ * </li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType#getHbType <em>Hb Type</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEDataType()
  * @model
  * @generated
  */
 public interface HbAnnotatedEDataType extends PAnnotatedEDataType, HbAnnotatedEModelElement {
 	/**
-	 * Returns the value of the '<em><b>Hb Type Def</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Hb Type Def</b></em>' containment reference. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Hb Type Def</em>' containment reference list isn't clear, there really should be
-	 * more of a description here...
+	 * If the meaning of the '<em>Hb Type Def</em>' containment reference list isn't clear, there
+	 * really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hb Type Def</em>' containment reference.
 	 * @see #setHbTypeDef(TypeDef)
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEDataType_HbTypeDef()
@@ -53,22 +65,26 @@ public interface HbAnnotatedEDataType extends PAnnotatedEDataType, HbAnnotatedEM
 	TypeDef getHbTypeDef();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType#getHbTypeDef <em>Hb Type Def</em>}' containment reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hb Type Def</em>' containment reference.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType#getHbTypeDef
+	 * <em>Hb Type Def</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Hb Type Def</em>' containment reference.
 	 * @see #getHbTypeDef()
 	 * @generated
 	 */
 	void setHbTypeDef(TypeDef value);
 
 	/**
-	 * Returns the value of the '<em><b>Hb Where</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Hb Where</b></em>' containment reference. <!-- begin-user-doc
+	 * -->
 	 * <p>
-	 * If the meaning of the '<em>Hb Where</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Hb Where</em>' containment reference isn't clear, there really
+	 * should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hb Where</em>' containment reference.
 	 * @see #setHbWhere(Where)
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEDataType_HbWhere()
@@ -78,24 +94,27 @@ public interface HbAnnotatedEDataType extends PAnnotatedEDataType, HbAnnotatedEM
 	Where getHbWhere();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType#getHbWhere <em>Hb Where</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hb Where</em>' containment reference.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType#getHbWhere
+	 * <em>Hb Where</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Hb Where</em>' containment reference.
 	 * @see #getHbWhere()
 	 * @generated
 	 */
 	void setHbWhere(Where value);
 
 	/**
-	 * Returns the value of the '<em><b>Hb Columns</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.emf.teneo.annotations.pannotation.Column}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Hb Columns</b></em>' containment reference list. The list
+	 * contents are of type {@link org.eclipse.emf.teneo.annotations.pannotation.Column}. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Hb Columns</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Hb Columns</em>' containment reference list isn't clear, there
+	 * really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hb Columns</em>' containment reference list.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEDataType_HbColumns()
 	 * @model containment="true"
@@ -104,13 +123,14 @@ public interface HbAnnotatedEDataType extends PAnnotatedEDataType, HbAnnotatedEM
 	EList<Column> getHbColumns();
 
 	/**
-	 * Returns the value of the '<em><b>Hb Id Bag</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Hb Id Bag</b></em>' containment reference. <!-- begin-user-doc
+	 * -->
 	 * <p>
-	 * If the meaning of the '<em>Hb Id Bag</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Hb Id Bag</em>' containment reference isn't clear, there really
+	 * should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hb Id Bag</em>' containment reference.
 	 * @see #setHbIdBag(IdBag)
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEDataType_HbIdBag()
@@ -120,23 +140,25 @@ public interface HbAnnotatedEDataType extends PAnnotatedEDataType, HbAnnotatedEM
 	IdBag getHbIdBag();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType#getHbIdBag <em>Hb Id Bag</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hb Id Bag</em>' containment reference.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType#getHbIdBag
+	 * <em>Hb Id Bag</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Hb Id Bag</em>' containment reference.
 	 * @see #getHbIdBag()
 	 * @generated
 	 */
 	void setHbIdBag(IdBag value);
 
 	/**
-	 * Returns the value of the '<em><b>Hb Index</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Hb Index</b></em>' reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Hb Index</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Hb Index</em>' reference isn't clear, there really should be more of
+	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hb Index</em>' reference.
 	 * @see #setHbIndex(Index)
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEDataType_HbIndex()
@@ -146,23 +168,26 @@ public interface HbAnnotatedEDataType extends PAnnotatedEDataType, HbAnnotatedEM
 	Index getHbIndex();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType#getHbIndex <em>Hb Index</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hb Index</em>' reference.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType#getHbIndex
+	 * <em>Hb Index</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Hb Index</em>' reference.
 	 * @see #getHbIndex()
 	 * @generated
 	 */
 	void setHbIndex(Index value);
 
 	/**
-	 * Returns the value of the '<em><b>Hb Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Hb Type</b></em>' containment reference. <!-- begin-user-doc
+	 * -->
 	 * <p>
-	 * If the meaning of the '<em>Hb Type</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Hb Type</em>' containment reference isn't clear, there really should
+	 * be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hb Type</em>' containment reference.
 	 * @see #setHbType(Type)
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEDataType_HbType()
@@ -172,10 +197,12 @@ public interface HbAnnotatedEDataType extends PAnnotatedEDataType, HbAnnotatedEM
 	Type getHbType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType#getHbType <em>Hb Type</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hb Type</em>' containment reference.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType#getHbType <em>Hb Type</em>}
+	 * ' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Hb Type</em>' containment reference.
 	 * @see #getHbType()
 	 * @generated
 	 */
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEModelElement.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEModelElement.java
index 467d966b1..34258e92c 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEModelElement.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEModelElement.java
@@ -9,10 +9,10 @@ package org.eclipse.emf.teneo.hibernate.hbmodel;
 import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEModelElement;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Hb Annotated EModel Element</b></em>'. <!--
- * end-user-doc -->
- *
- *
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Hb Annotated EModel Element</b></em>'. <!-- end-user-doc -->
+ * 
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEModelElement()
  * @model interface="true" abstract="true"
  * @generated
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEPackage.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEPackage.java
index 3bf6f64e0..4a2e55797 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEPackage.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEPackage.java
@@ -15,20 +15,30 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.NamedQuery;
 import org.eclipse.emf.teneo.hibernate.hbannotation.TypeDef;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Hb Annotated EPackage</b></em>'. <!--
- * end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Hb Annotated EPackage</b></em>'. <!-- end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage#getHbGenericGenerators <em>Hb Generic Generators</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage#getHbTypeDef <em>Hb Type Def</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage#getHbNamedQuery <em>Hb Named Query</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage#getFilterDef <em>Filter Def</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage#getAnyMetaDef <em>Any Meta Def</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage#getHbGenericGenerators <em>Hb
+ * Generic Generators</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage#getHbTypeDef <em>Hb Type Def
+ * </em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage#getHbNamedQuery <em>Hb Named
+ * Query</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage#getFilterDef <em>Filter Def
+ * </em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage#getAnyMetaDef <em>Any Meta Def
+ * </em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEPackage()
  * @model
  * @generated
@@ -36,14 +46,14 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.TypeDef;
 public interface HbAnnotatedEPackage extends PAnnotatedEPackage {
 	/**
 	 * Returns the value of the '<em><b>Hb Generic Generators</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator}.
-	 * <!-- begin-user-doc
-	 * -->
+	 * The list contents are of type
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.GenericGenerator}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Hb Generic Generators</em>' containment reference isn't clear, there really should
-	 * be more of a description here...
+	 * If the meaning of the '<em>Hb Generic Generators</em>' containment reference isn't clear, there
+	 * really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hb Generic Generators</em>' containment reference list.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEPackage_HbGenericGenerators()
 	 * @model containment="true"
@@ -52,14 +62,15 @@ public interface HbAnnotatedEPackage extends PAnnotatedEPackage {
 	EList<GenericGenerator> getHbGenericGenerators();
 
 	/**
-	 * Returns the value of the '<em><b>Hb Type Def</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.emf.teneo.hibernate.hbannotation.TypeDef}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Hb Type Def</b></em>' containment reference list. The list
+	 * contents are of type {@link org.eclipse.emf.teneo.hibernate.hbannotation.TypeDef}. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Hb Type Def</em>' containment reference list isn't clear, there really should be
-	 * more of a description here...
+	 * If the meaning of the '<em>Hb Type Def</em>' containment reference list isn't clear, there
+	 * really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hb Type Def</em>' containment reference list.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEPackage_HbTypeDef()
 	 * @model containment="true"
@@ -68,14 +79,15 @@ public interface HbAnnotatedEPackage extends PAnnotatedEPackage {
 	EList<TypeDef> getHbTypeDef();
 
 	/**
-	 * Returns the value of the '<em><b>Hb Named Query</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.emf.teneo.hibernate.hbannotation.NamedQuery}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Hb Named Query</b></em>' reference list. The list contents are
+	 * of type {@link org.eclipse.emf.teneo.hibernate.hbannotation.NamedQuery}. <!-- begin-user-doc
+	 * -->
 	 * <p>
-	 * If the meaning of the '<em>Hb Named Query</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Hb Named Query</em>' reference list isn't clear, there really should
+	 * be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hb Named Query</em>' reference list.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEPackage_HbNamedQuery()
 	 * @model
@@ -84,14 +96,14 @@ public interface HbAnnotatedEPackage extends PAnnotatedEPackage {
 	EList<NamedQuery> getHbNamedQuery();
 
 	/**
-	 * Returns the value of the '<em><b>Filter Def</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.emf.teneo.hibernate.hbannotation.FilterDef}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Filter Def</b></em>' reference list. The list contents are of
+	 * type {@link org.eclipse.emf.teneo.hibernate.hbannotation.FilterDef}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Filter Def</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Filter Def</em>' reference list isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Filter Def</em>' reference list.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEPackage_FilterDef()
 	 * @model
@@ -100,14 +112,15 @@ public interface HbAnnotatedEPackage extends PAnnotatedEPackage {
 	EList<FilterDef> getFilterDef();
 
 	/**
-	 * Returns the value of the '<em><b>Any Meta Def</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Any Meta Def</b></em>' reference list. The list contents are
+	 * of type {@link org.eclipse.emf.teneo.hibernate.hbannotation.AnyMetaDef}. <!-- begin-user-doc
+	 * -->
 	 * <p>
-	 * If the meaning of the '<em>Any Meta Def</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Any Meta Def</em>' reference list isn't clear, there really should
+	 * be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Any Meta Def</em>' reference list.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEPackage_AnyMetaDef()
 	 * @model
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEReference.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEReference.java
index ab3804771..15c67f99f 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEReference.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedEReference.java
@@ -19,38 +19,57 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.OnDelete;
 import org.eclipse.emf.teneo.hibernate.hbannotation.Type;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Hb Annotated EReference</b></em>'. <!--
- * end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Hb Annotated EReference</b></em>'. <!-- end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getHbCache <em>Hb Cache</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getHbFetch <em>Hb Fetch</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getHbOnDelete <em>Hb On Delete</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getNaturalId <em>Natural Id</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getImmutable <em>Immutable</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getNotFound <em>Not Found</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getHbType <em>Hb Type</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getBatchSize <em>Batch Size</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getAny <em>Any</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getAnyMetaDef <em>Any Meta Def</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getHbCache <em>Hb Cache
+ * </em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getHbFetch <em>Hb Fetch
+ * </em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getHbOnDelete <em>Hb On
+ * Delete</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getNaturalId <em>Natural Id
+ * </em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getImmutable <em>Immutable
+ * </em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getNotFound <em>Not Found
+ * </em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getHbType <em>Hb Type</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getBatchSize <em>Batch Size
+ * </em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getAny <em>Any</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getAnyMetaDef <em>Any Meta
+ * Def</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEReference()
  * @model
  * @generated
  */
 public interface HbAnnotatedEReference extends PAnnotatedEReference, HbAnnotatedETypeElement {
 	/**
-	 * Returns the value of the '<em><b>Hb Cache</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Hb Cache</b></em>' containment reference. <!-- begin-user-doc
+	 * -->
 	 * <p>
-	 * If the meaning of the '<em>Hb Cache</em>' containment reference isn't clear, there really should be more of a
-	 * description here...
+	 * If the meaning of the '<em>Hb Cache</em>' containment reference isn't clear, there really
+	 * should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hb Cache</em>' containment reference.
 	 * @see #setHbCache(Cache)
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEReference_HbCache()
@@ -60,22 +79,25 @@ public interface HbAnnotatedEReference extends PAnnotatedEReference, HbAnnotated
 	Cache getHbCache();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getHbCache <em>Hb Cache</em>}' containment reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hb Cache</em>' containment reference.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getHbCache
+	 * <em>Hb Cache</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Hb Cache</em>' containment reference.
 	 * @see #getHbCache()
 	 * @generated
 	 */
 	void setHbCache(Cache value);
 
 	/**
-	 * Returns the value of the '<em><b>Hb Fetch</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Hb Fetch</b></em>' reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Hb Fetch</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Hb Fetch</em>' containment reference isn't clear, there really
+	 * should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hb Fetch</em>' reference.
 	 * @see #setHbFetch(Fetch)
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEReference_HbFetch()
@@ -85,23 +107,25 @@ public interface HbAnnotatedEReference extends PAnnotatedEReference, HbAnnotated
 	Fetch getHbFetch();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getHbFetch <em>Hb Fetch</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hb Fetch</em>' reference.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getHbFetch
+	 * <em>Hb Fetch</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Hb Fetch</em>' reference.
 	 * @see #getHbFetch()
 	 * @generated
 	 */
 	void setHbFetch(Fetch value);
 
 	/**
-	 * Returns the value of the '<em><b>Hb On Delete</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Hb On Delete</b></em>' reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Hb On Delete</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Hb On Delete</em>' reference isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hb On Delete</em>' reference.
 	 * @see #setHbOnDelete(OnDelete)
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEReference_HbOnDelete()
@@ -111,23 +135,26 @@ public interface HbAnnotatedEReference extends PAnnotatedEReference, HbAnnotated
 	OnDelete getHbOnDelete();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getHbOnDelete <em>Hb On Delete</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hb On Delete</em>' reference.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getHbOnDelete
+	 * <em>Hb On Delete</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Hb On Delete</em>' reference.
 	 * @see #getHbOnDelete()
 	 * @generated
 	 */
 	void setHbOnDelete(OnDelete value);
 
 	/**
-	 * Returns the value of the '<em><b>Natural Id</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Natural Id</b></em>' containment reference. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Natural Id</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Natural Id</em>' containment reference isn't clear, there really
+	 * should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Natural Id</em>' containment reference.
 	 * @see #setNaturalId(NaturalId)
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEReference_NaturalId()
@@ -137,23 +164,26 @@ public interface HbAnnotatedEReference extends PAnnotatedEReference, HbAnnotated
 	NaturalId getNaturalId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getNaturalId <em>Natural Id</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Natural Id</em>' containment reference.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getNaturalId
+	 * <em>Natural Id</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Natural Id</em>' containment reference.
 	 * @see #getNaturalId()
 	 * @generated
 	 */
 	void setNaturalId(NaturalId value);
 
 	/**
-	 * Returns the value of the '<em><b>Immutable</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Immutable</b></em>' containment reference. <!-- begin-user-doc
+	 * -->
 	 * <p>
-	 * If the meaning of the '<em>Immutable</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Immutable</em>' containment reference isn't clear, there really
+	 * should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Immutable</em>' containment reference.
 	 * @see #setImmutable(Immutable)
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEReference_Immutable()
@@ -163,23 +193,26 @@ public interface HbAnnotatedEReference extends PAnnotatedEReference, HbAnnotated
 	Immutable getImmutable();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getImmutable <em>Immutable</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Immutable</em>' containment reference.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getImmutable
+	 * <em>Immutable</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Immutable</em>' containment reference.
 	 * @see #getImmutable()
 	 * @generated
 	 */
 	void setImmutable(Immutable value);
 
 	/**
-	 * Returns the value of the '<em><b>Not Found</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Not Found</b></em>' containment reference. <!-- begin-user-doc
+	 * -->
 	 * <p>
-	 * If the meaning of the '<em>Not Found</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Not Found</em>' containment reference isn't clear, there really
+	 * should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Not Found</em>' containment reference.
 	 * @see #setNotFound(NotFound)
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEReference_NotFound()
@@ -189,23 +222,26 @@ public interface HbAnnotatedEReference extends PAnnotatedEReference, HbAnnotated
 	NotFound getNotFound();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getNotFound <em>Not Found</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Not Found</em>' containment reference.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getNotFound
+	 * <em>Not Found</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Not Found</em>' containment reference.
 	 * @see #getNotFound()
 	 * @generated
 	 */
 	void setNotFound(NotFound value);
 
 	/**
-	 * Returns the value of the '<em><b>Hb Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Hb Type</b></em>' containment reference. <!-- begin-user-doc
+	 * -->
 	 * <p>
-	 * If the meaning of the '<em>Hb Type</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Hb Type</em>' containment reference isn't clear, there really should
+	 * be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hb Type</em>' containment reference.
 	 * @see #setHbType(Type)
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEReference_HbType()
@@ -215,23 +251,25 @@ public interface HbAnnotatedEReference extends PAnnotatedEReference, HbAnnotated
 	Type getHbType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getHbType <em>Hb Type</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hb Type</em>' containment reference.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getHbType
+	 * <em>Hb Type</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Hb Type</em>' containment reference.
 	 * @see #getHbType()
 	 * @generated
 	 */
 	void setHbType(Type value);
 
 	/**
-	 * Returns the value of the '<em><b>Batch Size</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Batch Size</b></em>' reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Batch Size</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Batch Size</em>' reference isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Batch Size</em>' reference.
 	 * @see #setBatchSize(BatchSize)
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEReference_BatchSize()
@@ -241,23 +279,25 @@ public interface HbAnnotatedEReference extends PAnnotatedEReference, HbAnnotated
 	BatchSize getBatchSize();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getBatchSize <em>Batch Size</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Batch Size</em>' reference.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getBatchSize
+	 * <em>Batch Size</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Batch Size</em>' reference.
 	 * @see #getBatchSize()
 	 * @generated
 	 */
 	void setBatchSize(BatchSize value);
 
 	/**
-	 * Returns the value of the '<em><b>Any</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Any</b></em>' reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Any</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Any</em>' reference isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Any</em>' reference.
 	 * @see #setAny(Any)
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEReference_Any()
@@ -267,23 +307,25 @@ public interface HbAnnotatedEReference extends PAnnotatedEReference, HbAnnotated
 	Any getAny();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getAny <em>Any</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Any</em>' reference.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getAny <em>Any</em>}'
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Any</em>' reference.
 	 * @see #getAny()
 	 * @generated
 	 */
 	void setAny(Any value);
 
 	/**
-	 * Returns the value of the '<em><b>Any Meta Def</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Any Meta Def</b></em>' reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Any Meta Def</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Any Meta Def</em>' reference isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Any Meta Def</em>' reference.
 	 * @see #setAnyMetaDef(AnyMetaDef)
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedEReference_AnyMetaDef()
@@ -293,10 +335,12 @@ public interface HbAnnotatedEReference extends PAnnotatedEReference, HbAnnotated
 	AnyMetaDef getAnyMetaDef();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getAnyMetaDef <em>Any Meta Def</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Any Meta Def</em>' reference.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getAnyMetaDef
+	 * <em>Any Meta Def</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Any Meta Def</em>' reference.
 	 * @see #getAnyMetaDef()
 	 * @generated
 	 */
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedETypeElement.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedETypeElement.java
index 729f28591..93eec3b86 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedETypeElement.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbAnnotatedETypeElement.java
@@ -20,38 +20,60 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.MapKeyManyToMany;
 import org.eclipse.emf.teneo.hibernate.hbannotation.Where;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Hb Annotated EType Element</b></em>'. <!--
- * end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Hb Annotated EType Element</b></em>'. <!-- end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbWhere <em>Hb Where</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbCollectionOfElements <em>Hb Collection Of Elements</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbMapKey <em>Hb Map Key</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbColumns <em>Hb Columns</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbCascade <em>Hb Cascade</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbIdBag <em>Hb Id Bag</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbIndex <em>Hb Index</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getFilter <em>Filter</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getMapKeyManyToMany <em>Map Key Many To Many</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getFormula <em>Formula</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbWhere <em>Hb Where
+ * </em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbCollectionOfElements
+ * <em>Hb Collection Of Elements</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbMapKey <em>Hb Map Key
+ * </em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbColumns <em>Hb
+ * Columns</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbCascade <em>Hb
+ * Cascade</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbIdBag <em>Hb Id Bag
+ * </em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbIndex <em>Hb Index
+ * </em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getFilter <em>Filter</em>}
+ * </li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getMapKeyManyToMany <em>
+ * Map Key Many To Many</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getFormula <em>Formula
+ * </em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedETypeElement()
  * @model interface="true" abstract="true"
  * @generated
  */
-public interface HbAnnotatedETypeElement extends PAnnotatedEStructuralFeature, HbAnnotatedEModelElement {
+public interface HbAnnotatedETypeElement extends PAnnotatedEStructuralFeature,
+		HbAnnotatedEModelElement {
 	/**
-	 * Returns the value of the '<em><b>Hb Where</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Hb Where</b></em>' containment reference. <!-- begin-user-doc
+	 * -->
 	 * <p>
-	 * If the meaning of the '<em>Hb Where</em>' containment reference isn't clear, there really should be more of a
-	 * description here...
+	 * If the meaning of the '<em>Hb Where</em>' containment reference isn't clear, there really
+	 * should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hb Where</em>' containment reference.
 	 * @see #setHbWhere(Where)
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedETypeElement_HbWhere()
@@ -61,20 +83,23 @@ public interface HbAnnotatedETypeElement extends PAnnotatedEStructuralFeature, H
 	Where getHbWhere();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbWhere <em>Hb Where</em>}' containment reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hb Where</em>' containment reference.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbWhere
+	 * <em>Hb Where</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Hb Where</em>' containment reference.
 	 * @see #getHbWhere()
 	 * @generated
 	 */
 	void setHbWhere(Where value);
 
 	/**
-	 * Returns the value of the '<em><b>Hb Collection Of Elements</b></em>' containment reference. <!--
-	 * begin-user-doc -->
+	 * Returns the value of the '<em><b>Hb Collection Of Elements</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Hb Collection Of Elements</em>' containment reference isn't clear, there really
-	 * should be more of a description here...
+	 * If the meaning of the '<em>Hb Collection Of Elements</em>' containment reference isn't clear,
+	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * 
@@ -87,22 +112,27 @@ public interface HbAnnotatedETypeElement extends PAnnotatedEStructuralFeature, H
 	CollectionOfElements getHbCollectionOfElements();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbCollectionOfElements <em>Hb Collection Of Elements</em>}' containment reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hb Collection Of Elements</em>' containment reference.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbCollectionOfElements
+	 * <em>Hb Collection Of Elements</em>}' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Hb Collection Of Elements</em>' containment reference.
 	 * @see #getHbCollectionOfElements()
 	 * @generated
 	 */
 	void setHbCollectionOfElements(CollectionOfElements value);
 
 	/**
-	 * Returns the value of the '<em><b>Hb Map Key</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Hb Map Key</b></em>' containment reference. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Hb Map Key</em>' containment reference isn't clear, there really should be more of
-	 * a description here...
+	 * If the meaning of the '<em>Hb Map Key</em>' containment reference isn't clear, there really
+	 * should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hb Map Key</em>' containment reference.
 	 * @see #setHbMapKey(HbMapKey)
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedETypeElement_HbMapKey()
@@ -113,24 +143,27 @@ public interface HbAnnotatedETypeElement extends PAnnotatedEStructuralFeature, H
 	HbMapKey getHbMapKey();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbMapKey <em>Hb Map Key</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hb Map Key</em>' containment reference.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbMapKey
+	 * <em>Hb Map Key</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Hb Map Key</em>' containment reference.
 	 * @see #getHbMapKey()
 	 * @generated
 	 */
 	void setHbMapKey(HbMapKey value);
 
 	/**
-	 * Returns the value of the '<em><b>Hb Columns</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.emf.teneo.annotations.pannotation.Column}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Hb Columns</b></em>' containment reference list. The list
+	 * contents are of type {@link org.eclipse.emf.teneo.annotations.pannotation.Column}. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Hb Columns</em>' containment reference list isn't clear, there really should be
-	 * more of a description here...
+	 * If the meaning of the '<em>Hb Columns</em>' containment reference list isn't clear, there
+	 * really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hb Columns</em>' containment reference list.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedETypeElement_HbColumns()
 	 * @model containment="true"
@@ -139,13 +172,14 @@ public interface HbAnnotatedETypeElement extends PAnnotatedEStructuralFeature, H
 	EList<Column> getHbColumns();
 
 	/**
-	 * Returns the value of the '<em><b>Hb Cascade</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Hb Cascade</b></em>' containment reference. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Hb Cascade</em>' containment reference isn't clear, there really should be more of
-	 * a description here...
+	 * If the meaning of the '<em>Hb Cascade</em>' containment reference isn't clear, there really
+	 * should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hb Cascade</em>' containment reference.
 	 * @see #setHbCascade(Cascade)
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedETypeElement_HbCascade()
@@ -155,22 +189,26 @@ public interface HbAnnotatedETypeElement extends PAnnotatedEStructuralFeature, H
 	Cascade getHbCascade();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbCascade <em>Hb Cascade</em>}' containment reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hb Cascade</em>' containment reference.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbCascade
+	 * <em>Hb Cascade</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Hb Cascade</em>' containment reference.
 	 * @see #getHbCascade()
 	 * @generated
 	 */
 	void setHbCascade(Cascade value);
 
 	/**
-	 * Returns the value of the '<em><b>Hb Id Bag</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Hb Id Bag</b></em>' containment reference. <!-- begin-user-doc
+	 * -->
 	 * <p>
-	 * If the meaning of the '<em>Hb Id Bag</em>' containment reference isn't clear, there really should be more of
-	 * a description here...
+	 * If the meaning of the '<em>Hb Id Bag</em>' containment reference isn't clear, there really
+	 * should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hb Id Bag</em>' containment reference.
 	 * @see #setHbIdBag(IdBag)
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedETypeElement_HbIdBag()
@@ -180,22 +218,25 @@ public interface HbAnnotatedETypeElement extends PAnnotatedEStructuralFeature, H
 	IdBag getHbIdBag();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbIdBag <em>Hb Id Bag</em>}' containment reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hb Id Bag</em>' containment reference.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbIdBag
+	 * <em>Hb Id Bag</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Hb Id Bag</em>' containment reference.
 	 * @see #getHbIdBag()
 	 * @generated
 	 */
 	void setHbIdBag(IdBag value);
 
 	/**
-	 * Returns the value of the '<em><b>Hb Index</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Hb Index</b></em>' reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Hb Index</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Hb Index</em>' reference isn't clear, there really should be more of
+	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Hb Index</em>' reference.
 	 * @see #setHbIndex(Index)
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedETypeElement_HbIndex()
@@ -205,24 +246,26 @@ public interface HbAnnotatedETypeElement extends PAnnotatedEStructuralFeature, H
 	Index getHbIndex();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbIndex <em>Hb Index</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hb Index</em>' reference.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbIndex
+	 * <em>Hb Index</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Hb Index</em>' reference.
 	 * @see #getHbIndex()
 	 * @generated
 	 */
 	void setHbIndex(Index value);
 
 	/**
-	 * Returns the value of the '<em><b>Filter</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.emf.teneo.hibernate.hbannotation.Filter}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Filter</b></em>' reference list. The list contents are of type
+	 * {@link org.eclipse.emf.teneo.hibernate.hbannotation.Filter}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Filter</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Filter</em>' reference list isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Filter</em>' reference list.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedETypeElement_Filter()
 	 * @model
@@ -231,13 +274,14 @@ public interface HbAnnotatedETypeElement extends PAnnotatedEStructuralFeature, H
 	EList<Filter> getFilter();
 
 	/**
-	 * Returns the value of the '<em><b>Map Key Many To Many</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Map Key Many To Many</b></em>' containment reference. <!--
+	 * begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Map Key Many To Many</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Map Key Many To Many</em>' containment reference isn't clear, there
+	 * really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Map Key Many To Many</em>' containment reference.
 	 * @see #setMapKeyManyToMany(MapKeyManyToMany)
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedETypeElement_MapKeyManyToMany()
@@ -248,23 +292,26 @@ public interface HbAnnotatedETypeElement extends PAnnotatedEStructuralFeature, H
 	MapKeyManyToMany getMapKeyManyToMany();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getMapKeyManyToMany <em>Map Key Many To Many</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Map Key Many To Many</em>' containment reference.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getMapKeyManyToMany
+	 * <em>Map Key Many To Many</em>}' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Map Key Many To Many</em>' containment reference.
 	 * @see #getMapKeyManyToMany()
 	 * @generated
 	 */
 	void setMapKeyManyToMany(MapKeyManyToMany value);
 
 	/**
-	 * Returns the value of the '<em><b>Formula</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Formula</b></em>' reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Formula</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Formula</em>' reference isn't clear, there really should be more of
+	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Formula</em>' reference.
 	 * @see #setFormula(Formula)
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#getHbAnnotatedETypeElement_Formula()
@@ -274,10 +321,12 @@ public interface HbAnnotatedETypeElement extends PAnnotatedEStructuralFeature, H
 	Formula getFormula();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getFormula <em>Formula</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Formula</em>' reference.
+	 * Sets the value of the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getFormula
+	 * <em>Formula</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *          the new value of the '<em>Formula</em>' reference.
 	 * @see #getFormula()
 	 * @generated
 	 */
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbmodelFactory.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbmodelFactory.java
index 0bd945f1d..625843c42 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbmodelFactory.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbmodelFactory.java
@@ -9,74 +9,71 @@ package org.eclipse.emf.teneo.hibernate.hbmodel;
 import org.eclipse.emf.ecore.EFactory;
 
 /**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each
+ * non-abstract class of the model. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage
  * @generated
  */
 public interface HbmodelFactory extends EFactory {
 	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	HbmodelFactory eINSTANCE = org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbmodelFactoryImpl.init();
 
 	/**
-	 * Returns a new object of class '<em>Hb Annotated EAttribute</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Hb Annotated EAttribute</em>'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Hb Annotated EAttribute</em>'.
 	 * @generated
 	 */
 	HbAnnotatedEAttribute createHbAnnotatedEAttribute();
 
 	/**
-	 * Returns a new object of class '<em>Hb Annotated EClass</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Hb Annotated EClass</em>'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Hb Annotated EClass</em>'.
 	 * @generated
 	 */
 	HbAnnotatedEClass createHbAnnotatedEClass();
 
 	/**
-	 * Returns a new object of class '<em>Hb Annotated EPackage</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Hb Annotated EPackage</em>'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Hb Annotated EPackage</em>'.
 	 * @generated
 	 */
 	HbAnnotatedEPackage createHbAnnotatedEPackage();
 
 	/**
-	 * Returns a new object of class '<em>Hb Annotated EReference</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Hb Annotated EReference</em>'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Hb Annotated EReference</em>'.
 	 * @generated
 	 */
 	HbAnnotatedEReference createHbAnnotatedEReference();
 
 	/**
-	 * Returns a new object of class '<em>Hb Annotated EData Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Hb Annotated EData Type</em>'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Hb Annotated EData Type</em>'.
 	 * @generated
 	 */
 	HbAnnotatedEDataType createHbAnnotatedEDataType();
 
 	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
 	HbmodelPackage getHbmodelPackage();
 
-} //HbmodelFactory
+} // HbmodelFactory
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbmodelPackage.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbmodelPackage.java
index 7e990fee7..2f0616097 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbmodelPackage.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/HbmodelPackage.java
@@ -12,57 +12,54 @@ import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.teneo.annotations.pamodel.PamodelPackage;
 
 /**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
+ * <!-- begin-user-doc --> The <b>Package</b> for the model. It contains accessors for the meta
+ * objects to represent
  * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelFactory
  * @model kind="package"
  * @generated
  */
 public interface HbmodelPackage extends EPackage {
 	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNAME = "hbmodel";
 
 	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_URI = "http://www.eclipse.org/emf/teneo/2006/HbModel";
 
 	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_PREFIX = "org.eclipse.emf.teneo.hibernate";
 
 	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	HbmodelPackage eINSTANCE = org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbmodelPackageImpl.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement <em>Hb Annotated EType Element</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement
+	 * <em>Hb Annotated EType Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbmodelPackageImpl#getHbAnnotatedETypeElement()
 	 * @generated
@@ -70,225 +67,226 @@ public interface HbmodelPackage extends EPackage {
 	int HB_ANNOTATED_ETYPE_ELEMENT = 0;
 
 	/**
-	 * The feature id for the '<em><b>Model Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Model Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ETYPE_ELEMENT__MODEL_ELEMENT = PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE__MODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Transient</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Transient</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ETYPE_ELEMENT__TRANSIENT = PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE__TRANSIENT;
 
 	/**
-	 * The feature id for the '<em><b>Attribute Overrides</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Attribute Overrides</b></em>' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ETYPE_ELEMENT__ATTRIBUTE_OVERRIDES = PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE__ATTRIBUTE_OVERRIDES;
 
 	/**
-	 * The feature id for the '<em><b>Join Table</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Join Table</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ETYPE_ELEMENT__JOIN_TABLE = PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE__JOIN_TABLE;
 
 	/**
-	 * The feature id for the '<em><b>One To Many</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>One To Many</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ETYPE_ELEMENT__ONE_TO_MANY = PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE__ONE_TO_MANY;
 
 	/**
-	 * The feature id for the '<em><b>Sequence Generator</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sequence Generator</b></em>' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ETYPE_ELEMENT__SEQUENCE_GENERATOR = PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE__SEQUENCE_GENERATOR;
 
 	/**
-	 * The feature id for the '<em><b>Table Generators</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Table Generators</b></em>' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ETYPE_ELEMENT__TABLE_GENERATORS = PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE__TABLE_GENERATORS;
 
 	/**
-	 * The feature id for the '<em><b>Join Columns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Join Columns</b></em>' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ETYPE_ELEMENT__JOIN_COLUMNS = PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE__JOIN_COLUMNS;
 
 	/**
-	 * The feature id for the '<em><b>Column</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Column</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ETYPE_ELEMENT__COLUMN = PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE__COLUMN;
 
 	/**
-	 * The feature id for the '<em><b>Pa EClass</b></em>' container reference.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Pa EClass</b></em>' container reference. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ETYPE_ELEMENT__PA_ECLASS = PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE__PA_ECLASS;
 
 	/**
-	 * The feature id for the '<em><b>Model EStructural Feature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Model EStructural Feature</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ETYPE_ELEMENT__MODEL_ESTRUCTURAL_FEATURE = PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE__MODEL_ESTRUCTURAL_FEATURE;
 
 	/**
-	 * The feature id for the '<em><b>Foreign Key</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Foreign Key</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ETYPE_ELEMENT__FOREIGN_KEY = PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE__FOREIGN_KEY;
 
 	/**
-	 * The feature id for the '<em><b>List Index Column</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>List Index Column</b></em>' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ETYPE_ELEMENT__LIST_INDEX_COLUMN = PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE__LIST_INDEX_COLUMN;
 
 	/**
-	 * The feature id for the '<em><b>Hb Where</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hb Where</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ETYPE_ELEMENT__HB_WHERE = PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Hb Collection Of Elements</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hb Collection Of Elements</b></em>' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ETYPE_ELEMENT__HB_COLLECTION_OF_ELEMENTS = PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Hb Map Key</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hb Map Key</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ETYPE_ELEMENT__HB_MAP_KEY = PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Hb Columns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hb Columns</b></em>' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ETYPE_ELEMENT__HB_COLUMNS = PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Hb Cascade</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hb Cascade</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ETYPE_ELEMENT__HB_CASCADE = PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Hb Id Bag</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hb Id Bag</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ETYPE_ELEMENT__HB_ID_BAG = PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE_FEATURE_COUNT + 5;
 
 	/**
-	 * The feature id for the '<em><b>Hb Index</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hb Index</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ETYPE_ELEMENT__HB_INDEX = PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE_FEATURE_COUNT + 6;
 
 	/**
-	 * The feature id for the '<em><b>Filter</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Filter</b></em>' reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ETYPE_ELEMENT__FILTER = PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE_FEATURE_COUNT + 7;
 
 	/**
-	 * The feature id for the '<em><b>Map Key Many To Many</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Map Key Many To Many</b></em>' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ETYPE_ELEMENT__MAP_KEY_MANY_TO_MANY = PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE_FEATURE_COUNT + 8;
 
 	/**
-	 * The feature id for the '<em><b>Formula</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Formula</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ETYPE_ELEMENT__FORMULA = PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE_FEATURE_COUNT + 9;
 
 	/**
-	 * The number of structural features of the '<em>Hb Annotated EType Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the ' <em>Hb Annotated EType Element</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ETYPE_ELEMENT_FEATURE_COUNT = PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE_FEATURE_COUNT + 10;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl <em>Hb Annotated EAttribute</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl
+	 * <em>Hb Annotated EAttribute</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbmodelPackageImpl#getHbAnnotatedEAttribute()
 	 * @generated
@@ -296,342 +294,343 @@ public interface HbmodelPackage extends EPackage {
 	int HB_ANNOTATED_EATTRIBUTE = 1;
 
 	/**
-	 * The feature id for the '<em><b>Model Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Model Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EATTRIBUTE__MODEL_ELEMENT = PamodelPackage.PANNOTATED_EATTRIBUTE__MODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Transient</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Transient</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EATTRIBUTE__TRANSIENT = PamodelPackage.PANNOTATED_EATTRIBUTE__TRANSIENT;
 
 	/**
-	 * The feature id for the '<em><b>Attribute Overrides</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Attribute Overrides</b></em>' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EATTRIBUTE__ATTRIBUTE_OVERRIDES = PamodelPackage.PANNOTATED_EATTRIBUTE__ATTRIBUTE_OVERRIDES;
 
 	/**
-	 * The feature id for the '<em><b>Join Table</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Join Table</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EATTRIBUTE__JOIN_TABLE = PamodelPackage.PANNOTATED_EATTRIBUTE__JOIN_TABLE;
 
 	/**
-	 * The feature id for the '<em><b>One To Many</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>One To Many</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EATTRIBUTE__ONE_TO_MANY = PamodelPackage.PANNOTATED_EATTRIBUTE__ONE_TO_MANY;
 
 	/**
-	 * The feature id for the '<em><b>Sequence Generator</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sequence Generator</b></em>' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EATTRIBUTE__SEQUENCE_GENERATOR = PamodelPackage.PANNOTATED_EATTRIBUTE__SEQUENCE_GENERATOR;
 
 	/**
-	 * The feature id for the '<em><b>Table Generators</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Table Generators</b></em>' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EATTRIBUTE__TABLE_GENERATORS = PamodelPackage.PANNOTATED_EATTRIBUTE__TABLE_GENERATORS;
 
 	/**
-	 * The feature id for the '<em><b>Join Columns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Join Columns</b></em>' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EATTRIBUTE__JOIN_COLUMNS = PamodelPackage.PANNOTATED_EATTRIBUTE__JOIN_COLUMNS;
 
 	/**
-	 * The feature id for the '<em><b>Column</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Column</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EATTRIBUTE__COLUMN = PamodelPackage.PANNOTATED_EATTRIBUTE__COLUMN;
 
 	/**
-	 * The feature id for the '<em><b>Pa EClass</b></em>' container reference.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Pa EClass</b></em>' container reference. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EATTRIBUTE__PA_ECLASS = PamodelPackage.PANNOTATED_EATTRIBUTE__PA_ECLASS;
 
 	/**
-	 * The feature id for the '<em><b>Model EStructural Feature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Model EStructural Feature</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EATTRIBUTE__MODEL_ESTRUCTURAL_FEATURE = PamodelPackage.PANNOTATED_EATTRIBUTE__MODEL_ESTRUCTURAL_FEATURE;
 
 	/**
-	 * The feature id for the '<em><b>Foreign Key</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Foreign Key</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EATTRIBUTE__FOREIGN_KEY = PamodelPackage.PANNOTATED_EATTRIBUTE__FOREIGN_KEY;
 
 	/**
-	 * The feature id for the '<em><b>List Index Column</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>List Index Column</b></em>' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EATTRIBUTE__LIST_INDEX_COLUMN = PamodelPackage.PANNOTATED_EATTRIBUTE__LIST_INDEX_COLUMN;
 
 	/**
-	 * The feature id for the '<em><b>Model EAttribute</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Model EAttribute</b></em>' reference. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EATTRIBUTE__MODEL_EATTRIBUTE = PamodelPackage.PANNOTATED_EATTRIBUTE__MODEL_EATTRIBUTE;
 
 	/**
-	 * The feature id for the '<em><b>Basic</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Basic</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EATTRIBUTE__BASIC = PamodelPackage.PANNOTATED_EATTRIBUTE__BASIC;
 
 	/**
-	 * The feature id for the '<em><b>Enumerated</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Enumerated</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EATTRIBUTE__ENUMERATED = PamodelPackage.PANNOTATED_EATTRIBUTE__ENUMERATED;
 
 	/**
-	 * The feature id for the '<em><b>Generated Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Generated Value</b></em>' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EATTRIBUTE__GENERATED_VALUE = PamodelPackage.PANNOTATED_EATTRIBUTE__GENERATED_VALUE;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EATTRIBUTE__ID = PamodelPackage.PANNOTATED_EATTRIBUTE__ID;
 
 	/**
-	 * The feature id for the '<em><b>Lob</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Lob</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EATTRIBUTE__LOB = PamodelPackage.PANNOTATED_EATTRIBUTE__LOB;
 
 	/**
-	 * The feature id for the '<em><b>Temporal</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Temporal</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EATTRIBUTE__TEMPORAL = PamodelPackage.PANNOTATED_EATTRIBUTE__TEMPORAL;
 
 	/**
-	 * The feature id for the '<em><b>Version</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Version</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EATTRIBUTE__VERSION = PamodelPackage.PANNOTATED_EATTRIBUTE__VERSION;
 
 	/**
-	 * The feature id for the '<em><b>Hb Where</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hb Where</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EATTRIBUTE__HB_WHERE = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Hb Collection Of Elements</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hb Collection Of Elements</b></em>' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EATTRIBUTE__HB_COLLECTION_OF_ELEMENTS = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Hb Map Key</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hb Map Key</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EATTRIBUTE__HB_MAP_KEY = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Hb Columns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hb Columns</b></em>' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EATTRIBUTE__HB_COLUMNS = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Hb Cascade</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hb Cascade</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EATTRIBUTE__HB_CASCADE = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Hb Id Bag</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hb Id Bag</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EATTRIBUTE__HB_ID_BAG = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 5;
 
 	/**
-	 * The feature id for the '<em><b>Hb Index</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hb Index</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EATTRIBUTE__HB_INDEX = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 6;
 
 	/**
-	 * The feature id for the '<em><b>Filter</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Filter</b></em>' reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EATTRIBUTE__FILTER = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 7;
 
 	/**
-	 * The feature id for the '<em><b>Map Key Many To Many</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Map Key Many To Many</b></em>' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EATTRIBUTE__MAP_KEY_MANY_TO_MANY = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 8;
 
 	/**
-	 * The feature id for the '<em><b>Formula</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Formula</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EATTRIBUTE__FORMULA = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 9;
 
 	/**
-	 * The feature id for the '<em><b>Hb Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Hb Type</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EATTRIBUTE__HB_TYPE = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 10;
 
 	/**
-	 * The feature id for the '<em><b>Generated</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Generated</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EATTRIBUTE__GENERATED = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 11;
 
 	/**
-	 * The feature id for the '<em><b>Natural Id</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Natural Id</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EATTRIBUTE__NATURAL_ID = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 12;
 
 	/**
-	 * The feature id for the '<em><b>Any</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Any</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EATTRIBUTE__ANY = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 13;
 
 	/**
-	 * The feature id for the '<em><b>Any Meta Def</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Any Meta Def</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EATTRIBUTE__ANY_META_DEF = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 14;
 
 	/**
-	 * The number of structural features of the '<em>Hb Annotated EAttribute</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Hb Annotated EAttribute</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EATTRIBUTE_FEATURE_COUNT = PamodelPackage.PANNOTATED_EATTRIBUTE_FEATURE_COUNT + 15;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEClassImpl <em>Hb Annotated EClass</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEClassImpl
+	 * <em>Hb Annotated EClass</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEClassImpl
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbmodelPackageImpl#getHbAnnotatedEClass()
 	 * @generated
@@ -639,36 +638,36 @@ public interface HbmodelPackage extends EPackage {
 	int HB_ANNOTATED_ECLASS = 2;
 
 	/**
-	 * The feature id for the '<em><b>Model Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Model Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ECLASS__MODEL_ELEMENT = PamodelPackage.PANNOTATED_ECLASS__MODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Transient</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Transient</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ECLASS__TRANSIENT = PamodelPackage.PANNOTATED_ECLASS__TRANSIENT;
 
 	/**
-	 * The feature id for the '<em><b>Pa EPackage</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Pa EPackage</b></em>' container reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ECLASS__PA_EPACKAGE = PamodelPackage.PANNOTATED_ECLASS__PA_EPACKAGE;
 
 	/**
-	 * The feature id for the '<em><b>Model EClass</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Model EClass</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -676,80 +675,80 @@ public interface HbmodelPackage extends EPackage {
 
 	/**
 	 * The feature id for the '<em><b>Pa EStructural Features</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ECLASS__PA_ESTRUCTURAL_FEATURES = PamodelPackage.PANNOTATED_ECLASS__PA_ESTRUCTURAL_FEATURES;
 
 	/**
-	 * The feature id for the '<em><b>Attribute Overrides</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Attribute Overrides</b></em>' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ECLASS__ATTRIBUTE_OVERRIDES = PamodelPackage.PANNOTATED_ECLASS__ATTRIBUTE_OVERRIDES;
 
 	/**
-	 * The feature id for the '<em><b>Discriminator Column</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Discriminator Column</b></em>' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ECLASS__DISCRIMINATOR_COLUMN = PamodelPackage.PANNOTATED_ECLASS__DISCRIMINATOR_COLUMN;
 
 	/**
-	 * The feature id for the '<em><b>Discriminator Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Discriminator Value</b></em>' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ECLASS__DISCRIMINATOR_VALUE = PamodelPackage.PANNOTATED_ECLASS__DISCRIMINATOR_VALUE;
 
 	/**
-	 * The feature id for the '<em><b>Embeddable</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Embeddable</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ECLASS__EMBEDDABLE = PamodelPackage.PANNOTATED_ECLASS__EMBEDDABLE;
 
 	/**
-	 * The feature id for the '<em><b>Mapped Superclass</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mapped Superclass</b></em>' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ECLASS__MAPPED_SUPERCLASS = PamodelPackage.PANNOTATED_ECLASS__MAPPED_SUPERCLASS;
 
 	/**
-	 * The feature id for the '<em><b>Entity</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Entity</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ECLASS__ENTITY = PamodelPackage.PANNOTATED_ECLASS__ENTITY;
 
 	/**
-	 * The feature id for the '<em><b>Id Class</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id Class</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ECLASS__ID_CLASS = PamodelPackage.PANNOTATED_ECLASS__ID_CLASS;
 
 	/**
-	 * The feature id for the '<em><b>Inheritance</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Inheritance</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -757,215 +756,216 @@ public interface HbmodelPackage extends EPackage {
 
 	/**
 	 * The feature id for the '<em><b>Primary Key Join Columns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ECLASS__PRIMARY_KEY_JOIN_COLUMNS = PamodelPackage.PANNOTATED_ECLASS__PRIMARY_KEY_JOIN_COLUMNS;
 
 	/**
-	 * The feature id for the '<em><b>Secondary Tables</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Secondary Tables</b></em>' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ECLASS__SECONDARY_TABLES = PamodelPackage.PANNOTATED_ECLASS__SECONDARY_TABLES;
 
 	/**
-	 * The feature id for the '<em><b>Table</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Table</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ECLASS__TABLE = PamodelPackage.PANNOTATED_ECLASS__TABLE;
 
 	/**
-	 * The feature id for the '<em><b>Table Generator</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Table Generator</b></em>' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ECLASS__TABLE_GENERATOR = PamodelPackage.PANNOTATED_ECLASS__TABLE_GENERATOR;
 
 	/**
-	 * The feature id for the '<em><b>Association Overrides</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Association Overrides</b></em>' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ECLASS__ASSOCIATION_OVERRIDES = PamodelPackage.PANNOTATED_ECLASS__ASSOCIATION_OVERRIDES;
 
 	/**
-	 * The feature id for the '<em><b>Eav Mapping</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Eav Mapping</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ECLASS__EAV_MAPPING = PamodelPackage.PANNOTATED_ECLASS__EAV_MAPPING;
 
 	/**
-	 * The feature id for the '<em><b>No EAV Mapping</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>No EAV Mapping</b></em>' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ECLASS__NO_EAV_MAPPING = PamodelPackage.PANNOTATED_ECLASS__NO_EAV_MAPPING;
 
 	/**
-	 * The feature id for the '<em><b>Sequence Generators</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sequence Generators</b></em>' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ECLASS__SEQUENCE_GENERATORS = PamodelPackage.PANNOTATED_ECLASS__SEQUENCE_GENERATORS;
 
 	/**
-	 * The feature id for the '<em><b>External</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>External</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ECLASS__EXTERNAL = PamodelPackage.PANNOTATED_ECLASS__EXTERNAL;
 
 	/**
-	 * The feature id for the '<em><b>Hb Cache</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hb Cache</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ECLASS__HB_CACHE = PamodelPackage.PANNOTATED_ECLASS_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Hb On Delete</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hb On Delete</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ECLASS__HB_ON_DELETE = PamodelPackage.PANNOTATED_ECLASS_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Hb Where</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hb Where</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ECLASS__HB_WHERE = PamodelPackage.PANNOTATED_ECLASS_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Hb Proxy</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hb Proxy</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ECLASS__HB_PROXY = PamodelPackage.PANNOTATED_ECLASS_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Hb Named Query</b></em>' reference list.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Hb Named Query</b></em>' reference list. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ECLASS__HB_NAMED_QUERY = PamodelPackage.PANNOTATED_ECLASS_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Filter Def</b></em>' reference list.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Filter Def</b></em>' reference list. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ECLASS__FILTER_DEF = PamodelPackage.PANNOTATED_ECLASS_FEATURE_COUNT + 5;
 
 	/**
-	 * The feature id for the '<em><b>Filter</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Filter</b></em>' reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ECLASS__FILTER = PamodelPackage.PANNOTATED_ECLASS_FEATURE_COUNT + 6;
 
 	/**
-	 * The feature id for the '<em><b>Discriminator Formula</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Discriminator Formula</b></em>' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ECLASS__DISCRIMINATOR_FORMULA = PamodelPackage.PANNOTATED_ECLASS_FEATURE_COUNT + 7;
 
 	/**
-	 * The feature id for the '<em><b>Force Discriminator</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Force Discriminator</b></em>' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ECLASS__FORCE_DISCRIMINATOR = PamodelPackage.PANNOTATED_ECLASS_FEATURE_COUNT + 8;
 
 	/**
-	 * The feature id for the '<em><b>Immutable</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Immutable</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ECLASS__IMMUTABLE = PamodelPackage.PANNOTATED_ECLASS_FEATURE_COUNT + 9;
 
 	/**
-	 * The feature id for the '<em><b>Hb Entity</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hb Entity</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ECLASS__HB_ENTITY = PamodelPackage.PANNOTATED_ECLASS_FEATURE_COUNT + 10;
 
 	/**
-	 * The feature id for the '<em><b>Batch Size</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Batch Size</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ECLASS__BATCH_SIZE = PamodelPackage.PANNOTATED_ECLASS_FEATURE_COUNT + 11;
 
 	/**
-	 * The feature id for the '<em><b>Hb Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Hb Type</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ECLASS__HB_TYPE = PamodelPackage.PANNOTATED_ECLASS_FEATURE_COUNT + 12;
 
 	/**
-	 * The number of structural features of the '<em>Hb Annotated EClass</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Hb Annotated EClass</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_ECLASS_FEATURE_COUNT = PamodelPackage.PANNOTATED_ECLASS_FEATURE_COUNT + 13;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEModelElement <em>Hb Annotated EModel Element</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEModelElement
+	 * <em>Hb Annotated EModel Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEModelElement
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbmodelPackageImpl#getHbAnnotatedEModelElement()
 	 * @generated
@@ -973,36 +973,37 @@ public interface HbmodelPackage extends EPackage {
 	int HB_ANNOTATED_EMODEL_ELEMENT = 3;
 
 	/**
-	 * The feature id for the '<em><b>Model Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Model Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EMODEL_ELEMENT__MODEL_ELEMENT = PamodelPackage.PANNOTATED_EMODEL_ELEMENT__MODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Transient</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Transient</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EMODEL_ELEMENT__TRANSIENT = PamodelPackage.PANNOTATED_EMODEL_ELEMENT__TRANSIENT;
 
 	/**
-	 * The number of structural features of the '<em>Hb Annotated EModel Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the ' <em>Hb Annotated EModel Element</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EMODEL_ELEMENT_FEATURE_COUNT = PamodelPackage.PANNOTATED_EMODEL_ELEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEPackageImpl <em>Hb Annotated EPackage</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEPackageImpl
+	 * <em>Hb Annotated EPackage</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEPackageImpl
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbmodelPackageImpl#getHbAnnotatedEPackage()
 	 * @generated
@@ -1010,72 +1011,72 @@ public interface HbmodelPackage extends EPackage {
 	int HB_ANNOTATED_EPACKAGE = 4;
 
 	/**
-	 * The feature id for the '<em><b>Model Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Model Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EPACKAGE__MODEL_ELEMENT = PamodelPackage.PANNOTATED_EPACKAGE__MODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Transient</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Transient</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EPACKAGE__TRANSIENT = PamodelPackage.PANNOTATED_EPACKAGE__TRANSIENT;
 
 	/**
-	 * The feature id for the '<em><b>Pa Model</b></em>' container reference.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Pa Model</b></em>' container reference. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EPACKAGE__PA_MODEL = PamodelPackage.PANNOTATED_EPACKAGE__PA_MODEL;
 
 	/**
-	 * The feature id for the '<em><b>Model EPackage</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Model EPackage</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EPACKAGE__MODEL_EPACKAGE = PamodelPackage.PANNOTATED_EPACKAGE__MODEL_EPACKAGE;
 
 	/**
-	 * The feature id for the '<em><b>Pa EClasses</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Pa EClasses</b></em>' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EPACKAGE__PA_ECLASSES = PamodelPackage.PANNOTATED_EPACKAGE__PA_ECLASSES;
 
 	/**
-	 * The feature id for the '<em><b>Sequence Generators</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sequence Generators</b></em>' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EPACKAGE__SEQUENCE_GENERATORS = PamodelPackage.PANNOTATED_EPACKAGE__SEQUENCE_GENERATORS;
 
 	/**
-	 * The feature id for the '<em><b>Table Generators</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Table Generators</b></em>' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EPACKAGE__TABLE_GENERATORS = PamodelPackage.PANNOTATED_EPACKAGE__TABLE_GENERATORS;
 
 	/**
-	 * The feature id for the '<em><b>Pa EData Types</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Pa EData Types</b></em>' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1083,71 +1084,72 @@ public interface HbmodelPackage extends EPackage {
 
 	/**
 	 * The feature id for the '<em><b>Sequence Style Generators</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EPACKAGE__SEQUENCE_STYLE_GENERATORS = PamodelPackage.PANNOTATED_EPACKAGE__SEQUENCE_STYLE_GENERATORS;
 
 	/**
-	 * The feature id for the '<em><b>Hb Generic Generators</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hb Generic Generators</b></em>' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EPACKAGE__HB_GENERIC_GENERATORS = PamodelPackage.PANNOTATED_EPACKAGE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Hb Type Def</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hb Type Def</b></em>' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EPACKAGE__HB_TYPE_DEF = PamodelPackage.PANNOTATED_EPACKAGE_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Hb Named Query</b></em>' reference list.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Hb Named Query</b></em>' reference list. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EPACKAGE__HB_NAMED_QUERY = PamodelPackage.PANNOTATED_EPACKAGE_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Filter Def</b></em>' reference list.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Filter Def</b></em>' reference list. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EPACKAGE__FILTER_DEF = PamodelPackage.PANNOTATED_EPACKAGE_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Any Meta Def</b></em>' reference list.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Any Meta Def</b></em>' reference list. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EPACKAGE__ANY_META_DEF = PamodelPackage.PANNOTATED_EPACKAGE_FEATURE_COUNT + 4;
 
 	/**
-	 * The number of structural features of the '<em>Hb Annotated EPackage</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Hb Annotated EPackage</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EPACKAGE_FEATURE_COUNT = PamodelPackage.PANNOTATED_EPACKAGE_FEATURE_COUNT + 5;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl <em>Hb Annotated EReference</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl
+	 * <em>Hb Annotated EReference</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbmodelPackageImpl#getHbAnnotatedEReference()
 	 * @generated
@@ -1155,189 +1157,189 @@ public interface HbmodelPackage extends EPackage {
 	int HB_ANNOTATED_EREFERENCE = 5;
 
 	/**
-	 * The feature id for the '<em><b>Model Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Model Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__MODEL_ELEMENT = PamodelPackage.PANNOTATED_EREFERENCE__MODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Transient</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Transient</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__TRANSIENT = PamodelPackage.PANNOTATED_EREFERENCE__TRANSIENT;
 
 	/**
-	 * The feature id for the '<em><b>Attribute Overrides</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Attribute Overrides</b></em>' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__ATTRIBUTE_OVERRIDES = PamodelPackage.PANNOTATED_EREFERENCE__ATTRIBUTE_OVERRIDES;
 
 	/**
-	 * The feature id for the '<em><b>Join Table</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Join Table</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__JOIN_TABLE = PamodelPackage.PANNOTATED_EREFERENCE__JOIN_TABLE;
 
 	/**
-	 * The feature id for the '<em><b>One To Many</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>One To Many</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__ONE_TO_MANY = PamodelPackage.PANNOTATED_EREFERENCE__ONE_TO_MANY;
 
 	/**
-	 * The feature id for the '<em><b>Sequence Generator</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Sequence Generator</b></em>' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__SEQUENCE_GENERATOR = PamodelPackage.PANNOTATED_EREFERENCE__SEQUENCE_GENERATOR;
 
 	/**
-	 * The feature id for the '<em><b>Table Generators</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Table Generators</b></em>' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__TABLE_GENERATORS = PamodelPackage.PANNOTATED_EREFERENCE__TABLE_GENERATORS;
 
 	/**
-	 * The feature id for the '<em><b>Join Columns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Join Columns</b></em>' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__JOIN_COLUMNS = PamodelPackage.PANNOTATED_EREFERENCE__JOIN_COLUMNS;
 
 	/**
-	 * The feature id for the '<em><b>Column</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Column</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__COLUMN = PamodelPackage.PANNOTATED_EREFERENCE__COLUMN;
 
 	/**
-	 * The feature id for the '<em><b>Pa EClass</b></em>' container reference.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Pa EClass</b></em>' container reference. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__PA_ECLASS = PamodelPackage.PANNOTATED_EREFERENCE__PA_ECLASS;
 
 	/**
-	 * The feature id for the '<em><b>Model EStructural Feature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Model EStructural Feature</b></em>' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__MODEL_ESTRUCTURAL_FEATURE = PamodelPackage.PANNOTATED_EREFERENCE__MODEL_ESTRUCTURAL_FEATURE;
 
 	/**
-	 * The feature id for the '<em><b>Foreign Key</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Foreign Key</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__FOREIGN_KEY = PamodelPackage.PANNOTATED_EREFERENCE__FOREIGN_KEY;
 
 	/**
-	 * The feature id for the '<em><b>List Index Column</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>List Index Column</b></em>' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__LIST_INDEX_COLUMN = PamodelPackage.PANNOTATED_EREFERENCE__LIST_INDEX_COLUMN;
 
 	/**
-	 * The feature id for the '<em><b>Model EReference</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Model EReference</b></em>' reference. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__MODEL_EREFERENCE = PamodelPackage.PANNOTATED_EREFERENCE__MODEL_EREFERENCE;
 
 	/**
-	 * The feature id for the '<em><b>Embedded</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Embedded</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__EMBEDDED = PamodelPackage.PANNOTATED_EREFERENCE__EMBEDDED;
 
 	/**
-	 * The feature id for the '<em><b>Embedded Id</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Embedded Id</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__EMBEDDED_ID = PamodelPackage.PANNOTATED_EREFERENCE__EMBEDDED_ID;
 
 	/**
-	 * The feature id for the '<em><b>Many To Many</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Many To Many</b></em>' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__MANY_TO_MANY = PamodelPackage.PANNOTATED_EREFERENCE__MANY_TO_MANY;
 
 	/**
-	 * The feature id for the '<em><b>Many To One</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Many To One</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__MANY_TO_ONE = PamodelPackage.PANNOTATED_EREFERENCE__MANY_TO_ONE;
 
 	/**
-	 * The feature id for the '<em><b>Map Key</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Map Key</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__MAP_KEY = PamodelPackage.PANNOTATED_EREFERENCE__MAP_KEY;
 
 	/**
-	 * The feature id for the '<em><b>One To One</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>One To One</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__ONE_TO_ONE = PamodelPackage.PANNOTATED_EREFERENCE__ONE_TO_ONE;
 
 	/**
-	 * The feature id for the '<em><b>Order By</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Order By</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1345,224 +1347,225 @@ public interface HbmodelPackage extends EPackage {
 
 	/**
 	 * The feature id for the '<em><b>Primary Key Join Columns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__PRIMARY_KEY_JOIN_COLUMNS = PamodelPackage.PANNOTATED_EREFERENCE__PRIMARY_KEY_JOIN_COLUMNS;
 
 	/**
-	 * The feature id for the '<em><b>Association Overrides</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Association Overrides</b></em>' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__ASSOCIATION_OVERRIDES = PamodelPackage.PANNOTATED_EREFERENCE__ASSOCIATION_OVERRIDES;
 
 	/**
-	 * The feature id for the '<em><b>External</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>External</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__EXTERNAL = PamodelPackage.PANNOTATED_EREFERENCE__EXTERNAL;
 
 	/**
-	 * The feature id for the '<em><b>Hb Where</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hb Where</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__HB_WHERE = PamodelPackage.PANNOTATED_EREFERENCE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Hb Collection Of Elements</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hb Collection Of Elements</b></em>' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__HB_COLLECTION_OF_ELEMENTS = PamodelPackage.PANNOTATED_EREFERENCE_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Hb Map Key</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hb Map Key</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__HB_MAP_KEY = PamodelPackage.PANNOTATED_EREFERENCE_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Hb Columns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hb Columns</b></em>' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__HB_COLUMNS = PamodelPackage.PANNOTATED_EREFERENCE_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Hb Cascade</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hb Cascade</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__HB_CASCADE = PamodelPackage.PANNOTATED_EREFERENCE_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Hb Id Bag</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hb Id Bag</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__HB_ID_BAG = PamodelPackage.PANNOTATED_EREFERENCE_FEATURE_COUNT + 5;
 
 	/**
-	 * The feature id for the '<em><b>Hb Index</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hb Index</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__HB_INDEX = PamodelPackage.PANNOTATED_EREFERENCE_FEATURE_COUNT + 6;
 
 	/**
-	 * The feature id for the '<em><b>Filter</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Filter</b></em>' reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__FILTER = PamodelPackage.PANNOTATED_EREFERENCE_FEATURE_COUNT + 7;
 
 	/**
-	 * The feature id for the '<em><b>Map Key Many To Many</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Map Key Many To Many</b></em>' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__MAP_KEY_MANY_TO_MANY = PamodelPackage.PANNOTATED_EREFERENCE_FEATURE_COUNT + 8;
 
 	/**
-	 * The feature id for the '<em><b>Formula</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Formula</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__FORMULA = PamodelPackage.PANNOTATED_EREFERENCE_FEATURE_COUNT + 9;
 
 	/**
-	 * The feature id for the '<em><b>Hb Cache</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hb Cache</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__HB_CACHE = PamodelPackage.PANNOTATED_EREFERENCE_FEATURE_COUNT + 10;
 
 	/**
-	 * The feature id for the '<em><b>Hb Fetch</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hb Fetch</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__HB_FETCH = PamodelPackage.PANNOTATED_EREFERENCE_FEATURE_COUNT + 11;
 
 	/**
-	 * The feature id for the '<em><b>Hb On Delete</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hb On Delete</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__HB_ON_DELETE = PamodelPackage.PANNOTATED_EREFERENCE_FEATURE_COUNT + 12;
 
 	/**
-	 * The feature id for the '<em><b>Natural Id</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Natural Id</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__NATURAL_ID = PamodelPackage.PANNOTATED_EREFERENCE_FEATURE_COUNT + 13;
 
 	/**
-	 * The feature id for the '<em><b>Immutable</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Immutable</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__IMMUTABLE = PamodelPackage.PANNOTATED_EREFERENCE_FEATURE_COUNT + 14;
 
 	/**
-	 * The feature id for the '<em><b>Not Found</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Not Found</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__NOT_FOUND = PamodelPackage.PANNOTATED_EREFERENCE_FEATURE_COUNT + 15;
 
 	/**
-	 * The feature id for the '<em><b>Hb Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Hb Type</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__HB_TYPE = PamodelPackage.PANNOTATED_EREFERENCE_FEATURE_COUNT + 16;
 
 	/**
-	 * The feature id for the '<em><b>Batch Size</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Batch Size</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__BATCH_SIZE = PamodelPackage.PANNOTATED_EREFERENCE_FEATURE_COUNT + 17;
 
 	/**
-	 * The feature id for the '<em><b>Any</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Any</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__ANY = PamodelPackage.PANNOTATED_EREFERENCE_FEATURE_COUNT + 18;
 
 	/**
-	 * The feature id for the '<em><b>Any Meta Def</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Any Meta Def</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE__ANY_META_DEF = PamodelPackage.PANNOTATED_EREFERENCE_FEATURE_COUNT + 19;
 
 	/**
-	 * The number of structural features of the '<em>Hb Annotated EReference</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Hb Annotated EReference</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EREFERENCE_FEATURE_COUNT = PamodelPackage.PANNOTATED_EREFERENCE_FEATURE_COUNT + 20;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEDataTypeImpl <em>Hb Annotated EData Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEDataTypeImpl
+	 * <em>Hb Annotated EData Type</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEDataTypeImpl
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbmodelPackageImpl#getHbAnnotatedEDataType()
 	 * @generated
@@ -1570,181 +1573,181 @@ public interface HbmodelPackage extends EPackage {
 	int HB_ANNOTATED_EDATA_TYPE = 6;
 
 	/**
-	 * The feature id for the '<em><b>Model Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Model Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EDATA_TYPE__MODEL_ELEMENT = PamodelPackage.PANNOTATED_EDATA_TYPE__MODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Transient</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Transient</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EDATA_TYPE__TRANSIENT = PamodelPackage.PANNOTATED_EDATA_TYPE__TRANSIENT;
 
 	/**
-	 * The feature id for the '<em><b>Model EData Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Model EData Type</b></em>' reference. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EDATA_TYPE__MODEL_EDATA_TYPE = PamodelPackage.PANNOTATED_EDATA_TYPE__MODEL_EDATA_TYPE;
 
 	/**
-	 * The feature id for the '<em><b>Basic</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Basic</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EDATA_TYPE__BASIC = PamodelPackage.PANNOTATED_EDATA_TYPE__BASIC;
 
 	/**
-	 * The feature id for the '<em><b>Enumerated</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Enumerated</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EDATA_TYPE__ENUMERATED = PamodelPackage.PANNOTATED_EDATA_TYPE__ENUMERATED;
 
 	/**
-	 * The feature id for the '<em><b>Generated Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Generated Value</b></em>' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EDATA_TYPE__GENERATED_VALUE = PamodelPackage.PANNOTATED_EDATA_TYPE__GENERATED_VALUE;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EDATA_TYPE__ID = PamodelPackage.PANNOTATED_EDATA_TYPE__ID;
 
 	/**
-	 * The feature id for the '<em><b>Lob</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Lob</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EDATA_TYPE__LOB = PamodelPackage.PANNOTATED_EDATA_TYPE__LOB;
 
 	/**
-	 * The feature id for the '<em><b>Temporal</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Temporal</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EDATA_TYPE__TEMPORAL = PamodelPackage.PANNOTATED_EDATA_TYPE__TEMPORAL;
 
 	/**
-	 * The feature id for the '<em><b>Version</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Version</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EDATA_TYPE__VERSION = PamodelPackage.PANNOTATED_EDATA_TYPE__VERSION;
 
 	/**
-	 * The feature id for the '<em><b>Pa EPackage</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Pa EPackage</b></em>' container reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EDATA_TYPE__PA_EPACKAGE = PamodelPackage.PANNOTATED_EDATA_TYPE__PA_EPACKAGE;
 
 	/**
-	 * The feature id for the '<em><b>Column</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Column</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EDATA_TYPE__COLUMN = PamodelPackage.PANNOTATED_EDATA_TYPE__COLUMN;
 
 	/**
-	 * The feature id for the '<em><b>Hb Type Def</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hb Type Def</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EDATA_TYPE__HB_TYPE_DEF = PamodelPackage.PANNOTATED_EDATA_TYPE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Hb Where</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hb Where</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EDATA_TYPE__HB_WHERE = PamodelPackage.PANNOTATED_EDATA_TYPE_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Hb Columns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hb Columns</b></em>' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EDATA_TYPE__HB_COLUMNS = PamodelPackage.PANNOTATED_EDATA_TYPE_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Hb Id Bag</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hb Id Bag</b></em>' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EDATA_TYPE__HB_ID_BAG = PamodelPackage.PANNOTATED_EDATA_TYPE_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Hb Index</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Hb Index</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EDATA_TYPE__HB_INDEX = PamodelPackage.PANNOTATED_EDATA_TYPE_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Hb Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Hb Type</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EDATA_TYPE__HB_TYPE = PamodelPackage.PANNOTATED_EDATA_TYPE_FEATURE_COUNT + 5;
 
 	/**
-	 * The number of structural features of the '<em>Hb Annotated EData Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Hb Annotated EData Type</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int HB_ANNOTATED_EDATA_TYPE_FEATURE_COUNT = PamodelPackage.PANNOTATED_EDATA_TYPE_FEATURE_COUNT + 6;
 
-
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement <em>Hb Annotated EType Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement
+	 * <em>Hb Annotated EType Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Hb Annotated EType Element</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement
 	 * @generated
@@ -1752,9 +1755,10 @@ public interface HbmodelPackage extends EPackage {
 	EClass getHbAnnotatedETypeElement();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbWhere <em>Hb Where</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbWhere
+	 * <em>Hb Where</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Hb Where</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbWhere()
 	 * @see #getHbAnnotatedETypeElement()
@@ -1763,10 +1767,11 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedETypeElement_HbWhere();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbCollectionOfElements <em>Hb Collection Of Elements</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Hb Collection Of Elements</em>'.
+	 * Returns the meta object for the containment reference '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbCollectionOfElements
+	 * <em>Hb Collection Of Elements</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the containment reference ' <em>Hb Collection Of Elements</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbCollectionOfElements()
 	 * @see #getHbAnnotatedETypeElement()
 	 * @generated
@@ -1774,10 +1779,11 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedETypeElement_HbCollectionOfElements();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbMapKey <em>Hb Map Key</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Hb Map Key</em>'.
+	 * Returns the meta object for the containment reference '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbMapKey
+	 * <em>Hb Map Key</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the containment reference '<em>Hb Map Key</em> '.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbMapKey()
 	 * @see #getHbAnnotatedETypeElement()
 	 * @generated
@@ -1785,10 +1791,11 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedETypeElement_HbMapKey();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbColumns <em>Hb Columns</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Hb Columns</em>'.
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbColumns
+	 * <em>Hb Columns</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the containment reference list ' <em>Hb Columns</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbColumns()
 	 * @see #getHbAnnotatedETypeElement()
 	 * @generated
@@ -1796,10 +1803,11 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedETypeElement_HbColumns();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbCascade <em>Hb Cascade</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Hb Cascade</em>'.
+	 * Returns the meta object for the containment reference '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbCascade
+	 * <em>Hb Cascade</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the containment reference '<em>Hb Cascade</em> '.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbCascade()
 	 * @see #getHbAnnotatedETypeElement()
 	 * @generated
@@ -1807,9 +1815,10 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedETypeElement_HbCascade();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbIdBag <em>Hb Id Bag</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbIdBag
+	 * <em>Hb Id Bag</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Hb Id Bag</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbIdBag()
 	 * @see #getHbAnnotatedETypeElement()
@@ -1818,9 +1827,10 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedETypeElement_HbIdBag();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbIndex <em>Hb Index</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbIndex
+	 * <em>Hb Index</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Hb Index</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getHbIndex()
 	 * @see #getHbAnnotatedETypeElement()
@@ -1829,9 +1839,10 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedETypeElement_HbIndex();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getFilter <em>Filter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getFilter
+	 * <em>Filter</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Filter</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getFilter()
 	 * @see #getHbAnnotatedETypeElement()
@@ -1840,10 +1851,11 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedETypeElement_Filter();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getMapKeyManyToMany <em>Map Key Many To Many</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Map Key Many To Many</em>'.
+	 * Returns the meta object for the containment reference '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getMapKeyManyToMany
+	 * <em>Map Key Many To Many</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the containment reference ' <em>Map Key Many To Many</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getMapKeyManyToMany()
 	 * @see #getHbAnnotatedETypeElement()
 	 * @generated
@@ -1851,9 +1863,10 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedETypeElement_MapKeyManyToMany();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getFormula <em>Formula</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getFormula
+	 * <em>Formula</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Formula</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement#getFormula()
 	 * @see #getHbAnnotatedETypeElement()
@@ -1862,9 +1875,10 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedETypeElement_Formula();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute <em>Hb Annotated EAttribute</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute
+	 * <em>Hb Annotated EAttribute</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Hb Annotated EAttribute</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute
 	 * @generated
@@ -1872,9 +1886,10 @@ public interface HbmodelPackage extends EPackage {
 	EClass getHbAnnotatedEAttribute();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute#getHbType <em>Hb Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute#getHbType
+	 * <em>Hb Type</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Hb Type</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute#getHbType()
 	 * @see #getHbAnnotatedEAttribute()
@@ -1883,9 +1898,10 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedEAttribute_HbType();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute#getGenerated <em>Generated</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute#getGenerated
+	 * <em>Generated</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Generated</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute#getGenerated()
 	 * @see #getHbAnnotatedEAttribute()
@@ -1894,10 +1910,11 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedEAttribute_Generated();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute#getNaturalId <em>Natural Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Natural Id</em>'.
+	 * Returns the meta object for the containment reference '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute#getNaturalId
+	 * <em>Natural Id</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the containment reference '<em>Natural Id</em> '.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute#getNaturalId()
 	 * @see #getHbAnnotatedEAttribute()
 	 * @generated
@@ -1905,9 +1922,10 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedEAttribute_NaturalId();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute#getAny <em>Any</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute#getAny <em>Any</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Any</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute#getAny()
 	 * @see #getHbAnnotatedEAttribute()
@@ -1916,9 +1934,10 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedEAttribute_Any();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute#getAnyMetaDef <em>Any Meta Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute#getAnyMetaDef
+	 * <em>Any Meta Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Any Meta Def</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute#getAnyMetaDef()
 	 * @see #getHbAnnotatedEAttribute()
@@ -1927,9 +1946,10 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedEAttribute_AnyMetaDef();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass <em>Hb Annotated EClass</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass <em>Hb Annotated EClass</em>}
+	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Hb Annotated EClass</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass
 	 * @generated
@@ -1937,9 +1957,10 @@ public interface HbmodelPackage extends EPackage {
 	EClass getHbAnnotatedEClass();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbCache <em>Hb Cache</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbCache <em>Hb Cache</em>}
+	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Hb Cache</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbCache()
 	 * @see #getHbAnnotatedEClass()
@@ -1948,9 +1969,10 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedEClass_HbCache();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbOnDelete <em>Hb On Delete</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbOnDelete
+	 * <em>Hb On Delete</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Hb On Delete</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbOnDelete()
 	 * @see #getHbAnnotatedEClass()
@@ -1959,9 +1981,10 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedEClass_HbOnDelete();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbWhere <em>Hb Where</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbWhere <em>Hb Where</em>}
+	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Hb Where</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbWhere()
 	 * @see #getHbAnnotatedEClass()
@@ -1970,9 +1993,10 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedEClass_HbWhere();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbProxy <em>Hb Proxy</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbProxy <em>Hb Proxy</em>}
+	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Hb Proxy</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbProxy()
 	 * @see #getHbAnnotatedEClass()
@@ -1981,9 +2005,10 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedEClass_HbProxy();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbNamedQuery <em>Hb Named Query</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbNamedQuery
+	 * <em>Hb Named Query</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Hb Named Query</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbNamedQuery()
 	 * @see #getHbAnnotatedEClass()
@@ -1992,9 +2017,10 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedEClass_HbNamedQuery();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getFilterDef <em>Filter Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getFilterDef
+	 * <em>Filter Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Filter Def</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getFilterDef()
 	 * @see #getHbAnnotatedEClass()
@@ -2003,9 +2029,10 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedEClass_FilterDef();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getFilter <em>Filter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getFilter <em>Filter</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Filter</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getFilter()
 	 * @see #getHbAnnotatedEClass()
@@ -2014,10 +2041,11 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedEClass_Filter();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getDiscriminatorFormula <em>Discriminator Formula</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Discriminator Formula</em>'.
+	 * Returns the meta object for the containment reference '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getDiscriminatorFormula
+	 * <em>Discriminator Formula</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the containment reference ' <em>Discriminator Formula</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getDiscriminatorFormula()
 	 * @see #getHbAnnotatedEClass()
 	 * @generated
@@ -2025,10 +2053,11 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedEClass_DiscriminatorFormula();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getForceDiscriminator <em>Force Discriminator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Force Discriminator</em>'.
+	 * Returns the meta object for the containment reference '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getForceDiscriminator
+	 * <em>Force Discriminator</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the containment reference ' <em>Force Discriminator</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getForceDiscriminator()
 	 * @see #getHbAnnotatedEClass()
 	 * @generated
@@ -2036,9 +2065,10 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedEClass_ForceDiscriminator();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getImmutable <em>Immutable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getImmutable
+	 * <em>Immutable</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Immutable</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getImmutable()
 	 * @see #getHbAnnotatedEClass()
@@ -2047,9 +2077,10 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedEClass_Immutable();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbEntity <em>Hb Entity</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbEntity
+	 * <em>Hb Entity</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Hb Entity</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbEntity()
 	 * @see #getHbAnnotatedEClass()
@@ -2058,9 +2089,10 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedEClass_HbEntity();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getBatchSize <em>Batch Size</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getBatchSize
+	 * <em>Batch Size</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Batch Size</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getBatchSize()
 	 * @see #getHbAnnotatedEClass()
@@ -2069,9 +2101,10 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedEClass_BatchSize();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbType <em>Hb Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbType <em>Hb Type</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Hb Type</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass#getHbType()
 	 * @see #getHbAnnotatedEClass()
@@ -2080,9 +2113,10 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedEClass_HbType();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEModelElement <em>Hb Annotated EModel Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEModelElement
+	 * <em>Hb Annotated EModel Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Hb Annotated EModel Element</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEModelElement
 	 * @generated
@@ -2090,9 +2124,10 @@ public interface HbmodelPackage extends EPackage {
 	EClass getHbAnnotatedEModelElement();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage <em>Hb Annotated EPackage</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage
+	 * <em>Hb Annotated EPackage</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Hb Annotated EPackage</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage
 	 * @generated
@@ -2100,10 +2135,11 @@ public interface HbmodelPackage extends EPackage {
 	EClass getHbAnnotatedEPackage();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage#getHbGenericGenerators <em>Hb Generic Generators</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Hb Generic Generators</em>'.
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage#getHbGenericGenerators
+	 * <em>Hb Generic Generators</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the containment reference list ' <em>Hb Generic Generators</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage#getHbGenericGenerators()
 	 * @see #getHbAnnotatedEPackage()
 	 * @generated
@@ -2111,10 +2147,11 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedEPackage_HbGenericGenerators();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage#getHbTypeDef <em>Hb Type Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Hb Type Def</em>'.
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage#getHbTypeDef
+	 * <em>Hb Type Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the containment reference list ' <em>Hb Type Def</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage#getHbTypeDef()
 	 * @see #getHbAnnotatedEPackage()
 	 * @generated
@@ -2122,9 +2159,10 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedEPackage_HbTypeDef();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage#getHbNamedQuery <em>Hb Named Query</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage#getHbNamedQuery
+	 * <em>Hb Named Query</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Hb Named Query</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage#getHbNamedQuery()
 	 * @see #getHbAnnotatedEPackage()
@@ -2133,9 +2171,10 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedEPackage_HbNamedQuery();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage#getFilterDef <em>Filter Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage#getFilterDef
+	 * <em>Filter Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Filter Def</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage#getFilterDef()
 	 * @see #getHbAnnotatedEPackage()
@@ -2144,9 +2183,10 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedEPackage_FilterDef();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage#getAnyMetaDef <em>Any Meta Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage#getAnyMetaDef
+	 * <em>Any Meta Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Any Meta Def</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage#getAnyMetaDef()
 	 * @see #getHbAnnotatedEPackage()
@@ -2155,9 +2195,10 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedEPackage_AnyMetaDef();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference <em>Hb Annotated EReference</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference
+	 * <em>Hb Annotated EReference</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Hb Annotated EReference</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference
 	 * @generated
@@ -2165,9 +2206,10 @@ public interface HbmodelPackage extends EPackage {
 	EClass getHbAnnotatedEReference();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getHbCache <em>Hb Cache</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getHbCache
+	 * <em>Hb Cache</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Hb Cache</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getHbCache()
 	 * @see #getHbAnnotatedEReference()
@@ -2176,9 +2218,10 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedEReference_HbCache();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getHbFetch <em>Hb Fetch</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getHbFetch
+	 * <em>Hb Fetch</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Hb Fetch</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getHbFetch()
 	 * @see #getHbAnnotatedEReference()
@@ -2187,9 +2230,10 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedEReference_HbFetch();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getHbOnDelete <em>Hb On Delete</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getHbOnDelete
+	 * <em>Hb On Delete</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Hb On Delete</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getHbOnDelete()
 	 * @see #getHbAnnotatedEReference()
@@ -2198,10 +2242,11 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedEReference_HbOnDelete();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getNaturalId <em>Natural Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Natural Id</em>'.
+	 * Returns the meta object for the containment reference '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getNaturalId
+	 * <em>Natural Id</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the containment reference '<em>Natural Id</em> '.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getNaturalId()
 	 * @see #getHbAnnotatedEReference()
 	 * @generated
@@ -2209,9 +2254,10 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedEReference_NaturalId();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getImmutable <em>Immutable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getImmutable
+	 * <em>Immutable</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Immutable</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getImmutable()
 	 * @see #getHbAnnotatedEReference()
@@ -2220,9 +2266,10 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedEReference_Immutable();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getNotFound <em>Not Found</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getNotFound
+	 * <em>Not Found</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Not Found</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getNotFound()
 	 * @see #getHbAnnotatedEReference()
@@ -2231,9 +2278,10 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedEReference_NotFound();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getHbType <em>Hb Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getHbType
+	 * <em>Hb Type</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Hb Type</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getHbType()
 	 * @see #getHbAnnotatedEReference()
@@ -2242,9 +2290,10 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedEReference_HbType();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getBatchSize <em>Batch Size</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getBatchSize
+	 * <em>Batch Size</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Batch Size</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getBatchSize()
 	 * @see #getHbAnnotatedEReference()
@@ -2253,9 +2302,10 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedEReference_BatchSize();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getAny <em>Any</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getAny <em>Any</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Any</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getAny()
 	 * @see #getHbAnnotatedEReference()
@@ -2264,9 +2314,10 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedEReference_Any();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getAnyMetaDef <em>Any Meta Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getAnyMetaDef
+	 * <em>Any Meta Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Any Meta Def</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference#getAnyMetaDef()
 	 * @see #getHbAnnotatedEReference()
@@ -2275,9 +2326,10 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedEReference_AnyMetaDef();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType <em>Hb Annotated EData Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType
+	 * <em>Hb Annotated EData Type</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Hb Annotated EData Type</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType
 	 * @generated
@@ -2285,10 +2337,11 @@ public interface HbmodelPackage extends EPackage {
 	EClass getHbAnnotatedEDataType();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType#getHbTypeDef <em>Hb Type Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Hb Type Def</em>'.
+	 * Returns the meta object for the containment reference '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType#getHbTypeDef
+	 * <em>Hb Type Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the containment reference '<em>Hb Type Def</em> '.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType#getHbTypeDef()
 	 * @see #getHbAnnotatedEDataType()
 	 * @generated
@@ -2296,9 +2349,10 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedEDataType_HbTypeDef();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType#getHbWhere <em>Hb Where</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType#getHbWhere
+	 * <em>Hb Where</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Hb Where</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType#getHbWhere()
 	 * @see #getHbAnnotatedEDataType()
@@ -2307,10 +2361,11 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedEDataType_HbWhere();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType#getHbColumns <em>Hb Columns</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Hb Columns</em>'.
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType#getHbColumns
+	 * <em>Hb Columns</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the containment reference list ' <em>Hb Columns</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType#getHbColumns()
 	 * @see #getHbAnnotatedEDataType()
 	 * @generated
@@ -2318,9 +2373,10 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedEDataType_HbColumns();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType#getHbIdBag <em>Hb Id Bag</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType#getHbIdBag
+	 * <em>Hb Id Bag</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Hb Id Bag</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType#getHbIdBag()
 	 * @see #getHbAnnotatedEDataType()
@@ -2329,9 +2385,10 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedEDataType_HbIdBag();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType#getHbIndex <em>Hb Index</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType#getHbIndex
+	 * <em>Hb Index</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Hb Index</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType#getHbIndex()
 	 * @see #getHbAnnotatedEDataType()
@@ -2340,9 +2397,10 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedEDataType_HbIndex();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType#getHbType <em>Hb Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType#getHbType <em>Hb Type</em>}
+	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Hb Type</em>'.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType#getHbType()
 	 * @see #getHbAnnotatedEDataType()
@@ -2351,31 +2409,32 @@ public interface HbmodelPackage extends EPackage {
 	EReference getHbAnnotatedEDataType_HbType();
 
 	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
 	HbmodelFactory getHbmodelFactory();
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
+	 * <!-- begin-user-doc --> Defines literals for the meta objects that represent
 	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	interface Literals {
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement <em>Hb Annotated EType Element</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement
+		 * <em>Hb Annotated EType Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement
 		 * @see org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbmodelPackageImpl#getHbAnnotatedETypeElement()
 		 * @generated
@@ -2384,88 +2443,97 @@ public interface HbmodelPackage extends EPackage {
 
 		/**
 		 * The meta object literal for the '<em><b>Hb Where</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
-		EReference HB_ANNOTATED_ETYPE_ELEMENT__HB_WHERE = eINSTANCE.getHbAnnotatedETypeElement_HbWhere();
+		EReference HB_ANNOTATED_ETYPE_ELEMENT__HB_WHERE = eINSTANCE
+				.getHbAnnotatedETypeElement_HbWhere();
 
 		/**
-		 * The meta object literal for the '<em><b>Hb Collection Of Elements</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the ' <em><b>Hb Collection Of Elements</b></em>' containment
+		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
-		EReference HB_ANNOTATED_ETYPE_ELEMENT__HB_COLLECTION_OF_ELEMENTS = eINSTANCE.getHbAnnotatedETypeElement_HbCollectionOfElements();
+		EReference HB_ANNOTATED_ETYPE_ELEMENT__HB_COLLECTION_OF_ELEMENTS = eINSTANCE
+				.getHbAnnotatedETypeElement_HbCollectionOfElements();
 
 		/**
 		 * The meta object literal for the '<em><b>Hb Map Key</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
-		EReference HB_ANNOTATED_ETYPE_ELEMENT__HB_MAP_KEY = eINSTANCE.getHbAnnotatedETypeElement_HbMapKey();
+		EReference HB_ANNOTATED_ETYPE_ELEMENT__HB_MAP_KEY = eINSTANCE
+				.getHbAnnotatedETypeElement_HbMapKey();
 
 		/**
-		 * The meta object literal for the '<em><b>Hb Columns</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Hb Columns</b></em>' containment reference list
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
-		EReference HB_ANNOTATED_ETYPE_ELEMENT__HB_COLUMNS = eINSTANCE.getHbAnnotatedETypeElement_HbColumns();
+		EReference HB_ANNOTATED_ETYPE_ELEMENT__HB_COLUMNS = eINSTANCE
+				.getHbAnnotatedETypeElement_HbColumns();
 
 		/**
 		 * The meta object literal for the '<em><b>Hb Cascade</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
-		EReference HB_ANNOTATED_ETYPE_ELEMENT__HB_CASCADE = eINSTANCE.getHbAnnotatedETypeElement_HbCascade();
+		EReference HB_ANNOTATED_ETYPE_ELEMENT__HB_CASCADE = eINSTANCE
+				.getHbAnnotatedETypeElement_HbCascade();
 
 		/**
 		 * The meta object literal for the '<em><b>Hb Id Bag</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
-		EReference HB_ANNOTATED_ETYPE_ELEMENT__HB_ID_BAG = eINSTANCE.getHbAnnotatedETypeElement_HbIdBag();
+		EReference HB_ANNOTATED_ETYPE_ELEMENT__HB_ID_BAG = eINSTANCE
+				.getHbAnnotatedETypeElement_HbIdBag();
 
 		/**
-		 * The meta object literal for the '<em><b>Hb Index</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Hb Index</b></em>' reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
-		EReference HB_ANNOTATED_ETYPE_ELEMENT__HB_INDEX = eINSTANCE.getHbAnnotatedETypeElement_HbIndex();
+		EReference HB_ANNOTATED_ETYPE_ELEMENT__HB_INDEX = eINSTANCE
+				.getHbAnnotatedETypeElement_HbIndex();
 
 		/**
-		 * The meta object literal for the '<em><b>Filter</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Filter</b></em>' reference list feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HB_ANNOTATED_ETYPE_ELEMENT__FILTER = eINSTANCE.getHbAnnotatedETypeElement_Filter();
 
 		/**
-		 * The meta object literal for the '<em><b>Map Key Many To Many</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Map Key Many To Many</b></em>' containment reference
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
-		EReference HB_ANNOTATED_ETYPE_ELEMENT__MAP_KEY_MANY_TO_MANY = eINSTANCE.getHbAnnotatedETypeElement_MapKeyManyToMany();
+		EReference HB_ANNOTATED_ETYPE_ELEMENT__MAP_KEY_MANY_TO_MANY = eINSTANCE
+				.getHbAnnotatedETypeElement_MapKeyManyToMany();
 
 		/**
-		 * The meta object literal for the '<em><b>Formula</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Formula</b></em>' reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HB_ANNOTATED_ETYPE_ELEMENT__FORMULA = eINSTANCE.getHbAnnotatedETypeElement_Formula();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl <em>Hb Annotated EAttribute</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl
+		 * <em>Hb Annotated EAttribute</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl
 		 * @see org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbmodelPackageImpl#getHbAnnotatedEAttribute()
 		 * @generated
@@ -2473,49 +2541,51 @@ public interface HbmodelPackage extends EPackage {
 		EClass HB_ANNOTATED_EATTRIBUTE = eINSTANCE.getHbAnnotatedEAttribute();
 
 		/**
-		 * The meta object literal for the '<em><b>Hb Type</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Hb Type</b></em>' containment reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HB_ANNOTATED_EATTRIBUTE__HB_TYPE = eINSTANCE.getHbAnnotatedEAttribute_HbType();
 
 		/**
 		 * The meta object literal for the '<em><b>Generated</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HB_ANNOTATED_EATTRIBUTE__GENERATED = eINSTANCE.getHbAnnotatedEAttribute_Generated();
 
 		/**
 		 * The meta object literal for the '<em><b>Natural Id</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HB_ANNOTATED_EATTRIBUTE__NATURAL_ID = eINSTANCE.getHbAnnotatedEAttribute_NaturalId();
 
 		/**
-		 * The meta object literal for the '<em><b>Any</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Any</b></em>' reference feature. <!-- begin-user-doc
+		 * --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HB_ANNOTATED_EATTRIBUTE__ANY = eINSTANCE.getHbAnnotatedEAttribute_Any();
 
 		/**
-		 * The meta object literal for the '<em><b>Any Meta Def</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Any Meta Def</b></em>' reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
-		EReference HB_ANNOTATED_EATTRIBUTE__ANY_META_DEF = eINSTANCE.getHbAnnotatedEAttribute_AnyMetaDef();
+		EReference HB_ANNOTATED_EATTRIBUTE__ANY_META_DEF = eINSTANCE
+				.getHbAnnotatedEAttribute_AnyMetaDef();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEClassImpl <em>Hb Annotated EClass</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEClassImpl
+		 * <em>Hb Annotated EClass</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEClassImpl
 		 * @see org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbmodelPackageImpl#getHbAnnotatedEClass()
 		 * @generated
@@ -2524,112 +2594,115 @@ public interface HbmodelPackage extends EPackage {
 
 		/**
 		 * The meta object literal for the '<em><b>Hb Cache</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HB_ANNOTATED_ECLASS__HB_CACHE = eINSTANCE.getHbAnnotatedEClass_HbCache();
 
 		/**
-		 * The meta object literal for the '<em><b>Hb On Delete</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Hb On Delete</b></em>' reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HB_ANNOTATED_ECLASS__HB_ON_DELETE = eINSTANCE.getHbAnnotatedEClass_HbOnDelete();
 
 		/**
 		 * The meta object literal for the '<em><b>Hb Where</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HB_ANNOTATED_ECLASS__HB_WHERE = eINSTANCE.getHbAnnotatedEClass_HbWhere();
 
 		/**
-		 * The meta object literal for the '<em><b>Hb Proxy</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Hb Proxy</b></em>' reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HB_ANNOTATED_ECLASS__HB_PROXY = eINSTANCE.getHbAnnotatedEClass_HbProxy();
 
 		/**
-		 * The meta object literal for the '<em><b>Hb Named Query</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Hb Named Query</b></em>' reference list feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HB_ANNOTATED_ECLASS__HB_NAMED_QUERY = eINSTANCE.getHbAnnotatedEClass_HbNamedQuery();
 
 		/**
-		 * The meta object literal for the '<em><b>Filter Def</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Filter Def</b></em>' reference list feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HB_ANNOTATED_ECLASS__FILTER_DEF = eINSTANCE.getHbAnnotatedEClass_FilterDef();
 
 		/**
-		 * The meta object literal for the '<em><b>Filter</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Filter</b></em>' reference list feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HB_ANNOTATED_ECLASS__FILTER = eINSTANCE.getHbAnnotatedEClass_Filter();
 
 		/**
-		 * The meta object literal for the '<em><b>Discriminator Formula</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Discriminator Formula</b></em>' containment reference
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
-		EReference HB_ANNOTATED_ECLASS__DISCRIMINATOR_FORMULA = eINSTANCE.getHbAnnotatedEClass_DiscriminatorFormula();
+		EReference HB_ANNOTATED_ECLASS__DISCRIMINATOR_FORMULA = eINSTANCE
+				.getHbAnnotatedEClass_DiscriminatorFormula();
 
 		/**
-		 * The meta object literal for the '<em><b>Force Discriminator</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Force Discriminator</b></em>' containment reference
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
-		EReference HB_ANNOTATED_ECLASS__FORCE_DISCRIMINATOR = eINSTANCE.getHbAnnotatedEClass_ForceDiscriminator();
+		EReference HB_ANNOTATED_ECLASS__FORCE_DISCRIMINATOR = eINSTANCE
+				.getHbAnnotatedEClass_ForceDiscriminator();
 
 		/**
 		 * The meta object literal for the '<em><b>Immutable</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HB_ANNOTATED_ECLASS__IMMUTABLE = eINSTANCE.getHbAnnotatedEClass_Immutable();
 
 		/**
-		 * The meta object literal for the '<em><b>Hb Entity</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Hb Entity</b></em>' reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HB_ANNOTATED_ECLASS__HB_ENTITY = eINSTANCE.getHbAnnotatedEClass_HbEntity();
 
 		/**
-		 * The meta object literal for the '<em><b>Batch Size</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Batch Size</b></em>' reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HB_ANNOTATED_ECLASS__BATCH_SIZE = eINSTANCE.getHbAnnotatedEClass_BatchSize();
 
 		/**
-		 * The meta object literal for the '<em><b>Hb Type</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Hb Type</b></em>' containment reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HB_ANNOTATED_ECLASS__HB_TYPE = eINSTANCE.getHbAnnotatedEClass_HbType();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEModelElement <em>Hb Annotated EModel Element</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEModelElement
+		 * <em>Hb Annotated EModel Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEModelElement
 		 * @see org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbmodelPackageImpl#getHbAnnotatedEModelElement()
 		 * @generated
@@ -2637,9 +2710,10 @@ public interface HbmodelPackage extends EPackage {
 		EClass HB_ANNOTATED_EMODEL_ELEMENT = eINSTANCE.getHbAnnotatedEModelElement();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEPackageImpl <em>Hb Annotated EPackage</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEPackageImpl
+		 * <em>Hb Annotated EPackage</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEPackageImpl
 		 * @see org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbmodelPackageImpl#getHbAnnotatedEPackage()
 		 * @generated
@@ -2647,49 +2721,52 @@ public interface HbmodelPackage extends EPackage {
 		EClass HB_ANNOTATED_EPACKAGE = eINSTANCE.getHbAnnotatedEPackage();
 
 		/**
-		 * The meta object literal for the '<em><b>Hb Generic Generators</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Hb Generic Generators</b></em>' containment reference
+		 * list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
-		EReference HB_ANNOTATED_EPACKAGE__HB_GENERIC_GENERATORS = eINSTANCE.getHbAnnotatedEPackage_HbGenericGenerators();
+		EReference HB_ANNOTATED_EPACKAGE__HB_GENERIC_GENERATORS = eINSTANCE
+				.getHbAnnotatedEPackage_HbGenericGenerators();
 
 		/**
-		 * The meta object literal for the '<em><b>Hb Type Def</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Hb Type Def</b></em>' containment reference list
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HB_ANNOTATED_EPACKAGE__HB_TYPE_DEF = eINSTANCE.getHbAnnotatedEPackage_HbTypeDef();
 
 		/**
-		 * The meta object literal for the '<em><b>Hb Named Query</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Hb Named Query</b></em>' reference list feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
-		EReference HB_ANNOTATED_EPACKAGE__HB_NAMED_QUERY = eINSTANCE.getHbAnnotatedEPackage_HbNamedQuery();
+		EReference HB_ANNOTATED_EPACKAGE__HB_NAMED_QUERY = eINSTANCE
+				.getHbAnnotatedEPackage_HbNamedQuery();
 
 		/**
-		 * The meta object literal for the '<em><b>Filter Def</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Filter Def</b></em>' reference list feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HB_ANNOTATED_EPACKAGE__FILTER_DEF = eINSTANCE.getHbAnnotatedEPackage_FilterDef();
 
 		/**
-		 * The meta object literal for the '<em><b>Any Meta Def</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Any Meta Def</b></em>' reference list feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HB_ANNOTATED_EPACKAGE__ANY_META_DEF = eINSTANCE.getHbAnnotatedEPackage_AnyMetaDef();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl <em>Hb Annotated EReference</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl
+		 * <em>Hb Annotated EReference</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl
 		 * @see org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbmodelPackageImpl#getHbAnnotatedEReference()
 		 * @generated
@@ -2698,88 +2775,91 @@ public interface HbmodelPackage extends EPackage {
 
 		/**
 		 * The meta object literal for the '<em><b>Hb Cache</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HB_ANNOTATED_EREFERENCE__HB_CACHE = eINSTANCE.getHbAnnotatedEReference_HbCache();
 
 		/**
-		 * The meta object literal for the '<em><b>Hb Fetch</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Hb Fetch</b></em>' reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HB_ANNOTATED_EREFERENCE__HB_FETCH = eINSTANCE.getHbAnnotatedEReference_HbFetch();
 
 		/**
-		 * The meta object literal for the '<em><b>Hb On Delete</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Hb On Delete</b></em>' reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
-		EReference HB_ANNOTATED_EREFERENCE__HB_ON_DELETE = eINSTANCE.getHbAnnotatedEReference_HbOnDelete();
+		EReference HB_ANNOTATED_EREFERENCE__HB_ON_DELETE = eINSTANCE
+				.getHbAnnotatedEReference_HbOnDelete();
 
 		/**
 		 * The meta object literal for the '<em><b>Natural Id</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HB_ANNOTATED_EREFERENCE__NATURAL_ID = eINSTANCE.getHbAnnotatedEReference_NaturalId();
 
 		/**
 		 * The meta object literal for the '<em><b>Immutable</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HB_ANNOTATED_EREFERENCE__IMMUTABLE = eINSTANCE.getHbAnnotatedEReference_Immutable();
 
 		/**
 		 * The meta object literal for the '<em><b>Not Found</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HB_ANNOTATED_EREFERENCE__NOT_FOUND = eINSTANCE.getHbAnnotatedEReference_NotFound();
 
 		/**
-		 * The meta object literal for the '<em><b>Hb Type</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Hb Type</b></em>' containment reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HB_ANNOTATED_EREFERENCE__HB_TYPE = eINSTANCE.getHbAnnotatedEReference_HbType();
 
 		/**
-		 * The meta object literal for the '<em><b>Batch Size</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Batch Size</b></em>' reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HB_ANNOTATED_EREFERENCE__BATCH_SIZE = eINSTANCE.getHbAnnotatedEReference_BatchSize();
 
 		/**
-		 * The meta object literal for the '<em><b>Any</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Any</b></em>' reference feature. <!-- begin-user-doc
+		 * --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HB_ANNOTATED_EREFERENCE__ANY = eINSTANCE.getHbAnnotatedEReference_Any();
 
 		/**
-		 * The meta object literal for the '<em><b>Any Meta Def</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Any Meta Def</b></em>' reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
-		EReference HB_ANNOTATED_EREFERENCE__ANY_META_DEF = eINSTANCE.getHbAnnotatedEReference_AnyMetaDef();
+		EReference HB_ANNOTATED_EREFERENCE__ANY_META_DEF = eINSTANCE
+				.getHbAnnotatedEReference_AnyMetaDef();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEDataTypeImpl <em>Hb Annotated EData Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEDataTypeImpl
+		 * <em>Hb Annotated EData Type</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEDataTypeImpl
 		 * @see org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbmodelPackageImpl#getHbAnnotatedEDataType()
 		 * @generated
@@ -2788,52 +2868,52 @@ public interface HbmodelPackage extends EPackage {
 
 		/**
 		 * The meta object literal for the '<em><b>Hb Type Def</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HB_ANNOTATED_EDATA_TYPE__HB_TYPE_DEF = eINSTANCE.getHbAnnotatedEDataType_HbTypeDef();
 
 		/**
 		 * The meta object literal for the '<em><b>Hb Where</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HB_ANNOTATED_EDATA_TYPE__HB_WHERE = eINSTANCE.getHbAnnotatedEDataType_HbWhere();
 
 		/**
-		 * The meta object literal for the '<em><b>Hb Columns</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Hb Columns</b></em>' containment reference list
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HB_ANNOTATED_EDATA_TYPE__HB_COLUMNS = eINSTANCE.getHbAnnotatedEDataType_HbColumns();
 
 		/**
 		 * The meta object literal for the '<em><b>Hb Id Bag</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HB_ANNOTATED_EDATA_TYPE__HB_ID_BAG = eINSTANCE.getHbAnnotatedEDataType_HbIdBag();
 
 		/**
-		 * The meta object literal for the '<em><b>Hb Index</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Hb Index</b></em>' reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HB_ANNOTATED_EDATA_TYPE__HB_INDEX = eINSTANCE.getHbAnnotatedEDataType_HbIndex();
 
 		/**
-		 * The meta object literal for the '<em><b>Hb Type</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Hb Type</b></em>' containment reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference HB_ANNOTATED_EDATA_TYPE__HB_TYPE = eINSTANCE.getHbAnnotatedEDataType_HbType();
 
 	}
 
-} //HbmodelPackage
+} // HbmodelPackage
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEAttributeImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEAttributeImpl.java
index 4216139a0..7f2779117 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEAttributeImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEAttributeImpl.java
@@ -39,36 +39,67 @@ import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement;
 import org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Hb Annotated EAttribute</b></em>'. <!--
- * end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Hb Annotated EAttribute</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getHbWhere <em>Hb Where</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getHbCollectionOfElements <em>Hb Collection Of Elements</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getHbMapKey <em>Hb Map Key</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getHbColumns <em>Hb Columns</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getHbCascade <em>Hb Cascade</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getHbIdBag <em>Hb Id Bag</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getHbIndex <em>Hb Index</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getFilter <em>Filter</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getMapKeyManyToMany <em>Map Key Many To Many</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getFormula <em>Formula</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getHbType <em>Hb Type</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getGenerated <em>Generated</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getNaturalId <em>Natural Id</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getAny <em>Any</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getAnyMetaDef <em>Any Meta Def</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getHbWhere <em>Hb
+ * Where</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getHbCollectionOfElements
+ * <em>Hb Collection Of Elements</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getHbMapKey <em>Hb
+ * Map Key</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getHbColumns <em>Hb
+ * Columns</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getHbCascade <em>Hb
+ * Cascade</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getHbIdBag <em>Hb
+ * Id Bag</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getHbIndex <em>Hb
+ * Index</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getFilter <em>
+ * Filter</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getMapKeyManyToMany
+ * <em>Map Key Many To Many</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getFormula <em>
+ * Formula</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getHbType <em>Hb
+ * Type</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getGenerated <em>
+ * Generated</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getNaturalId <em>
+ * Natural Id</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getAny <em>Any
+ * </em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEAttributeImpl#getAnyMetaDef <em>
+ * Any Meta Def</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implements HbAnnotatedEAttribute {
+public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implements
+		HbAnnotatedEAttribute {
 	/**
-	 * The cached value of the '{@link #getHbWhere() <em>Hb Where</em>}' containment reference.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
+	 * The cached value of the '{@link #getHbWhere() <em>Hb Where</em>}' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getHbWhere()
 	 * @generated
 	 * @ordered
@@ -76,8 +107,10 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
 	protected Where hbWhere;
 
 	/**
-	 * The cached value of the '{@link #getHbCollectionOfElements() <em>Hb Collection Of Elements</em>}' containment reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The cached value of the '{@link #getHbCollectionOfElements()
+	 * <em>Hb Collection Of Elements</em>}' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getHbCollectionOfElements()
 	 * @generated
 	 * @ordered
@@ -86,8 +119,8 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
 
 	/**
 	 * The cached value of the '{@link #getHbMapKey() <em>Hb Map Key</em>}' containment reference.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getHbMapKey()
 	 * @generated
 	 * @ordered
@@ -95,8 +128,8 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
 	protected HbMapKey hbMapKey;
 
 	/**
-	 * The cached value of the '{@link #getHbColumns() <em>Hb Columns</em>}' containment reference list. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
+	 * The cached value of the '{@link #getHbColumns() <em>Hb Columns</em>}' containment reference
+	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @see #getHbColumns()
 	 * @generated
@@ -105,8 +138,8 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
 	protected EList<Column> hbColumns;
 
 	/**
-	 * The cached value of the '{@link #getHbCascade() <em>Hb Cascade</em>}' containment reference. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
+	 * The cached value of the '{@link #getHbCascade() <em>Hb Cascade</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @see #getHbCascade()
 	 * @generated
@@ -115,9 +148,9 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
 	protected Cascade hbCascade;
 
 	/**
-	 * The cached value of the '{@link #getHbIdBag() <em>Hb Id Bag</em>}' containment reference.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
+	 * The cached value of the '{@link #getHbIdBag() <em>Hb Id Bag</em>}' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getHbIdBag()
 	 * @generated
 	 * @ordered
@@ -125,9 +158,9 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
 	protected IdBag hbIdBag;
 
 	/**
-	 * The cached value of the '{@link #getHbIndex() <em>Hb Index</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getHbIndex() <em>Hb Index</em>}' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getHbIndex()
 	 * @generated
 	 * @ordered
@@ -135,9 +168,9 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
 	protected Index hbIndex;
 
 	/**
-	 * The cached value of the '{@link #getFilter() <em>Filter</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getFilter() <em>Filter</em>}' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFilter()
 	 * @generated
 	 * @ordered
@@ -145,9 +178,9 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
 	protected EList<Filter> filter;
 
 	/**
-	 * The cached value of the '{@link #getMapKeyManyToMany() <em>Map Key Many To Many</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMapKeyManyToMany() <em>Map Key Many To Many</em>}'
+	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMapKeyManyToMany()
 	 * @generated
 	 * @ordered
@@ -155,9 +188,9 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
 	protected MapKeyManyToMany mapKeyManyToMany;
 
 	/**
-	 * The cached value of the '{@link #getFormula() <em>Formula</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getFormula() <em>Formula</em>}' reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFormula()
 	 * @generated
 	 * @ordered
@@ -165,9 +198,9 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
 	protected Formula formula;
 
 	/**
-	 * The cached value of the '{@link #getHbType() <em>Hb Type</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getHbType() <em>Hb Type</em>}' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getHbType()
 	 * @generated
 	 * @ordered
@@ -176,8 +209,8 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
 
 	/**
 	 * The cached value of the '{@link #getGenerated() <em>Generated</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getGenerated()
 	 * @generated
 	 * @ordered
@@ -186,8 +219,8 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
 
 	/**
 	 * The cached value of the '{@link #getNaturalId() <em>Natural Id</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getNaturalId()
 	 * @generated
 	 * @ordered
@@ -195,9 +228,9 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
 	protected NaturalId naturalId;
 
 	/**
-	 * The cached value of the '{@link #getAny() <em>Any</em>}' reference.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getAny() <em>Any</em>}' reference. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getAny()
 	 * @generated
 	 * @ordered
@@ -205,9 +238,9 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
 	protected Any any;
 
 	/**
-	 * The cached value of the '{@link #getAnyMetaDef() <em>Any Meta Def</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getAnyMetaDef() <em>Any Meta Def</em>}' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getAnyMetaDef()
 	 * @generated
 	 * @ordered
@@ -216,6 +249,7 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected HbAnnotatedEAttributeImpl() {
@@ -224,6 +258,7 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -233,6 +268,7 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Where getHbWhere() {
@@ -241,38 +277,48 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetHbWhere(Where newHbWhere, NotificationChain msgs) {
 		Where oldHbWhere = hbWhere;
 		hbWhere = newHbWhere;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_WHERE, oldHbWhere, newHbWhere);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_WHERE, oldHbWhere, newHbWhere);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHbWhere(Where newHbWhere) {
 		if (newHbWhere != hbWhere) {
 			NotificationChain msgs = null;
 			if (hbWhere != null)
-				msgs = ((InternalEObject)hbWhere).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_WHERE, null, msgs);
+				msgs = ((InternalEObject) hbWhere).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_WHERE, null, msgs);
 			if (newHbWhere != null)
-				msgs = ((InternalEObject)newHbWhere).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_WHERE, null, msgs);
+				msgs = ((InternalEObject) newHbWhere).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_WHERE, null, msgs);
 			msgs = basicSetHbWhere(newHbWhere, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_WHERE, newHbWhere, newHbWhere));
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_WHERE, newHbWhere, newHbWhere));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public CollectionOfElements getHbCollectionOfElements() {
@@ -281,38 +327,53 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetHbCollectionOfElements(CollectionOfElements newHbCollectionOfElements, NotificationChain msgs) {
+	public NotificationChain basicSetHbCollectionOfElements(
+			CollectionOfElements newHbCollectionOfElements, NotificationChain msgs) {
 		CollectionOfElements oldHbCollectionOfElements = hbCollectionOfElements;
 		hbCollectionOfElements = newHbCollectionOfElements;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_COLLECTION_OF_ELEMENTS, oldHbCollectionOfElements, newHbCollectionOfElements);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_COLLECTION_OF_ELEMENTS,
+					oldHbCollectionOfElements, newHbCollectionOfElements);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHbCollectionOfElements(CollectionOfElements newHbCollectionOfElements) {
 		if (newHbCollectionOfElements != hbCollectionOfElements) {
 			NotificationChain msgs = null;
 			if (hbCollectionOfElements != null)
-				msgs = ((InternalEObject)hbCollectionOfElements).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_COLLECTION_OF_ELEMENTS, null, msgs);
+				msgs = ((InternalEObject) hbCollectionOfElements).eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE
+								- HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_COLLECTION_OF_ELEMENTS, null, msgs);
 			if (newHbCollectionOfElements != null)
-				msgs = ((InternalEObject)newHbCollectionOfElements).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_COLLECTION_OF_ELEMENTS, null, msgs);
+				msgs = ((InternalEObject) newHbCollectionOfElements).eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+								- HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_COLLECTION_OF_ELEMENTS, null, msgs);
 			msgs = basicSetHbCollectionOfElements(newHbCollectionOfElements, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_COLLECTION_OF_ELEMENTS, newHbCollectionOfElements, newHbCollectionOfElements));
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_COLLECTION_OF_ELEMENTS,
+					newHbCollectionOfElements, newHbCollectionOfElements));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HbMapKey getHbMapKey() {
@@ -320,52 +381,62 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetHbMapKey(HbMapKey newHbMapKey, NotificationChain msgs) {
 		HbMapKey oldHbMapKey = hbMapKey;
 		hbMapKey = newHbMapKey;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_MAP_KEY, oldHbMapKey, newHbMapKey);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_MAP_KEY, oldHbMapKey, newHbMapKey);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHbMapKey(HbMapKey newHbMapKey) {
 		if (newHbMapKey != hbMapKey) {
 			NotificationChain msgs = null;
 			if (hbMapKey != null)
-				msgs = ((InternalEObject)hbMapKey).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_MAP_KEY, null, msgs);
+				msgs = ((InternalEObject) hbMapKey).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_MAP_KEY, null, msgs);
 			if (newHbMapKey != null)
-				msgs = ((InternalEObject)newHbMapKey).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_MAP_KEY, null, msgs);
+				msgs = ((InternalEObject) newHbMapKey).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_MAP_KEY, null, msgs);
 			msgs = basicSetHbMapKey(newHbMapKey, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_MAP_KEY, newHbMapKey, newHbMapKey));
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_MAP_KEY, newHbMapKey, newHbMapKey));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Column> getHbColumns() {
 		if (hbColumns == null) {
-			hbColumns = new EObjectContainmentEList<Column>(Column.class, this, HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_COLUMNS);
+			hbColumns = new EObjectContainmentEList<Column>(Column.class, this,
+					HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_COLUMNS);
 		}
 		return hbColumns;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Cascade getHbCascade() {
@@ -374,38 +445,48 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetHbCascade(Cascade newHbCascade, NotificationChain msgs) {
 		Cascade oldHbCascade = hbCascade;
 		hbCascade = newHbCascade;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_CASCADE, oldHbCascade, newHbCascade);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_CASCADE, oldHbCascade, newHbCascade);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHbCascade(Cascade newHbCascade) {
 		if (newHbCascade != hbCascade) {
 			NotificationChain msgs = null;
 			if (hbCascade != null)
-				msgs = ((InternalEObject)hbCascade).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_CASCADE, null, msgs);
+				msgs = ((InternalEObject) hbCascade).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_CASCADE, null, msgs);
 			if (newHbCascade != null)
-				msgs = ((InternalEObject)newHbCascade).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_CASCADE, null, msgs);
+				msgs = ((InternalEObject) newHbCascade).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_CASCADE, null, msgs);
 			msgs = basicSetHbCascade(newHbCascade, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_CASCADE, newHbCascade, newHbCascade));
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_CASCADE, newHbCascade, newHbCascade));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public IdBag getHbIdBag() {
@@ -414,56 +495,66 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetHbIdBag(IdBag newHbIdBag, NotificationChain msgs) {
 		IdBag oldHbIdBag = hbIdBag;
 		hbIdBag = newHbIdBag;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_ID_BAG, oldHbIdBag, newHbIdBag);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_ID_BAG, oldHbIdBag, newHbIdBag);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHbIdBag(IdBag newHbIdBag) {
 		if (newHbIdBag != hbIdBag) {
 			NotificationChain msgs = null;
 			if (hbIdBag != null)
-				msgs = ((InternalEObject)hbIdBag).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_ID_BAG, null, msgs);
+				msgs = ((InternalEObject) hbIdBag).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_ID_BAG, null, msgs);
 			if (newHbIdBag != null)
-				msgs = ((InternalEObject)newHbIdBag).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_ID_BAG, null, msgs);
+				msgs = ((InternalEObject) newHbIdBag).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_ID_BAG, null, msgs);
 			msgs = basicSetHbIdBag(newHbIdBag, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_ID_BAG, newHbIdBag, newHbIdBag));
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_ID_BAG, newHbIdBag, newHbIdBag));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Index getHbIndex() {
 		if (hbIndex != null && hbIndex.eIsProxy()) {
-			InternalEObject oldHbIndex = (InternalEObject)hbIndex;
-			hbIndex = (Index)eResolveProxy(oldHbIndex);
+			InternalEObject oldHbIndex = (InternalEObject) hbIndex;
+			hbIndex = (Index) eResolveProxy(oldHbIndex);
 			if (hbIndex != oldHbIndex) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_INDEX, oldHbIndex, hbIndex));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+							HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_INDEX, oldHbIndex, hbIndex));
 			}
 		}
 		return hbIndex;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Index basicGetHbIndex() {
@@ -471,32 +562,34 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHbIndex(Index newHbIndex) {
 		Index oldHbIndex = hbIndex;
 		hbIndex = newHbIndex;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_INDEX, oldHbIndex, hbIndex));
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_INDEX, oldHbIndex, hbIndex));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Filter> getFilter() {
 		if (filter == null) {
-			filter = new EObjectResolvingEList<Filter>(Filter.class, this, HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__FILTER);
+			filter = new EObjectResolvingEList<Filter>(Filter.class, this,
+					HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__FILTER);
 		}
 		return filter;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public MapKeyManyToMany getMapKeyManyToMany() {
@@ -504,59 +597,70 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetMapKeyManyToMany(MapKeyManyToMany newMapKeyManyToMany, NotificationChain msgs) {
+	public NotificationChain basicSetMapKeyManyToMany(MapKeyManyToMany newMapKeyManyToMany,
+			NotificationChain msgs) {
 		MapKeyManyToMany oldMapKeyManyToMany = mapKeyManyToMany;
 		mapKeyManyToMany = newMapKeyManyToMany;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__MAP_KEY_MANY_TO_MANY, oldMapKeyManyToMany, newMapKeyManyToMany);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__MAP_KEY_MANY_TO_MANY, oldMapKeyManyToMany,
+					newMapKeyManyToMany);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setMapKeyManyToMany(MapKeyManyToMany newMapKeyManyToMany) {
 		if (newMapKeyManyToMany != mapKeyManyToMany) {
 			NotificationChain msgs = null;
 			if (mapKeyManyToMany != null)
-				msgs = ((InternalEObject)mapKeyManyToMany).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__MAP_KEY_MANY_TO_MANY, null, msgs);
+				msgs = ((InternalEObject) mapKeyManyToMany).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__MAP_KEY_MANY_TO_MANY, null, msgs);
 			if (newMapKeyManyToMany != null)
-				msgs = ((InternalEObject)newMapKeyManyToMany).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__MAP_KEY_MANY_TO_MANY, null, msgs);
+				msgs = ((InternalEObject) newMapKeyManyToMany).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__MAP_KEY_MANY_TO_MANY, null, msgs);
 			msgs = basicSetMapKeyManyToMany(newMapKeyManyToMany, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__MAP_KEY_MANY_TO_MANY, newMapKeyManyToMany, newMapKeyManyToMany));
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__MAP_KEY_MANY_TO_MANY, newMapKeyManyToMany,
+					newMapKeyManyToMany));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Formula getFormula() {
 		if (formula != null && formula.eIsProxy()) {
-			InternalEObject oldFormula = (InternalEObject)formula;
-			formula = (Formula)eResolveProxy(oldFormula);
+			InternalEObject oldFormula = (InternalEObject) formula;
+			formula = (Formula) eResolveProxy(oldFormula);
 			if (formula != oldFormula) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__FORMULA, oldFormula, formula));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+							HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__FORMULA, oldFormula, formula));
 			}
 		}
 		return formula;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Formula basicGetFormula() {
@@ -564,19 +668,21 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFormula(Formula newFormula) {
 		Formula oldFormula = formula;
 		formula = newFormula;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__FORMULA, oldFormula, formula));
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__FORMULA, oldFormula, formula));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Type getHbType() {
@@ -585,39 +691,48 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetHbType(Type newHbType, NotificationChain msgs) {
 		Type oldHbType = hbType;
 		hbType = newHbType;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_TYPE, oldHbType, newHbType);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_TYPE, oldHbType, newHbType);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHbType(Type newHbType) {
 		if (newHbType != hbType) {
 			NotificationChain msgs = null;
 			if (hbType != null)
-				msgs = ((InternalEObject)hbType).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_TYPE, null, msgs);
+				msgs = ((InternalEObject) hbType).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_TYPE, null, msgs);
 			if (newHbType != null)
-				msgs = ((InternalEObject)newHbType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_TYPE, null, msgs);
+				msgs = ((InternalEObject) newHbType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_TYPE, null, msgs);
 			msgs = basicSetHbType(newHbType, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_TYPE, newHbType, newHbType));
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_TYPE, newHbType, newHbType));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Generated getGenerated() {
@@ -625,42 +740,49 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetGenerated(Generated newGenerated, NotificationChain msgs) {
 		Generated oldGenerated = generated;
 		generated = newGenerated;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__GENERATED, oldGenerated, newGenerated);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__GENERATED, oldGenerated, newGenerated);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setGenerated(Generated newGenerated) {
 		if (newGenerated != generated) {
 			NotificationChain msgs = null;
 			if (generated != null)
-				msgs = ((InternalEObject)generated).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__GENERATED, null, msgs);
+				msgs = ((InternalEObject) generated).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__GENERATED, null, msgs);
 			if (newGenerated != null)
-				msgs = ((InternalEObject)newGenerated).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__GENERATED, null, msgs);
+				msgs = ((InternalEObject) newGenerated).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__GENERATED, null, msgs);
 			msgs = basicSetGenerated(newGenerated, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__GENERATED, newGenerated, newGenerated));
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__GENERATED, newGenerated, newGenerated));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NaturalId getNaturalId() {
@@ -668,59 +790,67 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetNaturalId(NaturalId newNaturalId, NotificationChain msgs) {
 		NaturalId oldNaturalId = naturalId;
 		naturalId = newNaturalId;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__NATURAL_ID, oldNaturalId, newNaturalId);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__NATURAL_ID, oldNaturalId, newNaturalId);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setNaturalId(NaturalId newNaturalId) {
 		if (newNaturalId != naturalId) {
 			NotificationChain msgs = null;
 			if (naturalId != null)
-				msgs = ((InternalEObject)naturalId).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__NATURAL_ID, null, msgs);
+				msgs = ((InternalEObject) naturalId).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__NATURAL_ID, null, msgs);
 			if (newNaturalId != null)
-				msgs = ((InternalEObject)newNaturalId).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__NATURAL_ID, null, msgs);
+				msgs = ((InternalEObject) newNaturalId).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__NATURAL_ID, null, msgs);
 			msgs = basicSetNaturalId(newNaturalId, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__NATURAL_ID, newNaturalId, newNaturalId));
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__NATURAL_ID, newNaturalId, newNaturalId));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Any getAny() {
 		if (any != null && any.eIsProxy()) {
-			InternalEObject oldAny = (InternalEObject)any;
-			any = (Any)eResolveProxy(oldAny);
+			InternalEObject oldAny = (InternalEObject) any;
+			any = (Any) eResolveProxy(oldAny);
 			if (any != oldAny) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__ANY, oldAny, any));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+							HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__ANY, oldAny, any));
 			}
 		}
 		return any;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Any basicGetAny() {
@@ -728,37 +858,39 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setAny(Any newAny) {
 		Any oldAny = any;
 		any = newAny;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__ANY, oldAny, any));
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__ANY, oldAny, any));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AnyMetaDef getAnyMetaDef() {
 		if (anyMetaDef != null && anyMetaDef.eIsProxy()) {
-			InternalEObject oldAnyMetaDef = (InternalEObject)anyMetaDef;
-			anyMetaDef = (AnyMetaDef)eResolveProxy(oldAnyMetaDef);
+			InternalEObject oldAnyMetaDef = (InternalEObject) anyMetaDef;
+			anyMetaDef = (AnyMetaDef) eResolveProxy(oldAnyMetaDef);
 			if (anyMetaDef != oldAnyMetaDef) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__ANY_META_DEF, oldAnyMetaDef, anyMetaDef));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+							HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__ANY_META_DEF, oldAnyMetaDef, anyMetaDef));
 			}
 		}
 		return anyMetaDef;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AnyMetaDef basicGetAnyMetaDef() {
@@ -766,273 +898,297 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setAnyMetaDef(AnyMetaDef newAnyMetaDef) {
 		AnyMetaDef oldAnyMetaDef = anyMetaDef;
 		anyMetaDef = newAnyMetaDef;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__ANY_META_DEF, oldAnyMetaDef, anyMetaDef));
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__ANY_META_DEF, oldAnyMetaDef, anyMetaDef));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID,
+			NotificationChain msgs) {
 		switch (featureID) {
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_WHERE:
-				return basicSetHbWhere(null, msgs);
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_COLLECTION_OF_ELEMENTS:
-				return basicSetHbCollectionOfElements(null, msgs);
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_MAP_KEY:
-				return basicSetHbMapKey(null, msgs);
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_COLUMNS:
-				return ((InternalEList<?>)getHbColumns()).basicRemove(otherEnd, msgs);
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_CASCADE:
-				return basicSetHbCascade(null, msgs);
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_ID_BAG:
-				return basicSetHbIdBag(null, msgs);
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__MAP_KEY_MANY_TO_MANY:
-				return basicSetMapKeyManyToMany(null, msgs);
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_TYPE:
-				return basicSetHbType(null, msgs);
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__GENERATED:
-				return basicSetGenerated(null, msgs);
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__NATURAL_ID:
-				return basicSetNaturalId(null, msgs);
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_WHERE:
+			return basicSetHbWhere(null, msgs);
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_COLLECTION_OF_ELEMENTS:
+			return basicSetHbCollectionOfElements(null, msgs);
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_MAP_KEY:
+			return basicSetHbMapKey(null, msgs);
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_COLUMNS:
+			return ((InternalEList<?>) getHbColumns()).basicRemove(otherEnd, msgs);
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_CASCADE:
+			return basicSetHbCascade(null, msgs);
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_ID_BAG:
+			return basicSetHbIdBag(null, msgs);
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__MAP_KEY_MANY_TO_MANY:
+			return basicSetMapKeyManyToMany(null, msgs);
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_TYPE:
+			return basicSetHbType(null, msgs);
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__GENERATED:
+			return basicSetGenerated(null, msgs);
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__NATURAL_ID:
+			return basicSetNaturalId(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_WHERE:
-				return getHbWhere();
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_COLLECTION_OF_ELEMENTS:
-				return getHbCollectionOfElements();
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_MAP_KEY:
-				return getHbMapKey();
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_COLUMNS:
-				return getHbColumns();
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_CASCADE:
-				return getHbCascade();
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_ID_BAG:
-				return getHbIdBag();
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_INDEX:
-				if (resolve) return getHbIndex();
-				return basicGetHbIndex();
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__FILTER:
-				return getFilter();
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__MAP_KEY_MANY_TO_MANY:
-				return getMapKeyManyToMany();
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__FORMULA:
-				if (resolve) return getFormula();
-				return basicGetFormula();
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_TYPE:
-				return getHbType();
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__GENERATED:
-				return getGenerated();
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__NATURAL_ID:
-				return getNaturalId();
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__ANY:
-				if (resolve) return getAny();
-				return basicGetAny();
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__ANY_META_DEF:
-				if (resolve) return getAnyMetaDef();
-				return basicGetAnyMetaDef();
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_WHERE:
+			return getHbWhere();
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_COLLECTION_OF_ELEMENTS:
+			return getHbCollectionOfElements();
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_MAP_KEY:
+			return getHbMapKey();
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_COLUMNS:
+			return getHbColumns();
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_CASCADE:
+			return getHbCascade();
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_ID_BAG:
+			return getHbIdBag();
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_INDEX:
+			if (resolve)
+				return getHbIndex();
+			return basicGetHbIndex();
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__FILTER:
+			return getFilter();
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__MAP_KEY_MANY_TO_MANY:
+			return getMapKeyManyToMany();
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__FORMULA:
+			if (resolve)
+				return getFormula();
+			return basicGetFormula();
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_TYPE:
+			return getHbType();
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__GENERATED:
+			return getGenerated();
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__NATURAL_ID:
+			return getNaturalId();
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__ANY:
+			if (resolve)
+				return getAny();
+			return basicGetAny();
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__ANY_META_DEF:
+			if (resolve)
+				return getAnyMetaDef();
+			return basicGetAnyMetaDef();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
-		@Override
+	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_WHERE:
-				setHbWhere((Where)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_COLLECTION_OF_ELEMENTS:
-				setHbCollectionOfElements((CollectionOfElements)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_MAP_KEY:
-				setHbMapKey((HbMapKey)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_COLUMNS:
-				getHbColumns().clear();
-				getHbColumns().addAll((Collection<? extends Column>)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_CASCADE:
-				setHbCascade((Cascade)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_ID_BAG:
-				setHbIdBag((IdBag)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_INDEX:
-				setHbIndex((Index)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__FILTER:
-				getFilter().clear();
-				getFilter().addAll((Collection<? extends Filter>)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__MAP_KEY_MANY_TO_MANY:
-				setMapKeyManyToMany((MapKeyManyToMany)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__FORMULA:
-				setFormula((Formula)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_TYPE:
-				setHbType((Type)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__GENERATED:
-				setGenerated((Generated)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__NATURAL_ID:
-				setNaturalId((NaturalId)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__ANY:
-				setAny((Any)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__ANY_META_DEF:
-				setAnyMetaDef((AnyMetaDef)newValue);
-				return;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_WHERE:
+			setHbWhere((Where) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_COLLECTION_OF_ELEMENTS:
+			setHbCollectionOfElements((CollectionOfElements) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_MAP_KEY:
+			setHbMapKey((HbMapKey) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_COLUMNS:
+			getHbColumns().clear();
+			getHbColumns().addAll((Collection<? extends Column>) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_CASCADE:
+			setHbCascade((Cascade) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_ID_BAG:
+			setHbIdBag((IdBag) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_INDEX:
+			setHbIndex((Index) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__FILTER:
+			getFilter().clear();
+			getFilter().addAll((Collection<? extends Filter>) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__MAP_KEY_MANY_TO_MANY:
+			setMapKeyManyToMany((MapKeyManyToMany) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__FORMULA:
+			setFormula((Formula) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_TYPE:
+			setHbType((Type) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__GENERATED:
+			setGenerated((Generated) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__NATURAL_ID:
+			setNaturalId((NaturalId) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__ANY:
+			setAny((Any) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__ANY_META_DEF:
+			setAnyMetaDef((AnyMetaDef) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_WHERE:
-				setHbWhere((Where)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_COLLECTION_OF_ELEMENTS:
-				setHbCollectionOfElements((CollectionOfElements)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_MAP_KEY:
-				setHbMapKey((HbMapKey)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_COLUMNS:
-				getHbColumns().clear();
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_CASCADE:
-				setHbCascade((Cascade)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_ID_BAG:
-				setHbIdBag((IdBag)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_INDEX:
-				setHbIndex((Index)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__FILTER:
-				getFilter().clear();
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__MAP_KEY_MANY_TO_MANY:
-				setMapKeyManyToMany((MapKeyManyToMany)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__FORMULA:
-				setFormula((Formula)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_TYPE:
-				setHbType((Type)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__GENERATED:
-				setGenerated((Generated)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__NATURAL_ID:
-				setNaturalId((NaturalId)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__ANY:
-				setAny((Any)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__ANY_META_DEF:
-				setAnyMetaDef((AnyMetaDef)null);
-				return;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_WHERE:
+			setHbWhere((Where) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_COLLECTION_OF_ELEMENTS:
+			setHbCollectionOfElements((CollectionOfElements) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_MAP_KEY:
+			setHbMapKey((HbMapKey) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_COLUMNS:
+			getHbColumns().clear();
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_CASCADE:
+			setHbCascade((Cascade) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_ID_BAG:
+			setHbIdBag((IdBag) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_INDEX:
+			setHbIndex((Index) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__FILTER:
+			getFilter().clear();
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__MAP_KEY_MANY_TO_MANY:
+			setMapKeyManyToMany((MapKeyManyToMany) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__FORMULA:
+			setFormula((Formula) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_TYPE:
+			setHbType((Type) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__GENERATED:
+			setGenerated((Generated) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__NATURAL_ID:
+			setNaturalId((NaturalId) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__ANY:
+			setAny((Any) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__ANY_META_DEF:
+			setAnyMetaDef((AnyMetaDef) null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_WHERE:
-				return hbWhere != null;
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_COLLECTION_OF_ELEMENTS:
-				return hbCollectionOfElements != null;
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_MAP_KEY:
-				return hbMapKey != null;
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_COLUMNS:
-				return hbColumns != null && !hbColumns.isEmpty();
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_CASCADE:
-				return hbCascade != null;
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_ID_BAG:
-				return hbIdBag != null;
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_INDEX:
-				return hbIndex != null;
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__FILTER:
-				return filter != null && !filter.isEmpty();
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__MAP_KEY_MANY_TO_MANY:
-				return mapKeyManyToMany != null;
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__FORMULA:
-				return formula != null;
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_TYPE:
-				return hbType != null;
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__GENERATED:
-				return generated != null;
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__NATURAL_ID:
-				return naturalId != null;
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__ANY:
-				return any != null;
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__ANY_META_DEF:
-				return anyMetaDef != null;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_WHERE:
+			return hbWhere != null;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_COLLECTION_OF_ELEMENTS:
+			return hbCollectionOfElements != null;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_MAP_KEY:
+			return hbMapKey != null;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_COLUMNS:
+			return hbColumns != null && !hbColumns.isEmpty();
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_CASCADE:
+			return hbCascade != null;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_ID_BAG:
+			return hbIdBag != null;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_INDEX:
+			return hbIndex != null;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__FILTER:
+			return filter != null && !filter.isEmpty();
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__MAP_KEY_MANY_TO_MANY:
+			return mapKeyManyToMany != null;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__FORMULA:
+			return formula != null;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_TYPE:
+			return hbType != null;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__GENERATED:
+			return generated != null;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__NATURAL_ID:
+			return naturalId != null;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__ANY:
+			return any != null;
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__ANY_META_DEF:
+			return anyMetaDef != null;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
 		if (baseClass == HbAnnotatedEModelElement.class) {
 			switch (derivedFeatureID) {
-				default: return -1;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == HbAnnotatedETypeElement.class) {
 			switch (derivedFeatureID) {
-				case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_WHERE: return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_WHERE;
-				case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_COLLECTION_OF_ELEMENTS: return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_COLLECTION_OF_ELEMENTS;
-				case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_MAP_KEY: return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_MAP_KEY;
-				case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_COLUMNS: return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_COLUMNS;
-				case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_CASCADE: return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_CASCADE;
-				case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_ID_BAG: return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_ID_BAG;
-				case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_INDEX: return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_INDEX;
-				case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__FILTER: return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__FILTER;
-				case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__MAP_KEY_MANY_TO_MANY: return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__MAP_KEY_MANY_TO_MANY;
-				case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__FORMULA: return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__FORMULA;
-				default: return -1;
+			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_WHERE:
+				return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_WHERE;
+			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_COLLECTION_OF_ELEMENTS:
+				return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_COLLECTION_OF_ELEMENTS;
+			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_MAP_KEY:
+				return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_MAP_KEY;
+			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_COLUMNS:
+				return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_COLUMNS;
+			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_CASCADE:
+				return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_CASCADE;
+			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_ID_BAG:
+				return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_ID_BAG;
+			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_INDEX:
+				return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_INDEX;
+			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__FILTER:
+				return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__FILTER;
+			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__MAP_KEY_MANY_TO_MANY:
+				return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__MAP_KEY_MANY_TO_MANY;
+			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__FORMULA:
+				return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__FORMULA;
+			default:
+				return -1;
 			}
 		}
 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
@@ -1040,28 +1196,41 @@ public class HbAnnotatedEAttributeImpl extends PAnnotatedEAttributeImpl implemen
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
 		if (baseClass == HbAnnotatedEModelElement.class) {
 			switch (baseFeatureID) {
-				default: return -1;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == HbAnnotatedETypeElement.class) {
 			switch (baseFeatureID) {
-				case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_WHERE: return HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_WHERE;
-				case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_COLLECTION_OF_ELEMENTS: return HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_COLLECTION_OF_ELEMENTS;
-				case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_MAP_KEY: return HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_MAP_KEY;
-				case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_COLUMNS: return HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_COLUMNS;
-				case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_CASCADE: return HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_CASCADE;
-				case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_ID_BAG: return HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_ID_BAG;
-				case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_INDEX: return HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_INDEX;
-				case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__FILTER: return HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__FILTER;
-				case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__MAP_KEY_MANY_TO_MANY: return HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__MAP_KEY_MANY_TO_MANY;
-				case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__FORMULA: return HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__FORMULA;
-				default: return -1;
+			case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_WHERE:
+				return HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_WHERE;
+			case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_COLLECTION_OF_ELEMENTS:
+				return HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_COLLECTION_OF_ELEMENTS;
+			case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_MAP_KEY:
+				return HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_MAP_KEY;
+			case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_COLUMNS:
+				return HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_COLUMNS;
+			case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_CASCADE:
+				return HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_CASCADE;
+			case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_ID_BAG:
+				return HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_ID_BAG;
+			case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_INDEX:
+				return HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__HB_INDEX;
+			case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__FILTER:
+				return HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__FILTER;
+			case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__MAP_KEY_MANY_TO_MANY:
+				return HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__MAP_KEY_MANY_TO_MANY;
+			case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__FORMULA:
+				return HbmodelPackage.HB_ANNOTATED_EATTRIBUTE__FORMULA;
+			default:
+				return -1;
 			}
 		}
 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEClassImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEClassImpl.java
index ffedab3ba..c96a4b715 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEClassImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEClassImpl.java
@@ -33,34 +33,60 @@ import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass;
 import org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Hb Annotated EClass</b></em>'. <!--
- * end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Hb Annotated EClass</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEClassImpl#getHbCache <em>Hb Cache</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEClassImpl#getHbOnDelete <em>Hb On Delete</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEClassImpl#getHbWhere <em>Hb Where</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEClassImpl#getHbProxy <em>Hb Proxy</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEClassImpl#getHbNamedQuery <em>Hb Named Query</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEClassImpl#getFilterDef <em>Filter Def</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEClassImpl#getFilter <em>Filter</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEClassImpl#getDiscriminatorFormula <em>Discriminator Formula</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEClassImpl#getForceDiscriminator <em>Force Discriminator</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEClassImpl#getImmutable <em>Immutable</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEClassImpl#getHbEntity <em>Hb Entity</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEClassImpl#getBatchSize <em>Batch Size</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEClassImpl#getHbType <em>Hb Type</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEClassImpl#getHbCache <em>Hb Cache
+ * </em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEClassImpl#getHbOnDelete <em>Hb On
+ * Delete</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEClassImpl#getHbWhere <em>Hb Where
+ * </em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEClassImpl#getHbProxy <em>Hb Proxy
+ * </em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEClassImpl#getHbNamedQuery <em>Hb
+ * Named Query</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEClassImpl#getFilterDef <em>Filter
+ * Def</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEClassImpl#getFilter <em>Filter
+ * </em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEClassImpl#getDiscriminatorFormula
+ * <em>Discriminator Formula</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEClassImpl#getForceDiscriminator
+ * <em>Force Discriminator</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEClassImpl#getImmutable <em>
+ * Immutable</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEClassImpl#getHbEntity <em>Hb
+ * Entity</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEClassImpl#getBatchSize <em>Batch
+ * Size</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEClassImpl#getHbType <em>Hb Type
+ * </em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class HbAnnotatedEClassImpl extends PAnnotatedEClassImpl implements HbAnnotatedEClass {
 	/**
-	 * The cached value of the '{@link #getHbCache() <em>Hb Cache</em>}' containment reference.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
+	 * The cached value of the '{@link #getHbCache() <em>Hb Cache</em>}' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getHbCache()
 	 * @generated
 	 * @ordered
@@ -68,9 +94,9 @@ public class HbAnnotatedEClassImpl extends PAnnotatedEClassImpl implements HbAnn
 	protected Cache hbCache;
 
 	/**
-	 * The cached value of the '{@link #getHbOnDelete() <em>Hb On Delete</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getHbOnDelete() <em>Hb On Delete</em>}' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getHbOnDelete()
 	 * @generated
 	 * @ordered
@@ -78,9 +104,9 @@ public class HbAnnotatedEClassImpl extends PAnnotatedEClassImpl implements HbAnn
 	protected OnDelete hbOnDelete;
 
 	/**
-	 * The cached value of the '{@link #getHbWhere() <em>Hb Where</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getHbWhere() <em>Hb Where</em>}' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getHbWhere()
 	 * @generated
 	 * @ordered
@@ -88,9 +114,9 @@ public class HbAnnotatedEClassImpl extends PAnnotatedEClassImpl implements HbAnn
 	protected Where hbWhere;
 
 	/**
-	 * The cached value of the '{@link #getHbProxy() <em>Hb Proxy</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getHbProxy() <em>Hb Proxy</em>}' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getHbProxy()
 	 * @generated
 	 * @ordered
@@ -98,9 +124,9 @@ public class HbAnnotatedEClassImpl extends PAnnotatedEClassImpl implements HbAnn
 	protected Proxy hbProxy;
 
 	/**
-	 * The cached value of the '{@link #getHbNamedQuery() <em>Hb Named Query</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getHbNamedQuery() <em>Hb Named Query</em>} ' reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getHbNamedQuery()
 	 * @generated
 	 * @ordered
@@ -108,9 +134,9 @@ public class HbAnnotatedEClassImpl extends PAnnotatedEClassImpl implements HbAnn
 	protected EList<NamedQuery> hbNamedQuery;
 
 	/**
-	 * The cached value of the '{@link #getFilterDef() <em>Filter Def</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getFilterDef() <em>Filter Def</em>}' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFilterDef()
 	 * @generated
 	 * @ordered
@@ -118,9 +144,9 @@ public class HbAnnotatedEClassImpl extends PAnnotatedEClassImpl implements HbAnn
 	protected EList<FilterDef> filterDef;
 
 	/**
-	 * The cached value of the '{@link #getFilter() <em>Filter</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getFilter() <em>Filter</em>}' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFilter()
 	 * @generated
 	 * @ordered
@@ -128,9 +154,9 @@ public class HbAnnotatedEClassImpl extends PAnnotatedEClassImpl implements HbAnn
 	protected EList<Filter> filter;
 
 	/**
-	 * The cached value of the '{@link #getDiscriminatorFormula() <em>Discriminator Formula</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getDiscriminatorFormula() <em>Discriminator Formula</em>}'
+	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDiscriminatorFormula()
 	 * @generated
 	 * @ordered
@@ -138,9 +164,9 @@ public class HbAnnotatedEClassImpl extends PAnnotatedEClassImpl implements HbAnn
 	protected DiscriminatorFormula discriminatorFormula;
 
 	/**
-	 * The cached value of the '{@link #getForceDiscriminator() <em>Force Discriminator</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getForceDiscriminator() <em>Force Discriminator</em>}'
+	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getForceDiscriminator()
 	 * @generated
 	 * @ordered
@@ -149,8 +175,8 @@ public class HbAnnotatedEClassImpl extends PAnnotatedEClassImpl implements HbAnn
 
 	/**
 	 * The cached value of the '{@link #getImmutable() <em>Immutable</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getImmutable()
 	 * @generated
 	 * @ordered
@@ -158,9 +184,9 @@ public class HbAnnotatedEClassImpl extends PAnnotatedEClassImpl implements HbAnn
 	protected Immutable immutable;
 
 	/**
-	 * The cached value of the '{@link #getHbEntity() <em>Hb Entity</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getHbEntity() <em>Hb Entity</em>}' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getHbEntity()
 	 * @generated
 	 * @ordered
@@ -168,9 +194,9 @@ public class HbAnnotatedEClassImpl extends PAnnotatedEClassImpl implements HbAnn
 	protected HbEntity hbEntity;
 
 	/**
-	 * The cached value of the '{@link #getBatchSize() <em>Batch Size</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getBatchSize() <em>Batch Size</em>}' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getBatchSize()
 	 * @generated
 	 * @ordered
@@ -178,9 +204,9 @@ public class HbAnnotatedEClassImpl extends PAnnotatedEClassImpl implements HbAnn
 	protected BatchSize batchSize;
 
 	/**
-	 * The cached value of the '{@link #getHbType() <em>Hb Type</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getHbType() <em>Hb Type</em>}' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getHbType()
 	 * @generated
 	 * @ordered
@@ -189,6 +215,7 @@ public class HbAnnotatedEClassImpl extends PAnnotatedEClassImpl implements HbAnn
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected HbAnnotatedEClassImpl() {
@@ -197,6 +224,7 @@ public class HbAnnotatedEClassImpl extends PAnnotatedEClassImpl implements HbAnn
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -206,6 +234,7 @@ public class HbAnnotatedEClassImpl extends PAnnotatedEClassImpl implements HbAnn
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Cache getHbCache() {
@@ -214,56 +243,66 @@ public class HbAnnotatedEClassImpl extends PAnnotatedEClassImpl implements HbAnn
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetHbCache(Cache newHbCache, NotificationChain msgs) {
 		Cache oldHbCache = hbCache;
 		hbCache = newHbCache;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_ECLASS__HB_CACHE, oldHbCache, newHbCache);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_ECLASS__HB_CACHE, oldHbCache, newHbCache);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHbCache(Cache newHbCache) {
 		if (newHbCache != hbCache) {
 			NotificationChain msgs = null;
 			if (hbCache != null)
-				msgs = ((InternalEObject)hbCache).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_ECLASS__HB_CACHE, null, msgs);
+				msgs = ((InternalEObject) hbCache).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_ECLASS__HB_CACHE, null, msgs);
 			if (newHbCache != null)
-				msgs = ((InternalEObject)newHbCache).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_ECLASS__HB_CACHE, null, msgs);
+				msgs = ((InternalEObject) newHbCache).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_ECLASS__HB_CACHE, null, msgs);
 			msgs = basicSetHbCache(newHbCache, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_ECLASS__HB_CACHE, newHbCache, newHbCache));
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_ECLASS__HB_CACHE, newHbCache, newHbCache));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public OnDelete getHbOnDelete() {
 		if (hbOnDelete != null && hbOnDelete.eIsProxy()) {
-			InternalEObject oldHbOnDelete = (InternalEObject)hbOnDelete;
-			hbOnDelete = (OnDelete)eResolveProxy(oldHbOnDelete);
+			InternalEObject oldHbOnDelete = (InternalEObject) hbOnDelete;
+			hbOnDelete = (OnDelete) eResolveProxy(oldHbOnDelete);
 			if (hbOnDelete != oldHbOnDelete) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, HbmodelPackage.HB_ANNOTATED_ECLASS__HB_ON_DELETE, oldHbOnDelete, hbOnDelete));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+							HbmodelPackage.HB_ANNOTATED_ECLASS__HB_ON_DELETE, oldHbOnDelete, hbOnDelete));
 			}
 		}
 		return hbOnDelete;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public OnDelete basicGetHbOnDelete() {
@@ -271,20 +310,21 @@ public class HbAnnotatedEClassImpl extends PAnnotatedEClassImpl implements HbAnn
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHbOnDelete(OnDelete newHbOnDelete) {
 		OnDelete oldHbOnDelete = hbOnDelete;
 		hbOnDelete = newHbOnDelete;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_ECLASS__HB_ON_DELETE, oldHbOnDelete, hbOnDelete));
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_ECLASS__HB_ON_DELETE, oldHbOnDelete, hbOnDelete));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Where getHbWhere() {
@@ -292,59 +332,67 @@ public class HbAnnotatedEClassImpl extends PAnnotatedEClassImpl implements HbAnn
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetHbWhere(Where newHbWhere, NotificationChain msgs) {
 		Where oldHbWhere = hbWhere;
 		hbWhere = newHbWhere;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_ECLASS__HB_WHERE, oldHbWhere, newHbWhere);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_ECLASS__HB_WHERE, oldHbWhere, newHbWhere);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHbWhere(Where newHbWhere) {
 		if (newHbWhere != hbWhere) {
 			NotificationChain msgs = null;
 			if (hbWhere != null)
-				msgs = ((InternalEObject)hbWhere).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_ECLASS__HB_WHERE, null, msgs);
+				msgs = ((InternalEObject) hbWhere).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_ECLASS__HB_WHERE, null, msgs);
 			if (newHbWhere != null)
-				msgs = ((InternalEObject)newHbWhere).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_ECLASS__HB_WHERE, null, msgs);
+				msgs = ((InternalEObject) newHbWhere).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_ECLASS__HB_WHERE, null, msgs);
 			msgs = basicSetHbWhere(newHbWhere, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_ECLASS__HB_WHERE, newHbWhere, newHbWhere));
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_ECLASS__HB_WHERE, newHbWhere, newHbWhere));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Proxy getHbProxy() {
 		if (hbProxy != null && hbProxy.eIsProxy()) {
-			InternalEObject oldHbProxy = (InternalEObject)hbProxy;
-			hbProxy = (Proxy)eResolveProxy(oldHbProxy);
+			InternalEObject oldHbProxy = (InternalEObject) hbProxy;
+			hbProxy = (Proxy) eResolveProxy(oldHbProxy);
 			if (hbProxy != oldHbProxy) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, HbmodelPackage.HB_ANNOTATED_ECLASS__HB_PROXY, oldHbProxy, hbProxy));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+							HbmodelPackage.HB_ANNOTATED_ECLASS__HB_PROXY, oldHbProxy, hbProxy));
 			}
 		}
 		return hbProxy;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Proxy basicGetHbProxy() {
@@ -352,56 +400,60 @@ public class HbAnnotatedEClassImpl extends PAnnotatedEClassImpl implements HbAnn
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHbProxy(Proxy newHbProxy) {
 		Proxy oldHbProxy = hbProxy;
 		hbProxy = newHbProxy;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_ECLASS__HB_PROXY, oldHbProxy, hbProxy));
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_ECLASS__HB_PROXY, oldHbProxy, hbProxy));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<NamedQuery> getHbNamedQuery() {
 		if (hbNamedQuery == null) {
-			hbNamedQuery = new EObjectResolvingEList<NamedQuery>(NamedQuery.class, this, HbmodelPackage.HB_ANNOTATED_ECLASS__HB_NAMED_QUERY);
+			hbNamedQuery = new EObjectResolvingEList<NamedQuery>(NamedQuery.class, this,
+					HbmodelPackage.HB_ANNOTATED_ECLASS__HB_NAMED_QUERY);
 		}
 		return hbNamedQuery;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<FilterDef> getFilterDef() {
 		if (filterDef == null) {
-			filterDef = new EObjectResolvingEList<FilterDef>(FilterDef.class, this, HbmodelPackage.HB_ANNOTATED_ECLASS__FILTER_DEF);
+			filterDef = new EObjectResolvingEList<FilterDef>(FilterDef.class, this,
+					HbmodelPackage.HB_ANNOTATED_ECLASS__FILTER_DEF);
 		}
 		return filterDef;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Filter> getFilter() {
 		if (filter == null) {
-			filter = new EObjectResolvingEList<Filter>(Filter.class, this, HbmodelPackage.HB_ANNOTATED_ECLASS__FILTER);
+			filter = new EObjectResolvingEList<Filter>(Filter.class, this,
+					HbmodelPackage.HB_ANNOTATED_ECLASS__FILTER);
 		}
 		return filter;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DiscriminatorFormula getDiscriminatorFormula() {
@@ -409,42 +461,52 @@ public class HbAnnotatedEClassImpl extends PAnnotatedEClassImpl implements HbAnn
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetDiscriminatorFormula(DiscriminatorFormula newDiscriminatorFormula, NotificationChain msgs) {
+	public NotificationChain basicSetDiscriminatorFormula(
+			DiscriminatorFormula newDiscriminatorFormula, NotificationChain msgs) {
 		DiscriminatorFormula oldDiscriminatorFormula = discriminatorFormula;
 		discriminatorFormula = newDiscriminatorFormula;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_ECLASS__DISCRIMINATOR_FORMULA, oldDiscriminatorFormula, newDiscriminatorFormula);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_ECLASS__DISCRIMINATOR_FORMULA, oldDiscriminatorFormula,
+					newDiscriminatorFormula);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDiscriminatorFormula(DiscriminatorFormula newDiscriminatorFormula) {
 		if (newDiscriminatorFormula != discriminatorFormula) {
 			NotificationChain msgs = null;
 			if (discriminatorFormula != null)
-				msgs = ((InternalEObject)discriminatorFormula).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_ECLASS__DISCRIMINATOR_FORMULA, null, msgs);
+				msgs = ((InternalEObject) discriminatorFormula).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_ECLASS__DISCRIMINATOR_FORMULA, null, msgs);
 			if (newDiscriminatorFormula != null)
-				msgs = ((InternalEObject)newDiscriminatorFormula).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_ECLASS__DISCRIMINATOR_FORMULA, null, msgs);
+				msgs = ((InternalEObject) newDiscriminatorFormula).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_ECLASS__DISCRIMINATOR_FORMULA, null, msgs);
 			msgs = basicSetDiscriminatorFormula(newDiscriminatorFormula, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_ECLASS__DISCRIMINATOR_FORMULA, newDiscriminatorFormula, newDiscriminatorFormula));
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_ECLASS__DISCRIMINATOR_FORMULA, newDiscriminatorFormula,
+					newDiscriminatorFormula));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ForceDiscriminator getForceDiscriminator() {
@@ -452,42 +514,52 @@ public class HbAnnotatedEClassImpl extends PAnnotatedEClassImpl implements HbAnn
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetForceDiscriminator(ForceDiscriminator newForceDiscriminator, NotificationChain msgs) {
+	public NotificationChain basicSetForceDiscriminator(ForceDiscriminator newForceDiscriminator,
+			NotificationChain msgs) {
 		ForceDiscriminator oldForceDiscriminator = forceDiscriminator;
 		forceDiscriminator = newForceDiscriminator;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_ECLASS__FORCE_DISCRIMINATOR, oldForceDiscriminator, newForceDiscriminator);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_ECLASS__FORCE_DISCRIMINATOR, oldForceDiscriminator,
+					newForceDiscriminator);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setForceDiscriminator(ForceDiscriminator newForceDiscriminator) {
 		if (newForceDiscriminator != forceDiscriminator) {
 			NotificationChain msgs = null;
 			if (forceDiscriminator != null)
-				msgs = ((InternalEObject)forceDiscriminator).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_ECLASS__FORCE_DISCRIMINATOR, null, msgs);
+				msgs = ((InternalEObject) forceDiscriminator).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_ECLASS__FORCE_DISCRIMINATOR, null, msgs);
 			if (newForceDiscriminator != null)
-				msgs = ((InternalEObject)newForceDiscriminator).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_ECLASS__FORCE_DISCRIMINATOR, null, msgs);
+				msgs = ((InternalEObject) newForceDiscriminator).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_ECLASS__FORCE_DISCRIMINATOR, null, msgs);
 			msgs = basicSetForceDiscriminator(newForceDiscriminator, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_ECLASS__FORCE_DISCRIMINATOR, newForceDiscriminator, newForceDiscriminator));
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_ECLASS__FORCE_DISCRIMINATOR, newForceDiscriminator,
+					newForceDiscriminator));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Immutable getImmutable() {
@@ -495,59 +567,67 @@ public class HbAnnotatedEClassImpl extends PAnnotatedEClassImpl implements HbAnn
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetImmutable(Immutable newImmutable, NotificationChain msgs) {
 		Immutable oldImmutable = immutable;
 		immutable = newImmutable;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_ECLASS__IMMUTABLE, oldImmutable, newImmutable);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_ECLASS__IMMUTABLE, oldImmutable, newImmutable);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setImmutable(Immutable newImmutable) {
 		if (newImmutable != immutable) {
 			NotificationChain msgs = null;
 			if (immutable != null)
-				msgs = ((InternalEObject)immutable).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_ECLASS__IMMUTABLE, null, msgs);
+				msgs = ((InternalEObject) immutable).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_ECLASS__IMMUTABLE, null, msgs);
 			if (newImmutable != null)
-				msgs = ((InternalEObject)newImmutable).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_ECLASS__IMMUTABLE, null, msgs);
+				msgs = ((InternalEObject) newImmutable).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_ECLASS__IMMUTABLE, null, msgs);
 			msgs = basicSetImmutable(newImmutable, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_ECLASS__IMMUTABLE, newImmutable, newImmutable));
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_ECLASS__IMMUTABLE, newImmutable, newImmutable));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HbEntity getHbEntity() {
 		if (hbEntity != null && hbEntity.eIsProxy()) {
-			InternalEObject oldHbEntity = (InternalEObject)hbEntity;
-			hbEntity = (HbEntity)eResolveProxy(oldHbEntity);
+			InternalEObject oldHbEntity = (InternalEObject) hbEntity;
+			hbEntity = (HbEntity) eResolveProxy(oldHbEntity);
 			if (hbEntity != oldHbEntity) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, HbmodelPackage.HB_ANNOTATED_ECLASS__HB_ENTITY, oldHbEntity, hbEntity));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+							HbmodelPackage.HB_ANNOTATED_ECLASS__HB_ENTITY, oldHbEntity, hbEntity));
 			}
 		}
 		return hbEntity;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HbEntity basicGetHbEntity() {
@@ -555,37 +635,39 @@ public class HbAnnotatedEClassImpl extends PAnnotatedEClassImpl implements HbAnn
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHbEntity(HbEntity newHbEntity) {
 		HbEntity oldHbEntity = hbEntity;
 		hbEntity = newHbEntity;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_ECLASS__HB_ENTITY, oldHbEntity, hbEntity));
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_ECLASS__HB_ENTITY, oldHbEntity, hbEntity));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public BatchSize getBatchSize() {
 		if (batchSize != null && batchSize.eIsProxy()) {
-			InternalEObject oldBatchSize = (InternalEObject)batchSize;
-			batchSize = (BatchSize)eResolveProxy(oldBatchSize);
+			InternalEObject oldBatchSize = (InternalEObject) batchSize;
+			batchSize = (BatchSize) eResolveProxy(oldBatchSize);
 			if (batchSize != oldBatchSize) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, HbmodelPackage.HB_ANNOTATED_ECLASS__BATCH_SIZE, oldBatchSize, batchSize));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+							HbmodelPackage.HB_ANNOTATED_ECLASS__BATCH_SIZE, oldBatchSize, batchSize));
 			}
 		}
 		return batchSize;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public BatchSize basicGetBatchSize() {
@@ -593,20 +675,21 @@ public class HbAnnotatedEClassImpl extends PAnnotatedEClassImpl implements HbAnn
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBatchSize(BatchSize newBatchSize) {
 		BatchSize oldBatchSize = batchSize;
 		batchSize = newBatchSize;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_ECLASS__BATCH_SIZE, oldBatchSize, batchSize));
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_ECLASS__BATCH_SIZE, oldBatchSize, batchSize));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Type getHbType() {
@@ -614,240 +697,257 @@ public class HbAnnotatedEClassImpl extends PAnnotatedEClassImpl implements HbAnn
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetHbType(Type newHbType, NotificationChain msgs) {
 		Type oldHbType = hbType;
 		hbType = newHbType;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_ECLASS__HB_TYPE, oldHbType, newHbType);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_ECLASS__HB_TYPE, oldHbType, newHbType);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHbType(Type newHbType) {
 		if (newHbType != hbType) {
 			NotificationChain msgs = null;
 			if (hbType != null)
-				msgs = ((InternalEObject)hbType).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_ECLASS__HB_TYPE, null, msgs);
+				msgs = ((InternalEObject) hbType).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_ECLASS__HB_TYPE, null, msgs);
 			if (newHbType != null)
-				msgs = ((InternalEObject)newHbType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_ECLASS__HB_TYPE, null, msgs);
+				msgs = ((InternalEObject) newHbType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_ECLASS__HB_TYPE, null, msgs);
 			msgs = basicSetHbType(newHbType, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_ECLASS__HB_TYPE, newHbType, newHbType));
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_ECLASS__HB_TYPE, newHbType, newHbType));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID,
+			NotificationChain msgs) {
 		switch (featureID) {
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_CACHE:
-				return basicSetHbCache(null, msgs);
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_WHERE:
-				return basicSetHbWhere(null, msgs);
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__DISCRIMINATOR_FORMULA:
-				return basicSetDiscriminatorFormula(null, msgs);
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__FORCE_DISCRIMINATOR:
-				return basicSetForceDiscriminator(null, msgs);
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__IMMUTABLE:
-				return basicSetImmutable(null, msgs);
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_TYPE:
-				return basicSetHbType(null, msgs);
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_CACHE:
+			return basicSetHbCache(null, msgs);
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_WHERE:
+			return basicSetHbWhere(null, msgs);
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__DISCRIMINATOR_FORMULA:
+			return basicSetDiscriminatorFormula(null, msgs);
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__FORCE_DISCRIMINATOR:
+			return basicSetForceDiscriminator(null, msgs);
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__IMMUTABLE:
+			return basicSetImmutable(null, msgs);
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_TYPE:
+			return basicSetHbType(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_CACHE:
-				return getHbCache();
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_ON_DELETE:
-				if (resolve) return getHbOnDelete();
-				return basicGetHbOnDelete();
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_WHERE:
-				return getHbWhere();
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_PROXY:
-				if (resolve) return getHbProxy();
-				return basicGetHbProxy();
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_NAMED_QUERY:
-				return getHbNamedQuery();
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__FILTER_DEF:
-				return getFilterDef();
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__FILTER:
-				return getFilter();
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__DISCRIMINATOR_FORMULA:
-				return getDiscriminatorFormula();
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__FORCE_DISCRIMINATOR:
-				return getForceDiscriminator();
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__IMMUTABLE:
-				return getImmutable();
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_ENTITY:
-				if (resolve) return getHbEntity();
-				return basicGetHbEntity();
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__BATCH_SIZE:
-				if (resolve) return getBatchSize();
-				return basicGetBatchSize();
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_TYPE:
-				return getHbType();
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_CACHE:
+			return getHbCache();
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_ON_DELETE:
+			if (resolve)
+				return getHbOnDelete();
+			return basicGetHbOnDelete();
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_WHERE:
+			return getHbWhere();
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_PROXY:
+			if (resolve)
+				return getHbProxy();
+			return basicGetHbProxy();
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_NAMED_QUERY:
+			return getHbNamedQuery();
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__FILTER_DEF:
+			return getFilterDef();
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__FILTER:
+			return getFilter();
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__DISCRIMINATOR_FORMULA:
+			return getDiscriminatorFormula();
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__FORCE_DISCRIMINATOR:
+			return getForceDiscriminator();
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__IMMUTABLE:
+			return getImmutable();
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_ENTITY:
+			if (resolve)
+				return getHbEntity();
+			return basicGetHbEntity();
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__BATCH_SIZE:
+			if (resolve)
+				return getBatchSize();
+			return basicGetBatchSize();
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_TYPE:
+			return getHbType();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_CACHE:
-				setHbCache((Cache)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_ON_DELETE:
-				setHbOnDelete((OnDelete)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_WHERE:
-				setHbWhere((Where)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_PROXY:
-				setHbProxy((Proxy)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_NAMED_QUERY:
-				getHbNamedQuery().clear();
-				getHbNamedQuery().addAll((Collection<? extends NamedQuery>)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__FILTER_DEF:
-				getFilterDef().clear();
-				getFilterDef().addAll((Collection<? extends FilterDef>)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__FILTER:
-				getFilter().clear();
-				getFilter().addAll((Collection<? extends Filter>)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__DISCRIMINATOR_FORMULA:
-				setDiscriminatorFormula((DiscriminatorFormula)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__FORCE_DISCRIMINATOR:
-				setForceDiscriminator((ForceDiscriminator)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__IMMUTABLE:
-				setImmutable((Immutable)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_ENTITY:
-				setHbEntity((HbEntity)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__BATCH_SIZE:
-				setBatchSize((BatchSize)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_TYPE:
-				setHbType((Type)newValue);
-				return;
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_CACHE:
+			setHbCache((Cache) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_ON_DELETE:
+			setHbOnDelete((OnDelete) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_WHERE:
+			setHbWhere((Where) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_PROXY:
+			setHbProxy((Proxy) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_NAMED_QUERY:
+			getHbNamedQuery().clear();
+			getHbNamedQuery().addAll((Collection<? extends NamedQuery>) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__FILTER_DEF:
+			getFilterDef().clear();
+			getFilterDef().addAll((Collection<? extends FilterDef>) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__FILTER:
+			getFilter().clear();
+			getFilter().addAll((Collection<? extends Filter>) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__DISCRIMINATOR_FORMULA:
+			setDiscriminatorFormula((DiscriminatorFormula) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__FORCE_DISCRIMINATOR:
+			setForceDiscriminator((ForceDiscriminator) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__IMMUTABLE:
+			setImmutable((Immutable) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_ENTITY:
+			setHbEntity((HbEntity) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__BATCH_SIZE:
+			setBatchSize((BatchSize) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_TYPE:
+			setHbType((Type) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_CACHE:
-				setHbCache((Cache)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_ON_DELETE:
-				setHbOnDelete((OnDelete)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_WHERE:
-				setHbWhere((Where)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_PROXY:
-				setHbProxy((Proxy)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_NAMED_QUERY:
-				getHbNamedQuery().clear();
-				return;
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__FILTER_DEF:
-				getFilterDef().clear();
-				return;
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__FILTER:
-				getFilter().clear();
-				return;
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__DISCRIMINATOR_FORMULA:
-				setDiscriminatorFormula((DiscriminatorFormula)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__FORCE_DISCRIMINATOR:
-				setForceDiscriminator((ForceDiscriminator)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__IMMUTABLE:
-				setImmutable((Immutable)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_ENTITY:
-				setHbEntity((HbEntity)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__BATCH_SIZE:
-				setBatchSize((BatchSize)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_TYPE:
-				setHbType((Type)null);
-				return;
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_CACHE:
+			setHbCache((Cache) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_ON_DELETE:
+			setHbOnDelete((OnDelete) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_WHERE:
+			setHbWhere((Where) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_PROXY:
+			setHbProxy((Proxy) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_NAMED_QUERY:
+			getHbNamedQuery().clear();
+			return;
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__FILTER_DEF:
+			getFilterDef().clear();
+			return;
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__FILTER:
+			getFilter().clear();
+			return;
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__DISCRIMINATOR_FORMULA:
+			setDiscriminatorFormula((DiscriminatorFormula) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__FORCE_DISCRIMINATOR:
+			setForceDiscriminator((ForceDiscriminator) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__IMMUTABLE:
+			setImmutable((Immutable) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_ENTITY:
+			setHbEntity((HbEntity) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__BATCH_SIZE:
+			setBatchSize((BatchSize) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_TYPE:
+			setHbType((Type) null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_CACHE:
-				return hbCache != null;
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_ON_DELETE:
-				return hbOnDelete != null;
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_WHERE:
-				return hbWhere != null;
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_PROXY:
-				return hbProxy != null;
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_NAMED_QUERY:
-				return hbNamedQuery != null && !hbNamedQuery.isEmpty();
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__FILTER_DEF:
-				return filterDef != null && !filterDef.isEmpty();
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__FILTER:
-				return filter != null && !filter.isEmpty();
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__DISCRIMINATOR_FORMULA:
-				return discriminatorFormula != null;
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__FORCE_DISCRIMINATOR:
-				return forceDiscriminator != null;
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__IMMUTABLE:
-				return immutable != null;
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_ENTITY:
-				return hbEntity != null;
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__BATCH_SIZE:
-				return batchSize != null;
-			case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_TYPE:
-				return hbType != null;
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_CACHE:
+			return hbCache != null;
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_ON_DELETE:
+			return hbOnDelete != null;
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_WHERE:
+			return hbWhere != null;
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_PROXY:
+			return hbProxy != null;
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_NAMED_QUERY:
+			return hbNamedQuery != null && !hbNamedQuery.isEmpty();
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__FILTER_DEF:
+			return filterDef != null && !filterDef.isEmpty();
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__FILTER:
+			return filter != null && !filter.isEmpty();
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__DISCRIMINATOR_FORMULA:
+			return discriminatorFormula != null;
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__FORCE_DISCRIMINATOR:
+			return forceDiscriminator != null;
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__IMMUTABLE:
+			return immutable != null;
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_ENTITY:
+			return hbEntity != null;
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__BATCH_SIZE:
+			return batchSize != null;
+		case HbmodelPackage.HB_ANNOTATED_ECLASS__HB_TYPE:
+			return hbType != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEDataTypeImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEDataTypeImpl.java
index dc866dbac..03d2f08fc 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEDataTypeImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEDataTypeImpl.java
@@ -29,29 +29,43 @@ import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType;
 import org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Hb Annotated EData Type</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Hb Annotated EData Type</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEDataTypeImpl#getHbTypeDef <em>Hb Type Def</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEDataTypeImpl#getHbWhere <em>Hb Where</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEDataTypeImpl#getHbColumns <em>Hb Columns</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEDataTypeImpl#getHbIdBag <em>Hb Id Bag</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEDataTypeImpl#getHbIndex <em>Hb Index</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEDataTypeImpl#getHbType <em>Hb Type</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEDataTypeImpl#getHbTypeDef <em>Hb
+ * Type Def</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEDataTypeImpl#getHbWhere <em>Hb
+ * Where</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEDataTypeImpl#getHbColumns <em>Hb
+ * Columns</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEDataTypeImpl#getHbIdBag <em>Hb Id
+ * Bag</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEDataTypeImpl#getHbIndex <em>Hb
+ * Index</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEDataTypeImpl#getHbType <em>Hb
+ * Type</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class HbAnnotatedEDataTypeImpl extends PAnnotatedEDataTypeImpl implements HbAnnotatedEDataType {
+public class HbAnnotatedEDataTypeImpl extends PAnnotatedEDataTypeImpl implements
+		HbAnnotatedEDataType {
 
 	private ForeignKey foreignKey = null;
 
 	/**
 	 * The cached value of the '{@link #getHbTypeDef() <em>Hb Type Def</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getHbTypeDef()
 	 * @generated
 	 * @ordered
@@ -59,9 +73,9 @@ public class HbAnnotatedEDataTypeImpl extends PAnnotatedEDataTypeImpl implements
 	protected TypeDef hbTypeDef;
 
 	/**
-	 * The cached value of the '{@link #getHbWhere() <em>Hb Where</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getHbWhere() <em>Hb Where</em>}' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getHbWhere()
 	 * @generated
 	 * @ordered
@@ -69,9 +83,9 @@ public class HbAnnotatedEDataTypeImpl extends PAnnotatedEDataTypeImpl implements
 	protected Where hbWhere;
 
 	/**
-	 * The cached value of the '{@link #getHbColumns() <em>Hb Columns</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getHbColumns() <em>Hb Columns</em>}' containment reference
+	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getHbColumns()
 	 * @generated
 	 * @ordered
@@ -79,9 +93,9 @@ public class HbAnnotatedEDataTypeImpl extends PAnnotatedEDataTypeImpl implements
 	protected EList<Column> hbColumns;
 
 	/**
-	 * The cached value of the '{@link #getHbIdBag() <em>Hb Id Bag</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getHbIdBag() <em>Hb Id Bag</em>}' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getHbIdBag()
 	 * @generated
 	 * @ordered
@@ -89,9 +103,9 @@ public class HbAnnotatedEDataTypeImpl extends PAnnotatedEDataTypeImpl implements
 	protected IdBag hbIdBag;
 
 	/**
-	 * The cached value of the '{@link #getHbIndex() <em>Hb Index</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getHbIndex() <em>Hb Index</em>}' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getHbIndex()
 	 * @generated
 	 * @ordered
@@ -99,9 +113,9 @@ public class HbAnnotatedEDataTypeImpl extends PAnnotatedEDataTypeImpl implements
 	protected Index hbIndex;
 
 	/**
-	 * The cached value of the '{@link #getHbType() <em>Hb Type</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getHbType() <em>Hb Type</em>}' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getHbType()
 	 * @generated
 	 * @ordered
@@ -110,6 +124,7 @@ public class HbAnnotatedEDataTypeImpl extends PAnnotatedEDataTypeImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected HbAnnotatedEDataTypeImpl() {
@@ -118,6 +133,7 @@ public class HbAnnotatedEDataTypeImpl extends PAnnotatedEDataTypeImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -153,6 +169,7 @@ public class HbAnnotatedEDataTypeImpl extends PAnnotatedEDataTypeImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TypeDef getHbTypeDef() {
@@ -161,39 +178,48 @@ public class HbAnnotatedEDataTypeImpl extends PAnnotatedEDataTypeImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetHbTypeDef(TypeDef newHbTypeDef, NotificationChain msgs) {
 		TypeDef oldHbTypeDef = hbTypeDef;
 		hbTypeDef = newHbTypeDef;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_TYPE_DEF, oldHbTypeDef, newHbTypeDef);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_TYPE_DEF, oldHbTypeDef, newHbTypeDef);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHbTypeDef(TypeDef newHbTypeDef) {
 		if (newHbTypeDef != hbTypeDef) {
 			NotificationChain msgs = null;
 			if (hbTypeDef != null)
-				msgs = ((InternalEObject)hbTypeDef).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_TYPE_DEF, null, msgs);
+				msgs = ((InternalEObject) hbTypeDef).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_TYPE_DEF, null, msgs);
 			if (newHbTypeDef != null)
-				msgs = ((InternalEObject)newHbTypeDef).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_TYPE_DEF, null, msgs);
+				msgs = ((InternalEObject) newHbTypeDef).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_TYPE_DEF, null, msgs);
 			msgs = basicSetHbTypeDef(newHbTypeDef, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_TYPE_DEF, newHbTypeDef, newHbTypeDef));
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_TYPE_DEF, newHbTypeDef, newHbTypeDef));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Where getHbWhere() {
@@ -201,54 +227,62 @@ public class HbAnnotatedEDataTypeImpl extends PAnnotatedEDataTypeImpl implements
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetHbWhere(Where newHbWhere, NotificationChain msgs) {
 		Where oldHbWhere = hbWhere;
 		hbWhere = newHbWhere;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_WHERE, oldHbWhere, newHbWhere);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_WHERE, oldHbWhere, newHbWhere);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHbWhere(Where newHbWhere) {
 		if (newHbWhere != hbWhere) {
 			NotificationChain msgs = null;
 			if (hbWhere != null)
-				msgs = ((InternalEObject)hbWhere).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_WHERE, null, msgs);
+				msgs = ((InternalEObject) hbWhere).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_WHERE, null, msgs);
 			if (newHbWhere != null)
-				msgs = ((InternalEObject)newHbWhere).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_WHERE, null, msgs);
+				msgs = ((InternalEObject) newHbWhere).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_WHERE, null, msgs);
 			msgs = basicSetHbWhere(newHbWhere, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_WHERE, newHbWhere, newHbWhere));
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_WHERE, newHbWhere, newHbWhere));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Column> getHbColumns() {
 		if (hbColumns == null) {
-			hbColumns = new EObjectContainmentEList<Column>(Column.class, this, HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_COLUMNS);
+			hbColumns = new EObjectContainmentEList<Column>(Column.class, this,
+					HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_COLUMNS);
 		}
 		return hbColumns;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public IdBag getHbIdBag() {
@@ -256,59 +290,67 @@ public class HbAnnotatedEDataTypeImpl extends PAnnotatedEDataTypeImpl implements
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetHbIdBag(IdBag newHbIdBag, NotificationChain msgs) {
 		IdBag oldHbIdBag = hbIdBag;
 		hbIdBag = newHbIdBag;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_ID_BAG, oldHbIdBag, newHbIdBag);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_ID_BAG, oldHbIdBag, newHbIdBag);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHbIdBag(IdBag newHbIdBag) {
 		if (newHbIdBag != hbIdBag) {
 			NotificationChain msgs = null;
 			if (hbIdBag != null)
-				msgs = ((InternalEObject)hbIdBag).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_ID_BAG, null, msgs);
+				msgs = ((InternalEObject) hbIdBag).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_ID_BAG, null, msgs);
 			if (newHbIdBag != null)
-				msgs = ((InternalEObject)newHbIdBag).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_ID_BAG, null, msgs);
+				msgs = ((InternalEObject) newHbIdBag).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_ID_BAG, null, msgs);
 			msgs = basicSetHbIdBag(newHbIdBag, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_ID_BAG, newHbIdBag, newHbIdBag));
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_ID_BAG, newHbIdBag, newHbIdBag));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Index getHbIndex() {
 		if (hbIndex != null && hbIndex.eIsProxy()) {
-			InternalEObject oldHbIndex = (InternalEObject)hbIndex;
-			hbIndex = (Index)eResolveProxy(oldHbIndex);
+			InternalEObject oldHbIndex = (InternalEObject) hbIndex;
+			hbIndex = (Index) eResolveProxy(oldHbIndex);
 			if (hbIndex != oldHbIndex) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_INDEX, oldHbIndex, hbIndex));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+							HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_INDEX, oldHbIndex, hbIndex));
 			}
 		}
 		return hbIndex;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Index basicGetHbIndex() {
@@ -316,20 +358,21 @@ public class HbAnnotatedEDataTypeImpl extends PAnnotatedEDataTypeImpl implements
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHbIndex(Index newHbIndex) {
 		Index oldHbIndex = hbIndex;
 		hbIndex = newHbIndex;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_INDEX, oldHbIndex, hbIndex));
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_INDEX, oldHbIndex, hbIndex));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Type getHbType() {
@@ -337,163 +380,177 @@ public class HbAnnotatedEDataTypeImpl extends PAnnotatedEDataTypeImpl implements
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetHbType(Type newHbType, NotificationChain msgs) {
 		Type oldHbType = hbType;
 		hbType = newHbType;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_TYPE, oldHbType, newHbType);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_TYPE, oldHbType, newHbType);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHbType(Type newHbType) {
 		if (newHbType != hbType) {
 			NotificationChain msgs = null;
 			if (hbType != null)
-				msgs = ((InternalEObject)hbType).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_TYPE, null, msgs);
+				msgs = ((InternalEObject) hbType).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_TYPE, null, msgs);
 			if (newHbType != null)
-				msgs = ((InternalEObject)newHbType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_TYPE, null, msgs);
+				msgs = ((InternalEObject) newHbType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_TYPE, null, msgs);
 			msgs = basicSetHbType(newHbType, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_TYPE, newHbType, newHbType));
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_TYPE, newHbType, newHbType));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID,
+			NotificationChain msgs) {
 		switch (featureID) {
-			case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_TYPE_DEF:
-				return basicSetHbTypeDef(null, msgs);
-			case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_WHERE:
-				return basicSetHbWhere(null, msgs);
-			case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_COLUMNS:
-				return ((InternalEList<?>)getHbColumns()).basicRemove(otherEnd, msgs);
-			case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_ID_BAG:
-				return basicSetHbIdBag(null, msgs);
-			case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_TYPE:
-				return basicSetHbType(null, msgs);
+		case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_TYPE_DEF:
+			return basicSetHbTypeDef(null, msgs);
+		case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_WHERE:
+			return basicSetHbWhere(null, msgs);
+		case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_COLUMNS:
+			return ((InternalEList<?>) getHbColumns()).basicRemove(otherEnd, msgs);
+		case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_ID_BAG:
+			return basicSetHbIdBag(null, msgs);
+		case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_TYPE:
+			return basicSetHbType(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_TYPE_DEF:
-				return getHbTypeDef();
-			case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_WHERE:
-				return getHbWhere();
-			case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_COLUMNS:
-				return getHbColumns();
-			case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_ID_BAG:
-				return getHbIdBag();
-			case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_INDEX:
-				if (resolve) return getHbIndex();
-				return basicGetHbIndex();
-			case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_TYPE:
-				return getHbType();
+		case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_TYPE_DEF:
+			return getHbTypeDef();
+		case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_WHERE:
+			return getHbWhere();
+		case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_COLUMNS:
+			return getHbColumns();
+		case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_ID_BAG:
+			return getHbIdBag();
+		case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_INDEX:
+			if (resolve)
+				return getHbIndex();
+			return basicGetHbIndex();
+		case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_TYPE:
+			return getHbType();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_TYPE_DEF:
-				setHbTypeDef((TypeDef)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_WHERE:
-				setHbWhere((Where)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_COLUMNS:
-				getHbColumns().clear();
-				getHbColumns().addAll((Collection<? extends Column>)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_ID_BAG:
-				setHbIdBag((IdBag)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_INDEX:
-				setHbIndex((Index)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_TYPE:
-				setHbType((Type)newValue);
-				return;
+		case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_TYPE_DEF:
+			setHbTypeDef((TypeDef) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_WHERE:
+			setHbWhere((Where) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_COLUMNS:
+			getHbColumns().clear();
+			getHbColumns().addAll((Collection<? extends Column>) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_ID_BAG:
+			setHbIdBag((IdBag) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_INDEX:
+			setHbIndex((Index) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_TYPE:
+			setHbType((Type) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_TYPE_DEF:
-				setHbTypeDef((TypeDef)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_WHERE:
-				setHbWhere((Where)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_COLUMNS:
-				getHbColumns().clear();
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_ID_BAG:
-				setHbIdBag((IdBag)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_INDEX:
-				setHbIndex((Index)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_TYPE:
-				setHbType((Type)null);
-				return;
+		case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_TYPE_DEF:
+			setHbTypeDef((TypeDef) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_WHERE:
+			setHbWhere((Where) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_COLUMNS:
+			getHbColumns().clear();
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_ID_BAG:
+			setHbIdBag((IdBag) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_INDEX:
+			setHbIndex((Index) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_TYPE:
+			setHbType((Type) null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_TYPE_DEF:
-				return hbTypeDef != null;
-			case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_WHERE:
-				return hbWhere != null;
-			case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_COLUMNS:
-				return hbColumns != null && !hbColumns.isEmpty();
-			case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_ID_BAG:
-				return hbIdBag != null;
-			case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_INDEX:
-				return hbIndex != null;
-			case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_TYPE:
-				return hbType != null;
+		case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_TYPE_DEF:
+			return hbTypeDef != null;
+		case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_WHERE:
+			return hbWhere != null;
+		case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_COLUMNS:
+			return hbColumns != null && !hbColumns.isEmpty();
+		case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_ID_BAG:
+			return hbIdBag != null;
+		case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_INDEX:
+			return hbIndex != null;
+		case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE__HB_TYPE:
+			return hbType != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -501,7 +558,7 @@ public class HbAnnotatedEDataTypeImpl extends PAnnotatedEDataTypeImpl implements
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEStructuralFeature#getForeignKey()
+	 * @see org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEStructuralFeature# getForeignKey()
 	 */
 	public ForeignKey getForeignKey() {
 		return foreignKey;
@@ -510,7 +567,8 @@ public class HbAnnotatedEDataTypeImpl extends PAnnotatedEDataTypeImpl implements
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEStructuralFeature#setForeignKey(org.eclipse.emf.teneo.annotations.pannotation.ForeignKey)
+	 * @see org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEStructuralFeature#
+	 * setForeignKey(org.eclipse.emf.teneo.annotations.pannotation.ForeignKey)
 	 */
 	public void setForeignKey(ForeignKey value) {
 		foreignKey = value;
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEPackageImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEPackageImpl.java
index 1ec70de22..9b8773373 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEPackageImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEPackageImpl.java
@@ -25,25 +25,36 @@ import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage;
 import org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Hb Annotated EPackage</b></em>'. <!--
- * end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Hb Annotated EPackage</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEPackageImpl#getHbGenericGenerators <em>Hb Generic Generators</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEPackageImpl#getHbTypeDef <em>Hb Type Def</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEPackageImpl#getHbNamedQuery <em>Hb Named Query</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEPackageImpl#getFilterDef <em>Filter Def</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEPackageImpl#getAnyMetaDef <em>Any Meta Def</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEPackageImpl#getHbGenericGenerators
+ * <em>Hb Generic Generators</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEPackageImpl#getHbTypeDef <em>Hb
+ * Type Def</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEPackageImpl#getHbNamedQuery <em>
+ * Hb Named Query</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEPackageImpl#getFilterDef <em>
+ * Filter Def</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEPackageImpl#getAnyMetaDef <em>Any
+ * Meta Def</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class HbAnnotatedEPackageImpl extends PAnnotatedEPackageImpl implements HbAnnotatedEPackage {
 	/**
-	 * The cached value of the '{@link #getHbGenericGenerators() <em>Hb Generic Generators</em>}' containment reference list.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The cached value of the '{@link #getHbGenericGenerators() <em>Hb Generic Generators</em>}'
+	 * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getHbGenericGenerators()
 	 * @generated
 	 * @ordered
@@ -51,8 +62,8 @@ public class HbAnnotatedEPackageImpl extends PAnnotatedEPackageImpl implements H
 	protected EList<GenericGenerator> hbGenericGenerators;
 
 	/**
-	 * The cached value of the '{@link #getHbTypeDef() <em>Hb Type Def</em>}' containment reference list. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
+	 * The cached value of the '{@link #getHbTypeDef() <em>Hb Type Def</em>}' containment reference
+	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @see #getHbTypeDef()
 	 * @generated
@@ -61,9 +72,9 @@ public class HbAnnotatedEPackageImpl extends PAnnotatedEPackageImpl implements H
 	protected EList<TypeDef> hbTypeDef;
 
 	/**
-	 * The cached value of the '{@link #getHbNamedQuery() <em>Hb Named Query</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getHbNamedQuery() <em>Hb Named Query</em>} ' reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getHbNamedQuery()
 	 * @generated
 	 * @ordered
@@ -71,9 +82,9 @@ public class HbAnnotatedEPackageImpl extends PAnnotatedEPackageImpl implements H
 	protected EList<NamedQuery> hbNamedQuery;
 
 	/**
-	 * The cached value of the '{@link #getFilterDef() <em>Filter Def</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getFilterDef() <em>Filter Def</em>}' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFilterDef()
 	 * @generated
 	 * @ordered
@@ -81,9 +92,9 @@ public class HbAnnotatedEPackageImpl extends PAnnotatedEPackageImpl implements H
 	protected EList<FilterDef> filterDef;
 
 	/**
-	 * The cached value of the '{@link #getAnyMetaDef() <em>Any Meta Def</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getAnyMetaDef() <em>Any Meta Def</em>}' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getAnyMetaDef()
 	 * @generated
 	 * @ordered
@@ -92,6 +103,7 @@ public class HbAnnotatedEPackageImpl extends PAnnotatedEPackageImpl implements H
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected HbAnnotatedEPackageImpl() {
@@ -100,6 +112,7 @@ public class HbAnnotatedEPackageImpl extends PAnnotatedEPackageImpl implements H
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -109,173 +122,186 @@ public class HbAnnotatedEPackageImpl extends PAnnotatedEPackageImpl implements H
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<GenericGenerator> getHbGenericGenerators() {
 		if (hbGenericGenerators == null) {
-			hbGenericGenerators = new EObjectContainmentEList<GenericGenerator>(GenericGenerator.class, this, HbmodelPackage.HB_ANNOTATED_EPACKAGE__HB_GENERIC_GENERATORS);
+			hbGenericGenerators = new EObjectContainmentEList<GenericGenerator>(GenericGenerator.class,
+					this, HbmodelPackage.HB_ANNOTATED_EPACKAGE__HB_GENERIC_GENERATORS);
 		}
 		return hbGenericGenerators;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<TypeDef> getHbTypeDef() {
 		if (hbTypeDef == null) {
-			hbTypeDef = new EObjectContainmentEList<TypeDef>(TypeDef.class, this, HbmodelPackage.HB_ANNOTATED_EPACKAGE__HB_TYPE_DEF);
+			hbTypeDef = new EObjectContainmentEList<TypeDef>(TypeDef.class, this,
+					HbmodelPackage.HB_ANNOTATED_EPACKAGE__HB_TYPE_DEF);
 		}
 		return hbTypeDef;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<NamedQuery> getHbNamedQuery() {
 		if (hbNamedQuery == null) {
-			hbNamedQuery = new EObjectResolvingEList<NamedQuery>(NamedQuery.class, this, HbmodelPackage.HB_ANNOTATED_EPACKAGE__HB_NAMED_QUERY);
+			hbNamedQuery = new EObjectResolvingEList<NamedQuery>(NamedQuery.class, this,
+					HbmodelPackage.HB_ANNOTATED_EPACKAGE__HB_NAMED_QUERY);
 		}
 		return hbNamedQuery;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<FilterDef> getFilterDef() {
 		if (filterDef == null) {
-			filterDef = new EObjectResolvingEList<FilterDef>(FilterDef.class, this, HbmodelPackage.HB_ANNOTATED_EPACKAGE__FILTER_DEF);
+			filterDef = new EObjectResolvingEList<FilterDef>(FilterDef.class, this,
+					HbmodelPackage.HB_ANNOTATED_EPACKAGE__FILTER_DEF);
 		}
 		return filterDef;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<AnyMetaDef> getAnyMetaDef() {
 		if (anyMetaDef == null) {
-			anyMetaDef = new EObjectResolvingEList<AnyMetaDef>(AnyMetaDef.class, this, HbmodelPackage.HB_ANNOTATED_EPACKAGE__ANY_META_DEF);
+			anyMetaDef = new EObjectResolvingEList<AnyMetaDef>(AnyMetaDef.class, this,
+					HbmodelPackage.HB_ANNOTATED_EPACKAGE__ANY_META_DEF);
 		}
 		return anyMetaDef;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID,
+			NotificationChain msgs) {
 		switch (featureID) {
-			case HbmodelPackage.HB_ANNOTATED_EPACKAGE__HB_GENERIC_GENERATORS:
-				return ((InternalEList<?>)getHbGenericGenerators()).basicRemove(otherEnd, msgs);
-			case HbmodelPackage.HB_ANNOTATED_EPACKAGE__HB_TYPE_DEF:
-				return ((InternalEList<?>)getHbTypeDef()).basicRemove(otherEnd, msgs);
+		case HbmodelPackage.HB_ANNOTATED_EPACKAGE__HB_GENERIC_GENERATORS:
+			return ((InternalEList<?>) getHbGenericGenerators()).basicRemove(otherEnd, msgs);
+		case HbmodelPackage.HB_ANNOTATED_EPACKAGE__HB_TYPE_DEF:
+			return ((InternalEList<?>) getHbTypeDef()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case HbmodelPackage.HB_ANNOTATED_EPACKAGE__HB_GENERIC_GENERATORS:
-				return getHbGenericGenerators();
-			case HbmodelPackage.HB_ANNOTATED_EPACKAGE__HB_TYPE_DEF:
-				return getHbTypeDef();
-			case HbmodelPackage.HB_ANNOTATED_EPACKAGE__HB_NAMED_QUERY:
-				return getHbNamedQuery();
-			case HbmodelPackage.HB_ANNOTATED_EPACKAGE__FILTER_DEF:
-				return getFilterDef();
-			case HbmodelPackage.HB_ANNOTATED_EPACKAGE__ANY_META_DEF:
-				return getAnyMetaDef();
+		case HbmodelPackage.HB_ANNOTATED_EPACKAGE__HB_GENERIC_GENERATORS:
+			return getHbGenericGenerators();
+		case HbmodelPackage.HB_ANNOTATED_EPACKAGE__HB_TYPE_DEF:
+			return getHbTypeDef();
+		case HbmodelPackage.HB_ANNOTATED_EPACKAGE__HB_NAMED_QUERY:
+			return getHbNamedQuery();
+		case HbmodelPackage.HB_ANNOTATED_EPACKAGE__FILTER_DEF:
+			return getFilterDef();
+		case HbmodelPackage.HB_ANNOTATED_EPACKAGE__ANY_META_DEF:
+			return getAnyMetaDef();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
-		@Override
+	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case HbmodelPackage.HB_ANNOTATED_EPACKAGE__HB_GENERIC_GENERATORS:
-				getHbGenericGenerators().clear();
-				getHbGenericGenerators().addAll((Collection<? extends GenericGenerator>)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EPACKAGE__HB_TYPE_DEF:
-				getHbTypeDef().clear();
-				getHbTypeDef().addAll((Collection<? extends TypeDef>)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EPACKAGE__HB_NAMED_QUERY:
-				getHbNamedQuery().clear();
-				getHbNamedQuery().addAll((Collection<? extends NamedQuery>)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EPACKAGE__FILTER_DEF:
-				getFilterDef().clear();
-				getFilterDef().addAll((Collection<? extends FilterDef>)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EPACKAGE__ANY_META_DEF:
-				getAnyMetaDef().clear();
-				getAnyMetaDef().addAll((Collection<? extends AnyMetaDef>)newValue);
-				return;
+		case HbmodelPackage.HB_ANNOTATED_EPACKAGE__HB_GENERIC_GENERATORS:
+			getHbGenericGenerators().clear();
+			getHbGenericGenerators().addAll((Collection<? extends GenericGenerator>) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EPACKAGE__HB_TYPE_DEF:
+			getHbTypeDef().clear();
+			getHbTypeDef().addAll((Collection<? extends TypeDef>) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EPACKAGE__HB_NAMED_QUERY:
+			getHbNamedQuery().clear();
+			getHbNamedQuery().addAll((Collection<? extends NamedQuery>) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EPACKAGE__FILTER_DEF:
+			getFilterDef().clear();
+			getFilterDef().addAll((Collection<? extends FilterDef>) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EPACKAGE__ANY_META_DEF:
+			getAnyMetaDef().clear();
+			getAnyMetaDef().addAll((Collection<? extends AnyMetaDef>) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case HbmodelPackage.HB_ANNOTATED_EPACKAGE__HB_GENERIC_GENERATORS:
-				getHbGenericGenerators().clear();
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EPACKAGE__HB_TYPE_DEF:
-				getHbTypeDef().clear();
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EPACKAGE__HB_NAMED_QUERY:
-				getHbNamedQuery().clear();
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EPACKAGE__FILTER_DEF:
-				getFilterDef().clear();
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EPACKAGE__ANY_META_DEF:
-				getAnyMetaDef().clear();
-				return;
+		case HbmodelPackage.HB_ANNOTATED_EPACKAGE__HB_GENERIC_GENERATORS:
+			getHbGenericGenerators().clear();
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EPACKAGE__HB_TYPE_DEF:
+			getHbTypeDef().clear();
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EPACKAGE__HB_NAMED_QUERY:
+			getHbNamedQuery().clear();
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EPACKAGE__FILTER_DEF:
+			getFilterDef().clear();
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EPACKAGE__ANY_META_DEF:
+			getAnyMetaDef().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case HbmodelPackage.HB_ANNOTATED_EPACKAGE__HB_GENERIC_GENERATORS:
-				return hbGenericGenerators != null && !hbGenericGenerators.isEmpty();
-			case HbmodelPackage.HB_ANNOTATED_EPACKAGE__HB_TYPE_DEF:
-				return hbTypeDef != null && !hbTypeDef.isEmpty();
-			case HbmodelPackage.HB_ANNOTATED_EPACKAGE__HB_NAMED_QUERY:
-				return hbNamedQuery != null && !hbNamedQuery.isEmpty();
-			case HbmodelPackage.HB_ANNOTATED_EPACKAGE__FILTER_DEF:
-				return filterDef != null && !filterDef.isEmpty();
-			case HbmodelPackage.HB_ANNOTATED_EPACKAGE__ANY_META_DEF:
-				return anyMetaDef != null && !anyMetaDef.isEmpty();
+		case HbmodelPackage.HB_ANNOTATED_EPACKAGE__HB_GENERIC_GENERATORS:
+			return hbGenericGenerators != null && !hbGenericGenerators.isEmpty();
+		case HbmodelPackage.HB_ANNOTATED_EPACKAGE__HB_TYPE_DEF:
+			return hbTypeDef != null && !hbTypeDef.isEmpty();
+		case HbmodelPackage.HB_ANNOTATED_EPACKAGE__HB_NAMED_QUERY:
+			return hbNamedQuery != null && !hbNamedQuery.isEmpty();
+		case HbmodelPackage.HB_ANNOTATED_EPACKAGE__FILTER_DEF:
+			return filterDef != null && !filterDef.isEmpty();
+		case HbmodelPackage.HB_ANNOTATED_EPACKAGE__ANY_META_DEF:
+			return anyMetaDef != null && !anyMetaDef.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEReferenceImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEReferenceImpl.java
index 182406c3f..5a5fef96c 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEReferenceImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbAnnotatedEReferenceImpl.java
@@ -44,41 +44,82 @@ import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement;
 import org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Hb Annotated EReference</b></em>'. <!--
- * end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Hb Annotated EReference</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getHbWhere <em>Hb Where</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getHbCollectionOfElements <em>Hb Collection Of Elements</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getHbMapKey <em>Hb Map Key</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getHbColumns <em>Hb Columns</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getHbCascade <em>Hb Cascade</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getHbIdBag <em>Hb Id Bag</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getHbIndex <em>Hb Index</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getFilter <em>Filter</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getMapKeyManyToMany <em>Map Key Many To Many</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getFormula <em>Formula</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getHbCache <em>Hb Cache</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getHbFetch <em>Hb Fetch</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getHbOnDelete <em>Hb On Delete</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getNaturalId <em>Natural Id</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getImmutable <em>Immutable</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getNotFound <em>Not Found</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getHbType <em>Hb Type</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getBatchSize <em>Batch Size</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getAny <em>Any</em>}</li>
- *   <li>{@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getAnyMetaDef <em>Any Meta Def</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getHbWhere <em>Hb
+ * Where</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getHbCollectionOfElements
+ * <em>Hb Collection Of Elements</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getHbMapKey <em>Hb
+ * Map Key</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getHbColumns <em>Hb
+ * Columns</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getHbCascade <em>Hb
+ * Cascade</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getHbIdBag <em>Hb
+ * Id Bag</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getHbIndex <em>Hb
+ * Index</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getFilter <em>
+ * Filter</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getMapKeyManyToMany
+ * <em>Map Key Many To Many</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getFormula <em>
+ * Formula</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getHbCache <em>Hb
+ * Cache</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getHbFetch <em>Hb
+ * Fetch</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getHbOnDelete <em>
+ * Hb On Delete</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getNaturalId <em>
+ * Natural Id</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getImmutable <em>
+ * Immutable</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getNotFound <em>Not
+ * Found</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getHbType <em>Hb
+ * Type</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getBatchSize <em>
+ * Batch Size</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getAny <em>Any
+ * </em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.impl.HbAnnotatedEReferenceImpl#getAnyMetaDef <em>
+ * Any Meta Def</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implements HbAnnotatedEReference {
+public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implements
+		HbAnnotatedEReference {
 	/**
-	 * The cached value of the '{@link #getHbWhere() <em>Hb Where</em>}' containment reference.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
+	 * The cached value of the '{@link #getHbWhere() <em>Hb Where</em>}' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getHbWhere()
 	 * @generated
 	 * @ordered
@@ -86,8 +127,10 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
 	protected Where hbWhere;
 
 	/**
-	 * The cached value of the '{@link #getHbCollectionOfElements() <em>Hb Collection Of Elements</em>}' containment reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The cached value of the '{@link #getHbCollectionOfElements()
+	 * <em>Hb Collection Of Elements</em>}' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getHbCollectionOfElements()
 	 * @generated
 	 * @ordered
@@ -96,8 +139,8 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
 
 	/**
 	 * The cached value of the '{@link #getHbMapKey() <em>Hb Map Key</em>}' containment reference.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getHbMapKey()
 	 * @generated
 	 * @ordered
@@ -105,8 +148,8 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
 	protected HbMapKey hbMapKey;
 
 	/**
-	 * The cached value of the '{@link #getHbColumns() <em>Hb Columns</em>}' containment reference list. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
+	 * The cached value of the '{@link #getHbColumns() <em>Hb Columns</em>}' containment reference
+	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @see #getHbColumns()
 	 * @generated
@@ -115,8 +158,8 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
 	protected EList<Column> hbColumns;
 
 	/**
-	 * The cached value of the '{@link #getHbCascade() <em>Hb Cascade</em>}' containment reference. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
+	 * The cached value of the '{@link #getHbCascade() <em>Hb Cascade</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @see #getHbCascade()
 	 * @generated
@@ -125,9 +168,9 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
 	protected Cascade hbCascade;
 
 	/**
-	 * The cached value of the '{@link #getHbIdBag() <em>Hb Id Bag</em>}' containment reference.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
+	 * The cached value of the '{@link #getHbIdBag() <em>Hb Id Bag</em>}' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getHbIdBag()
 	 * @generated
 	 * @ordered
@@ -135,9 +178,9 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
 	protected IdBag hbIdBag;
 
 	/**
-	 * The cached value of the '{@link #getHbIndex() <em>Hb Index</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getHbIndex() <em>Hb Index</em>}' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getHbIndex()
 	 * @generated
 	 * @ordered
@@ -145,9 +188,9 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
 	protected Index hbIndex;
 
 	/**
-	 * The cached value of the '{@link #getFilter() <em>Filter</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getFilter() <em>Filter</em>}' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFilter()
 	 * @generated
 	 * @ordered
@@ -155,9 +198,9 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
 	protected EList<Filter> filter;
 
 	/**
-	 * The cached value of the '{@link #getMapKeyManyToMany() <em>Map Key Many To Many</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMapKeyManyToMany() <em>Map Key Many To Many</em>}'
+	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMapKeyManyToMany()
 	 * @generated
 	 * @ordered
@@ -165,9 +208,9 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
 	protected MapKeyManyToMany mapKeyManyToMany;
 
 	/**
-	 * The cached value of the '{@link #getFormula() <em>Formula</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getFormula() <em>Formula</em>}' reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFormula()
 	 * @generated
 	 * @ordered
@@ -175,9 +218,9 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
 	protected Formula formula;
 
 	/**
-	 * The cached value of the '{@link #getHbCache() <em>Hb Cache</em>}' containment reference.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
+	 * The cached value of the '{@link #getHbCache() <em>Hb Cache</em>}' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getHbCache()
 	 * @generated
 	 * @ordered
@@ -185,9 +228,9 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
 	protected Cache hbCache;
 
 	/**
-	 * The cached value of the '{@link #getHbFetch() <em>Hb Fetch</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getHbFetch() <em>Hb Fetch</em>}' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getHbFetch()
 	 * @generated
 	 * @ordered
@@ -195,9 +238,9 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
 	protected Fetch hbFetch;
 
 	/**
-	 * The cached value of the '{@link #getHbOnDelete() <em>Hb On Delete</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getHbOnDelete() <em>Hb On Delete</em>}' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getHbOnDelete()
 	 * @generated
 	 * @ordered
@@ -206,8 +249,8 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
 
 	/**
 	 * The cached value of the '{@link #getNaturalId() <em>Natural Id</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getNaturalId()
 	 * @generated
 	 * @ordered
@@ -216,8 +259,8 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
 
 	/**
 	 * The cached value of the '{@link #getImmutable() <em>Immutable</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getImmutable()
 	 * @generated
 	 * @ordered
@@ -225,9 +268,9 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
 	protected Immutable immutable;
 
 	/**
-	 * The cached value of the '{@link #getNotFound() <em>Not Found</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getNotFound() <em>Not Found</em>}' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getNotFound()
 	 * @generated
 	 * @ordered
@@ -235,9 +278,9 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
 	protected NotFound notFound;
 
 	/**
-	 * The cached value of the '{@link #getHbType() <em>Hb Type</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getHbType() <em>Hb Type</em>}' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getHbType()
 	 * @generated
 	 * @ordered
@@ -245,9 +288,9 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
 	protected Type hbType;
 
 	/**
-	 * The cached value of the '{@link #getBatchSize() <em>Batch Size</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getBatchSize() <em>Batch Size</em>}' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getBatchSize()
 	 * @generated
 	 * @ordered
@@ -255,9 +298,9 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
 	protected BatchSize batchSize;
 
 	/**
-	 * The cached value of the '{@link #getAny() <em>Any</em>}' reference.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getAny() <em>Any</em>}' reference. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getAny()
 	 * @generated
 	 * @ordered
@@ -265,9 +308,9 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
 	protected Any any;
 
 	/**
-	 * The cached value of the '{@link #getAnyMetaDef() <em>Any Meta Def</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getAnyMetaDef() <em>Any Meta Def</em>}' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getAnyMetaDef()
 	 * @generated
 	 * @ordered
@@ -276,6 +319,7 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected HbAnnotatedEReferenceImpl() {
@@ -284,6 +328,7 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -293,6 +338,7 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Where getHbWhere() {
@@ -301,38 +347,48 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetHbWhere(Where newHbWhere, NotificationChain msgs) {
 		Where oldHbWhere = hbWhere;
 		hbWhere = newHbWhere;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_WHERE, oldHbWhere, newHbWhere);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_WHERE, oldHbWhere, newHbWhere);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHbWhere(Where newHbWhere) {
 		if (newHbWhere != hbWhere) {
 			NotificationChain msgs = null;
 			if (hbWhere != null)
-				msgs = ((InternalEObject)hbWhere).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_WHERE, null, msgs);
+				msgs = ((InternalEObject) hbWhere).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_WHERE, null, msgs);
 			if (newHbWhere != null)
-				msgs = ((InternalEObject)newHbWhere).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_WHERE, null, msgs);
+				msgs = ((InternalEObject) newHbWhere).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_WHERE, null, msgs);
 			msgs = basicSetHbWhere(newHbWhere, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_WHERE, newHbWhere, newHbWhere));
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_WHERE, newHbWhere, newHbWhere));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public CollectionOfElements getHbCollectionOfElements() {
@@ -341,38 +397,53 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetHbCollectionOfElements(CollectionOfElements newHbCollectionOfElements, NotificationChain msgs) {
+	public NotificationChain basicSetHbCollectionOfElements(
+			CollectionOfElements newHbCollectionOfElements, NotificationChain msgs) {
 		CollectionOfElements oldHbCollectionOfElements = hbCollectionOfElements;
 		hbCollectionOfElements = newHbCollectionOfElements;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_COLLECTION_OF_ELEMENTS, oldHbCollectionOfElements, newHbCollectionOfElements);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_COLLECTION_OF_ELEMENTS,
+					oldHbCollectionOfElements, newHbCollectionOfElements);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHbCollectionOfElements(CollectionOfElements newHbCollectionOfElements) {
 		if (newHbCollectionOfElements != hbCollectionOfElements) {
 			NotificationChain msgs = null;
 			if (hbCollectionOfElements != null)
-				msgs = ((InternalEObject)hbCollectionOfElements).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_COLLECTION_OF_ELEMENTS, null, msgs);
+				msgs = ((InternalEObject) hbCollectionOfElements).eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE
+								- HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_COLLECTION_OF_ELEMENTS, null, msgs);
 			if (newHbCollectionOfElements != null)
-				msgs = ((InternalEObject)newHbCollectionOfElements).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_COLLECTION_OF_ELEMENTS, null, msgs);
+				msgs = ((InternalEObject) newHbCollectionOfElements).eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+								- HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_COLLECTION_OF_ELEMENTS, null, msgs);
 			msgs = basicSetHbCollectionOfElements(newHbCollectionOfElements, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_COLLECTION_OF_ELEMENTS, newHbCollectionOfElements, newHbCollectionOfElements));
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_COLLECTION_OF_ELEMENTS,
+					newHbCollectionOfElements, newHbCollectionOfElements));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HbMapKey getHbMapKey() {
@@ -380,52 +451,62 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetHbMapKey(HbMapKey newHbMapKey, NotificationChain msgs) {
 		HbMapKey oldHbMapKey = hbMapKey;
 		hbMapKey = newHbMapKey;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_MAP_KEY, oldHbMapKey, newHbMapKey);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_MAP_KEY, oldHbMapKey, newHbMapKey);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHbMapKey(HbMapKey newHbMapKey) {
 		if (newHbMapKey != hbMapKey) {
 			NotificationChain msgs = null;
 			if (hbMapKey != null)
-				msgs = ((InternalEObject)hbMapKey).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_MAP_KEY, null, msgs);
+				msgs = ((InternalEObject) hbMapKey).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_MAP_KEY, null, msgs);
 			if (newHbMapKey != null)
-				msgs = ((InternalEObject)newHbMapKey).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_MAP_KEY, null, msgs);
+				msgs = ((InternalEObject) newHbMapKey).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_MAP_KEY, null, msgs);
 			msgs = basicSetHbMapKey(newHbMapKey, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_MAP_KEY, newHbMapKey, newHbMapKey));
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_MAP_KEY, newHbMapKey, newHbMapKey));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Column> getHbColumns() {
 		if (hbColumns == null) {
-			hbColumns = new EObjectContainmentEList<Column>(Column.class, this, HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_COLUMNS);
+			hbColumns = new EObjectContainmentEList<Column>(Column.class, this,
+					HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_COLUMNS);
 		}
 		return hbColumns;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Cascade getHbCascade() {
@@ -434,38 +515,48 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetHbCascade(Cascade newHbCascade, NotificationChain msgs) {
 		Cascade oldHbCascade = hbCascade;
 		hbCascade = newHbCascade;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CASCADE, oldHbCascade, newHbCascade);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CASCADE, oldHbCascade, newHbCascade);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHbCascade(Cascade newHbCascade) {
 		if (newHbCascade != hbCascade) {
 			NotificationChain msgs = null;
 			if (hbCascade != null)
-				msgs = ((InternalEObject)hbCascade).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CASCADE, null, msgs);
+				msgs = ((InternalEObject) hbCascade).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CASCADE, null, msgs);
 			if (newHbCascade != null)
-				msgs = ((InternalEObject)newHbCascade).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CASCADE, null, msgs);
+				msgs = ((InternalEObject) newHbCascade).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CASCADE, null, msgs);
 			msgs = basicSetHbCascade(newHbCascade, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CASCADE, newHbCascade, newHbCascade));
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CASCADE, newHbCascade, newHbCascade));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public IdBag getHbIdBag() {
@@ -474,56 +565,66 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetHbIdBag(IdBag newHbIdBag, NotificationChain msgs) {
 		IdBag oldHbIdBag = hbIdBag;
 		hbIdBag = newHbIdBag;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_ID_BAG, oldHbIdBag, newHbIdBag);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_ID_BAG, oldHbIdBag, newHbIdBag);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHbIdBag(IdBag newHbIdBag) {
 		if (newHbIdBag != hbIdBag) {
 			NotificationChain msgs = null;
 			if (hbIdBag != null)
-				msgs = ((InternalEObject)hbIdBag).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_ID_BAG, null, msgs);
+				msgs = ((InternalEObject) hbIdBag).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_ID_BAG, null, msgs);
 			if (newHbIdBag != null)
-				msgs = ((InternalEObject)newHbIdBag).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_ID_BAG, null, msgs);
+				msgs = ((InternalEObject) newHbIdBag).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_ID_BAG, null, msgs);
 			msgs = basicSetHbIdBag(newHbIdBag, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_ID_BAG, newHbIdBag, newHbIdBag));
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_ID_BAG, newHbIdBag, newHbIdBag));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Index getHbIndex() {
 		if (hbIndex != null && hbIndex.eIsProxy()) {
-			InternalEObject oldHbIndex = (InternalEObject)hbIndex;
-			hbIndex = (Index)eResolveProxy(oldHbIndex);
+			InternalEObject oldHbIndex = (InternalEObject) hbIndex;
+			hbIndex = (Index) eResolveProxy(oldHbIndex);
 			if (hbIndex != oldHbIndex) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_INDEX, oldHbIndex, hbIndex));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+							HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_INDEX, oldHbIndex, hbIndex));
 			}
 		}
 		return hbIndex;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Index basicGetHbIndex() {
@@ -531,32 +632,34 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHbIndex(Index newHbIndex) {
 		Index oldHbIndex = hbIndex;
 		hbIndex = newHbIndex;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_INDEX, oldHbIndex, hbIndex));
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_INDEX, oldHbIndex, hbIndex));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Filter> getFilter() {
 		if (filter == null) {
-			filter = new EObjectResolvingEList<Filter>(Filter.class, this, HbmodelPackage.HB_ANNOTATED_EREFERENCE__FILTER);
+			filter = new EObjectResolvingEList<Filter>(Filter.class, this,
+					HbmodelPackage.HB_ANNOTATED_EREFERENCE__FILTER);
 		}
 		return filter;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public MapKeyManyToMany getMapKeyManyToMany() {
@@ -564,59 +667,70 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetMapKeyManyToMany(MapKeyManyToMany newMapKeyManyToMany, NotificationChain msgs) {
+	public NotificationChain basicSetMapKeyManyToMany(MapKeyManyToMany newMapKeyManyToMany,
+			NotificationChain msgs) {
 		MapKeyManyToMany oldMapKeyManyToMany = mapKeyManyToMany;
 		mapKeyManyToMany = newMapKeyManyToMany;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EREFERENCE__MAP_KEY_MANY_TO_MANY, oldMapKeyManyToMany, newMapKeyManyToMany);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EREFERENCE__MAP_KEY_MANY_TO_MANY, oldMapKeyManyToMany,
+					newMapKeyManyToMany);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setMapKeyManyToMany(MapKeyManyToMany newMapKeyManyToMany) {
 		if (newMapKeyManyToMany != mapKeyManyToMany) {
 			NotificationChain msgs = null;
 			if (mapKeyManyToMany != null)
-				msgs = ((InternalEObject)mapKeyManyToMany).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EREFERENCE__MAP_KEY_MANY_TO_MANY, null, msgs);
+				msgs = ((InternalEObject) mapKeyManyToMany).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EREFERENCE__MAP_KEY_MANY_TO_MANY, null, msgs);
 			if (newMapKeyManyToMany != null)
-				msgs = ((InternalEObject)newMapKeyManyToMany).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EREFERENCE__MAP_KEY_MANY_TO_MANY, null, msgs);
+				msgs = ((InternalEObject) newMapKeyManyToMany).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EREFERENCE__MAP_KEY_MANY_TO_MANY, null, msgs);
 			msgs = basicSetMapKeyManyToMany(newMapKeyManyToMany, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EREFERENCE__MAP_KEY_MANY_TO_MANY, newMapKeyManyToMany, newMapKeyManyToMany));
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EREFERENCE__MAP_KEY_MANY_TO_MANY, newMapKeyManyToMany,
+					newMapKeyManyToMany));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Formula getFormula() {
 		if (formula != null && formula.eIsProxy()) {
-			InternalEObject oldFormula = (InternalEObject)formula;
-			formula = (Formula)eResolveProxy(oldFormula);
+			InternalEObject oldFormula = (InternalEObject) formula;
+			formula = (Formula) eResolveProxy(oldFormula);
 			if (formula != oldFormula) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, HbmodelPackage.HB_ANNOTATED_EREFERENCE__FORMULA, oldFormula, formula));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+							HbmodelPackage.HB_ANNOTATED_EREFERENCE__FORMULA, oldFormula, formula));
 			}
 		}
 		return formula;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Formula basicGetFormula() {
@@ -624,19 +738,21 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFormula(Formula newFormula) {
 		Formula oldFormula = formula;
 		formula = newFormula;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EREFERENCE__FORMULA, oldFormula, formula));
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EREFERENCE__FORMULA, oldFormula, formula));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Cache getHbCache() {
@@ -645,56 +761,66 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetHbCache(Cache newHbCache, NotificationChain msgs) {
 		Cache oldHbCache = hbCache;
 		hbCache = newHbCache;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CACHE, oldHbCache, newHbCache);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CACHE, oldHbCache, newHbCache);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHbCache(Cache newHbCache) {
 		if (newHbCache != hbCache) {
 			NotificationChain msgs = null;
 			if (hbCache != null)
-				msgs = ((InternalEObject)hbCache).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CACHE, null, msgs);
+				msgs = ((InternalEObject) hbCache).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CACHE, null, msgs);
 			if (newHbCache != null)
-				msgs = ((InternalEObject)newHbCache).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CACHE, null, msgs);
+				msgs = ((InternalEObject) newHbCache).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CACHE, null, msgs);
 			msgs = basicSetHbCache(newHbCache, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CACHE, newHbCache, newHbCache));
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CACHE, newHbCache, newHbCache));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Fetch getHbFetch() {
 		if (hbFetch != null && hbFetch.eIsProxy()) {
-			InternalEObject oldHbFetch = (InternalEObject)hbFetch;
-			hbFetch = (Fetch)eResolveProxy(oldHbFetch);
+			InternalEObject oldHbFetch = (InternalEObject) hbFetch;
+			hbFetch = (Fetch) eResolveProxy(oldHbFetch);
 			if (hbFetch != oldHbFetch) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_FETCH, oldHbFetch, hbFetch));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+							HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_FETCH, oldHbFetch, hbFetch));
 			}
 		}
 		return hbFetch;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Fetch basicGetHbFetch() {
@@ -702,37 +828,39 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHbFetch(Fetch newHbFetch) {
 		Fetch oldHbFetch = hbFetch;
 		hbFetch = newHbFetch;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_FETCH, oldHbFetch, hbFetch));
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_FETCH, oldHbFetch, hbFetch));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public OnDelete getHbOnDelete() {
 		if (hbOnDelete != null && hbOnDelete.eIsProxy()) {
-			InternalEObject oldHbOnDelete = (InternalEObject)hbOnDelete;
-			hbOnDelete = (OnDelete)eResolveProxy(oldHbOnDelete);
+			InternalEObject oldHbOnDelete = (InternalEObject) hbOnDelete;
+			hbOnDelete = (OnDelete) eResolveProxy(oldHbOnDelete);
 			if (hbOnDelete != oldHbOnDelete) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_ON_DELETE, oldHbOnDelete, hbOnDelete));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+							HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_ON_DELETE, oldHbOnDelete, hbOnDelete));
 			}
 		}
 		return hbOnDelete;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public OnDelete basicGetHbOnDelete() {
@@ -740,20 +868,21 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHbOnDelete(OnDelete newHbOnDelete) {
 		OnDelete oldHbOnDelete = hbOnDelete;
 		hbOnDelete = newHbOnDelete;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_ON_DELETE, oldHbOnDelete, hbOnDelete));
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_ON_DELETE, oldHbOnDelete, hbOnDelete));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NaturalId getNaturalId() {
@@ -761,42 +890,49 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetNaturalId(NaturalId newNaturalId, NotificationChain msgs) {
 		NaturalId oldNaturalId = naturalId;
 		naturalId = newNaturalId;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EREFERENCE__NATURAL_ID, oldNaturalId, newNaturalId);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EREFERENCE__NATURAL_ID, oldNaturalId, newNaturalId);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setNaturalId(NaturalId newNaturalId) {
 		if (newNaturalId != naturalId) {
 			NotificationChain msgs = null;
 			if (naturalId != null)
-				msgs = ((InternalEObject)naturalId).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EREFERENCE__NATURAL_ID, null, msgs);
+				msgs = ((InternalEObject) naturalId).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EREFERENCE__NATURAL_ID, null, msgs);
 			if (newNaturalId != null)
-				msgs = ((InternalEObject)newNaturalId).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EREFERENCE__NATURAL_ID, null, msgs);
+				msgs = ((InternalEObject) newNaturalId).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EREFERENCE__NATURAL_ID, null, msgs);
 			msgs = basicSetNaturalId(newNaturalId, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EREFERENCE__NATURAL_ID, newNaturalId, newNaturalId));
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EREFERENCE__NATURAL_ID, newNaturalId, newNaturalId));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Immutable getImmutable() {
@@ -804,42 +940,49 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetImmutable(Immutable newImmutable, NotificationChain msgs) {
 		Immutable oldImmutable = immutable;
 		immutable = newImmutable;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EREFERENCE__IMMUTABLE, oldImmutable, newImmutable);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EREFERENCE__IMMUTABLE, oldImmutable, newImmutable);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setImmutable(Immutable newImmutable) {
 		if (newImmutable != immutable) {
 			NotificationChain msgs = null;
 			if (immutable != null)
-				msgs = ((InternalEObject)immutable).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EREFERENCE__IMMUTABLE, null, msgs);
+				msgs = ((InternalEObject) immutable).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EREFERENCE__IMMUTABLE, null, msgs);
 			if (newImmutable != null)
-				msgs = ((InternalEObject)newImmutable).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EREFERENCE__IMMUTABLE, null, msgs);
+				msgs = ((InternalEObject) newImmutable).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EREFERENCE__IMMUTABLE, null, msgs);
 			msgs = basicSetImmutable(newImmutable, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EREFERENCE__IMMUTABLE, newImmutable, newImmutable));
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EREFERENCE__IMMUTABLE, newImmutable, newImmutable));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotFound getNotFound() {
@@ -847,42 +990,49 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetNotFound(NotFound newNotFound, NotificationChain msgs) {
 		NotFound oldNotFound = notFound;
 		notFound = newNotFound;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EREFERENCE__NOT_FOUND, oldNotFound, newNotFound);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EREFERENCE__NOT_FOUND, oldNotFound, newNotFound);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setNotFound(NotFound newNotFound) {
 		if (newNotFound != notFound) {
 			NotificationChain msgs = null;
 			if (notFound != null)
-				msgs = ((InternalEObject)notFound).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EREFERENCE__NOT_FOUND, null, msgs);
+				msgs = ((InternalEObject) notFound).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EREFERENCE__NOT_FOUND, null, msgs);
 			if (newNotFound != null)
-				msgs = ((InternalEObject)newNotFound).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EREFERENCE__NOT_FOUND, null, msgs);
+				msgs = ((InternalEObject) newNotFound).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EREFERENCE__NOT_FOUND, null, msgs);
 			msgs = basicSetNotFound(newNotFound, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EREFERENCE__NOT_FOUND, newNotFound, newNotFound));
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EREFERENCE__NOT_FOUND, newNotFound, newNotFound));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Type getHbType() {
@@ -890,59 +1040,67 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetHbType(Type newHbType, NotificationChain msgs) {
 		Type oldHbType = hbType;
 		hbType = newHbType;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_TYPE, oldHbType, newHbType);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_TYPE, oldHbType, newHbType);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHbType(Type newHbType) {
 		if (newHbType != hbType) {
 			NotificationChain msgs = null;
 			if (hbType != null)
-				msgs = ((InternalEObject)hbType).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_TYPE, null, msgs);
+				msgs = ((InternalEObject) hbType).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_TYPE, null, msgs);
 			if (newHbType != null)
-				msgs = ((InternalEObject)newHbType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_TYPE, null, msgs);
+				msgs = ((InternalEObject) newHbType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+						- HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_TYPE, null, msgs);
 			msgs = basicSetHbType(newHbType, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_TYPE, newHbType, newHbType));
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_TYPE, newHbType, newHbType));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public BatchSize getBatchSize() {
 		if (batchSize != null && batchSize.eIsProxy()) {
-			InternalEObject oldBatchSize = (InternalEObject)batchSize;
-			batchSize = (BatchSize)eResolveProxy(oldBatchSize);
+			InternalEObject oldBatchSize = (InternalEObject) batchSize;
+			batchSize = (BatchSize) eResolveProxy(oldBatchSize);
 			if (batchSize != oldBatchSize) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, HbmodelPackage.HB_ANNOTATED_EREFERENCE__BATCH_SIZE, oldBatchSize, batchSize));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+							HbmodelPackage.HB_ANNOTATED_EREFERENCE__BATCH_SIZE, oldBatchSize, batchSize));
 			}
 		}
 		return batchSize;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public BatchSize basicGetBatchSize() {
@@ -950,37 +1108,39 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBatchSize(BatchSize newBatchSize) {
 		BatchSize oldBatchSize = batchSize;
 		batchSize = newBatchSize;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EREFERENCE__BATCH_SIZE, oldBatchSize, batchSize));
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EREFERENCE__BATCH_SIZE, oldBatchSize, batchSize));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Any getAny() {
 		if (any != null && any.eIsProxy()) {
-			InternalEObject oldAny = (InternalEObject)any;
-			any = (Any)eResolveProxy(oldAny);
+			InternalEObject oldAny = (InternalEObject) any;
+			any = (Any) eResolveProxy(oldAny);
 			if (any != oldAny) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, HbmodelPackage.HB_ANNOTATED_EREFERENCE__ANY, oldAny, any));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+							HbmodelPackage.HB_ANNOTATED_EREFERENCE__ANY, oldAny, any));
 			}
 		}
 		return any;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Any basicGetAny() {
@@ -988,37 +1148,39 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setAny(Any newAny) {
 		Any oldAny = any;
 		any = newAny;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EREFERENCE__ANY, oldAny, any));
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EREFERENCE__ANY, oldAny, any));
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AnyMetaDef getAnyMetaDef() {
 		if (anyMetaDef != null && anyMetaDef.eIsProxy()) {
-			InternalEObject oldAnyMetaDef = (InternalEObject)anyMetaDef;
-			anyMetaDef = (AnyMetaDef)eResolveProxy(oldAnyMetaDef);
+			InternalEObject oldAnyMetaDef = (InternalEObject) anyMetaDef;
+			anyMetaDef = (AnyMetaDef) eResolveProxy(oldAnyMetaDef);
 			if (anyMetaDef != oldAnyMetaDef) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, HbmodelPackage.HB_ANNOTATED_EREFERENCE__ANY_META_DEF, oldAnyMetaDef, anyMetaDef));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+							HbmodelPackage.HB_ANNOTATED_EREFERENCE__ANY_META_DEF, oldAnyMetaDef, anyMetaDef));
 			}
 		}
 		return anyMetaDef;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AnyMetaDef basicGetAnyMetaDef() {
@@ -1026,330 +1188,357 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setAnyMetaDef(AnyMetaDef newAnyMetaDef) {
 		AnyMetaDef oldAnyMetaDef = anyMetaDef;
 		anyMetaDef = newAnyMetaDef;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HbmodelPackage.HB_ANNOTATED_EREFERENCE__ANY_META_DEF, oldAnyMetaDef, anyMetaDef));
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					HbmodelPackage.HB_ANNOTATED_EREFERENCE__ANY_META_DEF, oldAnyMetaDef, anyMetaDef));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID,
+			NotificationChain msgs) {
 		switch (featureID) {
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_WHERE:
-				return basicSetHbWhere(null, msgs);
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_COLLECTION_OF_ELEMENTS:
-				return basicSetHbCollectionOfElements(null, msgs);
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_MAP_KEY:
-				return basicSetHbMapKey(null, msgs);
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_COLUMNS:
-				return ((InternalEList<?>)getHbColumns()).basicRemove(otherEnd, msgs);
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CASCADE:
-				return basicSetHbCascade(null, msgs);
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_ID_BAG:
-				return basicSetHbIdBag(null, msgs);
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__MAP_KEY_MANY_TO_MANY:
-				return basicSetMapKeyManyToMany(null, msgs);
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CACHE:
-				return basicSetHbCache(null, msgs);
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__NATURAL_ID:
-				return basicSetNaturalId(null, msgs);
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__IMMUTABLE:
-				return basicSetImmutable(null, msgs);
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__NOT_FOUND:
-				return basicSetNotFound(null, msgs);
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_TYPE:
-				return basicSetHbType(null, msgs);
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_WHERE:
+			return basicSetHbWhere(null, msgs);
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_COLLECTION_OF_ELEMENTS:
+			return basicSetHbCollectionOfElements(null, msgs);
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_MAP_KEY:
+			return basicSetHbMapKey(null, msgs);
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_COLUMNS:
+			return ((InternalEList<?>) getHbColumns()).basicRemove(otherEnd, msgs);
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CASCADE:
+			return basicSetHbCascade(null, msgs);
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_ID_BAG:
+			return basicSetHbIdBag(null, msgs);
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__MAP_KEY_MANY_TO_MANY:
+			return basicSetMapKeyManyToMany(null, msgs);
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CACHE:
+			return basicSetHbCache(null, msgs);
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__NATURAL_ID:
+			return basicSetNaturalId(null, msgs);
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__IMMUTABLE:
+			return basicSetImmutable(null, msgs);
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__NOT_FOUND:
+			return basicSetNotFound(null, msgs);
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_TYPE:
+			return basicSetHbType(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_WHERE:
-				return getHbWhere();
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_COLLECTION_OF_ELEMENTS:
-				return getHbCollectionOfElements();
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_MAP_KEY:
-				return getHbMapKey();
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_COLUMNS:
-				return getHbColumns();
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CASCADE:
-				return getHbCascade();
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_ID_BAG:
-				return getHbIdBag();
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_INDEX:
-				if (resolve) return getHbIndex();
-				return basicGetHbIndex();
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__FILTER:
-				return getFilter();
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__MAP_KEY_MANY_TO_MANY:
-				return getMapKeyManyToMany();
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__FORMULA:
-				if (resolve) return getFormula();
-				return basicGetFormula();
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CACHE:
-				return getHbCache();
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_FETCH:
-				if (resolve) return getHbFetch();
-				return basicGetHbFetch();
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_ON_DELETE:
-				if (resolve) return getHbOnDelete();
-				return basicGetHbOnDelete();
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__NATURAL_ID:
-				return getNaturalId();
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__IMMUTABLE:
-				return getImmutable();
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__NOT_FOUND:
-				return getNotFound();
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_TYPE:
-				return getHbType();
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__BATCH_SIZE:
-				if (resolve) return getBatchSize();
-				return basicGetBatchSize();
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__ANY:
-				if (resolve) return getAny();
-				return basicGetAny();
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__ANY_META_DEF:
-				if (resolve) return getAnyMetaDef();
-				return basicGetAnyMetaDef();
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_WHERE:
+			return getHbWhere();
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_COLLECTION_OF_ELEMENTS:
+			return getHbCollectionOfElements();
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_MAP_KEY:
+			return getHbMapKey();
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_COLUMNS:
+			return getHbColumns();
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CASCADE:
+			return getHbCascade();
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_ID_BAG:
+			return getHbIdBag();
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_INDEX:
+			if (resolve)
+				return getHbIndex();
+			return basicGetHbIndex();
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__FILTER:
+			return getFilter();
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__MAP_KEY_MANY_TO_MANY:
+			return getMapKeyManyToMany();
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__FORMULA:
+			if (resolve)
+				return getFormula();
+			return basicGetFormula();
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CACHE:
+			return getHbCache();
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_FETCH:
+			if (resolve)
+				return getHbFetch();
+			return basicGetHbFetch();
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_ON_DELETE:
+			if (resolve)
+				return getHbOnDelete();
+			return basicGetHbOnDelete();
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__NATURAL_ID:
+			return getNaturalId();
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__IMMUTABLE:
+			return getImmutable();
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__NOT_FOUND:
+			return getNotFound();
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_TYPE:
+			return getHbType();
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__BATCH_SIZE:
+			if (resolve)
+				return getBatchSize();
+			return basicGetBatchSize();
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__ANY:
+			if (resolve)
+				return getAny();
+			return basicGetAny();
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__ANY_META_DEF:
+			if (resolve)
+				return getAnyMetaDef();
+			return basicGetAnyMetaDef();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
-		@Override
+	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_WHERE:
-				setHbWhere((Where)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_COLLECTION_OF_ELEMENTS:
-				setHbCollectionOfElements((CollectionOfElements)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_MAP_KEY:
-				setHbMapKey((HbMapKey)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_COLUMNS:
-				getHbColumns().clear();
-				getHbColumns().addAll((Collection<? extends Column>)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CASCADE:
-				setHbCascade((Cascade)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_ID_BAG:
-				setHbIdBag((IdBag)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_INDEX:
-				setHbIndex((Index)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__FILTER:
-				getFilter().clear();
-				getFilter().addAll((Collection<? extends Filter>)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__MAP_KEY_MANY_TO_MANY:
-				setMapKeyManyToMany((MapKeyManyToMany)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__FORMULA:
-				setFormula((Formula)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CACHE:
-				setHbCache((Cache)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_FETCH:
-				setHbFetch((Fetch)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_ON_DELETE:
-				setHbOnDelete((OnDelete)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__NATURAL_ID:
-				setNaturalId((NaturalId)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__IMMUTABLE:
-				setImmutable((Immutable)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__NOT_FOUND:
-				setNotFound((NotFound)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_TYPE:
-				setHbType((Type)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__BATCH_SIZE:
-				setBatchSize((BatchSize)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__ANY:
-				setAny((Any)newValue);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__ANY_META_DEF:
-				setAnyMetaDef((AnyMetaDef)newValue);
-				return;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_WHERE:
+			setHbWhere((Where) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_COLLECTION_OF_ELEMENTS:
+			setHbCollectionOfElements((CollectionOfElements) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_MAP_KEY:
+			setHbMapKey((HbMapKey) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_COLUMNS:
+			getHbColumns().clear();
+			getHbColumns().addAll((Collection<? extends Column>) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CASCADE:
+			setHbCascade((Cascade) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_ID_BAG:
+			setHbIdBag((IdBag) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_INDEX:
+			setHbIndex((Index) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__FILTER:
+			getFilter().clear();
+			getFilter().addAll((Collection<? extends Filter>) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__MAP_KEY_MANY_TO_MANY:
+			setMapKeyManyToMany((MapKeyManyToMany) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__FORMULA:
+			setFormula((Formula) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CACHE:
+			setHbCache((Cache) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_FETCH:
+			setHbFetch((Fetch) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_ON_DELETE:
+			setHbOnDelete((OnDelete) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__NATURAL_ID:
+			setNaturalId((NaturalId) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__IMMUTABLE:
+			setImmutable((Immutable) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__NOT_FOUND:
+			setNotFound((NotFound) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_TYPE:
+			setHbType((Type) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__BATCH_SIZE:
+			setBatchSize((BatchSize) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__ANY:
+			setAny((Any) newValue);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__ANY_META_DEF:
+			setAnyMetaDef((AnyMetaDef) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_WHERE:
-				setHbWhere((Where)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_COLLECTION_OF_ELEMENTS:
-				setHbCollectionOfElements((CollectionOfElements)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_MAP_KEY:
-				setHbMapKey((HbMapKey)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_COLUMNS:
-				getHbColumns().clear();
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CASCADE:
-				setHbCascade((Cascade)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_ID_BAG:
-				setHbIdBag((IdBag)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_INDEX:
-				setHbIndex((Index)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__FILTER:
-				getFilter().clear();
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__MAP_KEY_MANY_TO_MANY:
-				setMapKeyManyToMany((MapKeyManyToMany)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__FORMULA:
-				setFormula((Formula)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CACHE:
-				setHbCache((Cache)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_FETCH:
-				setHbFetch((Fetch)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_ON_DELETE:
-				setHbOnDelete((OnDelete)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__NATURAL_ID:
-				setNaturalId((NaturalId)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__IMMUTABLE:
-				setImmutable((Immutable)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__NOT_FOUND:
-				setNotFound((NotFound)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_TYPE:
-				setHbType((Type)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__BATCH_SIZE:
-				setBatchSize((BatchSize)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__ANY:
-				setAny((Any)null);
-				return;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__ANY_META_DEF:
-				setAnyMetaDef((AnyMetaDef)null);
-				return;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_WHERE:
+			setHbWhere((Where) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_COLLECTION_OF_ELEMENTS:
+			setHbCollectionOfElements((CollectionOfElements) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_MAP_KEY:
+			setHbMapKey((HbMapKey) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_COLUMNS:
+			getHbColumns().clear();
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CASCADE:
+			setHbCascade((Cascade) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_ID_BAG:
+			setHbIdBag((IdBag) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_INDEX:
+			setHbIndex((Index) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__FILTER:
+			getFilter().clear();
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__MAP_KEY_MANY_TO_MANY:
+			setMapKeyManyToMany((MapKeyManyToMany) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__FORMULA:
+			setFormula((Formula) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CACHE:
+			setHbCache((Cache) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_FETCH:
+			setHbFetch((Fetch) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_ON_DELETE:
+			setHbOnDelete((OnDelete) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__NATURAL_ID:
+			setNaturalId((NaturalId) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__IMMUTABLE:
+			setImmutable((Immutable) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__NOT_FOUND:
+			setNotFound((NotFound) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_TYPE:
+			setHbType((Type) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__BATCH_SIZE:
+			setBatchSize((BatchSize) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__ANY:
+			setAny((Any) null);
+			return;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__ANY_META_DEF:
+			setAnyMetaDef((AnyMetaDef) null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_WHERE:
-				return hbWhere != null;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_COLLECTION_OF_ELEMENTS:
-				return hbCollectionOfElements != null;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_MAP_KEY:
-				return hbMapKey != null;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_COLUMNS:
-				return hbColumns != null && !hbColumns.isEmpty();
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CASCADE:
-				return hbCascade != null;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_ID_BAG:
-				return hbIdBag != null;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_INDEX:
-				return hbIndex != null;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__FILTER:
-				return filter != null && !filter.isEmpty();
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__MAP_KEY_MANY_TO_MANY:
-				return mapKeyManyToMany != null;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__FORMULA:
-				return formula != null;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CACHE:
-				return hbCache != null;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_FETCH:
-				return hbFetch != null;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_ON_DELETE:
-				return hbOnDelete != null;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__NATURAL_ID:
-				return naturalId != null;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__IMMUTABLE:
-				return immutable != null;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__NOT_FOUND:
-				return notFound != null;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_TYPE:
-				return hbType != null;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__BATCH_SIZE:
-				return batchSize != null;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__ANY:
-				return any != null;
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__ANY_META_DEF:
-				return anyMetaDef != null;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_WHERE:
+			return hbWhere != null;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_COLLECTION_OF_ELEMENTS:
+			return hbCollectionOfElements != null;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_MAP_KEY:
+			return hbMapKey != null;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_COLUMNS:
+			return hbColumns != null && !hbColumns.isEmpty();
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CASCADE:
+			return hbCascade != null;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_ID_BAG:
+			return hbIdBag != null;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_INDEX:
+			return hbIndex != null;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__FILTER:
+			return filter != null && !filter.isEmpty();
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__MAP_KEY_MANY_TO_MANY:
+			return mapKeyManyToMany != null;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__FORMULA:
+			return formula != null;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CACHE:
+			return hbCache != null;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_FETCH:
+			return hbFetch != null;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_ON_DELETE:
+			return hbOnDelete != null;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__NATURAL_ID:
+			return naturalId != null;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__IMMUTABLE:
+			return immutable != null;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__NOT_FOUND:
+			return notFound != null;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_TYPE:
+			return hbType != null;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__BATCH_SIZE:
+			return batchSize != null;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__ANY:
+			return any != null;
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE__ANY_META_DEF:
+			return anyMetaDef != null;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
 		if (baseClass == HbAnnotatedEModelElement.class) {
 			switch (derivedFeatureID) {
-				default: return -1;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == HbAnnotatedETypeElement.class) {
 			switch (derivedFeatureID) {
-				case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_WHERE: return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_WHERE;
-				case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_COLLECTION_OF_ELEMENTS: return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_COLLECTION_OF_ELEMENTS;
-				case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_MAP_KEY: return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_MAP_KEY;
-				case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_COLUMNS: return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_COLUMNS;
-				case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CASCADE: return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_CASCADE;
-				case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_ID_BAG: return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_ID_BAG;
-				case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_INDEX: return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_INDEX;
-				case HbmodelPackage.HB_ANNOTATED_EREFERENCE__FILTER: return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__FILTER;
-				case HbmodelPackage.HB_ANNOTATED_EREFERENCE__MAP_KEY_MANY_TO_MANY: return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__MAP_KEY_MANY_TO_MANY;
-				case HbmodelPackage.HB_ANNOTATED_EREFERENCE__FORMULA: return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__FORMULA;
-				default: return -1;
+			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_WHERE:
+				return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_WHERE;
+			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_COLLECTION_OF_ELEMENTS:
+				return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_COLLECTION_OF_ELEMENTS;
+			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_MAP_KEY:
+				return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_MAP_KEY;
+			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_COLUMNS:
+				return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_COLUMNS;
+			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CASCADE:
+				return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_CASCADE;
+			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_ID_BAG:
+				return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_ID_BAG;
+			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_INDEX:
+				return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_INDEX;
+			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__FILTER:
+				return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__FILTER;
+			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__MAP_KEY_MANY_TO_MANY:
+				return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__MAP_KEY_MANY_TO_MANY;
+			case HbmodelPackage.HB_ANNOTATED_EREFERENCE__FORMULA:
+				return HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__FORMULA;
+			default:
+				return -1;
 			}
 		}
 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
@@ -1357,28 +1546,41 @@ public class HbAnnotatedEReferenceImpl extends PAnnotatedEReferenceImpl implemen
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
 		if (baseClass == HbAnnotatedEModelElement.class) {
 			switch (baseFeatureID) {
-				default: return -1;
+			default:
+				return -1;
 			}
 		}
 		if (baseClass == HbAnnotatedETypeElement.class) {
 			switch (baseFeatureID) {
-				case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_WHERE: return HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_WHERE;
-				case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_COLLECTION_OF_ELEMENTS: return HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_COLLECTION_OF_ELEMENTS;
-				case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_MAP_KEY: return HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_MAP_KEY;
-				case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_COLUMNS: return HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_COLUMNS;
-				case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_CASCADE: return HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CASCADE;
-				case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_ID_BAG: return HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_ID_BAG;
-				case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_INDEX: return HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_INDEX;
-				case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__FILTER: return HbmodelPackage.HB_ANNOTATED_EREFERENCE__FILTER;
-				case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__MAP_KEY_MANY_TO_MANY: return HbmodelPackage.HB_ANNOTATED_EREFERENCE__MAP_KEY_MANY_TO_MANY;
-				case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__FORMULA: return HbmodelPackage.HB_ANNOTATED_EREFERENCE__FORMULA;
-				default: return -1;
+			case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_WHERE:
+				return HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_WHERE;
+			case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_COLLECTION_OF_ELEMENTS:
+				return HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_COLLECTION_OF_ELEMENTS;
+			case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_MAP_KEY:
+				return HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_MAP_KEY;
+			case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_COLUMNS:
+				return HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_COLUMNS;
+			case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_CASCADE:
+				return HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_CASCADE;
+			case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_ID_BAG:
+				return HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_ID_BAG;
+			case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__HB_INDEX:
+				return HbmodelPackage.HB_ANNOTATED_EREFERENCE__HB_INDEX;
+			case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__FILTER:
+				return HbmodelPackage.HB_ANNOTATED_EREFERENCE__FILTER;
+			case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__MAP_KEY_MANY_TO_MANY:
+				return HbmodelPackage.HB_ANNOTATED_EREFERENCE__MAP_KEY_MANY_TO_MANY;
+			case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT__FORMULA:
+				return HbmodelPackage.HB_ANNOTATED_EREFERENCE__FORMULA;
+			default:
+				return -1;
 			}
 		}
 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbmodelFactoryImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbmodelFactoryImpl.java
index 4582aab06..6d2771036 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbmodelFactoryImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbmodelFactoryImpl.java
@@ -11,7 +11,6 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.emf.teneo.hibernate.hbmodel.*;
 import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute;
 import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass;
 import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType;
@@ -21,35 +20,32 @@ import org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelFactory;
 import org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class HbmodelFactoryImpl extends EFactoryImpl implements HbmodelFactory {
 	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static HbmodelFactory init() {
 		try {
-			HbmodelFactory theHbmodelFactory = (HbmodelFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/teneo/2006/HbModel"); 
+			HbmodelFactory theHbmodelFactory = (HbmodelFactory) EPackage.Registry.INSTANCE
+					.getEFactory("http://www.eclipse.org/emf/teneo/2006/HbModel");
 			if (theHbmodelFactory != null) {
 				return theHbmodelFactory;
 			}
-		}
-		catch (Exception exception) {
+		} catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new HbmodelFactoryImpl();
 	}
 
 	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HbmodelFactoryImpl() {
@@ -57,26 +53,32 @@ public class HbmodelFactoryImpl extends EFactoryImpl implements HbmodelFactory {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public EObject create(EClass eClass) {
 		switch (eClass.getClassifierID()) {
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE: return createHbAnnotatedEAttribute();
-			case HbmodelPackage.HB_ANNOTATED_ECLASS: return createHbAnnotatedEClass();
-			case HbmodelPackage.HB_ANNOTATED_EPACKAGE: return createHbAnnotatedEPackage();
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE: return createHbAnnotatedEReference();
-			case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE: return createHbAnnotatedEDataType();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE:
+			return createHbAnnotatedEAttribute();
+		case HbmodelPackage.HB_ANNOTATED_ECLASS:
+			return createHbAnnotatedEClass();
+		case HbmodelPackage.HB_ANNOTATED_EPACKAGE:
+			return createHbAnnotatedEPackage();
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE:
+			return createHbAnnotatedEReference();
+		case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE:
+			return createHbAnnotatedEDataType();
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName()
+					+ "' is not a valid classifier");
 		}
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HbAnnotatedEAttribute createHbAnnotatedEAttribute() {
@@ -85,8 +87,8 @@ public class HbmodelFactoryImpl extends EFactoryImpl implements HbmodelFactory {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HbAnnotatedEClass createHbAnnotatedEClass() {
@@ -95,8 +97,8 @@ public class HbmodelFactoryImpl extends EFactoryImpl implements HbmodelFactory {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HbAnnotatedEPackage createHbAnnotatedEPackage() {
@@ -105,8 +107,8 @@ public class HbmodelFactoryImpl extends EFactoryImpl implements HbmodelFactory {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HbAnnotatedEReference createHbAnnotatedEReference() {
@@ -115,8 +117,8 @@ public class HbmodelFactoryImpl extends EFactoryImpl implements HbmodelFactory {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HbAnnotatedEDataType createHbAnnotatedEDataType() {
@@ -125,17 +127,17 @@ public class HbmodelFactoryImpl extends EFactoryImpl implements HbmodelFactory {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HbmodelPackage getHbmodelPackage() {
-		return (HbmodelPackage)getEPackage();
+		return (HbmodelPackage) getEPackage();
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @deprecated
 	 * @generated
 	 */
@@ -144,4 +146,4 @@ public class HbmodelFactoryImpl extends EFactoryImpl implements HbmodelFactory {
 		return HbmodelPackage.eINSTANCE;
 	}
 
-} //HbmodelFactoryImpl
+} // HbmodelFactoryImpl
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbmodelPackageImpl.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbmodelPackageImpl.java
index 69e4555e3..2bfc3b861 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbmodelPackageImpl.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/impl/HbmodelPackageImpl.java
@@ -25,71 +25,69 @@ import org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelFactory;
 import org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class HbmodelPackageImpl extends EPackageImpl implements HbmodelPackage {
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass hbAnnotatedETypeElementEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass hbAnnotatedEAttributeEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass hbAnnotatedEClassEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass hbAnnotatedEModelElementEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass hbAnnotatedEPackageEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass hbAnnotatedEReferenceEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass hbAnnotatedEDataTypeEClass = null;
 
 	/**
 	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package package URI
+	 * value.
+	 * <p>
+	 * Note: the correct way to create the package is via the static factory method {@link #init
+	 * init()}, which also performs initialization of the package, or returns the registered package,
+	 * if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage#eNS_URI
 	 * @see #init()
@@ -100,29 +98,34 @@ public class HbmodelPackageImpl extends EPackageImpl implements HbmodelPackage {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private static boolean isInited = false;
 
 	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon
+	 * which it depends.
+	 * 
+	 * <p>
+	 * This method is used to initialize {@link HbmodelPackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain
+	 * the package. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
-	 * <p>This method is used to initialize {@link HbmodelPackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
 	 * @see #eNS_URI
 	 * @see #createPackageContents()
 	 * @see #initializePackageContents()
 	 * @generated
 	 */
 	public static HbmodelPackage init() {
-		if (isInited) return (HbmodelPackage)EPackage.Registry.INSTANCE.getEPackage(HbmodelPackage.eNS_URI);
+		if (isInited)
+			return (HbmodelPackage) EPackage.Registry.INSTANCE.getEPackage(HbmodelPackage.eNS_URI);
 
 		// Obtain or create and register package
-		HbmodelPackageImpl theHbmodelPackage = (HbmodelPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof HbmodelPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new HbmodelPackageImpl());
+		HbmodelPackageImpl theHbmodelPackage = (HbmodelPackageImpl) (EPackage.Registry.INSTANCE
+				.get(eNS_URI) instanceof HbmodelPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+				: new HbmodelPackageImpl());
 
 		isInited = true;
 
@@ -131,7 +134,9 @@ public class HbmodelPackageImpl extends EPackageImpl implements HbmodelPackage {
 		PannotationPackage.eINSTANCE.eClass();
 
 		// Obtain or create and register interdependencies
-		HbannotationPackageImpl theHbannotationPackage = (HbannotationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(HbannotationPackage.eNS_URI) instanceof HbannotationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(HbannotationPackage.eNS_URI) : HbannotationPackage.eINSTANCE);
+		HbannotationPackageImpl theHbannotationPackage = (HbannotationPackageImpl) (EPackage.Registry.INSTANCE
+				.getEPackage(HbannotationPackage.eNS_URI) instanceof HbannotationPackageImpl ? EPackage.Registry.INSTANCE
+				.getEPackage(HbannotationPackage.eNS_URI) : HbannotationPackage.eINSTANCE);
 
 		// Create package meta-data objects
 		theHbmodelPackage.createPackageContents();
@@ -144,15 +149,14 @@ public class HbmodelPackageImpl extends EPackageImpl implements HbmodelPackage {
 		// Mark meta-data to indicate it can't be changed
 		theHbmodelPackage.freeze();
 
-  
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(HbmodelPackage.eNS_URI, theHbmodelPackage);
 		return theHbmodelPackage;
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getHbAnnotatedETypeElement() {
@@ -160,98 +164,98 @@ public class HbmodelPackageImpl extends EPackageImpl implements HbmodelPackage {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedETypeElement_HbWhere() {
-		return (EReference)hbAnnotatedETypeElementEClass.getEStructuralFeatures().get(0);
+		return (EReference) hbAnnotatedETypeElementEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedETypeElement_HbCollectionOfElements() {
-		return (EReference)hbAnnotatedETypeElementEClass.getEStructuralFeatures().get(1);
+		return (EReference) hbAnnotatedETypeElementEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedETypeElement_HbMapKey() {
-		return (EReference)hbAnnotatedETypeElementEClass.getEStructuralFeatures().get(2);
+		return (EReference) hbAnnotatedETypeElementEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedETypeElement_HbColumns() {
-		return (EReference)hbAnnotatedETypeElementEClass.getEStructuralFeatures().get(3);
+		return (EReference) hbAnnotatedETypeElementEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedETypeElement_HbCascade() {
-		return (EReference)hbAnnotatedETypeElementEClass.getEStructuralFeatures().get(4);
+		return (EReference) hbAnnotatedETypeElementEClass.getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedETypeElement_HbIdBag() {
-		return (EReference)hbAnnotatedETypeElementEClass.getEStructuralFeatures().get(5);
+		return (EReference) hbAnnotatedETypeElementEClass.getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedETypeElement_HbIndex() {
-		return (EReference)hbAnnotatedETypeElementEClass.getEStructuralFeatures().get(6);
+		return (EReference) hbAnnotatedETypeElementEClass.getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedETypeElement_Filter() {
-		return (EReference)hbAnnotatedETypeElementEClass.getEStructuralFeatures().get(7);
+		return (EReference) hbAnnotatedETypeElementEClass.getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedETypeElement_MapKeyManyToMany() {
-		return (EReference)hbAnnotatedETypeElementEClass.getEStructuralFeatures().get(8);
+		return (EReference) hbAnnotatedETypeElementEClass.getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedETypeElement_Formula() {
-		return (EReference)hbAnnotatedETypeElementEClass.getEStructuralFeatures().get(9);
+		return (EReference) hbAnnotatedETypeElementEClass.getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getHbAnnotatedEAttribute() {
@@ -259,53 +263,53 @@ public class HbmodelPackageImpl extends EPackageImpl implements HbmodelPackage {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedEAttribute_HbType() {
-		return (EReference)hbAnnotatedEAttributeEClass.getEStructuralFeatures().get(0);
+		return (EReference) hbAnnotatedEAttributeEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedEAttribute_Generated() {
-		return (EReference)hbAnnotatedEAttributeEClass.getEStructuralFeatures().get(1);
+		return (EReference) hbAnnotatedEAttributeEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedEAttribute_NaturalId() {
-		return (EReference)hbAnnotatedEAttributeEClass.getEStructuralFeatures().get(2);
+		return (EReference) hbAnnotatedEAttributeEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedEAttribute_Any() {
-		return (EReference)hbAnnotatedEAttributeEClass.getEStructuralFeatures().get(3);
+		return (EReference) hbAnnotatedEAttributeEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedEAttribute_AnyMetaDef() {
-		return (EReference)hbAnnotatedEAttributeEClass.getEStructuralFeatures().get(4);
+		return (EReference) hbAnnotatedEAttributeEClass.getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getHbAnnotatedEClass() {
@@ -313,125 +317,125 @@ public class HbmodelPackageImpl extends EPackageImpl implements HbmodelPackage {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedEClass_HbCache() {
-		return (EReference)hbAnnotatedEClassEClass.getEStructuralFeatures().get(0);
+		return (EReference) hbAnnotatedEClassEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedEClass_HbOnDelete() {
-		return (EReference)hbAnnotatedEClassEClass.getEStructuralFeatures().get(1);
+		return (EReference) hbAnnotatedEClassEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedEClass_HbWhere() {
-		return (EReference)hbAnnotatedEClassEClass.getEStructuralFeatures().get(2);
+		return (EReference) hbAnnotatedEClassEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedEClass_HbProxy() {
-		return (EReference)hbAnnotatedEClassEClass.getEStructuralFeatures().get(3);
+		return (EReference) hbAnnotatedEClassEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedEClass_HbNamedQuery() {
-		return (EReference)hbAnnotatedEClassEClass.getEStructuralFeatures().get(4);
+		return (EReference) hbAnnotatedEClassEClass.getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedEClass_FilterDef() {
-		return (EReference)hbAnnotatedEClassEClass.getEStructuralFeatures().get(5);
+		return (EReference) hbAnnotatedEClassEClass.getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedEClass_Filter() {
-		return (EReference)hbAnnotatedEClassEClass.getEStructuralFeatures().get(6);
+		return (EReference) hbAnnotatedEClassEClass.getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedEClass_DiscriminatorFormula() {
-		return (EReference)hbAnnotatedEClassEClass.getEStructuralFeatures().get(7);
+		return (EReference) hbAnnotatedEClassEClass.getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedEClass_ForceDiscriminator() {
-		return (EReference)hbAnnotatedEClassEClass.getEStructuralFeatures().get(8);
+		return (EReference) hbAnnotatedEClassEClass.getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedEClass_Immutable() {
-		return (EReference)hbAnnotatedEClassEClass.getEStructuralFeatures().get(9);
+		return (EReference) hbAnnotatedEClassEClass.getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedEClass_HbEntity() {
-		return (EReference)hbAnnotatedEClassEClass.getEStructuralFeatures().get(10);
+		return (EReference) hbAnnotatedEClassEClass.getEStructuralFeatures().get(10);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedEClass_BatchSize() {
-		return (EReference)hbAnnotatedEClassEClass.getEStructuralFeatures().get(11);
+		return (EReference) hbAnnotatedEClassEClass.getEStructuralFeatures().get(11);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedEClass_HbType() {
-		return (EReference)hbAnnotatedEClassEClass.getEStructuralFeatures().get(12);
+		return (EReference) hbAnnotatedEClassEClass.getEStructuralFeatures().get(12);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getHbAnnotatedEModelElement() {
@@ -439,8 +443,8 @@ public class HbmodelPackageImpl extends EPackageImpl implements HbmodelPackage {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getHbAnnotatedEPackage() {
@@ -448,53 +452,53 @@ public class HbmodelPackageImpl extends EPackageImpl implements HbmodelPackage {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedEPackage_HbGenericGenerators() {
-		return (EReference)hbAnnotatedEPackageEClass.getEStructuralFeatures().get(0);
+		return (EReference) hbAnnotatedEPackageEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedEPackage_HbTypeDef() {
-		return (EReference)hbAnnotatedEPackageEClass.getEStructuralFeatures().get(1);
+		return (EReference) hbAnnotatedEPackageEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedEPackage_HbNamedQuery() {
-		return (EReference)hbAnnotatedEPackageEClass.getEStructuralFeatures().get(2);
+		return (EReference) hbAnnotatedEPackageEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedEPackage_FilterDef() {
-		return (EReference)hbAnnotatedEPackageEClass.getEStructuralFeatures().get(3);
+		return (EReference) hbAnnotatedEPackageEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedEPackage_AnyMetaDef() {
-		return (EReference)hbAnnotatedEPackageEClass.getEStructuralFeatures().get(4);
+		return (EReference) hbAnnotatedEPackageEClass.getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getHbAnnotatedEReference() {
@@ -502,98 +506,98 @@ public class HbmodelPackageImpl extends EPackageImpl implements HbmodelPackage {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedEReference_HbCache() {
-		return (EReference)hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(0);
+		return (EReference) hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedEReference_HbFetch() {
-		return (EReference)hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(1);
+		return (EReference) hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedEReference_HbOnDelete() {
-		return (EReference)hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(2);
+		return (EReference) hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedEReference_NaturalId() {
-		return (EReference)hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(3);
+		return (EReference) hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedEReference_Immutable() {
-		return (EReference)hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(4);
+		return (EReference) hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedEReference_NotFound() {
-		return (EReference)hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(5);
+		return (EReference) hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedEReference_HbType() {
-		return (EReference)hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(6);
+		return (EReference) hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(6);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedEReference_BatchSize() {
-		return (EReference)hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(7);
+		return (EReference) hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(7);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedEReference_Any() {
-		return (EReference)hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(8);
+		return (EReference) hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(8);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedEReference_AnyMetaDef() {
-		return (EReference)hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(9);
+		return (EReference) hbAnnotatedEReferenceEClass.getEStructuralFeatures().get(9);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getHbAnnotatedEDataType() {
@@ -601,97 +605,99 @@ public class HbmodelPackageImpl extends EPackageImpl implements HbmodelPackage {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedEDataType_HbTypeDef() {
-		return (EReference)hbAnnotatedEDataTypeEClass.getEStructuralFeatures().get(0);
+		return (EReference) hbAnnotatedEDataTypeEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedEDataType_HbWhere() {
-		return (EReference)hbAnnotatedEDataTypeEClass.getEStructuralFeatures().get(1);
+		return (EReference) hbAnnotatedEDataTypeEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedEDataType_HbColumns() {
-		return (EReference)hbAnnotatedEDataTypeEClass.getEStructuralFeatures().get(2);
+		return (EReference) hbAnnotatedEDataTypeEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedEDataType_HbIdBag() {
-		return (EReference)hbAnnotatedEDataTypeEClass.getEStructuralFeatures().get(3);
+		return (EReference) hbAnnotatedEDataTypeEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedEDataType_HbIndex() {
-		return (EReference)hbAnnotatedEDataTypeEClass.getEStructuralFeatures().get(4);
+		return (EReference) hbAnnotatedEDataTypeEClass.getEStructuralFeatures().get(4);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getHbAnnotatedEDataType_HbType() {
-		return (EReference)hbAnnotatedEDataTypeEClass.getEStructuralFeatures().get(5);
+		return (EReference) hbAnnotatedEDataTypeEClass.getEStructuralFeatures().get(5);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HbmodelFactory getHbmodelFactory() {
-		return (HbmodelFactory)getEFactoryInstance();
+		return (HbmodelFactory) getEFactoryInstance();
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isCreated = false;
 
 	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Creates the meta-model objects for the package. This method is guarded to have no affect on any
+	 * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated) return;
+		if (isCreated)
+			return;
 		isCreated = true;
 
 		// Create classes and their features
 		hbAnnotatedETypeElementEClass = createEClass(HB_ANNOTATED_ETYPE_ELEMENT);
 		createEReference(hbAnnotatedETypeElementEClass, HB_ANNOTATED_ETYPE_ELEMENT__HB_WHERE);
-		createEReference(hbAnnotatedETypeElementEClass, HB_ANNOTATED_ETYPE_ELEMENT__HB_COLLECTION_OF_ELEMENTS);
+		createEReference(hbAnnotatedETypeElementEClass,
+				HB_ANNOTATED_ETYPE_ELEMENT__HB_COLLECTION_OF_ELEMENTS);
 		createEReference(hbAnnotatedETypeElementEClass, HB_ANNOTATED_ETYPE_ELEMENT__HB_MAP_KEY);
 		createEReference(hbAnnotatedETypeElementEClass, HB_ANNOTATED_ETYPE_ELEMENT__HB_COLUMNS);
 		createEReference(hbAnnotatedETypeElementEClass, HB_ANNOTATED_ETYPE_ELEMENT__HB_CASCADE);
 		createEReference(hbAnnotatedETypeElementEClass, HB_ANNOTATED_ETYPE_ELEMENT__HB_ID_BAG);
 		createEReference(hbAnnotatedETypeElementEClass, HB_ANNOTATED_ETYPE_ELEMENT__HB_INDEX);
 		createEReference(hbAnnotatedETypeElementEClass, HB_ANNOTATED_ETYPE_ELEMENT__FILTER);
-		createEReference(hbAnnotatedETypeElementEClass, HB_ANNOTATED_ETYPE_ELEMENT__MAP_KEY_MANY_TO_MANY);
+		createEReference(hbAnnotatedETypeElementEClass,
+				HB_ANNOTATED_ETYPE_ELEMENT__MAP_KEY_MANY_TO_MANY);
 		createEReference(hbAnnotatedETypeElementEClass, HB_ANNOTATED_ETYPE_ELEMENT__FORMULA);
 
 		hbAnnotatedEAttributeEClass = createEClass(HB_ANNOTATED_EATTRIBUTE);
@@ -747,21 +753,21 @@ public class HbmodelPackageImpl extends EPackageImpl implements HbmodelPackage {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isInitialized = false;
 
 	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Complete the initialization of the package and its meta-model. This method is guarded to have
+	 * no affect on any invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized) return;
+		if (isInitialized)
+			return;
 		isInitialized = true;
 
 		// Initialize package
@@ -770,21 +776,26 @@ public class HbmodelPackageImpl extends EPackageImpl implements HbmodelPackage {
 		setNsURI(eNS_URI);
 
 		// Obtain other dependent packages
-		PamodelPackage thePamodelPackage = (PamodelPackage)EPackage.Registry.INSTANCE.getEPackage(PamodelPackage.eNS_URI);
-		HbannotationPackage theHbannotationPackage = (HbannotationPackage)EPackage.Registry.INSTANCE.getEPackage(HbannotationPackage.eNS_URI);
-		PannotationPackage thePannotationPackage = (PannotationPackage)EPackage.Registry.INSTANCE.getEPackage(PannotationPackage.eNS_URI);
+		PamodelPackage thePamodelPackage = (PamodelPackage) EPackage.Registry.INSTANCE
+				.getEPackage(PamodelPackage.eNS_URI);
+		HbannotationPackage theHbannotationPackage = (HbannotationPackage) EPackage.Registry.INSTANCE
+				.getEPackage(HbannotationPackage.eNS_URI);
+		PannotationPackage thePannotationPackage = (PannotationPackage) EPackage.Registry.INSTANCE
+				.getEPackage(PannotationPackage.eNS_URI);
 
 		// Create type parameters
 
 		// Set bounds for type parameters
 
 		// Add supertypes to classes
-		hbAnnotatedETypeElementEClass.getESuperTypes().add(thePamodelPackage.getPAnnotatedEStructuralFeature());
+		hbAnnotatedETypeElementEClass.getESuperTypes().add(
+				thePamodelPackage.getPAnnotatedEStructuralFeature());
 		hbAnnotatedETypeElementEClass.getESuperTypes().add(this.getHbAnnotatedEModelElement());
 		hbAnnotatedEAttributeEClass.getESuperTypes().add(thePamodelPackage.getPAnnotatedEAttribute());
 		hbAnnotatedEAttributeEClass.getESuperTypes().add(this.getHbAnnotatedETypeElement());
 		hbAnnotatedEClassEClass.getESuperTypes().add(thePamodelPackage.getPAnnotatedEClass());
-		hbAnnotatedEModelElementEClass.getESuperTypes().add(thePamodelPackage.getPAnnotatedEModelElement());
+		hbAnnotatedEModelElementEClass.getESuperTypes().add(
+				thePamodelPackage.getPAnnotatedEModelElement());
 		hbAnnotatedEPackageEClass.getESuperTypes().add(thePamodelPackage.getPAnnotatedEPackage());
 		hbAnnotatedEReferenceEClass.getESuperTypes().add(thePamodelPackage.getPAnnotatedEReference());
 		hbAnnotatedEReferenceEClass.getESuperTypes().add(this.getHbAnnotatedETypeElement());
@@ -792,68 +803,215 @@ public class HbmodelPackageImpl extends EPackageImpl implements HbmodelPackage {
 		hbAnnotatedEDataTypeEClass.getESuperTypes().add(this.getHbAnnotatedEModelElement());
 
 		// Initialize classes and features; add operations and parameters
-		initEClass(hbAnnotatedETypeElementEClass, HbAnnotatedETypeElement.class, "HbAnnotatedETypeElement", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getHbAnnotatedETypeElement_HbWhere(), theHbannotationPackage.getWhere(), null, "hbWhere", null, 0, 1, HbAnnotatedETypeElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedETypeElement_HbCollectionOfElements(), theHbannotationPackage.getCollectionOfElements(), null, "hbCollectionOfElements", null, 0, 1, HbAnnotatedETypeElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedETypeElement_HbMapKey(), theHbannotationPackage.getHbMapKey(), null, "hbMapKey", null, 0, 1, HbAnnotatedETypeElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedETypeElement_HbColumns(), thePannotationPackage.getColumn(), null, "hbColumns", null, 0, -1, HbAnnotatedETypeElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedETypeElement_HbCascade(), theHbannotationPackage.getCascade(), null, "hbCascade", null, 0, 1, HbAnnotatedETypeElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedETypeElement_HbIdBag(), theHbannotationPackage.getIdBag(), null, "hbIdBag", null, 0, 1, HbAnnotatedETypeElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedETypeElement_HbIndex(), theHbannotationPackage.getIndex(), null, "hbIndex", null, 0, 1, HbAnnotatedETypeElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedETypeElement_Filter(), theHbannotationPackage.getFilter(), null, "Filter", null, 0, -1, HbAnnotatedETypeElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedETypeElement_MapKeyManyToMany(), theHbannotationPackage.getMapKeyManyToMany(), null, "mapKeyManyToMany", null, 0, 1, HbAnnotatedETypeElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedETypeElement_Formula(), theHbannotationPackage.getFormula(), null, "formula", null, 0, 1, HbAnnotatedETypeElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(hbAnnotatedEAttributeEClass, HbAnnotatedEAttribute.class, "HbAnnotatedEAttribute", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getHbAnnotatedEAttribute_HbType(), theHbannotationPackage.getType(), null, "hbType", null, 0, 1, HbAnnotatedEAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedEAttribute_Generated(), theHbannotationPackage.getGenerated(), null, "generated", null, 0, 1, HbAnnotatedEAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedEAttribute_NaturalId(), theHbannotationPackage.getNaturalId(), null, "naturalId", null, 0, 1, HbAnnotatedEAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedEAttribute_Any(), theHbannotationPackage.getAny(), null, "any", null, 0, 1, HbAnnotatedEAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedEAttribute_AnyMetaDef(), theHbannotationPackage.getAnyMetaDef(), null, "anyMetaDef", null, 0, 1, HbAnnotatedEAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(hbAnnotatedEClassEClass, HbAnnotatedEClass.class, "HbAnnotatedEClass", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getHbAnnotatedEClass_HbCache(), theHbannotationPackage.getCache(), null, "hbCache", null, 0, 1, HbAnnotatedEClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedEClass_HbOnDelete(), theHbannotationPackage.getOnDelete(), null, "hbOnDelete", null, 0, 1, HbAnnotatedEClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedEClass_HbWhere(), theHbannotationPackage.getWhere(), null, "hbWhere", null, 0, 1, HbAnnotatedEClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedEClass_HbProxy(), theHbannotationPackage.getProxy(), null, "hbProxy", null, 0, 1, HbAnnotatedEClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedEClass_HbNamedQuery(), theHbannotationPackage.getNamedQuery(), null, "hbNamedQuery", null, 0, -1, HbAnnotatedEClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedEClass_FilterDef(), theHbannotationPackage.getFilterDef(), null, "FilterDef", null, 0, -1, HbAnnotatedEClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedEClass_Filter(), theHbannotationPackage.getFilter(), null, "Filter", null, 0, -1, HbAnnotatedEClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedEClass_DiscriminatorFormula(), theHbannotationPackage.getDiscriminatorFormula(), null, "discriminatorFormula", null, 0, 1, HbAnnotatedEClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedEClass_ForceDiscriminator(), theHbannotationPackage.getForceDiscriminator(), null, "forceDiscriminator", null, 0, 1, HbAnnotatedEClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedEClass_Immutable(), theHbannotationPackage.getImmutable(), null, "immutable", null, 0, 1, HbAnnotatedEClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedEClass_HbEntity(), theHbannotationPackage.getHbEntity(), null, "hbEntity", null, 0, 1, HbAnnotatedEClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedEClass_BatchSize(), theHbannotationPackage.getBatchSize(), null, "batchSize", null, 0, 1, HbAnnotatedEClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedEClass_HbType(), theHbannotationPackage.getType(), null, "hbType", null, 0, 1, HbAnnotatedEClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(hbAnnotatedEModelElementEClass, HbAnnotatedEModelElement.class, "HbAnnotatedEModelElement", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(hbAnnotatedEPackageEClass, HbAnnotatedEPackage.class, "HbAnnotatedEPackage", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getHbAnnotatedEPackage_HbGenericGenerators(), theHbannotationPackage.getGenericGenerator(), null, "hbGenericGenerators", null, 0, -1, HbAnnotatedEPackage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedEPackage_HbTypeDef(), theHbannotationPackage.getTypeDef(), null, "hbTypeDef", null, 0, -1, HbAnnotatedEPackage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedEPackage_HbNamedQuery(), theHbannotationPackage.getNamedQuery(), null, "hbNamedQuery", null, 0, -1, HbAnnotatedEPackage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedEPackage_FilterDef(), theHbannotationPackage.getFilterDef(), null, "FilterDef", null, 0, -1, HbAnnotatedEPackage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedEPackage_AnyMetaDef(), theHbannotationPackage.getAnyMetaDef(), null, "anyMetaDef", null, 0, -1, HbAnnotatedEPackage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(hbAnnotatedEReferenceEClass, HbAnnotatedEReference.class, "HbAnnotatedEReference", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getHbAnnotatedEReference_HbCache(), theHbannotationPackage.getCache(), null, "hbCache", null, 0, 1, HbAnnotatedEReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedEReference_HbFetch(), theHbannotationPackage.getFetch(), null, "hbFetch", null, 0, 1, HbAnnotatedEReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedEReference_HbOnDelete(), theHbannotationPackage.getOnDelete(), null, "hbOnDelete", null, 0, 1, HbAnnotatedEReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedEReference_NaturalId(), theHbannotationPackage.getNaturalId(), null, "naturalId", null, 0, 1, HbAnnotatedEReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedEReference_Immutable(), theHbannotationPackage.getImmutable(), null, "immutable", null, 0, 1, HbAnnotatedEReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedEReference_NotFound(), theHbannotationPackage.getNotFound(), null, "notFound", null, 0, 1, HbAnnotatedEReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedEReference_HbType(), theHbannotationPackage.getType(), null, "hbType", null, 0, 1, HbAnnotatedEReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedEReference_BatchSize(), theHbannotationPackage.getBatchSize(), null, "batchSize", null, 0, 1, HbAnnotatedEReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedEReference_Any(), theHbannotationPackage.getAny(), null, "any", null, 0, 1, HbAnnotatedEReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedEReference_AnyMetaDef(), theHbannotationPackage.getAnyMetaDef(), null, "anyMetaDef", null, 0, 1, HbAnnotatedEReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(hbAnnotatedEDataTypeEClass, HbAnnotatedEDataType.class, "HbAnnotatedEDataType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getHbAnnotatedEDataType_HbTypeDef(), theHbannotationPackage.getTypeDef(), null, "hbTypeDef", null, 0, 1, HbAnnotatedEDataType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedEDataType_HbWhere(), theHbannotationPackage.getWhere(), null, "hbWhere", null, 0, 1, HbAnnotatedEDataType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedEDataType_HbColumns(), thePannotationPackage.getColumn(), null, "hbColumns", null, 0, -1, HbAnnotatedEDataType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedEDataType_HbIdBag(), theHbannotationPackage.getIdBag(), null, "hbIdBag", null, 0, 1, HbAnnotatedEDataType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedEDataType_HbIndex(), theHbannotationPackage.getIndex(), null, "hbIndex", null, 0, 1, HbAnnotatedEDataType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHbAnnotatedEDataType_HbType(), theHbannotationPackage.getType(), null, "hbType", null, 0, 1, HbAnnotatedEDataType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEClass(hbAnnotatedETypeElementEClass, HbAnnotatedETypeElement.class,
+				"HbAnnotatedETypeElement", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getHbAnnotatedETypeElement_HbWhere(), theHbannotationPackage.getWhere(), null,
+				"hbWhere", null, 0, 1, HbAnnotatedETypeElement.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEReference(getHbAnnotatedETypeElement_HbCollectionOfElements(),
+				theHbannotationPackage.getCollectionOfElements(), null, "hbCollectionOfElements", null, 0,
+				1, HbAnnotatedETypeElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getHbAnnotatedETypeElement_HbMapKey(), theHbannotationPackage.getHbMapKey(),
+				null, "hbMapKey", null, 0, 1, HbAnnotatedETypeElement.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEReference(getHbAnnotatedETypeElement_HbColumns(), thePannotationPackage.getColumn(), null,
+				"hbColumns", null, 0, -1, HbAnnotatedETypeElement.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEReference(getHbAnnotatedETypeElement_HbCascade(), theHbannotationPackage.getCascade(),
+				null, "hbCascade", null, 0, 1, HbAnnotatedETypeElement.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEReference(getHbAnnotatedETypeElement_HbIdBag(), theHbannotationPackage.getIdBag(), null,
+				"hbIdBag", null, 0, 1, HbAnnotatedETypeElement.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEReference(getHbAnnotatedETypeElement_HbIndex(), theHbannotationPackage.getIndex(), null,
+				"hbIndex", null, 0, 1, HbAnnotatedETypeElement.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEReference(getHbAnnotatedETypeElement_Filter(), theHbannotationPackage.getFilter(), null,
+				"Filter", null, 0, -1, HbAnnotatedETypeElement.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEReference(getHbAnnotatedETypeElement_MapKeyManyToMany(),
+				theHbannotationPackage.getMapKeyManyToMany(), null, "mapKeyManyToMany", null, 0, 1,
+				HbAnnotatedETypeElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getHbAnnotatedETypeElement_Formula(), theHbannotationPackage.getFormula(), null,
+				"formula", null, 0, 1, HbAnnotatedETypeElement.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+
+		initEClass(hbAnnotatedEAttributeEClass, HbAnnotatedEAttribute.class, "HbAnnotatedEAttribute",
+				!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getHbAnnotatedEAttribute_HbType(), theHbannotationPackage.getType(), null,
+				"hbType", null, 0, 1, HbAnnotatedEAttribute.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEReference(getHbAnnotatedEAttribute_Generated(), theHbannotationPackage.getGenerated(),
+				null, "generated", null, 0, 1, HbAnnotatedEAttribute.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEReference(getHbAnnotatedEAttribute_NaturalId(), theHbannotationPackage.getNaturalId(),
+				null, "naturalId", null, 0, 1, HbAnnotatedEAttribute.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEReference(getHbAnnotatedEAttribute_Any(), theHbannotationPackage.getAny(), null, "any",
+				null, 0, 1, HbAnnotatedEAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+				!IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getHbAnnotatedEAttribute_AnyMetaDef(), theHbannotationPackage.getAnyMetaDef(),
+				null, "anyMetaDef", null, 0, 1, HbAnnotatedEAttribute.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+
+		initEClass(hbAnnotatedEClassEClass, HbAnnotatedEClass.class, "HbAnnotatedEClass", !IS_ABSTRACT,
+				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getHbAnnotatedEClass_HbCache(), theHbannotationPackage.getCache(), null,
+				"hbCache", null, 0, 1, HbAnnotatedEClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+				IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getHbAnnotatedEClass_HbOnDelete(), theHbannotationPackage.getOnDelete(), null,
+				"hbOnDelete", null, 0, 1, HbAnnotatedEClass.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEReference(getHbAnnotatedEClass_HbWhere(), theHbannotationPackage.getWhere(), null,
+				"hbWhere", null, 0, 1, HbAnnotatedEClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+				IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getHbAnnotatedEClass_HbProxy(), theHbannotationPackage.getProxy(), null,
+				"hbProxy", null, 0, 1, HbAnnotatedEClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+				!IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getHbAnnotatedEClass_HbNamedQuery(), theHbannotationPackage.getNamedQuery(),
+				null, "hbNamedQuery", null, 0, -1, HbAnnotatedEClass.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEReference(getHbAnnotatedEClass_FilterDef(), theHbannotationPackage.getFilterDef(), null,
+				"FilterDef", null, 0, -1, HbAnnotatedEClass.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEReference(getHbAnnotatedEClass_Filter(), theHbannotationPackage.getFilter(), null,
+				"Filter", null, 0, -1, HbAnnotatedEClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+				!IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getHbAnnotatedEClass_DiscriminatorFormula(),
+				theHbannotationPackage.getDiscriminatorFormula(), null, "discriminatorFormula", null, 0, 1,
+				HbAnnotatedEClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getHbAnnotatedEClass_ForceDiscriminator(),
+				theHbannotationPackage.getForceDiscriminator(), null, "forceDiscriminator", null, 0, 1,
+				HbAnnotatedEClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getHbAnnotatedEClass_Immutable(), theHbannotationPackage.getImmutable(), null,
+				"immutable", null, 0, 1, HbAnnotatedEClass.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEReference(getHbAnnotatedEClass_HbEntity(), theHbannotationPackage.getHbEntity(), null,
+				"hbEntity", null, 0, 1, HbAnnotatedEClass.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEReference(getHbAnnotatedEClass_BatchSize(), theHbannotationPackage.getBatchSize(), null,
+				"batchSize", null, 0, 1, HbAnnotatedEClass.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEReference(getHbAnnotatedEClass_HbType(), theHbannotationPackage.getType(), null, "hbType",
+				null, 0, 1, HbAnnotatedEClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+				IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(hbAnnotatedEModelElementEClass, HbAnnotatedEModelElement.class,
+				"HbAnnotatedEModelElement", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(hbAnnotatedEPackageEClass, HbAnnotatedEPackage.class, "HbAnnotatedEPackage",
+				!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getHbAnnotatedEPackage_HbGenericGenerators(),
+				theHbannotationPackage.getGenericGenerator(), null, "hbGenericGenerators", null, 0, -1,
+				HbAnnotatedEPackage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getHbAnnotatedEPackage_HbTypeDef(), theHbannotationPackage.getTypeDef(), null,
+				"hbTypeDef", null, 0, -1, HbAnnotatedEPackage.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEReference(getHbAnnotatedEPackage_HbNamedQuery(), theHbannotationPackage.getNamedQuery(),
+				null, "hbNamedQuery", null, 0, -1, HbAnnotatedEPackage.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEReference(getHbAnnotatedEPackage_FilterDef(), theHbannotationPackage.getFilterDef(), null,
+				"FilterDef", null, 0, -1, HbAnnotatedEPackage.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEReference(getHbAnnotatedEPackage_AnyMetaDef(), theHbannotationPackage.getAnyMetaDef(),
+				null, "anyMetaDef", null, 0, -1, HbAnnotatedEPackage.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+
+		initEClass(hbAnnotatedEReferenceEClass, HbAnnotatedEReference.class, "HbAnnotatedEReference",
+				!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getHbAnnotatedEReference_HbCache(), theHbannotationPackage.getCache(), null,
+				"hbCache", null, 0, 1, HbAnnotatedEReference.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEReference(getHbAnnotatedEReference_HbFetch(), theHbannotationPackage.getFetch(), null,
+				"hbFetch", null, 0, 1, HbAnnotatedEReference.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEReference(getHbAnnotatedEReference_HbOnDelete(), theHbannotationPackage.getOnDelete(),
+				null, "hbOnDelete", null, 0, 1, HbAnnotatedEReference.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEReference(getHbAnnotatedEReference_NaturalId(), theHbannotationPackage.getNaturalId(),
+				null, "naturalId", null, 0, 1, HbAnnotatedEReference.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEReference(getHbAnnotatedEReference_Immutable(), theHbannotationPackage.getImmutable(),
+				null, "immutable", null, 0, 1, HbAnnotatedEReference.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEReference(getHbAnnotatedEReference_NotFound(), theHbannotationPackage.getNotFound(), null,
+				"notFound", null, 0, 1, HbAnnotatedEReference.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEReference(getHbAnnotatedEReference_HbType(), theHbannotationPackage.getType(), null,
+				"hbType", null, 0, 1, HbAnnotatedEReference.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEReference(getHbAnnotatedEReference_BatchSize(), theHbannotationPackage.getBatchSize(),
+				null, "batchSize", null, 0, 1, HbAnnotatedEReference.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEReference(getHbAnnotatedEReference_Any(), theHbannotationPackage.getAny(), null, "any",
+				null, 0, 1, HbAnnotatedEReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+				!IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getHbAnnotatedEReference_AnyMetaDef(), theHbannotationPackage.getAnyMetaDef(),
+				null, "anyMetaDef", null, 0, 1, HbAnnotatedEReference.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+
+		initEClass(hbAnnotatedEDataTypeEClass, HbAnnotatedEDataType.class, "HbAnnotatedEDataType",
+				!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getHbAnnotatedEDataType_HbTypeDef(), theHbannotationPackage.getTypeDef(), null,
+				"hbTypeDef", null, 0, 1, HbAnnotatedEDataType.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEReference(getHbAnnotatedEDataType_HbWhere(), theHbannotationPackage.getWhere(), null,
+				"hbWhere", null, 0, 1, HbAnnotatedEDataType.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEReference(getHbAnnotatedEDataType_HbColumns(), thePannotationPackage.getColumn(), null,
+				"hbColumns", null, 0, -1, HbAnnotatedEDataType.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEReference(getHbAnnotatedEDataType_HbIdBag(), theHbannotationPackage.getIdBag(), null,
+				"hbIdBag", null, 0, 1, HbAnnotatedEDataType.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEReference(getHbAnnotatedEDataType_HbIndex(), theHbannotationPackage.getIndex(), null,
+				"hbIndex", null, 0, 1, HbAnnotatedEDataType.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEReference(getHbAnnotatedEDataType_HbType(), theHbannotationPackage.getType(), null,
+				"hbType", null, 0, 1, HbAnnotatedEDataType.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
 
 		// Create resource
 		createResource(eNS_URI);
@@ -864,25 +1022,17 @@ public class HbmodelPackageImpl extends EPackageImpl implements HbmodelPackage {
 	}
 
 	/**
-	 * Initializes the annotations for <b>teneo/internal/PersistenceMapping</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Initializes the annotations for <b>teneo/internal/PersistenceMapping</b>. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void createPersistenceMappingAnnotations() {
-		String source = "teneo/internal/PersistenceMapping";		
-		addAnnotation
-		  (getHbAnnotatedETypeElement_HbMapKey(), 
-		   source, 
-		   new String[] {
-			 "elementName", "hb-map-key"
-		   });		
-		addAnnotation
-		  (getHbAnnotatedETypeElement_MapKeyManyToMany(), 
-		   source, 
-		   new String[] {
-			 "elementName", "hb-map-key"
-		   });
-	}
-
-} //HbmodelPackageImpl
+		String source = "teneo/internal/PersistenceMapping";
+		addAnnotation(getHbAnnotatedETypeElement_HbMapKey(), source, new String[] { "elementName",
+				"hb-map-key" });
+		addAnnotation(getHbAnnotatedETypeElement_MapKeyManyToMany(), source, new String[] {
+				"elementName", "hb-map-key" });
+	}
+
+} // HbmodelPackageImpl
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/util/HbmodelAdapterFactory.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/util/HbmodelAdapterFactory.java
index dc61036c9..6a2f15692 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/util/HbmodelAdapterFactory.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/util/HbmodelAdapterFactory.java
@@ -25,26 +25,23 @@ import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedETypedElement;
 import org.eclipse.emf.teneo.hibernate.hbmodel.*;
 
 /**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter
+ * <code>createXXX</code> method for each class of the model. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage
  * @generated
  */
 public class HbmodelAdapterFactory extends AdapterFactoryImpl {
 	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static HbmodelPackage modelPackage;
 
 	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HbmodelAdapterFactory() {
@@ -54,10 +51,10 @@ public class HbmodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
+	 * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is
+	 * an instance object of the model. <!-- end-user-doc -->
+	 * 
 	 * @return whether this factory is applicable for the type of the object.
 	 * @generated
 	 */
@@ -67,105 +64,119 @@ public class HbmodelAdapterFactory extends AdapterFactoryImpl {
 			return true;
 		}
 		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
+			return ((EObject) object).eClass().getEPackage() == modelPackage;
 		}
 		return false;
 	}
 
 	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	protected HbmodelSwitch<Adapter> modelSwitch =
-		new HbmodelSwitch<Adapter>() {
-			@Override
-			public Adapter caseHbAnnotatedETypeElement(HbAnnotatedETypeElement object) {
-				return createHbAnnotatedETypeElementAdapter();
-			}
-			@Override
-			public Adapter caseHbAnnotatedEAttribute(HbAnnotatedEAttribute object) {
-				return createHbAnnotatedEAttributeAdapter();
-			}
-			@Override
-			public Adapter caseHbAnnotatedEClass(HbAnnotatedEClass object) {
-				return createHbAnnotatedEClassAdapter();
-			}
-			@Override
-			public Adapter caseHbAnnotatedEModelElement(HbAnnotatedEModelElement object) {
-				return createHbAnnotatedEModelElementAdapter();
-			}
-			@Override
-			public Adapter caseHbAnnotatedEPackage(HbAnnotatedEPackage object) {
-				return createHbAnnotatedEPackageAdapter();
-			}
-			@Override
-			public Adapter caseHbAnnotatedEReference(HbAnnotatedEReference object) {
-				return createHbAnnotatedEReferenceAdapter();
-			}
-			@Override
-			public Adapter caseHbAnnotatedEDataType(HbAnnotatedEDataType object) {
-				return createHbAnnotatedEDataTypeAdapter();
-			}
-			@Override
-			public Adapter casePAnnotatedEModelElement(PAnnotatedEModelElement object) {
-				return createPAnnotatedEModelElementAdapter();
-			}
-			@Override
-			public Adapter casePAnnotatedETypedElement(PAnnotatedETypedElement object) {
-				return createPAnnotatedETypedElementAdapter();
-			}
-			@Override
-			public Adapter casePAnnotatedEStructuralFeature(PAnnotatedEStructuralFeature object) {
-				return createPAnnotatedEStructuralFeatureAdapter();
-			}
-			@Override
-			public Adapter casePAnnotatedEAttribute(PAnnotatedEAttribute object) {
-				return createPAnnotatedEAttributeAdapter();
-			}
-			@Override
-			public Adapter casePAnnotatedEClass(PAnnotatedEClass object) {
-				return createPAnnotatedEClassAdapter();
-			}
-			@Override
-			public Adapter casePAnnotatedEPackage(PAnnotatedEPackage object) {
-				return createPAnnotatedEPackageAdapter();
-			}
-			@Override
-			public Adapter casePAnnotatedEReference(PAnnotatedEReference object) {
-				return createPAnnotatedEReferenceAdapter();
-			}
-			@Override
-			public Adapter casePAnnotatedEDataType(PAnnotatedEDataType object) {
-				return createPAnnotatedEDataTypeAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
+	protected HbmodelSwitch<Adapter> modelSwitch = new HbmodelSwitch<Adapter>() {
+		@Override
+		public Adapter caseHbAnnotatedETypeElement(HbAnnotatedETypeElement object) {
+			return createHbAnnotatedETypeElementAdapter();
+		}
+
+		@Override
+		public Adapter caseHbAnnotatedEAttribute(HbAnnotatedEAttribute object) {
+			return createHbAnnotatedEAttributeAdapter();
+		}
+
+		@Override
+		public Adapter caseHbAnnotatedEClass(HbAnnotatedEClass object) {
+			return createHbAnnotatedEClassAdapter();
+		}
+
+		@Override
+		public Adapter caseHbAnnotatedEModelElement(HbAnnotatedEModelElement object) {
+			return createHbAnnotatedEModelElementAdapter();
+		}
+
+		@Override
+		public Adapter caseHbAnnotatedEPackage(HbAnnotatedEPackage object) {
+			return createHbAnnotatedEPackageAdapter();
+		}
+
+		@Override
+		public Adapter caseHbAnnotatedEReference(HbAnnotatedEReference object) {
+			return createHbAnnotatedEReferenceAdapter();
+		}
+
+		@Override
+		public Adapter caseHbAnnotatedEDataType(HbAnnotatedEDataType object) {
+			return createHbAnnotatedEDataTypeAdapter();
+		}
+
+		@Override
+		public Adapter casePAnnotatedEModelElement(PAnnotatedEModelElement object) {
+			return createPAnnotatedEModelElementAdapter();
+		}
+
+		@Override
+		public Adapter casePAnnotatedETypedElement(PAnnotatedETypedElement object) {
+			return createPAnnotatedETypedElementAdapter();
+		}
+
+		@Override
+		public Adapter casePAnnotatedEStructuralFeature(PAnnotatedEStructuralFeature object) {
+			return createPAnnotatedEStructuralFeatureAdapter();
+		}
+
+		@Override
+		public Adapter casePAnnotatedEAttribute(PAnnotatedEAttribute object) {
+			return createPAnnotatedEAttributeAdapter();
+		}
+
+		@Override
+		public Adapter casePAnnotatedEClass(PAnnotatedEClass object) {
+			return createPAnnotatedEClassAdapter();
+		}
+
+		@Override
+		public Adapter casePAnnotatedEPackage(PAnnotatedEPackage object) {
+			return createPAnnotatedEPackageAdapter();
+		}
+
+		@Override
+		public Adapter casePAnnotatedEReference(PAnnotatedEReference object) {
+			return createPAnnotatedEReferenceAdapter();
+		}
+
+		@Override
+		public Adapter casePAnnotatedEDataType(PAnnotatedEDataType object) {
+			return createPAnnotatedEDataTypeAdapter();
+		}
+
+		@Override
+		public Adapter defaultCase(EObject object) {
+			return createEObjectAdapter();
+		}
+	};
 
 	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
+	 * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param target
+	 *          the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
 	 */
 	@Override
 	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
+		return modelSwitch.doSwitch((EObject) target);
 	}
 
-
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement <em>Hb Annotated EType Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement
+	 * <em>Hb Annotated EType Element</em>}'. <!-- begin-user-doc --> This default implementation
+	 * returns null so that we can easily ignore cases; it's useful to ignore a case when inheritance
+	 * will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement
 	 * @generated
@@ -175,11 +186,12 @@ public class HbmodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute <em>Hb Annotated EAttribute</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute
+	 * <em>Hb Annotated EAttribute</em>}'. <!-- begin-user-doc --> This default implementation returns
+	 * null so that we can easily ignore cases; it's useful to ignore a case when inheritance will
+	 * catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute
 	 * @generated
@@ -189,11 +201,12 @@ public class HbmodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass <em>Hb Annotated EClass</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass <em>Hb Annotated EClass</em>}
+	 * '. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+	 * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass
 	 * @generated
@@ -203,11 +216,12 @@ public class HbmodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEModelElement <em>Hb Annotated EModel Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEModelElement
+	 * <em>Hb Annotated EModel Element</em>}'. <!-- begin-user-doc --> This default implementation
+	 * returns null so that we can easily ignore cases; it's useful to ignore a case when inheritance
+	 * will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEModelElement
 	 * @generated
@@ -217,11 +231,12 @@ public class HbmodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage <em>Hb Annotated EPackage</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage
+	 * <em>Hb Annotated EPackage</em>}'. <!-- begin-user-doc --> This default implementation returns
+	 * null so that we can easily ignore cases; it's useful to ignore a case when inheritance will
+	 * catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage
 	 * @generated
@@ -231,11 +246,12 @@ public class HbmodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference <em>Hb Annotated EReference</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference
+	 * <em>Hb Annotated EReference</em>}'. <!-- begin-user-doc --> This default implementation returns
+	 * null so that we can easily ignore cases; it's useful to ignore a case when inheritance will
+	 * catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference
 	 * @generated
@@ -245,11 +261,12 @@ public class HbmodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType <em>Hb Annotated EData Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType
+	 * <em>Hb Annotated EData Type</em>}'. <!-- begin-user-doc --> This default implementation returns
+	 * null so that we can easily ignore cases; it's useful to ignore a case when inheritance will
+	 * catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType
 	 * @generated
@@ -259,11 +276,12 @@ public class HbmodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEModelElement <em>PAnnotated EModel Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEModelElement
+	 * <em>PAnnotated EModel Element</em>}'. <!-- begin-user-doc --> This default implementation
+	 * returns null so that we can easily ignore cases; it's useful to ignore a case when inheritance
+	 * will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEModelElement
 	 * @generated
@@ -273,11 +291,12 @@ public class HbmodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedETypedElement <em>PAnnotated ETyped Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedETypedElement
+	 * <em>PAnnotated ETyped Element</em>}'. <!-- begin-user-doc --> This default implementation
+	 * returns null so that we can easily ignore cases; it's useful to ignore a case when inheritance
+	 * will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedETypedElement
 	 * @generated
@@ -287,11 +306,12 @@ public class HbmodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEStructuralFeature <em>PAnnotated EStructural Feature</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEStructuralFeature
+	 * <em>PAnnotated EStructural Feature</em>}'. <!-- begin-user-doc --> This default implementation
+	 * returns null so that we can easily ignore cases; it's useful to ignore a case when inheritance
+	 * will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEStructuralFeature
 	 * @generated
@@ -301,11 +321,12 @@ public class HbmodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEAttribute <em>PAnnotated EAttribute</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEAttribute
+	 * <em>PAnnotated EAttribute</em>}'. <!-- begin-user-doc --> This default implementation returns
+	 * null so that we can easily ignore cases; it's useful to ignore a case when inheritance will
+	 * catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEAttribute
 	 * @generated
@@ -315,11 +336,12 @@ public class HbmodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEClass <em>PAnnotated EClass</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEClass <em>PAnnotated EClass</em>}'.
+	 * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore
+	 * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEClass
 	 * @generated
@@ -329,11 +351,12 @@ public class HbmodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEPackage <em>PAnnotated EPackage</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEPackage
+	 * <em>PAnnotated EPackage</em>}'. <!-- begin-user-doc --> This default implementation returns
+	 * null so that we can easily ignore cases; it's useful to ignore a case when inheritance will
+	 * catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEPackage
 	 * @generated
@@ -343,11 +366,12 @@ public class HbmodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEReference <em>PAnnotated EReference</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEReference
+	 * <em>PAnnotated EReference</em>}'. <!-- begin-user-doc --> This default implementation returns
+	 * null so that we can easily ignore cases; it's useful to ignore a case when inheritance will
+	 * catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEReference
 	 * @generated
@@ -357,11 +381,12 @@ public class HbmodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEDataType <em>PAnnotated EData Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEDataType
+	 * <em>PAnnotated EData Type</em>}'. <!-- begin-user-doc --> This default implementation returns
+	 * null so that we can easily ignore cases; it's useful to ignore a case when inheritance will
+	 * catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEDataType
 	 * @generated
@@ -371,10 +396,9 @@ public class HbmodelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation
+	 * returns null. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @generated
 	 */
@@ -382,4 +406,4 @@ public class HbmodelAdapterFactory extends AdapterFactoryImpl {
 		return null;
 	}
 
-} //HbmodelAdapterFactory
+} // HbmodelAdapterFactory
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/util/HbmodelSwitch.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/util/HbmodelSwitch.java
index 96f8a11fb..6aada9b75 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/util/HbmodelSwitch.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/util/HbmodelSwitch.java
@@ -28,31 +28,26 @@ import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement;
 import org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage;
 
 /**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
+ * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance hierarchy. It supports the
+ * call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for
+ * each class of the model, starting with the actual class of the object and proceeding up the
+ * inheritance hierarchy until a non-null result is returned, which is the result of the switch.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.emf.teneo.hibernate.hbmodel.HbmodelPackage
  * @generated
  */
 public class HbmodelSwitch<T> {
 	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static HbmodelPackage modelPackage;
 
 	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public HbmodelSwitch() {
@@ -62,9 +57,9 @@ public class HbmodelSwitch<T> {
 	}
 
 	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it
+	 * yields that result. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
@@ -73,112 +68,142 @@ public class HbmodelSwitch<T> {
 	}
 
 	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it
+	 * yields that result. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
 	protected T doSwitch(EClass theEClass, EObject theEObject) {
 		if (theEClass.eContainer() == modelPackage) {
 			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
+		} else {
 			List<EClass> eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch(eSuperTypes.get(0), theEObject);
+			return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0),
+					theEObject);
 		}
 	}
 
 	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it
+	 * yields that result. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
 	protected T doSwitch(int classifierID, EObject theEObject) {
 		switch (classifierID) {
-			case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT: {
-				HbAnnotatedETypeElement hbAnnotatedETypeElement = (HbAnnotatedETypeElement)theEObject;
-				T result = caseHbAnnotatedETypeElement(hbAnnotatedETypeElement);
-				if (result == null) result = casePAnnotatedEStructuralFeature(hbAnnotatedETypeElement);
-				if (result == null) result = caseHbAnnotatedEModelElement(hbAnnotatedETypeElement);
-				if (result == null) result = casePAnnotatedETypedElement(hbAnnotatedETypeElement);
-				if (result == null) result = casePAnnotatedEModelElement(hbAnnotatedETypeElement);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE: {
-				HbAnnotatedEAttribute hbAnnotatedEAttribute = (HbAnnotatedEAttribute)theEObject;
-				T result = caseHbAnnotatedEAttribute(hbAnnotatedEAttribute);
-				if (result == null) result = casePAnnotatedEAttribute(hbAnnotatedEAttribute);
-				if (result == null) result = caseHbAnnotatedETypeElement(hbAnnotatedEAttribute);
-				if (result == null) result = casePAnnotatedEStructuralFeature(hbAnnotatedEAttribute);
-				if (result == null) result = caseHbAnnotatedEModelElement(hbAnnotatedEAttribute);
-				if (result == null) result = casePAnnotatedETypedElement(hbAnnotatedEAttribute);
-				if (result == null) result = casePAnnotatedEModelElement(hbAnnotatedEAttribute);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HbmodelPackage.HB_ANNOTATED_ECLASS: {
-				HbAnnotatedEClass hbAnnotatedEClass = (HbAnnotatedEClass)theEObject;
-				T result = caseHbAnnotatedEClass(hbAnnotatedEClass);
-				if (result == null) result = casePAnnotatedEClass(hbAnnotatedEClass);
-				if (result == null) result = casePAnnotatedEModelElement(hbAnnotatedEClass);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HbmodelPackage.HB_ANNOTATED_EMODEL_ELEMENT: {
-				HbAnnotatedEModelElement hbAnnotatedEModelElement = (HbAnnotatedEModelElement)theEObject;
-				T result = caseHbAnnotatedEModelElement(hbAnnotatedEModelElement);
-				if (result == null) result = casePAnnotatedEModelElement(hbAnnotatedEModelElement);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HbmodelPackage.HB_ANNOTATED_EPACKAGE: {
-				HbAnnotatedEPackage hbAnnotatedEPackage = (HbAnnotatedEPackage)theEObject;
-				T result = caseHbAnnotatedEPackage(hbAnnotatedEPackage);
-				if (result == null) result = casePAnnotatedEPackage(hbAnnotatedEPackage);
-				if (result == null) result = casePAnnotatedEModelElement(hbAnnotatedEPackage);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HbmodelPackage.HB_ANNOTATED_EREFERENCE: {
-				HbAnnotatedEReference hbAnnotatedEReference = (HbAnnotatedEReference)theEObject;
-				T result = caseHbAnnotatedEReference(hbAnnotatedEReference);
-				if (result == null) result = casePAnnotatedEReference(hbAnnotatedEReference);
-				if (result == null) result = caseHbAnnotatedETypeElement(hbAnnotatedEReference);
-				if (result == null) result = casePAnnotatedEStructuralFeature(hbAnnotatedEReference);
-				if (result == null) result = caseHbAnnotatedEModelElement(hbAnnotatedEReference);
-				if (result == null) result = casePAnnotatedETypedElement(hbAnnotatedEReference);
-				if (result == null) result = casePAnnotatedEModelElement(hbAnnotatedEReference);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE: {
-				HbAnnotatedEDataType hbAnnotatedEDataType = (HbAnnotatedEDataType)theEObject;
-				T result = caseHbAnnotatedEDataType(hbAnnotatedEDataType);
-				if (result == null) result = casePAnnotatedEDataType(hbAnnotatedEDataType);
-				if (result == null) result = caseHbAnnotatedEModelElement(hbAnnotatedEDataType);
-				if (result == null) result = casePAnnotatedEModelElement(hbAnnotatedEDataType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
+		case HbmodelPackage.HB_ANNOTATED_ETYPE_ELEMENT: {
+			HbAnnotatedETypeElement hbAnnotatedETypeElement = (HbAnnotatedETypeElement) theEObject;
+			T result = caseHbAnnotatedETypeElement(hbAnnotatedETypeElement);
+			if (result == null)
+				result = casePAnnotatedEStructuralFeature(hbAnnotatedETypeElement);
+			if (result == null)
+				result = caseHbAnnotatedEModelElement(hbAnnotatedETypeElement);
+			if (result == null)
+				result = casePAnnotatedETypedElement(hbAnnotatedETypeElement);
+			if (result == null)
+				result = casePAnnotatedEModelElement(hbAnnotatedETypeElement);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HbmodelPackage.HB_ANNOTATED_EATTRIBUTE: {
+			HbAnnotatedEAttribute hbAnnotatedEAttribute = (HbAnnotatedEAttribute) theEObject;
+			T result = caseHbAnnotatedEAttribute(hbAnnotatedEAttribute);
+			if (result == null)
+				result = casePAnnotatedEAttribute(hbAnnotatedEAttribute);
+			if (result == null)
+				result = caseHbAnnotatedETypeElement(hbAnnotatedEAttribute);
+			if (result == null)
+				result = casePAnnotatedEStructuralFeature(hbAnnotatedEAttribute);
+			if (result == null)
+				result = caseHbAnnotatedEModelElement(hbAnnotatedEAttribute);
+			if (result == null)
+				result = casePAnnotatedETypedElement(hbAnnotatedEAttribute);
+			if (result == null)
+				result = casePAnnotatedEModelElement(hbAnnotatedEAttribute);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HbmodelPackage.HB_ANNOTATED_ECLASS: {
+			HbAnnotatedEClass hbAnnotatedEClass = (HbAnnotatedEClass) theEObject;
+			T result = caseHbAnnotatedEClass(hbAnnotatedEClass);
+			if (result == null)
+				result = casePAnnotatedEClass(hbAnnotatedEClass);
+			if (result == null)
+				result = casePAnnotatedEModelElement(hbAnnotatedEClass);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HbmodelPackage.HB_ANNOTATED_EMODEL_ELEMENT: {
+			HbAnnotatedEModelElement hbAnnotatedEModelElement = (HbAnnotatedEModelElement) theEObject;
+			T result = caseHbAnnotatedEModelElement(hbAnnotatedEModelElement);
+			if (result == null)
+				result = casePAnnotatedEModelElement(hbAnnotatedEModelElement);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HbmodelPackage.HB_ANNOTATED_EPACKAGE: {
+			HbAnnotatedEPackage hbAnnotatedEPackage = (HbAnnotatedEPackage) theEObject;
+			T result = caseHbAnnotatedEPackage(hbAnnotatedEPackage);
+			if (result == null)
+				result = casePAnnotatedEPackage(hbAnnotatedEPackage);
+			if (result == null)
+				result = casePAnnotatedEModelElement(hbAnnotatedEPackage);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HbmodelPackage.HB_ANNOTATED_EREFERENCE: {
+			HbAnnotatedEReference hbAnnotatedEReference = (HbAnnotatedEReference) theEObject;
+			T result = caseHbAnnotatedEReference(hbAnnotatedEReference);
+			if (result == null)
+				result = casePAnnotatedEReference(hbAnnotatedEReference);
+			if (result == null)
+				result = caseHbAnnotatedETypeElement(hbAnnotatedEReference);
+			if (result == null)
+				result = casePAnnotatedEStructuralFeature(hbAnnotatedEReference);
+			if (result == null)
+				result = caseHbAnnotatedEModelElement(hbAnnotatedEReference);
+			if (result == null)
+				result = casePAnnotatedETypedElement(hbAnnotatedEReference);
+			if (result == null)
+				result = casePAnnotatedEModelElement(hbAnnotatedEReference);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case HbmodelPackage.HB_ANNOTATED_EDATA_TYPE: {
+			HbAnnotatedEDataType hbAnnotatedEDataType = (HbAnnotatedEDataType) theEObject;
+			T result = caseHbAnnotatedEDataType(hbAnnotatedEDataType);
+			if (result == null)
+				result = casePAnnotatedEDataType(hbAnnotatedEDataType);
+			if (result == null)
+				result = caseHbAnnotatedEModelElement(hbAnnotatedEDataType);
+			if (result == null)
+				result = casePAnnotatedEModelElement(hbAnnotatedEDataType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
 		}
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Hb Annotated EType Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Hb Annotated EType Element</em>'.
+	 * Returns the result of interpreting the object as an instance of '
+	 * <em>Hb Annotated EType Element</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of '
+	 *         <em>Hb Annotated EType Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -187,13 +212,14 @@ public class HbmodelSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Hb Annotated EAttribute</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Hb Annotated EAttribute</em>'.
+	 * Returns the result of interpreting the object as an instance of '
+	 * <em>Hb Annotated EAttribute</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of '
+	 *         <em>Hb Annotated EAttribute</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -202,13 +228,14 @@ public class HbmodelSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Hb Annotated EClass</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Hb Annotated EClass</em>'.
+	 * Returns the result of interpreting the object as an instance of ' <em>Hb Annotated EClass</em>
+	 * '. <!-- begin-user-doc --> This implementation returns null; returning a non-null result will
+	 * terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>Hb Annotated EClass</em>
+	 *         '.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -217,13 +244,14 @@ public class HbmodelSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Hb Annotated EModel Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Hb Annotated EModel Element</em>'.
+	 * Returns the result of interpreting the object as an instance of '
+	 * <em>Hb Annotated EModel Element</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of '
+	 *         <em>Hb Annotated EModel Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -232,13 +260,14 @@ public class HbmodelSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Hb Annotated EPackage</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Hb Annotated EPackage</em>'.
+	 * Returns the result of interpreting the object as an instance of '
+	 * <em>Hb Annotated EPackage</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of '
+	 *         <em>Hb Annotated EPackage</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -247,13 +276,14 @@ public class HbmodelSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Hb Annotated EReference</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Hb Annotated EReference</em>'.
+	 * Returns the result of interpreting the object as an instance of '
+	 * <em>Hb Annotated EReference</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of '
+	 *         <em>Hb Annotated EReference</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -262,13 +292,14 @@ public class HbmodelSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Hb Annotated EData Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Hb Annotated EData Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '
+	 * <em>Hb Annotated EData Type</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of '
+	 *         <em>Hb Annotated EData Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -277,13 +308,14 @@ public class HbmodelSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>PAnnotated EModel Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>PAnnotated EModel Element</em>'.
+	 * Returns the result of interpreting the object as an instance of '
+	 * <em>PAnnotated EModel Element</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of '
+	 *         <em>PAnnotated EModel Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -292,13 +324,14 @@ public class HbmodelSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>PAnnotated ETyped Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>PAnnotated ETyped Element</em>'.
+	 * Returns the result of interpreting the object as an instance of '
+	 * <em>PAnnotated ETyped Element</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of '
+	 *         <em>PAnnotated ETyped Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -307,13 +340,14 @@ public class HbmodelSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>PAnnotated EStructural Feature</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>PAnnotated EStructural Feature</em>'.
+	 * Returns the result of interpreting the object as an instance of '
+	 * <em>PAnnotated EStructural Feature</em>'. <!-- begin-user-doc --> This implementation returns
+	 * null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of '
+	 *         <em>PAnnotated EStructural Feature</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -322,13 +356,14 @@ public class HbmodelSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>PAnnotated EAttribute</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>PAnnotated EAttribute</em>'.
+	 * Returns the result of interpreting the object as an instance of '
+	 * <em>PAnnotated EAttribute</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of '
+	 *         <em>PAnnotated EAttribute</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -337,13 +372,13 @@ public class HbmodelSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>PAnnotated EClass</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>PAnnotated EClass</em>'.
+	 * Returns the result of interpreting the object as an instance of ' <em>PAnnotated EClass</em>'.
+	 * <!-- begin-user-doc --> This implementation returns null; returning a non-null result will
+	 * terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>PAnnotated EClass</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -352,13 +387,14 @@ public class HbmodelSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>PAnnotated EPackage</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>PAnnotated EPackage</em>'.
+	 * Returns the result of interpreting the object as an instance of ' <em>PAnnotated EPackage</em>
+	 * '. <!-- begin-user-doc --> This implementation returns null; returning a non-null result will
+	 * terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>PAnnotated EPackage</em>
+	 *         '.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -367,13 +403,14 @@ public class HbmodelSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>PAnnotated EReference</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>PAnnotated EReference</em>'.
+	 * Returns the result of interpreting the object as an instance of '
+	 * <em>PAnnotated EReference</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of '
+	 *         <em>PAnnotated EReference</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -382,13 +419,14 @@ public class HbmodelSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>PAnnotated EData Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>PAnnotated EData Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '
+	 * <em>PAnnotated EData Type</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of '
+	 *         <em>PAnnotated EData Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -397,13 +435,13 @@ public class HbmodelSwitch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * Returns the result of interpreting the object as an instance of ' <em>EObject</em>'. <!--
+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate
+	 * the switch, but this is the last case anyway. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *          the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
 	 */
@@ -411,4 +449,4 @@ public class HbmodelSwitch<T> {
 		return null;
 	}
 
-} //HbmodelSwitch
+} // HbmodelSwitch
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/validation/HbAnnotatedEAttributeValidator.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/validation/HbAnnotatedEAttributeValidator.java
index 8732c548e..17e32747f 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/validation/HbAnnotatedEAttributeValidator.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/validation/HbAnnotatedEAttributeValidator.java
@@ -10,10 +10,12 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.Generated;
 import org.eclipse.emf.teneo.hibernate.hbannotation.Type;
 
 /**
- * A sample validator interface for {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ * A sample validator interface for
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute}. This doesn't really do
+ * anything, and it's not a real EMF artifact. It was generated by the
+ * org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can
+ * be extended. This can be disabled with -vmargs
+ * -Dorg.eclipse.emf.examples.generator.validator=false.
  */
 public interface HbAnnotatedEAttributeValidator {
 	boolean validate();
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/validation/HbAnnotatedEClassValidator.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/validation/HbAnnotatedEClassValidator.java
index 0b30e73fd..d58981ff1 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/validation/HbAnnotatedEClassValidator.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/validation/HbAnnotatedEClassValidator.java
@@ -16,10 +16,12 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.Proxy;
 import org.eclipse.emf.teneo.hibernate.hbannotation.Where;
 
 /**
- * A sample validator interface for {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ * A sample validator interface for
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEClass}. This doesn't really do
+ * anything, and it's not a real EMF artifact. It was generated by the
+ * org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can
+ * be extended. This can be disabled with -vmargs
+ * -Dorg.eclipse.emf.examples.generator.validator=false.
  */
 public interface HbAnnotatedEClassValidator {
 	boolean validate();
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/validation/HbAnnotatedEDataTypeValidator.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/validation/HbAnnotatedEDataTypeValidator.java
index e95432706..86d4fa4a0 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/validation/HbAnnotatedEDataTypeValidator.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/validation/HbAnnotatedEDataTypeValidator.java
@@ -14,10 +14,12 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.TypeDef;
 import org.eclipse.emf.teneo.hibernate.hbannotation.Where;
 
 /**
- * A sample validator interface for {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ * A sample validator interface for
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEDataType}. This doesn't really do
+ * anything, and it's not a real EMF artifact. It was generated by the
+ * org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can
+ * be extended. This can be disabled with -vmargs
+ * -Dorg.eclipse.emf.examples.generator.validator=false.
  */
 public interface HbAnnotatedEDataTypeValidator {
 	boolean validate();
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/validation/HbAnnotatedEModelElementValidator.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/validation/HbAnnotatedEModelElementValidator.java
index 6ec7d6ab4..a3eb5459c 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/validation/HbAnnotatedEModelElementValidator.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/validation/HbAnnotatedEModelElementValidator.java
@@ -6,12 +6,13 @@
  */
 package org.eclipse.emf.teneo.hibernate.hbmodel.validation;
 
-
 /**
- * A sample validator interface for {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEModelElement}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ * A sample validator interface for
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEModelElement}. This doesn't really do
+ * anything, and it's not a real EMF artifact. It was generated by the
+ * org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can
+ * be extended. This can be disabled with -vmargs
+ * -Dorg.eclipse.emf.examples.generator.validator=false.
  */
 public interface HbAnnotatedEModelElementValidator {
 	boolean validate();
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/validation/HbAnnotatedEPackageValidator.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/validation/HbAnnotatedEPackageValidator.java
index f1cc0b51f..81a290ec2 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/validation/HbAnnotatedEPackageValidator.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/validation/HbAnnotatedEPackageValidator.java
@@ -14,15 +14,18 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.NamedQuery;
 import org.eclipse.emf.teneo.hibernate.hbannotation.TypeDef;
 
 /**
- * A sample validator interface for {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ * A sample validator interface for
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEPackage}. This doesn't really do
+ * anything, and it's not a real EMF artifact. It was generated by the
+ * org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can
+ * be extended. This can be disabled with -vmargs
+ * -Dorg.eclipse.emf.examples.generator.validator=false.
  */
 public interface HbAnnotatedEPackageValidator {
 	boolean validate();
 
 	boolean validateHbGenericGenerators(EList<GenericGenerator> value);
+
 	boolean validateHbTypeDef(EList<TypeDef> value);
 
 	boolean validateHbNamedQuery(EList<NamedQuery> value);
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/validation/HbAnnotatedEReferenceValidator.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/validation/HbAnnotatedEReferenceValidator.java
index 35bfe78df..c5cb9042b 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/validation/HbAnnotatedEReferenceValidator.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/validation/HbAnnotatedEReferenceValidator.java
@@ -11,15 +11,18 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.Fetch;
 import org.eclipse.emf.teneo.hibernate.hbannotation.OnDelete;
 
 /**
- * A sample validator interface for {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ * A sample validator interface for
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference}. This doesn't really do
+ * anything, and it's not a real EMF artifact. It was generated by the
+ * org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can
+ * be extended. This can be disabled with -vmargs
+ * -Dorg.eclipse.emf.examples.generator.validator=false.
  */
 public interface HbAnnotatedEReferenceValidator {
 	boolean validate();
 
 	boolean validateHbCache(Cache value);
+
 	boolean validateHbFetch(Fetch value);
 
 	boolean validateHbOnDelete(OnDelete value);
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/validation/HbAnnotatedETypeElementValidator.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/validation/HbAnnotatedETypeElementValidator.java
index 2f699db16..a02486775 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/validation/HbAnnotatedETypeElementValidator.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/hbmodel/validation/HbAnnotatedETypeElementValidator.java
@@ -19,19 +19,26 @@ import org.eclipse.emf.teneo.hibernate.hbannotation.MapKey;
 import org.eclipse.emf.teneo.hibernate.hbannotation.Where;
 
 /**
- * A sample validator interface for {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ * A sample validator interface for
+ * {@link org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement}. This doesn't really do
+ * anything, and it's not a real EMF artifact. It was generated by the
+ * org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can
+ * be extended. This can be disabled with -vmargs
+ * -Dorg.eclipse.emf.examples.generator.validator=false.
  */
 public interface HbAnnotatedETypeElementValidator {
 	boolean validate();
 
 	boolean validateHbWhere(Where value);
+
 	boolean validateHbCollectionOfElements(CollectionOfElements value);
+
 	boolean validateHbMapKey(MapKey value);
+
 	boolean validateHbColumns(EList<Column> value);
+
 	boolean validateHbCascade(Cascade value);
+
 	boolean validateHbIdBag(IdBag value);
 
 	boolean validateHbIndex(Index value);
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/AbstractAssociationMapper.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/AbstractAssociationMapper.java
index 6ae09000d..d12200be2 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/AbstractAssociationMapper.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/AbstractAssociationMapper.java
@@ -9,7 +9,6 @@
 package org.eclipse.emf.teneo.hibernate.mapper;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import org.apache.commons.logging.Log;
@@ -47,58 +46,50 @@ import org.eclipse.emf.teneo.simpledom.Element;
 import org.eclipse.emf.teneo.util.StoreUtil;
 
 /**
- * Class contains different convenience methods which are of use for association
- * mapping.
+ * Class contains different convenience methods which are of use for association mapping.
  * 
  * @author <a href="mailto:mtaal at elver.org">Martin Taal</a>
  */
 public abstract class AbstractAssociationMapper extends AbstractMapper {
 
 	/** Logger */
-	private static final Log log = LogFactory
-			.getLog(AbstractAssociationMapper.class);
+	private static final Log log = LogFactory.getLog(AbstractAssociationMapper.class);
 
 	/**
 	 * @return
 	 */
-	protected Element addOneToOne(PAnnotatedEReference aReference,
-			String assocName, String targetEntity) {
+	protected Element addOneToOne(PAnnotatedEReference aReference, String assocName,
+			String targetEntity) {
 		final PAnnotatedEClass referedToAClass = aReference.getAReferenceType();
 		final Element element;
-		if (referedToAClass.isOnlyMapAsEntity()
-				|| !getHbmContext().forceUseOfInstance(referedToAClass)) {
+		if (referedToAClass.isOnlyMapAsEntity() || !getHbmContext().forceUseOfInstance(referedToAClass)) {
 			element = getHbmContext().getCurrent().addElement("one-to-one")
-					.addAttribute("name", assocName)
-					.addAttribute("entity-name", targetEntity);
+					.addAttribute("name", assocName).addAttribute("entity-name", targetEntity);
 		} else {
 			element = getHbmContext()
 					.getCurrent()
 					.addElement("one-to-one")
 					.addAttribute("name", assocName)
-					.addAttribute(
-							"class",
-							getHbmContext().getInstanceClassName(
-									referedToAClass.getModelEClass()));
+					.addAttribute("class",
+							getHbmContext().getInstanceClassName(referedToAClass.getModelEClass()));
 		}
 
 		if (aReference instanceof HbAnnotatedEReference) {
 			final HbAnnotatedEReference hae = (HbAnnotatedEReference) aReference;
 			if (hae.getHbFetch() != null) {
-				element.addAttribute("fetch", hae.getHbFetch().getValue()
-						.getName().toLowerCase());
+				element.addAttribute("fetch", hae.getHbFetch().getValue().getName().toLowerCase());
 			}
 		}
 		return element;
 	}
 
 	// translates jpa CascadeType to HbCascadeType
-	protected List<HbCascadeType> getCascades(Cascade cascade,
-			List<CascadeType> cascades, boolean orphanRemoval) {
+	protected List<HbCascadeType> getCascades(Cascade cascade, List<CascadeType> cascades,
+			boolean orphanRemoval) {
 		final List<HbCascadeType> result = cascade != null ? cascade.getValue()
 				: convertCascade(cascades);
 		if (orphanRemoval
-				&& !(result.contains(HbCascadeType.ALL) || result
-						.contains(HbCascadeType.DELETE_ORPHAN))) {
+				&& !(result.contains(HbCascadeType.ALL) || result.contains(HbCascadeType.DELETE_ORPHAN))) {
 			result.add(HbCascadeType.DELETE_ORPHAN);
 		}
 		return result;
@@ -131,29 +122,24 @@ public abstract class AbstractAssociationMapper extends AbstractMapper {
 	}
 
 	/** Adds a manytoone tag to the current element of the hbmcontext */
-	protected Element addManyToOne(Element currentParent,
-			PAnnotatedEReference aReference, String referedTo,
-			boolean isPartOfKey) {
-		final String assocName = getHbmContext().getPropertyName(
-				aReference.getModelEReference());
+	protected Element addManyToOne(Element currentParent, PAnnotatedEReference aReference,
+			String referedTo, boolean isPartOfKey) {
+		final String assocName = getHbmContext().getPropertyName(aReference.getModelEReference());
 		log.debug("addManyToOne " + assocName + "/" + referedTo);
 
 		final String tagName;
 		if (((HbAnnotatedEReference) aReference).getHbType() != null) {
 			tagName = "property";
-			final Element element = currentParent.addElement(tagName)
-					.addAttribute("name", assocName);
-			final Type hbType = ((HbAnnotatedEReference) aReference)
-					.getHbType();
+			final Element element = currentParent.addElement(tagName).addAttribute("name", assocName);
+			final Type hbType = ((HbAnnotatedEReference) aReference).getHbType();
 			final List<Parameter> params = hbType.getParameters();
 			if (params == null || params.isEmpty()) {
 				element.addAttribute("type", hbType.getType());
 			} else {
-				final Element typeElement = element.addElement("type")
-						.addAttribute("name", hbType.getType());
+				final Element typeElement = element.addElement("type").addAttribute("name",
+						hbType.getType());
 				for (Parameter param : params) {
-					typeElement.addElement("param")
-							.addAttribute("name", param.getName())
+					typeElement.addElement("param").addAttribute("name", param.getName())
 							.addText(param.getValue());
 				}
 			}
@@ -164,31 +150,21 @@ public abstract class AbstractAssociationMapper extends AbstractMapper {
 			tagName = "many-to-one";
 		}
 
-		final EClass referedToEClass = aReference.getModelEReference()
-				.getEReferenceType();
-		final PAnnotatedEClass referedToAClass = aReference.getPaModel()
-				.getPAnnotated(referedToEClass);
+		final EClass referedToEClass = aReference.getModelEReference().getEReferenceType();
+		final PAnnotatedEClass referedToAClass = aReference.getPaModel().getPAnnotated(referedToEClass);
 		final Element element;
-		if (referedToAClass.isOnlyMapAsEntity()
-				|| !getHbmContext().forceUseOfInstance(referedToAClass)) {
-			element = currentParent.addElement(tagName)
-					.addAttribute("name", assocName)
+		if (referedToAClass.isOnlyMapAsEntity() || !getHbmContext().forceUseOfInstance(referedToAClass)) {
+			element = currentParent.addElement(tagName).addAttribute("name", assocName)
 					.addAttribute("entity-name", referedTo);
 		} else {
-			element = currentParent
-					.addElement(tagName)
-					.addAttribute("name", assocName)
-					.addAttribute(
-							"class",
-							getHbmContext().getInstanceClassName(
-									referedToEClass));
+			element = currentParent.addElement(tagName).addAttribute("name", assocName)
+					.addAttribute("class", getHbmContext().getInstanceClassName(referedToEClass));
 		}
 
 		if (aReference instanceof HbAnnotatedEReference) {
 			final HbAnnotatedEReference hae = (HbAnnotatedEReference) aReference;
 			if (hae.getHbFetch() != null) {
-				element.addAttribute("fetch", hae.getHbFetch().getValue()
-						.getName().toLowerCase());
+				element.addAttribute("fetch", hae.getHbFetch().getValue().getName().toLowerCase());
 			}
 		}
 
@@ -196,15 +172,13 @@ public abstract class AbstractAssociationMapper extends AbstractMapper {
 	}
 
 	/**
-	 * Adds joincolumns to the associationElement, sets the insert and update
-	 * attributes of the associationElement on the basis of the
-	 * insertable/updatable attributes of the joinColumns. Note that the
-	 * joinColumns list can be empty. forcenullable is set to true when a
-	 * feature map entry is being processed.
+	 * Adds joincolumns to the associationElement, sets the insert and update attributes of the
+	 * associationElement on the basis of the insertable/updatable attributes of the joinColumns. Note
+	 * that the joinColumns list can be empty. forcenullable is set to true when a feature map entry
+	 * is being processed.
 	 */
-	protected void addJoinColumns(PAnnotatedEReference per,
-			Element associationElement, List<JoinColumn> joinColumns,
-			boolean forceNullable) {
+	protected void addJoinColumns(PAnnotatedEReference per, Element associationElement,
+			List<JoinColumn> joinColumns, boolean forceNullable) {
 
 		if (per.getMapsId() != null) {
 			if (mapMapsIdColumns(per, associationElement)) {
@@ -212,8 +186,8 @@ public abstract class AbstractAssociationMapper extends AbstractMapper {
 			}
 		}
 
-		log.debug("addJoinColumns " + associationElement.getName()
-				+ "/ no of joincolumns" + joinColumns.size());
+		log.debug("addJoinColumns " + associationElement.getName() + "/ no of joincolumns"
+				+ joinColumns.size());
 
 		// assumption is that if one column is not insertable then the
 		// association is
@@ -228,20 +202,12 @@ public abstract class AbstractAssociationMapper extends AbstractMapper {
 					.addElement("column")
 					.addAttribute(
 							"not-null",
-							(joinColumn.isNullable() && joinColumn
-									.isSetNullable()) || forceNullable ? "false"
-									: "true")
-					.addAttribute("unique",
-							joinColumn.isUnique() ? "true" : "false");
+							(joinColumn.isNullable() && joinColumn.isSetNullable()) || forceNullable ? "false"
+									: "true").addAttribute("unique", joinColumn.isUnique() ? "true" : "false");
 			if (joinColumn.getName() != null) {
 
-				columnElement
-						.addAttribute(
-								"name",
-								getHbmContext().trunc(joinColumn,
-										joinColumn.getName()));
-				final String uc = getHbmContext().getUniqueConstraintKey(
-						joinColumn.getName());
+				columnElement.addAttribute("name", getHbmContext().trunc(joinColumn, joinColumn.getName()));
+				final String uc = getHbmContext().getUniqueConstraintKey(joinColumn.getName());
 				if (uc != null) {
 					columnElement.addAttribute("unique-key", uc);
 				}
@@ -283,31 +249,25 @@ public abstract class AbstractAssociationMapper extends AbstractMapper {
 			if (joinColumn.getReferencedColumnName() != null) {
 				String propName = null;
 				final String colName = joinColumn.getReferencedColumnName();
-				for (PAnnotatedEStructuralFeature pef : per.getPaEClass()
-						.getPaEStructuralFeatures()) {
+				for (PAnnotatedEStructuralFeature pef : per.getPaEClass().getPaEStructuralFeatures()) {
 					if (pef instanceof PAnnotatedEReference) {
 						final PAnnotatedEReference paEreference = (PAnnotatedEReference) pef;
 						// set a default, by looking for the efeature name
-						if (pef.getModelElement().getName().equals(colName)
-								&& propName == null) {
-							propName = getHbmContext().getPropertyName(
-									paEreference.getModelEReference());
+						if (pef.getModelElement().getName().equals(colName) && propName == null) {
+							propName = getHbmContext().getPropertyName(paEreference.getModelEReference());
 						}
 						// use the columnname, that's according to the standard
 						if (paEreference.getColumn() != null
-								&& paEreference.getColumn().getName()
-										.equals(colName)) {
-							propName = getHbmContext().getPropertyName(
-									paEreference.getModelEReference());
+								&& paEreference.getColumn().getName().equals(colName)) {
+							propName = getHbmContext().getPropertyName(paEreference.getModelEReference());
 						}
 					}
 				}
 				if (propName != null) {
 					associationElement.addAttribute("property-ref", propName);
 				} else {
-					log.warn("No property found for the referencedColumnName  "
-							+ colName + " and EReference "
-							+ per.getModelElement().getName());
+					log.warn("No property found for the referencedColumnName  " + colName
+							+ " and EReference " + per.getModelElement().getName());
 				}
 			}
 
@@ -316,50 +276,43 @@ public abstract class AbstractAssociationMapper extends AbstractMapper {
 		if (associationElement.getName().compareTo("map-key-many-to-many") != 0
 				&& associationElement.getName().compareTo("join") != 0
 				&& associationElement.getName().compareTo("key-many-to-one") != 0) {
-			associationElement.addAttribute("insert",
-					Boolean.toString(insertable));
-			associationElement.addAttribute("update",
-					Boolean.toString(updatable));
+			associationElement.addAttribute("insert", Boolean.toString(insertable));
+			associationElement.addAttribute("update", Boolean.toString(updatable));
 		}
 	}
 
 	/**
-	 * Creates cascades for onetoone/manytoone, they differ from many relations
-	 * because no delete-orphan is supported.
+	 * Creates cascades for onetoone/manytoone, they differ from many relations because no
+	 * delete-orphan is supported.
 	 * 
 	 * @param associationElement
-	 *            : the element to which the cascades are added.
+	 *          : the element to which the cascades are added.
 	 * @param cascade
-	 *            : list of cascade annotation types
+	 *          : list of cascade annotation types
 	 */
-	protected void addCascadesForSingle(Element associationElement,
-			List<HbCascadeType> cascades) {
+	protected void addCascadesForSingle(Element associationElement, List<HbCascadeType> cascades) {
 		addCascades(associationElement, cascades, false);
 	}
 
 	/**
-	 * Adds a foreign key attribute to the collection element, if the aFeature
-	 * has a foreign key
+	 * Adds a foreign key attribute to the collection element, if the aFeature has a foreign key
 	 */
-	protected void addForeignKeyAttribute(Element manyElement,
-			PAnnotatedEStructuralFeature aFeature) {
+	protected void addForeignKeyAttribute(Element manyElement, PAnnotatedEStructuralFeature aFeature) {
 		if (aFeature.getForeignKey() != null) {
-			manyElement.addAttribute("foreign-key", aFeature.getForeignKey()
-					.getName());
+			manyElement.addAttribute("foreign-key", aFeature.getForeignKey().getName());
 		}
 	}
 
 	/**
-	 * Creates cascades for onetomany, it differs from single relations because
-	 * delete-orphan is supported when cascade=all
+	 * Creates cascades for onetomany, it differs from single relations because delete-orphan is
+	 * supported when cascade=all
 	 * 
 	 * @param associationElement
-	 *            : the element to which the cascades are added.
+	 *          : the element to which the cascades are added.
 	 * @param cascade
-	 *            : list of cascade annotation types
+	 *          : list of cascade annotation types
 	 */
-	protected void addCascadesForMany(Element associationElement,
-			List<HbCascadeType> cascades) {
+	protected void addCascadesForMany(Element associationElement, List<HbCascadeType> cascades) {
 		addCascades(associationElement, cascades, true);
 	}
 
@@ -374,20 +327,15 @@ public abstract class AbstractAssociationMapper extends AbstractMapper {
 		if (FetchType.EXTRA.equals(fetch)) {
 			associationElement.addAttribute("lazy", "extra");
 		} else {
-			associationElement.addAttribute("lazy",
-					FetchType.LAZY.equals(fetch) ? "true" : "false");
+			associationElement.addAttribute("lazy", FetchType.LAZY.equals(fetch) ? "true" : "false");
 		}
 	}
 
-	protected void addLazyProxy(Element element, FetchType fetch,
-			PAnnotatedEReference paReference) {
-		final HbAnnotatedEClass haClass = (HbAnnotatedEClass) paReference
-				.getAReferenceType();
+	protected void addLazyProxy(Element element, FetchType fetch, PAnnotatedEReference paReference) {
+		final HbAnnotatedEClass haClass = (HbAnnotatedEClass) paReference.getAReferenceType();
 
 		boolean lazyFetch = fetch == null || fetch == FetchType.LAZY;
-		boolean doProxy = lazyFetch
-				&& (haClass.getHbProxy() != null && haClass.getHbProxy()
-						.isLazy());
+		boolean doProxy = lazyFetch && (haClass.getHbProxy() != null && haClass.getHbProxy().isLazy());
 		if (doProxy && lazyFetch) {
 			element.addAttribute("lazy", "proxy");
 		} else {
@@ -396,19 +344,15 @@ public abstract class AbstractAssociationMapper extends AbstractMapper {
 	}
 
 	/**
-	 * Adds a listindex element with the column name set to the give collection
-	 * element.
+	 * Adds a listindex element with the column name set to the give collection element.
 	 */
-	protected void addListIndex(Element collElement,
-			PAnnotatedEStructuralFeature aFeature) {
+	protected void addListIndex(Element collElement, PAnnotatedEStructuralFeature aFeature) {
 		// TODO use column name generator
 		String name = getIndexColumnName(aFeature);
 
-		log.debug("Add list index " + name + " to "
-				+ aFeature.getModelEStructuralFeature().getName());
+		log.debug("Add list index " + name + " to " + aFeature.getModelEStructuralFeature().getName());
 
-		if (aFeature.getOrderColumn() != null
-				&& aFeature.getOrderColumn().getName() != null) {
+		if (aFeature.getOrderColumn() != null && aFeature.getOrderColumn().getName() != null) {
 			collElement.addElement("list-index").addAttribute("column",
 					getHbmContext().trunc(aFeature.getOrderColumn(), name));
 		} else {
@@ -418,30 +362,25 @@ public abstract class AbstractAssociationMapper extends AbstractMapper {
 	}
 
 	protected String getIndexColumnName(PAnnotatedEStructuralFeature aFeature) {
-		final SQLNameStrategy sqlNameStrategy = getHbmContext()
-				.getExtensionManager().getExtension(SQLNameStrategy.class);
-		if (aFeature.getOrderColumn() != null
-				&& aFeature.getOrderColumn().getName() != null) {
+		final SQLNameStrategy sqlNameStrategy = getHbmContext().getExtensionManager().getExtension(
+				SQLNameStrategy.class);
+		if (aFeature.getOrderColumn() != null && aFeature.getOrderColumn().getName() != null) {
 			return aFeature.getOrderColumn().getName();
 		}
 		if (aFeature.getListIndexColumn() != null) {
 			return aFeature.getListIndexColumn().getName();
 		}
 		if (sqlNameStrategy instanceof ClassicSQLNameStrategy) {
-			return ((ClassicSQLNameStrategy) sqlNameStrategy)
-					.getIndexColumnName(aFeature);
+			return ((ClassicSQLNameStrategy) sqlNameStrategy).getIndexColumnName(aFeature);
 		} else {
-			return getHbmContext().getPersistenceOptions()
-					.getSQLColumnNamePrefix()
+			return getHbmContext().getPersistenceOptions().getSQLColumnNamePrefix()
 					+ (aFeature.getPaEClass().getModelEClass().getName() + "_"
-							+ aFeature.getModelEStructuralFeature().getName() + "_IDX")
-							.toUpperCase();
+							+ aFeature.getModelEStructuralFeature().getName() + "_IDX").toUpperCase();
 		}
 	}
 
 	/**
-	 * Adds a map-key element with the column name set to the give selected
-	 * column element.
+	 * Adds a map-key element with the column name set to the give selected column element.
 	 */
 	// bugzilla 238515
 	// protected void addMapKey(Element collElement,
@@ -485,11 +424,9 @@ public abstract class AbstractAssociationMapper extends AbstractMapper {
 	protected void addMapKey(Element collElement, PAnnotatedEReference aref) {
 		final EReference eref = aref.getModelEReference();
 		final HbAnnotatedEReference hbRef = (HbAnnotatedEReference) aref;
-		final EStructuralFeature keyFeature = eref.getEReferenceType()
-				.getEStructuralFeature("key");
+		final EStructuralFeature keyFeature = eref.getEReferenceType().getEStructuralFeature("key");
 
-		final PAnnotatedEStructuralFeature paKeyFeature = aref.getPaModel()
-				.getPAnnotated(keyFeature);
+		final PAnnotatedEStructuralFeature paKeyFeature = aref.getPaModel().getPAnnotated(keyFeature);
 		PAnnotatedEAttribute paAttribute = null;
 		if (paKeyFeature instanceof PAnnotatedEAttribute) {
 
@@ -497,15 +434,11 @@ public abstract class AbstractAssociationMapper extends AbstractMapper {
 
 			// put different things that are defined at reference level to the
 			// key
-			if (paAttribute.getEnumerated() == null
-					&& aref.getMapKeyEnumerated() != null) {
-				paAttribute.setEnumerated(EcoreUtil.copy(aref
-						.getMapKeyEnumerated()));
+			if (paAttribute.getEnumerated() == null && aref.getMapKeyEnumerated() != null) {
+				paAttribute.setEnumerated(EcoreUtil.copy(aref.getMapKeyEnumerated()));
 			}
-			if (paAttribute.getTemporal() == null
-					&& aref.getMapKeyTemporal() != null) {
-				paAttribute
-						.setTemporal(EcoreUtil.copy(aref.getMapKeyTemporal()));
+			if (paAttribute.getTemporal() == null && aref.getMapKeyTemporal() != null) {
+				paAttribute.setTemporal(EcoreUtil.copy(aref.getMapKeyTemporal()));
 			}
 		}
 
@@ -516,24 +449,20 @@ public abstract class AbstractAssociationMapper extends AbstractMapper {
 		}
 
 		if (keyFeature == null) {
-			throw new IllegalArgumentException("The EFeature " + eref.getName()
-					+ " of EClass " + eref.getEContainingClass().getName()
-					+ " does not have a keyfeature. "
+			throw new IllegalArgumentException("The EFeature " + eref.getName() + " of EClass "
+					+ eref.getEContainingClass().getName() + " does not have a keyfeature. "
 					+ "Are you sure that this feature is an EMap");
 		}
 
 		if (hbRef.getHbMapKey() != null) {
-			final org.eclipse.emf.teneo.hibernate.hbannotation.HbMapKey mapKey = hbRef
-					.getHbMapKey();
+			final org.eclipse.emf.teneo.hibernate.hbannotation.HbMapKey mapKey = hbRef.getHbMapKey();
 			final Element mapKeyElement = collElement.addElement("map-key");
 			if (mapKey.getColumns() != null && mapKey.getColumns().size() > 0) {
-				addColumnsAndFormula(mapKeyElement, aref, mapKey.getColumns(),
-						false, false, false, false);
+				addColumnsAndFormula(mapKeyElement, aref, mapKey.getColumns(), false, false, false, false);
 			} else if (hbRef.getMapKeyColumn() != null) {
 				final List<Column> mkColumns = new ArrayList<Column>();
 				mkColumns.add(hbRef.getMapKeyColumn());
-				addColumnsAndFormula(mapKeyElement, aref, mkColumns, false,
-						false, false, false);
+				addColumnsAndFormula(mapKeyElement, aref, mkColumns, false, false, false, false);
 			}
 			setType(paAttribute, mapKeyElement);
 		} else if (hbRef.getMapKey() != null) {
@@ -542,33 +471,25 @@ public abstract class AbstractAssociationMapper extends AbstractMapper {
 			if (hbRef.getMapKeyColumn() != null) {
 				final List<Column> mkColumns = new ArrayList<Column>();
 				mkColumns.add(hbRef.getMapKeyColumn());
-				addColumnsAndFormula(mapKeyElement, aref, mkColumns, false,
-						false, false, false);
+				addColumnsAndFormula(mapKeyElement, aref, mkColumns, false, false, false, false);
 			} else {
-				mapKeyElement.addAttribute(
-						"column",
-						getHbmContext().trunc(hbRef.getMapKey(),
-								mapKey.getName()));
+				mapKeyElement.addAttribute("column",
+						getHbmContext().trunc(hbRef.getMapKey(), mapKey.getName()));
 			}
 
 			setType(paAttribute, mapKeyElement);
 		} else if (hbRef.getMapKeyManyToMany() != null) {
 			final MapKeyManyToMany mkm = hbRef.getMapKeyManyToMany();
-			final PAnnotatedEClass referedAClass = aref.getPaModel()
-					.getPAnnotated(
-							((EReference) keyFeature).getEReferenceType());
-			final Element mkmElement = collElement
-					.addElement("map-key-many-to-many");
-			if (referedAClass.isOnlyMapAsEntity()
-					|| !getHbmContext().forceUseOfInstance(referedAClass)) {
-				final String entityName = mkm.getTargetEntity() != null ? mkm
-						.getTargetEntity() : hbmContext
-						.getEntityName(((EReference) keyFeature)
-								.getEReferenceType());
+			final PAnnotatedEClass referedAClass = aref.getPaModel().getPAnnotated(
+					((EReference) keyFeature).getEReferenceType());
+			final Element mkmElement = collElement.addElement("map-key-many-to-many");
+			if (referedAClass.isOnlyMapAsEntity() || !getHbmContext().forceUseOfInstance(referedAClass)) {
+				final String entityName = mkm.getTargetEntity() != null ? mkm.getTargetEntity()
+						: hbmContext.getEntityName(((EReference) keyFeature).getEReferenceType());
 				mkmElement.addAttribute("entity-name", entityName);
 			} else {
-				mkmElement.addAttribute("class", getHbmContext()
-						.getInstanceClassName(referedAClass.getModelEClass()));
+				mkmElement.addAttribute("class",
+						getHbmContext().getInstanceClassName(referedAClass.getModelEClass()));
 			}
 			if (mkm.getJoinColumns() != null && mkm.getJoinColumns().size() > 0) {
 				addJoinColumns(hbRef, mkmElement, mkm.getJoinColumns(), false);
@@ -578,21 +499,15 @@ public abstract class AbstractAssociationMapper extends AbstractMapper {
 				addJoinColumns(hbRef, mkmElement, jcs, false);
 			}
 		} else if (keyFeature instanceof EReference) {
-			final PAnnotatedEClass referedAClass = aref.getPaModel()
-					.getPAnnotated(
-							((EReference) keyFeature).getEReferenceType());
-			if (referedAClass.isOnlyMapAsEntity()
-					|| !getHbmContext().forceUseOfInstance(referedAClass)) {
-				final String entityName = hbmContext
-						.getEntityName(((EReference) keyFeature)
-								.getEReferenceType());
-				collElement.addElement("map-key-many-to-many").addAttribute(
-						"entity-name", entityName);
+			final PAnnotatedEClass referedAClass = aref.getPaModel().getPAnnotated(
+					((EReference) keyFeature).getEReferenceType());
+			if (referedAClass.isOnlyMapAsEntity() || !getHbmContext().forceUseOfInstance(referedAClass)) {
+				final String entityName = hbmContext.getEntityName(((EReference) keyFeature)
+						.getEReferenceType());
+				collElement.addElement("map-key-many-to-many").addAttribute("entity-name", entityName);
 			} else {
-				collElement.addElement("map-key-many-to-many").addAttribute(
-						"class",
-						getHbmContext().getInstanceClassName(
-								referedAClass.getModelEClass()));
+				collElement.addElement("map-key-many-to-many").addAttribute("class",
+						getHbmContext().getInstanceClassName(referedAClass.getModelEClass()));
 			}
 			Element mkmElement = collElement.element("map-key-many-to-many");
 			if (hbRef.getMapKeyJoinColumns().size() > 0) {
@@ -609,21 +524,18 @@ public abstract class AbstractAssociationMapper extends AbstractMapper {
 			if (hbRef.getMapKeyColumn() != null) {
 				final List<Column> mkColumns = new ArrayList<Column>();
 				mkColumns.add(hbRef.getMapKeyColumn());
-				addColumnsAndFormula(mapKeyElement, aref, mkColumns, false,
-						false, false, false);
+				addColumnsAndFormula(mapKeyElement, aref, mkColumns, false, false, false, false);
 			}
 		}
 	}
 
 	/**
 	 * @return a newly added hibernate for given collection
-	 * @deprecated use addCollectionElement(PAnnotatedEStructuralFeature)
-	 *             instead. protected Element addCollectionElement(String name,
-	 *             boolean isIndexed) { return
+	 * @deprecated use addCollectionElement(PAnnotatedEStructuralFeature) instead. protected Element
+	 *             addCollectionElement(String name, boolean isIndexed) { return
 	 *             getHbmContext().getCurrent().addElement(isIndexed ? "list" :
 	 *             "bag").addAttribute("name", name); // .addAttribute("access",
-	 *             "org.eclipse.emf.teneo.hibernate.mapping.elist.EListPropertyAccessor"
-	 *             ); }
+	 *             "org.eclipse.emf.teneo.hibernate.mapping.elist.EListPropertyAccessor" ); }
 	 */
 
 	/**
@@ -631,29 +543,25 @@ public abstract class AbstractAssociationMapper extends AbstractMapper {
 	 * <ul>
 	 * <li>"&lt;list&gt;" if the collection is indexed.
 	 * <li>"&lt;bag&gt;" if the collection is not indexed.
-	 * <li>"&lt;idbag&gt;" if the collection is not indexed and has an IdBag
-	 * annotation.
+	 * <li>"&lt;idbag&gt;" if the collection is not indexed and has an IdBag annotation.
 	 * </ul>
 	 * 
 	 * @param hbFeature
-	 *            The structural feature for which to create collection.
+	 *          The structural feature for which to create collection.
 	 * @return The collection element.
 	 */
-	protected Element addCollectionElement(
-			PAnnotatedEStructuralFeature paFeature) {
+	protected Element addCollectionElement(PAnnotatedEStructuralFeature paFeature) {
 		final Element collectionElement;
 		HbAnnotatedETypeElement hbFeature = (HbAnnotatedETypeElement) paFeature;
 		final PAnnotatedEReference paReference = paFeature instanceof PAnnotatedEReference ? (PAnnotatedEReference) paFeature
 				: null;
 		final IdBag idBag = hbFeature.getHbIdBag();
 
-		final EStructuralFeature estruct = paFeature
-				.getModelEStructuralFeature();
+		final EStructuralFeature estruct = paFeature.getModelEStructuralFeature();
 		final boolean isArray = estruct instanceof EAttribute
 				&& estruct.getEType().getInstanceClass() != null
 				&& estruct.getEType().getInstanceClass().isArray();
-		final boolean isMap = StoreUtil.isMap(estruct)
-				&& getHbmContext().isMapEMapAsTrueMap();
+		final boolean isMap = StoreUtil.isMap(estruct) && getHbmContext().isMapEMapAsTrueMap();
 
 		// disabled following check because it also failed for many eattribute
 		// which even with a onetomany
@@ -665,21 +573,17 @@ public abstract class AbstractAssociationMapper extends AbstractMapper {
 		// IdBag.");
 		// }
 		final boolean hasOrderBy = paFeature instanceof PAnnotatedEReference
-				&& (paReference.getOrderBy() != null && paReference
-						.getOrderColumn() == null);
+				&& (paReference.getOrderBy() != null && paReference.getOrderColumn() == null);
 		final boolean hasWhereClause = paFeature instanceof PAnnotatedEReference
 				&& ((HbAnnotatedEReference) paFeature).getHbWhere() != null;
 
 		if (isArray) { // array type
-			collectionElement = getHbmContext().getCurrent()
-					.addElement("array");
+			collectionElement = getHbmContext().getCurrent().addElement("array");
 		} else if (isMap) {
 			collectionElement = getHbmContext().getCurrent().addElement("map");
 		} else if (idBag != null) {
-			collectionElement = getHbmContext().getCurrent()
-					.addElement("idbag");
-		} else if (getHbmContext().isGeneratedByEMF()
-				&& hbFeature.getOneToMany() != null
+			collectionElement = getHbmContext().getCurrent().addElement("idbag");
+		} else if (getHbmContext().isGeneratedByEMF() && hbFeature.getOneToMany() != null
 				&& hbFeature.getOneToMany().isList()) {
 			if (hasOrderBy && hbFeature.getOneToMany().isIndexed()) {
 				log.warn("One to many ereference has indexed=true and has orderby set. Ignoring indexed and using orderby, assuming set "
@@ -687,30 +591,22 @@ public abstract class AbstractAssociationMapper extends AbstractMapper {
 			}
 
 			if (hasOrderBy || !hbFeature.getOneToMany().isIndexed()) {
-				collectionElement = getHbmContext().getCurrent().addElement(
-						"bag");
+				collectionElement = getHbmContext().getCurrent().addElement("bag");
 			} else {
-				collectionElement = getHbmContext().getCurrent().addElement(
-						"list");
+				collectionElement = getHbmContext().getCurrent().addElement("list");
 			}
-		} else if (!getHbmContext().isGeneratedByEMF()
-				&& hbFeature.getOneToMany() != null) {
+		} else if (!getHbmContext().isGeneratedByEMF() && hbFeature.getOneToMany() != null) {
 			if (hasOrderBy && hbFeature.getOneToMany().isIndexed()) {
 				log.warn("One to many ereference has indexed=true and has orderby set. "
-						+ "Ignoring indexed and using orderby, assuming set "
-						+ hbFeature);
+						+ "Ignoring indexed and using orderby, assuming set " + hbFeature);
 			}
 
 			if (!hbFeature.getOneToMany().isList() || hasOrderBy) {
-				collectionElement = getHbmContext().getCurrent().addElement(
-						"set");
-			} else if (hbFeature.getOneToMany().isList()
-					&& !hbFeature.getOneToMany().isIndexed()) {
-				collectionElement = getHbmContext().getCurrent().addElement(
-						"bag");
+				collectionElement = getHbmContext().getCurrent().addElement("set");
+			} else if (hbFeature.getOneToMany().isList() && !hbFeature.getOneToMany().isIndexed()) {
+				collectionElement = getHbmContext().getCurrent().addElement("bag");
 			} else {
-				collectionElement = getHbmContext().getCurrent().addElement(
-						"list");
+				collectionElement = getHbmContext().getCurrent().addElement("list");
 			}
 		} else if (hbFeature instanceof PAnnotatedEReference
 				&& ((PAnnotatedEReference) hbFeature).getManyToMany() != null
@@ -720,33 +616,26 @@ public abstract class AbstractAssociationMapper extends AbstractMapper {
 			collectionElement = getHbmContext().getCurrent().addElement("bag");
 		}
 
-		collectionElement.addAttribute(
-				"name",
-				getHbmContext().getPropertyName(
-						hbFeature.getModelEStructuralFeature()));
+		collectionElement.addAttribute("name",
+				getHbmContext().getPropertyName(hbFeature.getModelEStructuralFeature()));
 		if (idBag != null) {
-			final String generator = (idBag.getGenerator() == null ? "increment"
-					: idBag.getGenerator());
-			final String type = (idBag.getType() == null ? "long" : idBag
-					.getType());
+			final String generator = (idBag.getGenerator() == null ? "increment" : idBag.getGenerator());
+			final String type = (idBag.getType() == null ? "long" : idBag.getType());
 			// if (false && idBag.getTable() != null) {
 			// collectionElement.addAttribute("table", idBag.getTable());
 			// }
-			final Element collectionIdElement = collectionElement
-					.addElement("collection-id");
-			collectionIdElement.addAttribute("column",
-					hbmContext.getIdbagIDColumnName());
+			final Element collectionIdElement = collectionElement.addElement("collection-id");
+			collectionIdElement.addAttribute("column", hbmContext.getIdbagIDColumnName());
 			collectionIdElement.addAttribute("type", type);
 
-			collectionIdElement.addElement("generator").addAttribute("class",
-					generator);
+			collectionIdElement.addElement("generator").addAttribute("class", generator);
 		}
 
 		if (hbFeature instanceof HbAnnotatedEReference) {
 			final HbAnnotatedEReference hae = (HbAnnotatedEReference) hbFeature;
 			if (hae.getHbFetch() != null) {
-				collectionElement.addAttribute("fetch", hae.getHbFetch()
-						.getValue().getName().toLowerCase());
+				collectionElement
+						.addAttribute("fetch", hae.getHbFetch().getValue().getName().toLowerCase());
 			}
 		}
 
@@ -759,16 +648,14 @@ public abstract class AbstractAssociationMapper extends AbstractMapper {
 				// a sql function, just copy it completely
 				name = orderByValue;
 			} else {
-				name = getColumnNameForOrderBy(aClass, paReference.getOrderBy()
-						.getValue());
+				name = getColumnNameForOrderBy(aClass, paReference.getOrderBy().getValue());
 			}
 			collectionElement.addAttribute("order-by", name);
 		}
 
 		if (hasWhereClause) {
-			collectionElement.addAttribute("where",
-					((HbAnnotatedEReference) paFeature).getHbWhere()
-							.getClause());
+			collectionElement.addAttribute("where", ((HbAnnotatedEReference) paFeature).getHbWhere()
+					.getClause());
 		}
 
 		final boolean hasBatchSize = paFeature instanceof HbAnnotatedEReference
@@ -776,16 +663,14 @@ public abstract class AbstractAssociationMapper extends AbstractMapper {
 
 		if (hasBatchSize) {
 			collectionElement.addAttribute("batch-size", ""
-					+ ((HbAnnotatedEReference) paFeature).getBatchSize()
-							.getSize());
+					+ ((HbAnnotatedEReference) paFeature).getBatchSize().getSize());
 		}
 
 		return collectionElement;
 	}
 
 	// returns the column name of a certain feature in the target entity
-	protected String getColumnNameForOrderBy(PAnnotatedEClass aClass,
-			String orderBy) {
+	protected String getColumnNameForOrderBy(PAnnotatedEClass aClass, String orderBy) {
 		// handle the case of multiple features separated by commas
 		final StringBuilder sb = new StringBuilder();
 		String[] orderBys = null;
@@ -819,25 +704,19 @@ public abstract class AbstractAssociationMapper extends AbstractMapper {
 				direction = ob.substring(index);
 				ob = ob.substring(0, index).trim();
 				if (ob.trim().startsWith(getHbmContext().getEscapeCharacter())) {
-					ob = ob.trim().substring(
-							getHbmContext().getEscapeCharacter().length());
+					ob = ob.trim().substring(getHbmContext().getEscapeCharacter().length());
 				}
 				if (ob.trim().endsWith(getHbmContext().getEscapeCharacter())) {
-					ob = ob.trim().substring(
-							0,
-							ob.trim().length()
-									- getHbmContext().getEscapeCharacter()
-											.length());
+					ob = ob.trim().substring(0,
+							ob.trim().length() - getHbmContext().getEscapeCharacter().length());
 				}
 			}
 			boolean found = false;
 			for (PAnnotatedEStructuralFeature aFeature : getAllFeatures(aClass)) {
 				if (aFeature.getModelElement().getName().compareTo(ob) == 0) {
 					if (aFeature instanceof PAnnotatedEReference) {
-						throw new MappingException(
-								"Feature "
-										+ ob
-										+ " is an ereference, onle eattribute is supported");
+						throw new MappingException("Feature " + ob
+								+ " is an ereference, onle eattribute is supported");
 					}
 					found = true;
 					final PAnnotatedEAttribute attr = (PAnnotatedEAttribute) aFeature;
@@ -858,8 +737,7 @@ public abstract class AbstractAssociationMapper extends AbstractMapper {
 				}
 			}
 			if (!found) {
-				throw new MappingException("Feature " + ob
-						+ " not found in eclass "
+				throw new MappingException("Feature " + ob + " not found in eclass "
 						+ aClass.getModelEClass().getName());
 			}
 		}
@@ -871,16 +749,14 @@ public abstract class AbstractAssociationMapper extends AbstractMapper {
 		if (name.startsWith(getHbmContext().getEscapeCharacter())) {
 			return name;
 		}
-		return getHbmContext().getEscapeCharacter() + name
-				+ getHbmContext().getEscapeCharacter();
+		return getHbmContext().getEscapeCharacter() + name + getHbmContext().getEscapeCharacter();
 	}
 
 	/**
 	 * Add Element element in given collection element.
 	 */
-	protected Element addElementElement(Element collElement,
-			PAnnotatedEStructuralFeature paFeature, List<Column> columns,
-			String targetEntity) {
+	protected Element addElementElement(Element collElement, PAnnotatedEStructuralFeature paFeature,
+			List<Column> columns, String targetEntity) {
 		final Element elElement;
 		// if (targetEntity == null || paAttribute.getEnumerated() != null ||
 		// StoreUtil.isQName(paAttribute.getModelEAttribute())) {
@@ -900,14 +776,12 @@ public abstract class AbstractAssociationMapper extends AbstractMapper {
 		return elElement;
 	}
 
-	protected boolean mapMapsIdColumns(PAnnotatedEReference per,
-			Element parentElement) {
+	protected boolean mapMapsIdColumns(PAnnotatedEReference per, Element parentElement) {
 		// find the embedded id type and its features
 		final PAnnotatedEClass aClass = per.getPaEClass();
 		final String name = per.getMapsId().getValue();
 		PAnnotatedEReference embeddedERef = null;
-		for (PAnnotatedEStructuralFeature pef : aClass
-				.getPaEStructuralFeatures()) {
+		for (PAnnotatedEStructuralFeature pef : aClass.getPaEStructuralFeatures()) {
 			if (pef instanceof PAnnotatedEReference
 					&& ((PAnnotatedEReference) pef).getEmbeddedId() != null) {
 				embeddedERef = (PAnnotatedEReference) pef;
@@ -916,39 +790,28 @@ public abstract class AbstractAssociationMapper extends AbstractMapper {
 		if (embeddedERef == null) {
 			return false;
 		}
-		final PAnnotatedEClass embeddedIdAClass = embeddedERef
-				.getAReferenceType();
-		for (PAnnotatedEStructuralFeature aFeature : embeddedIdAClass
-				.getPaEStructuralFeatures()) {
+		final PAnnotatedEClass embeddedIdAClass = embeddedERef.getAReferenceType();
+		for (PAnnotatedEStructuralFeature aFeature : embeddedIdAClass.getPaEStructuralFeatures()) {
 			// if only map a specific name then ignore all efeatures which are
 			// not that name
-			if (name != null
-					&& !aFeature.getModelEStructuralFeature().getName()
-							.equals(name)) {
+			if (name != null && !aFeature.getModelEStructuralFeature().getName().equals(name)) {
 				continue;
 			}
 
 			if (aFeature instanceof PAnnotatedEAttribute) {
 				PAnnotatedEAttribute aAttribute = (PAnnotatedEAttribute) aFeature;
-				addColumnsAndFormula(parentElement, aAttribute,
-						getColumns(aAttribute), getHbmContext()
-								.isCurrentElementFeatureMap(), false);
+				addColumnsAndFormula(parentElement, aAttribute, getColumns(aAttribute), getHbmContext()
+						.isCurrentElementFeatureMap(), false);
 			} else if (aFeature instanceof PAnnotatedEReference
-					&& !((PAnnotatedEReference) aFeature).getModelEReference()
-							.isMany()) {
+					&& !((PAnnotatedEReference) aFeature).getModelEReference().isMany()) {
 				final PAnnotatedEReference embeddedIdReferenceProperty = (PAnnotatedEReference) aFeature;
 				final List<JoinColumn> jcs = getJoinColumns(embeddedIdReferenceProperty);
-				final ManyToOne mto = embeddedIdReferenceProperty
-						.getManyToOne();
-
-				addJoinColumns(
-						embeddedIdReferenceProperty,
-						parentElement,
-						jcs,
-						getHbmContext().isDoForceOptional(
-								embeddedIdReferenceProperty)
-								|| mto.isOptional()
-								|| getHbmContext().isCurrentElementFeatureMap());
+				final ManyToOne mto = embeddedIdReferenceProperty.getManyToOne();
+
+				addJoinColumns(embeddedIdReferenceProperty, parentElement, jcs, getHbmContext()
+						.isDoForceOptional(embeddedIdReferenceProperty)
+						|| mto.isOptional()
+						|| getHbmContext().isCurrentElementFeatureMap());
 			}
 		}
 
@@ -959,11 +822,11 @@ public abstract class AbstractAssociationMapper extends AbstractMapper {
 	}
 
 	/**
-	 * Adds columns to a key element. Also sets update on the key element based
-	 * on the values in the columns.
+	 * Adds columns to a key element. Also sets update on the key element based on the values in the
+	 * columns.
 	 */
-	protected void addKeyColumns(HbAnnotatedETypeElement per,
-			Element keyElement, List<JoinColumn> joinColumns) {
+	protected void addKeyColumns(HbAnnotatedETypeElement per, Element keyElement,
+			List<JoinColumn> joinColumns) {
 		if (per instanceof HbAnnotatedEReference) {
 			final HbAnnotatedEReference hbRef = (HbAnnotatedEReference) per;
 			if (hbRef.getMapsId() != null) {
@@ -981,8 +844,7 @@ public abstract class AbstractAssociationMapper extends AbstractMapper {
 
 			if (!setUpdatable && keyElement.getName().compareTo("key") == 0) {
 				isUpdatable = joinColumn.isUpdatable();
-				keyElement.addAttribute("update", isUpdatable ? "true"
-						: "false");
+				keyElement.addAttribute("update", isUpdatable ? "true" : "false");
 				setUpdatable = true;
 			}
 
@@ -990,25 +852,17 @@ public abstract class AbstractAssociationMapper extends AbstractMapper {
 			// join column
 			// is added to a join table
 			if (!joinColumn.isInsertable()) {
-				log.error("Unsupported non insertable join column in "
-						+ joinColumn);
-				throw new MappingException(
-						"Unsupported non insertable join column", joinColumn);
+				log.error("Unsupported non insertable join column in " + joinColumn);
+				throw new MappingException("Unsupported non insertable join column", joinColumn);
 			}
 			if (setUpdatable && joinColumn.isUpdatable() != isUpdatable) {
 				log.error("Unsupported join column updatable in " + joinColumn);
-				throw new MappingException("Unsupported join column updatable",
-						joinColumn);
+				throw new MappingException("Unsupported join column updatable", joinColumn);
 			}
 
-			final Element ce = keyElement
-					.addElement("column")
-					.addAttribute(
-							"name",
-							getHbmContext().trunc(joinColumn,
-									joinColumn.getName()))
-					.addAttribute("unique",
-							joinColumn.isUnique() ? "true" : "false");
+			final Element ce = keyElement.addElement("column")
+					.addAttribute("name", getHbmContext().trunc(joinColumn, joinColumn.getName()))
+					.addAttribute("unique", joinColumn.isUnique() ? "true" : "false");
 
 			// --- JJH, adapted by Martin Taal
 			addCommentElement(per.getModelElement(), ce);
@@ -1024,27 +878,21 @@ public abstract class AbstractAssociationMapper extends AbstractMapper {
 			if (joinColumn.getReferencedColumnName() != null) {
 				String propName = null;
 				final String colName = joinColumn.getReferencedColumnName();
-				for (PAnnotatedEStructuralFeature pef : per.getPaEClass()
-						.getPaEStructuralFeatures()) {
+				for (PAnnotatedEStructuralFeature pef : per.getPaEClass().getPaEStructuralFeatures()) {
 					// set a default, by looking for the efeature name
-					if (pef.getModelElement().getName().equals(colName)
-							&& propName == null) {
-						propName = getHbmContext().getPropertyName(
-								pef.getModelEStructuralFeature());
+					if (pef.getModelElement().getName().equals(colName) && propName == null) {
+						propName = getHbmContext().getPropertyName(pef.getModelEStructuralFeature());
 					}
 					// use the columnname, that's according to the standard
-					if (pef.getColumn() != null
-							&& pef.getColumn().getName().equals(colName)) {
-						propName = getHbmContext().getPropertyName(
-								pef.getModelEStructuralFeature());
+					if (pef.getColumn() != null && pef.getColumn().getName().equals(colName)) {
+						propName = getHbmContext().getPropertyName(pef.getModelEStructuralFeature());
 					}
 				}
 				if (propName != null) {
 					keyElement.addAttribute("property-ref", propName);
 				} else {
-					log.warn("No property found for the referencedColumnName  "
-							+ colName + " and EReference "
-							+ per.getModelElement().getName());
+					log.warn("No property found for the referencedColumnName  " + colName
+							+ " and EReference " + per.getModelElement().getName());
 				}
 			}
 
@@ -1057,8 +905,7 @@ public abstract class AbstractAssociationMapper extends AbstractMapper {
 
 			if (joinColumn.getColumnDefinition() != null) {
 				log.error("Unsupported column definition in " + joinColumn);
-				throw new MappingException("Unsupported column definition",
-						joinColumn);
+				throw new MappingException("Unsupported column definition", joinColumn);
 			}
 		}
 		// TODO jc.getReferencedColumnName();
@@ -1070,8 +917,8 @@ public abstract class AbstractAssociationMapper extends AbstractMapper {
 	 * @param collElement
 	 * @param joinTable
 	 */
-	protected void addJoinTable(HbAnnotatedETypeElement hbAnnotatedElement,
-			Element collElement, Element keyElement, JoinTable joinTable) {
+	protected void addJoinTable(HbAnnotatedETypeElement hbAnnotatedElement, Element collElement,
+			Element keyElement, JoinTable joinTable) {
 		if (joinTable == null) {
 			log.debug("No joinTable");
 			return;
@@ -1083,34 +930,30 @@ public abstract class AbstractAssociationMapper extends AbstractMapper {
 			collElement.addAttribute("schema", joinTable.getSchema());
 		}
 		if (joinTable.getName() != null) {
-			collElement.addAttribute("table",
-					getHbmContext().trunc(joinTable, joinTable.getName()));
+			collElement.addAttribute("table", getHbmContext().trunc(joinTable, joinTable.getName()));
 		}
 		if (joinTable.getUniqueConstraints().size() > 0) {
 			log.error("Unsupported unique constraints in " + joinTable);
-			throw new MappingException("Unsupported unique constraints",
-					joinTable);
-		}
-		addKeyColumns(hbAnnotatedElement, keyElement,
-				joinTable.getJoinColumns()/*
-										 * == null ? new ArrayList() :
-										 * (List)joinTable. getJoinColumns
-										 * ().getValue()
-										 */);
+			throw new MappingException("Unsupported unique constraints", joinTable);
+		}
+		addKeyColumns(hbAnnotatedElement, keyElement, joinTable.getJoinColumns()/*
+																																						 * == null ? new
+																																						 * ArrayList ( ) : (
+																																						 * List ) joinTable .
+																																						 * getJoinColumns ( ) .
+																																						 * getValue ( )
+																																						 */);
 	}
 
 	protected JoinTable getJoinTable(PAnnotatedEReference paReference) {
-		final AssociationOverride override = getHbmContext()
-				.getAssociationOverrides(paReference);
+		final AssociationOverride override = getHbmContext().getAssociationOverrides(paReference);
 		if (override != null && override.getJoinTable() != null) {
 			return override.getJoinTable();
 		}
-		final boolean isMap = StoreUtil.isMap(paReference
-				.getModelEStructuralFeature())
+		final boolean isMap = StoreUtil.isMap(paReference.getModelEStructuralFeature())
 				&& getHbmContext().isMapEMapAsTrueMap();
 
-		if ((paReference.getEmbedded() != null || isMap || paReference
-				.getElementCollection() != null)
+		if ((paReference.getEmbedded() != null || isMap || paReference.getElementCollection() != null)
 				&& paReference.getCollectionTable() != null) {
 			return paReference.getCollectionTable();
 		}
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/AbstractMapper.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/AbstractMapper.java
index 8292eb51d..09bbdb393 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/AbstractMapper.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/AbstractMapper.java
@@ -73,8 +73,8 @@ public abstract class AbstractMapper {
 
 	/** Returns the correct temporal type for hibernate */
 	private static String hbType(TemporalType temporalType) {
-		return TEMPORAL_TYPE_NAMES[temporalType != null ? temporalType
-				.getValue() : TemporalType.TIMESTAMP.getValue()];
+		return TEMPORAL_TYPE_NAMES[temporalType != null ? temporalType.getValue()
+				: TemporalType.TIMESTAMP.getValue()];
 	}
 
 	/** logs it all */
@@ -86,8 +86,7 @@ public abstract class AbstractMapper {
 		if (paReference.getModelEReference().getEOpposite() == null) {
 			return null;
 		}
-		return paReference.getPaModel().getPAnnotated(
-				paReference.getModelEReference().getEOpposite());
+		return paReference.getPaModel().getPAnnotated(paReference.getModelEReference().getEOpposite());
 	}
 
 	/** The mapping context of this mapping action */
@@ -115,8 +114,7 @@ public abstract class AbstractMapper {
 		addAccessor(element, hbmContext.getPropertyHandlerName());
 	}
 
-	protected void setType(PAnnotatedEStructuralFeature paFeature,
-			Element propElement) {
+	protected void setType(PAnnotatedEStructuralFeature paFeature, Element propElement) {
 		if (paFeature instanceof PAnnotatedEAttribute) {
 			setType((PAnnotatedEAttribute) paFeature, propElement);
 		} else {
@@ -130,24 +128,14 @@ public abstract class AbstractMapper {
 		final Element typeElement = propElement.addElement("type");
 		if (external != null) {
 			if (external.getType() == null) { // standard external
-				typeElement.addAttribute("name", getHbmContext()
-						.getExternalUserType());
+				typeElement.addAttribute("name", getHbmContext().getExternalUserType());
 			} else {
 				typeElement.addAttribute("name", external.getType());
 			}
-			typeElement
-					.addElement("param")
-					.addAttribute("name", HbMapperConstants.ECLASS_NAME_META)
-					.addText(
-							paReference.getModelEReference()
-									.getEReferenceType().getName());
-			typeElement
-					.addElement("param")
-					.addAttribute("name", HbMapperConstants.EPACKAGE_PARAM)
-					.addText(
-							paReference.getModelEReference()
-									.getEReferenceType().getEPackage()
-									.getNsURI());
+			typeElement.addElement("param").addAttribute("name", HbMapperConstants.ECLASS_NAME_META)
+					.addText(paReference.getModelEReference().getEReferenceType().getName());
+			typeElement.addElement("param").addAttribute("name", HbMapperConstants.EPACKAGE_PARAM)
+					.addText(paReference.getModelEReference().getEReferenceType().getEPackage().getNsURI());
 			return;
 		}
 
@@ -157,11 +145,10 @@ public abstract class AbstractMapper {
 		if (type == null) {
 			type = ((HbAnnotatedEClass) hbReference.getPaEClass()).getHbType();
 		}
-		if (type == null || type.getType() == null ) {
+		if (type == null || type.getType() == null) {
 			throw new MappingException(
 					"No external or type annotation set (or type has no name) on eReference "
-							+ StoreUtil.toString(paReference
-									.getModelEReference()));
+							+ StoreUtil.toString(paReference.getModelEReference()));
 		}
 		final String name = type.getType();
 		final List<Parameter> params = type.getParameters();
@@ -169,8 +156,7 @@ public abstract class AbstractMapper {
 			typeElement.addAttribute("name", name);
 			if (params != null) {
 				for (Parameter param : params) {
-					typeElement.addElement("param")
-							.addAttribute("name", param.getName())
+					typeElement.addElement("param").addAttribute("name", param.getName())
 							.addText(param.getValue());
 				}
 			}
@@ -183,8 +169,7 @@ public abstract class AbstractMapper {
 		// handle the type annotation
 		final HbAnnotatedEAttribute hea = (HbAnnotatedEAttribute) paAttribute;
 		final EDataType ed = (EDataType) hea.getModelEAttribute().getEType();
-		final HbAnnotatedEDataType hed = (HbAnnotatedEDataType) hea
-				.getPaModel().getPAnnotated(ed);
+		final HbAnnotatedEDataType hed = (HbAnnotatedEDataType) hea.getPaModel().getPAnnotated(ed);
 
 		final String name;
 		final List<Parameter> params;
@@ -206,97 +191,73 @@ public abstract class AbstractMapper {
 				// simple
 				propElement.addAttribute("type", name);
 			} else {
-				final Element typeElement = propElement.addElement("type")
-						.addAttribute("name", name);
+				final Element typeElement = propElement.addElement("type").addAttribute("name", name);
 				for (Parameter param : params) {
-					typeElement.addElement("param")
-							.addAttribute("name", param.getName())
+					typeElement.addElement("param").addAttribute("name", param.getName())
 							.addText(param.getValue());
 				}
 			}
 		} else if (paAttribute.getEnumerated() != null) {
 			handleEnumType(paAttribute, propElement);
 		} else if (StoreUtil.isQName(paAttribute.getModelEAttribute())) {
-			propElement.addAttribute("type",
-					"org.eclipse.emf.teneo.hibernate.mapping.QNameUserType");
+			propElement.addAttribute("type", "org.eclipse.emf.teneo.hibernate.mapping.QNameUserType");
 		} else {
 			final String hType = hbType(paAttribute);
 			if (hType != null) {
 				propElement.addAttribute("type", hType);
 			} else {
-				final Element typeElement = propElement.addElement("type")
-						.addAttribute("name", hbmContext.getDefaultUserType());
-				typeElement
-						.addElement("param")
-						.addAttribute("name", HbMapperConstants.EDATATYPE_PARAM)
-						.addText(
-								paAttribute.getModelEAttribute()
-										.getEAttributeType().getName());
-				typeElement
-						.addElement("param")
-						.addAttribute("name", HbMapperConstants.EPACKAGE_PARAM)
-						.addText(
-								paAttribute.getModelEAttribute().getEType()
-										.getEPackage().getNsURI());
+				final Element typeElement = propElement.addElement("type").addAttribute("name",
+						hbmContext.getDefaultUserType());
+				typeElement.addElement("param").addAttribute("name", HbMapperConstants.EDATATYPE_PARAM)
+						.addText(paAttribute.getModelEAttribute().getEAttributeType().getName());
+				typeElement.addElement("param").addAttribute("name", HbMapperConstants.EPACKAGE_PARAM)
+						.addText(paAttribute.getModelEAttribute().getEType().getEPackage().getNsURI());
 			}
 		}
 	}
 
 	/** Handle the enum type */
-	private void handleEnumType(PAnnotatedEAttribute paAttribute,
-			Element propElement) {
+	private void handleEnumType(PAnnotatedEAttribute paAttribute, Element propElement) {
 		final Enumerated enumerated = paAttribute.getEnumerated();
 		assert (enumerated != null);
 		final EAttribute eattr = paAttribute.getModelEAttribute();
 		final EClassifier eclassifier = eattr.getEType();
 		if (!getHbmContext().isGeneratedByEMF()
 				&& getHbmContext().getInstanceClass(eclassifier) != null) {
-			final Class<?> instanceClass = getHbmContext().getInstanceClass(
-					eclassifier);
-			final Element typeElement = propElement.addElement("type")
-					.addAttribute("name", getEnumUserType(enumerated));
-			typeElement.addElement("param")
-					.addAttribute("name", HbMapperConstants.ENUM_CLASS_PARAM)
+			final Class<?> instanceClass = getHbmContext().getInstanceClass(eclassifier);
+			final Element typeElement = propElement.addElement("type").addAttribute("name",
+					getEnumUserType(enumerated));
+			typeElement.addElement("param").addAttribute("name", HbMapperConstants.ENUM_CLASS_PARAM)
 					.addText(instanceClass.getName());
-			typeElement.addElement("param")
-					.addAttribute("name", HbMapperConstants.ECLASSIFIER_PARAM)
+			typeElement.addElement("param").addAttribute("name", HbMapperConstants.ECLASSIFIER_PARAM)
 					.addText(eclassifier.getName());
-			typeElement.addElement("param")
-					.addAttribute("name", HbMapperConstants.EPACKAGE_PARAM)
+			typeElement.addElement("param").addAttribute("name", HbMapperConstants.EPACKAGE_PARAM)
 					.addText(eclassifier.getEPackage().getNsURI());
-		} else if (getHbmContext().isGeneratedByEMF()
-				&& eclassifier.getInstanceClass() != null) {
-			final Element typeElement = propElement.addElement("type")
-					.addAttribute("name", getEnumUserType(enumerated));
-			typeElement.addElement("param")
-					.addAttribute("name", HbMapperConstants.ENUM_CLASS_PARAM)
+		} else if (getHbmContext().isGeneratedByEMF() && eclassifier.getInstanceClass() != null) {
+			final Element typeElement = propElement.addElement("type").addAttribute("name",
+					getEnumUserType(enumerated));
+			typeElement.addElement("param").addAttribute("name", HbMapperConstants.ENUM_CLASS_PARAM)
 					.addText(eclassifier.getInstanceClass().getName());
-			typeElement.addElement("param")
-					.addAttribute("name", HbMapperConstants.ECLASSIFIER_PARAM)
+			typeElement.addElement("param").addAttribute("name", HbMapperConstants.ECLASSIFIER_PARAM)
 					.addText(eclassifier.getName());
-			typeElement.addElement("param")
-					.addAttribute("name", HbMapperConstants.EPACKAGE_PARAM)
+			typeElement.addElement("param").addAttribute("name", HbMapperConstants.EPACKAGE_PARAM)
 					.addText(eclassifier.getEPackage().getNsURI());
 		} else { // must be emf dynamic
-			final Element typeElement = propElement.addElement("type")
-					.addAttribute("name", hbDynamicEnumType(enumerated));
-			typeElement.addElement("param")
-					.addAttribute("name", HbMapperConstants.ECLASSIFIER_PARAM)
+			final Element typeElement = propElement.addElement("type").addAttribute("name",
+					hbDynamicEnumType(enumerated));
+			typeElement.addElement("param").addAttribute("name", HbMapperConstants.ECLASSIFIER_PARAM)
 					.addText(eclassifier.getName());
-			typeElement.addElement("param")
-					.addAttribute("name", HbMapperConstants.EPACKAGE_PARAM)
+			typeElement.addElement("param").addAttribute("name", HbMapperConstants.EPACKAGE_PARAM)
 					.addText(eclassifier.getEPackage().getNsURI());
 		}
 	}
 
 	// gather the pafeatures of the supertypes also
-	protected List<PAnnotatedEStructuralFeature> getAllFeatures(
-			PAnnotatedEClass componentAClass) {
+	protected List<PAnnotatedEStructuralFeature> getAllFeatures(PAnnotatedEClass componentAClass) {
 		final ArrayList<PAnnotatedEStructuralFeature> result = new ArrayList<PAnnotatedEStructuralFeature>();
 		result.addAll(componentAClass.getPaEStructuralFeatures());
 		for (EClass eClass : componentAClass.getModelEClass().getESuperTypes()) {
-			final PAnnotatedEClass aSuperClass = componentAClass.getPaModel()
-					.getPAnnotated(eClass);
+			final PAnnotatedEClass aSuperClass = componentAClass.getPaModel().getPAnnotated(eClass);
 			if (aSuperClass != null) {
 				result.addAll(getAllFeatures(aSuperClass));
 			}
@@ -307,14 +268,13 @@ public abstract class AbstractMapper {
 	/**
 	 * @return Returns the hibernate name for the given Ecore data type.
 	 * @throws MappingException
-	 *             if no corresponding hb type is defined.
+	 *           if no corresponding hb type is defined.
 	 */
 	protected String hbType(PAnnotatedEAttribute paAttribute) {
 		final EAttribute eAttribute = paAttribute.getModelEAttribute();
-		final HbAnnotatedEDataType hed = (HbAnnotatedEDataType) paAttribute
-				.getPaModel().getPAnnotated(eAttribute.getEAttributeType());
-		final EDataType eDataType = paAttribute.getModelEAttribute()
-				.getEAttributeType();
+		final HbAnnotatedEDataType hed = (HbAnnotatedEDataType) paAttribute.getPaModel().getPAnnotated(
+				eAttribute.getEAttributeType());
+		final EDataType eDataType = paAttribute.getModelEAttribute().getEAttributeType();
 		if (hed != null && hed.getHbTypeDef() != null) {
 			return hed.getHbTypeDef().getName();
 		} else if (paAttribute.getLob() != null) {
@@ -323,9 +283,8 @@ public abstract class AbstractMapper {
 			} else if (EcoreDataTypes.INSTANCE.isEString(eDataType)) {
 				return "text";
 			} else {
-				throw new MappingException(
-						"Lob annotations can only be used with Strings or byte arrays. "
-								+ "Attribute is of type: " + eDataType);
+				throw new MappingException("Lob annotations can only be used with Strings or byte arrays. "
+						+ "Attribute is of type: " + eDataType);
 			}
 		} else if (EcoreDataTypes.INSTANCE.isEWrapper(eDataType)
 				|| EcoreDataTypes.INSTANCE.isEPrimitive(eDataType)) {
@@ -333,29 +292,23 @@ public abstract class AbstractMapper {
 		} else if (EcoreDataTypes.INSTANCE.isEString(eDataType)) {
 			return eDataType.getInstanceClassName();
 		} else if (EcoreDataTypes.INSTANCE.isEDateTime(eDataType)
-				|| (paAttribute.getTemporal() != null && paAttribute
-						.getTemporal().getValue().getValue() == TemporalType.TIMESTAMP_VALUE)) {
+				|| (paAttribute.getTemporal() != null && paAttribute.getTemporal().getValue().getValue() == TemporalType.TIMESTAMP_VALUE)) {
 			return getEDateTimeClass(paAttribute);
 		} else if (EcoreDataTypes.INSTANCE.isETime(eDataType)
-				|| (paAttribute.getTemporal() != null && paAttribute
-						.getTemporal().getValue().getValue() == TemporalType.TIME_VALUE)) {
+				|| (paAttribute.getTemporal() != null && paAttribute.getTemporal().getValue().getValue() == TemporalType.TIME_VALUE)) {
 			return getETimeClass(paAttribute);
 		} else if (EcoreDataTypes.INSTANCE.isEDuration(eDataType)) {
 			return hbmContext.getDurationType();
-		} else if (EcoreDataTypes.INSTANCE.isEDate(eDataType, getHbmContext()
-				.getPersistenceOptions())
-				|| (paAttribute.getTemporal() != null && paAttribute
-						.getTemporal().getValue().getValue() == TemporalType.DATE_VALUE)) {
+		} else if (EcoreDataTypes.INSTANCE.isEDate(eDataType, getHbmContext().getPersistenceOptions())
+				|| (paAttribute.getTemporal() != null && paAttribute.getTemporal().getValue().getValue() == TemporalType.DATE_VALUE)) {
 			return getEDateClass(paAttribute);
-		} else if (eDataType.getInstanceClass() != null
-				&& eDataType.getInstanceClass() == Object.class) {
+		} else if (eDataType.getInstanceClass() != null && eDataType.getInstanceClass() == Object.class) {
 			// null forces caller to use usertype
 			return null; // "org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType";
 			// } else if (eDataType.getInstanceClass() != null) {
 			// return eDataType.getInstanceClassName();
 		} else {
-			final String result = EcoreDataTypes.INSTANCE
-					.getTargetTypeName(paAttribute);
+			final String result = EcoreDataTypes.INSTANCE.getTargetTypeName(paAttribute);
 			if (result.compareTo(Object.class.getName()) == 0) {
 				// all edatatypes are translatable to a string, done by caller
 				return null; // "org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType";
@@ -368,19 +321,13 @@ public abstract class AbstractMapper {
 	protected String getTargetTypeName(PAnnotatedEAttribute aAttribute) {
 		final EAttribute eAttribute = aAttribute.getModelEAttribute();
 		// check on equality on object.class is used for listunion simpleunions
-		final Class<?> instanceClass = eAttribute.getEAttributeType()
-				.getInstanceClass();
+		final Class<?> instanceClass = eAttribute.getEAttributeType().getInstanceClass();
 		if (instanceClass != null && !Object.class.equals(instanceClass)
 				&& !List.class.equals(instanceClass)) {
 			if (instanceClass.isArray()) {
 				// get rid of the [] at the end
-				return eAttribute
-						.getEType()
-						.getInstanceClassName()
-						.substring(
-								0,
-								eAttribute.getEType().getInstanceClassName()
-										.length() - 2);
+				return eAttribute.getEType().getInstanceClassName()
+						.substring(0, eAttribute.getEType().getInstanceClassName().length() - 2);
 			}
 			return instanceClass.getName();
 		} else {
@@ -412,8 +359,7 @@ public abstract class AbstractMapper {
 	}
 
 	/**
-	 * Returns the correct enum primitive hibernate type, for Elver this is a
-	 * hibernate user type.
+	 * Returns the correct enum primitive hibernate type, for Elver this is a hibernate user type.
 	 */
 	public String getEnumUserType(Enumerated enumerated) {
 		if (EnumType.STRING == enumerated.getValue()) {
@@ -424,8 +370,7 @@ public abstract class AbstractMapper {
 	}
 
 	/**
-	 * Returns the correct enum primitive hibernate type, for Elver this is a
-	 * hibernate user type.
+	 * Returns the correct enum primitive hibernate type, for Elver this is a hibernate user type.
 	 */
 	protected String hbDynamicEnumType(Enumerated enumerated) {
 		if (EnumType.STRING == enumerated.getValue()) {
@@ -439,11 +384,9 @@ public abstract class AbstractMapper {
 	 * @return The name of the java class needed to map the date type
 	 */
 	public String getEDateClass(PAnnotatedEAttribute paAttribute) {
-		final EDataType eDataType = paAttribute.getModelEAttribute()
-				.getEAttributeType();
+		final EDataType eDataType = paAttribute.getModelEAttribute().getEAttributeType();
 
-		assert (EcoreDataTypes.INSTANCE.isEDate(eDataType, getHbmContext()
-				.getPersistenceOptions()));
+		assert (EcoreDataTypes.INSTANCE.isEDate(eDataType, getHbmContext().getPersistenceOptions()));
 
 		if (XMLTypePackage.eINSTANCE.getDate().equals(eDataType)) {
 			return getHbmContext().getXSDDateUserType();
@@ -460,8 +403,7 @@ public abstract class AbstractMapper {
 		}
 
 		// only override if the user did not specify a more specific class
-		if (EcoreDataTypes.INSTANCE.isEDate(eDataType, getHbmContext()
-				.getPersistenceOptions())) {
+		if (EcoreDataTypes.INSTANCE.isEDate(eDataType, getHbmContext().getPersistenceOptions())) {
 			// EMF returns an XSD Date type as an Object instance. go figure.
 			// note that I would prefer to use the class instance to get the
 			// name
@@ -480,8 +422,7 @@ public abstract class AbstractMapper {
 	 * @return The name of the java class needed to map the time type
 	 */
 	public String getETimeClass(PAnnotatedEAttribute paAttribute) {
-		final EDataType eDataType = paAttribute.getModelEAttribute()
-				.getEAttributeType();
+		final EDataType eDataType = paAttribute.getModelEAttribute().getEAttributeType();
 
 		if (XMLTypePackage.eINSTANCE.getTime().equals(eDataType)) {
 			return getHbmContext().getXSDTimeUserType();
@@ -494,8 +435,7 @@ public abstract class AbstractMapper {
 
 		// bugzilla 277546
 		if (eDataType.getInstanceClass() != null
-				&& Timestamp.class.isAssignableFrom(eDataType
-						.getInstanceClass())) {
+				&& Timestamp.class.isAssignableFrom(eDataType.getInstanceClass())) {
 			return eDataType.getInstanceClass().getName();
 		}
 
@@ -520,12 +460,10 @@ public abstract class AbstractMapper {
 	}
 
 	/*
-	 * @return The name of the java class needed to map the datetime/timestamp
-	 * type
+	 * @return The name of the java class needed to map the datetime/timestamp type
 	 */
 	public String getEDateTimeClass(PAnnotatedEAttribute paAttribute) {
-		final EDataType eDataType = paAttribute.getModelEAttribute()
-				.getEAttributeType();
+		final EDataType eDataType = paAttribute.getModelEAttribute().getEAttributeType();
 
 		assert (EcoreDataTypes.INSTANCE.isEDateTime(eDataType));
 
@@ -565,12 +503,11 @@ public abstract class AbstractMapper {
 	}
 
 	/**
-	 * Returns the (possibly overridden) JoinColumns annotations for the given
-	 * reference or an empty list if no JoinColumns were defined.
+	 * Returns the (possibly overridden) JoinColumns annotations for the given reference or an empty
+	 * list if no JoinColumns were defined.
 	 */
 	protected List<JoinColumn> getJoinColumns(PAnnotatedEReference paReference) {
-		final AssociationOverride override = getHbmContext().getAssociationOverrides(
-				paReference);
+		final AssociationOverride override = getHbmContext().getAssociationOverrides(paReference);
 		List<JoinColumn> joinColumns = null;
 		if (override != null) {
 			if (override.getJoinTable() != null) {
@@ -590,11 +527,9 @@ public abstract class AbstractMapper {
 	/** Adds a cache element */
 	protected void addCacheElement(Element parent, Cache cache) {
 		// translate to hibernate specific notation
-		final String usage = cache.getUsage().getName().toLowerCase()
-				.replaceAll("_", "-");
+		final String usage = cache.getUsage().getName().toLowerCase().replaceAll("_", "-");
 
-		Element cacheElement = parent.addElement("cache").addAttribute("usage",
-				usage);
+		Element cacheElement = parent.addElement("cache").addAttribute("usage", usage);
 		if (cache.getRegion() != null) {
 			cacheElement.addAttribute("region", cache.getRegion());
 		}
@@ -606,17 +541,15 @@ public abstract class AbstractMapper {
 	}
 
 	/** Same as above only handles multiple columns */
-	protected void addColumnsAndFormula(Element propertyElement,
-			PAnnotatedEStructuralFeature pef, List<Column> columns,
-			boolean isNullable, boolean setColumnAttributesInProperty) {
-		addColumnsAndFormula(propertyElement, pef, columns, isNullable,
-				setColumnAttributesInProperty, false, false);
+	protected void addColumnsAndFormula(Element propertyElement, PAnnotatedEStructuralFeature pef,
+			List<Column> columns, boolean isNullable, boolean setColumnAttributesInProperty) {
+		addColumnsAndFormula(propertyElement, pef, columns, isNullable, setColumnAttributesInProperty,
+				false, false);
 	}
 
 	/** Same as above only handles multiple columns */
-	protected void addColumnsAndFormula(Element propertyElement,
-			PAnnotatedEStructuralFeature pef, List<Column> columns,
-			boolean isNullable, boolean setColumnAttributesInProperty,
+	protected void addColumnsAndFormula(Element propertyElement, PAnnotatedEStructuralFeature pef,
+			List<Column> columns, boolean isNullable, boolean setColumnAttributesInProperty,
 			boolean isUnique, boolean isIdProperty) {
 		// if no columns set then use some default
 		final HbAnnotatedETypeElement hbFeature = (HbAnnotatedETypeElement) pef;
@@ -641,55 +574,46 @@ public abstract class AbstractMapper {
 			columns.add(col);
 		}
 		// if only one id column then it is not nullable!
-		if (isIdProperty && columns.size() == 1
-				&& pef.getPaEClass().getIdClass() == null) {
+		if (isIdProperty && columns.size() == 1 && pef.getPaEClass().getIdClass() == null) {
 			columns.get(0).setNullable(false);
 			// set to false, see bugzilla 280169
 			columns.get(0).setUnique(false);
 		}
 
 		for (Column column : columns) {
-			addColumn(propertyElement, pef, column, isNullable,
-					setColumnAttributesInProperty);
+			addColumn(propertyElement, pef, column, isNullable, setColumnAttributesInProperty);
 		}
 
 		// do the formula part
 		if (hbFeature.getFormula() != null) {
-			propertyElement.addElement("formula").addText(
-					hbFeature.getFormula().getValue());
+			propertyElement.addElement("formula").addText(hbFeature.getFormula().getValue());
 		}
 	}
 
 	protected String getColumnName(PAnnotatedEStructuralFeature pef) {
 		if (getHbmContext().getEmbeddingFeature() != null) { // embedded
 			// TODO: check illegal, embedded component can not really have an id
-			final PAnnotatedEStructuralFeature embeddingFeature = getHbmContext()
-					.getEmbeddingFeature();
+			final PAnnotatedEStructuralFeature embeddingFeature = getHbmContext().getEmbeddingFeature();
 			return getHbmContext().getSqlNameStrategy().getColumnName(pef,
 					embeddingFeature.getModelEStructuralFeature().getName());
 		} else {
-			return getHbmContext().getSqlNameStrategy()
-					.getColumnName(pef, null);
+			return getHbmContext().getSqlNameStrategy().getColumnName(pef, null);
 		}
 	}
 
 	/**
-	 * Add a comment element, if the eModelElement has documentation, returns
-	 * the comment element
+	 * Add a comment element, if the eModelElement has documentation, returns the comment element
 	 */
-	protected Element addCommentElement(EModelElement eModelElement,
-			Element hbmElement) {
+	protected Element addCommentElement(EModelElement eModelElement, Element hbmElement) {
 		if (hbmContext.getMaximumCommentLength() == 0) {
 			return null;
 		}
 		final String commentData = EcoreUtil.getDocumentation(eModelElement);
 		if (commentData != null) {
 			final Element comment = hbmElement.addElement("comment");
-			String commentText = commentData.replace('\'', ' ').replace('"',
-					' ');
+			String commentText = commentData.replace('\'', ' ').replace('"', ' ');
 			if (commentText.length() > hbmContext.getMaximumCommentLength()) {
-				commentText = commentText.substring(0,
-						hbmContext.getMaximumCommentLength());
+				commentText = commentText.substring(0, hbmContext.getMaximumCommentLength());
 			}
 			comment.addText(commentText);
 			return comment;
@@ -698,8 +622,7 @@ public abstract class AbstractMapper {
 	}
 
 	/** Adds anytype columns */
-	protected List<Column> getAnyTypeColumns(String featureName,
-			boolean isNullable) {
+	protected List<Column> getAnyTypeColumns(String featureName, boolean isNullable) {
 		final ArrayList<Column> result = new ArrayList<Column>();
 		final Column typeColumn = PannotationFactory.eINSTANCE.createColumn();
 		typeColumn.setName(hbmContext.trunc(null, featureName + "_type"));
@@ -713,8 +636,7 @@ public abstract class AbstractMapper {
 	}
 
 	/**
-	 * Returns the (possibly overridden) columns annotation for the given
-	 * attribute.
+	 * Returns the (possibly overridden) columns annotation for the given attribute.
 	 */
 	protected List<Column> getColumns(PAnnotatedEStructuralFeature paFeature) {
 		final Column defaultColumn = paFeature.getColumn();
@@ -738,18 +660,15 @@ public abstract class AbstractMapper {
 	}
 
 	/** Sets property attributes on the basis of the column */
-	private void addColumn(Element propertyElement,
-			PAnnotatedEStructuralFeature pef, Column column,
+	private void addColumn(Element propertyElement, PAnnotatedEStructuralFeature pef, Column column,
 			boolean isNullable, boolean setColumnAttributesInProperty) {
 		if (column != null) {
 			if (setColumnAttributesInProperty) {
 				// this is not the nicest place to do this
 				if (propertyElement.getName().compareTo("property") == 0
 						|| propertyElement.getName().compareTo("many-to-one") == 0) {
-					propertyElement.addAttribute("insert",
-							column.isInsertable() ? "true" : "false");
-					propertyElement.addAttribute("update",
-							column.isUpdatable() ? "true" : "false");
+					propertyElement.addAttribute("insert", column.isInsertable() ? "true" : "false");
+					propertyElement.addAttribute("update", column.isUpdatable() ? "true" : "false");
 				}
 				// MT: I think that the column nullability should not be used
 				// for setting not-null
@@ -767,11 +686,10 @@ public abstract class AbstractMapper {
 				// can be used in case of
 				// single table inheritance mapping
 				if (!propertyElement.getName().equals("any")) {
-					propertyElement.addAttribute("not-null", isNullable
-							|| column.isNullable() ? "false" : "true");
+					propertyElement.addAttribute("not-null", isNullable || column.isNullable() ? "false"
+							: "true");
 				}
-				propertyElement.addAttribute("unique",
-						column.isUnique() ? "true" : "false");
+				propertyElement.addAttribute("unique", column.isUnique() ? "true" : "false");
 			}
 			addColumnElement(propertyElement, pef, column, isNullable);
 		}
@@ -788,18 +706,18 @@ public abstract class AbstractMapper {
 	}
 
 	/**
-	 * Creates cascades for onetoone/manytoone, they differ from many relations
-	 * because no delete-orphan is supported.
+	 * Creates cascades for onetoone/manytoone, they differ from many relations because no
+	 * delete-orphan is supported.
 	 * 
 	 * @param associationElement
-	 *            : the element to which the cascades are added.
+	 *          : the element to which the cascades are added.
 	 * @param cascade
-	 *            : list of cascade annotation types
+	 *          : list of cascade annotation types
 	 * @param addDeleteOrphan
-	 *            : if true then delete-orphan is added in case of cascade all
+	 *          : if true then delete-orphan is added in case of cascade all
 	 */
-	protected void addCascades(Element associationElement,
-			List<HbCascadeType> cascades, boolean addDeleteOrphan) {
+	protected void addCascades(Element associationElement, List<HbCascadeType> cascades,
+			boolean addDeleteOrphan) {
 		if (!cascades.isEmpty()) {
 			StringBuffer sb = new StringBuffer();
 			for (HbCascadeType cascade : cascades) {
@@ -831,20 +749,17 @@ public abstract class AbstractMapper {
 				} else if (cascade == HbCascadeType.SAVE_UPDATE) {
 					sb.append("save-update,");
 				} else {
-					throw new MappingException("Cascade " + cascade.getName()
-							+ " not supported");
+					throw new MappingException("Cascade " + cascade.getName() + " not supported");
 				}
 			}
-			associationElement.addAttribute("cascade",
-					sb.substring(0, sb.length() - 1));
+			associationElement.addAttribute("cascade", sb.substring(0, sb.length() - 1));
 		}
 	}
 
 	/**
 	 * Create an any Element
 	 */
-	public Element createAny(String name,
-			PAnnotatedEStructuralFeature paFeature, Any any,
+	public Element createAny(String name, PAnnotatedEStructuralFeature paFeature, Any any,
 			AnyMetaDef anyMetaDef, boolean isMany) {
 
 		final AnyMetaDef localAnyMetaDef;
@@ -869,8 +784,7 @@ public abstract class AbstractMapper {
 		}
 
 		// don't know how to create an element, so add an remove it...
-		final Element anyElement = getHbmContext().getCurrent()
-				.addElement(tagName)
+		final Element anyElement = getHbmContext().getCurrent().addElement(tagName)
 				.addAttribute("id-type", localAnyMetaDef.getIdType())
 				.addAttribute("meta-type", localAnyMetaDef.getMetaType());
 		getHbmContext().getCurrent().remove(anyElement);
@@ -882,8 +796,7 @@ public abstract class AbstractMapper {
 				if (((HbAnnotatedEReference) paFeature).getHbCascade() == null) {
 					cascades.add(HbCascadeType.ALL);
 				} else {
-					cascades.addAll(((HbAnnotatedEReference) paFeature)
-							.getHbCascade().getValue());
+					cascades.addAll(((HbAnnotatedEReference) paFeature).getHbCascade().getValue());
 				}
 			} else {
 				cascades.add(HbCascadeType.ALL);
@@ -895,13 +808,11 @@ public abstract class AbstractMapper {
 		if (localAny.getMetaColumn() != null) {
 			columns.add(localAny.getMetaColumn());
 		} else {
-			final Column typeColumn = PannotationFactory.eINSTANCE
-					.createColumn();
+			final Column typeColumn = PannotationFactory.eINSTANCE.createColumn();
 			// bugzilla 294201, trunc is also done later in addColumn
 			// typeColumn.setName(hbmContext.trunc(paFeature.getModelEStructuralFeature().getName()
 			// + "_type"));
-			typeColumn.setName(paFeature.getModelEStructuralFeature().getName()
-					+ "_type");
+			typeColumn.setName(paFeature.getModelEStructuralFeature().getName() + "_type");
 			typeColumn.setNullable(localAny.isOptional());
 			columns.add(typeColumn);
 		}
@@ -913,32 +824,25 @@ public abstract class AbstractMapper {
 			// bugzilla 294201, trunc is also done later in addColumn
 			// idColumn.setName(hbmContext.trunc(paFeature.getModelEStructuralFeature().getName()
 			// + "_id"));
-			idColumn.setName(paFeature.getModelEStructuralFeature().getName()
-					+ "_id");
+			idColumn.setName(paFeature.getModelEStructuralFeature().getName() + "_id");
 			idColumn.setNullable(localAny.isOptional());
 			columns.add(idColumn);
 		}
-		addColumnsAndFormula(anyElement, paFeature, columns, paFeature
-				.getModelEStructuralFeature().isRequired(), false);
+		addColumnsAndFormula(anyElement, paFeature, columns, paFeature.getModelEStructuralFeature()
+				.isRequired(), false);
 		return anyElement;
 	}
 
 	/**
-	 * Add a columnelement to the property, takes into account length, precision
-	 * etc. forceNullable is set when the feature belongs to a featuremap
+	 * Add a columnelement to the property, takes into account length, precision etc. forceNullable is
+	 * set when the feature belongs to a featuremap
 	 */
-	private void addColumnElement(Element propertyElement,
-			PAnnotatedEStructuralFeature pef, Column column,
-			boolean forceNullable) {
+	private void addColumnElement(Element propertyElement, PAnnotatedEStructuralFeature pef,
+			Column column, boolean forceNullable) {
 		if (column != null) {
-			Element columnElement = propertyElement
-					.addElement("column")
-					.addAttribute(
-							"not-null",
-							column.isNullable() || forceNullable ? "false"
-									: "true")
-					.addAttribute("unique",
-							column.isUnique() ? "true" : "false");
+			Element columnElement = propertyElement.addElement("column")
+					.addAttribute("not-null", column.isNullable() || forceNullable ? "false" : "true")
+					.addAttribute("unique", column.isUnique() ? "true" : "false");
 			final String name;
 			if (column.getName() != null) {
 				name = column.getName();
@@ -948,35 +852,27 @@ public abstract class AbstractMapper {
 					// have an id
 					final PAnnotatedEStructuralFeature embeddingFeature = getHbmContext()
 							.getEmbeddingFeature();
-					name = getHbmContext().getSqlNameStrategy().getColumnName(
-							pef,
-							embeddingFeature.getModelEStructuralFeature()
-									.getName());
+					name = getHbmContext().getSqlNameStrategy().getColumnName(pef,
+							embeddingFeature.getModelEStructuralFeature().getName());
 				} else {
-					name = getHbmContext().getSqlNameStrategy().getColumnName(
-							pef, null);
+					name = getHbmContext().getSqlNameStrategy().getColumnName(pef, null);
 				}
 			}
 			if (column.getUniqueKey() != null) {
 				columnElement.addAttribute("unique-key", column.getUniqueKey());
 			}
-			columnElement.addAttribute("name",
-					getHbmContext().trunc(column, name));
+			columnElement.addAttribute("name", getHbmContext().trunc(column, name));
 			if (column.isSetLength()) {
-				columnElement.addAttribute("length",
-						Integer.toString(column.getLength()));
+				columnElement.addAttribute("length", Integer.toString(column.getLength()));
 			}
 			if (column.isSetPrecision()) {
-				columnElement.addAttribute("precision",
-						Integer.toString(column.getPrecision()));
+				columnElement.addAttribute("precision", Integer.toString(column.getPrecision()));
 			}
 			if (column.isSetScale()) {
-				columnElement.addAttribute("scale",
-						Integer.toString(column.getScale()));
+				columnElement.addAttribute("scale", Integer.toString(column.getScale()));
 			}
 			if (column.getColumnDefinition() != null) {
-				columnElement.addAttribute("sql-type",
-						column.getColumnDefinition());
+				columnElement.addAttribute("sql-type", column.getColumnDefinition());
 			}
 			final String uc = getHbmContext().getUniqueConstraintKey(name);
 			if (uc != null) {
@@ -984,8 +880,7 @@ public abstract class AbstractMapper {
 			}
 			if (pef instanceof HbAnnotatedETypeElement
 					&& ((HbAnnotatedETypeElement) pef).getHbIndex() != null) {
-				final Index index = ((HbAnnotatedETypeElement) pef)
-						.getHbIndex();
+				final Index index = ((HbAnnotatedETypeElement) pef).getHbIndex();
 				columnElement.addAttribute("index", index.getName());
 			}
 
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/BasicMapper.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/BasicMapper.java
index ea3bd89db..1942c1838 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/BasicMapper.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/BasicMapper.java
@@ -52,7 +52,8 @@ public class BasicMapper extends AbstractMapper implements ExtensionPoint {
 
 		final EAttribute eattr = paAttribute.getModelEAttribute();
 		final String attrName = getHbmContext().getPropertyName(eattr);
-		final Element propElement = getHbmContext().getCurrent().addElement("property").addAttribute("name", attrName);
+		final Element propElement = getHbmContext().getCurrent().addElement("property")
+				.addAttribute("name", attrName);
 
 		Basic basic = paAttribute.getBasic();
 		if (basic == null) {
@@ -60,7 +61,8 @@ public class BasicMapper extends AbstractMapper implements ExtensionPoint {
 		}
 
 		propElement.addAttribute("lazy", FetchType.LAZY.equals(basic.getFetch()) ? "true" : "false");
-		addColumnsAndFormula(propElement, paAttribute, getColumns(paAttribute), isNullable(basic, paAttribute), true);
+		addColumnsAndFormula(propElement, paAttribute, getColumns(paAttribute),
+				isNullable(basic, paAttribute), true);
 		// todo check: not-null is also set in the call to addcolumns, decide
 		// were to do what!
 		final boolean isNullable = isNullable(basic, paAttribute);
@@ -69,8 +71,8 @@ public class BasicMapper extends AbstractMapper implements ExtensionPoint {
 
 		if (((HbAnnotatedEAttribute) paAttribute).getGenerated() != null
 				&& ((HbAnnotatedEAttribute) paAttribute).getGenerated().getValue() != null) {
-			propElement.addAttribute("generated", ((HbAnnotatedEAttribute) paAttribute).getGenerated().getValue()
-					.getName().toLowerCase());
+			propElement.addAttribute("generated", ((HbAnnotatedEAttribute) paAttribute).getGenerated()
+					.getValue().getName().toLowerCase());
 		}
 
 		if (((HbAnnotatedEAttribute) paAttribute).getHbIndex() != null) {
@@ -86,15 +88,16 @@ public class BasicMapper extends AbstractMapper implements ExtensionPoint {
 		if (getHbmContext().getPersistenceOptions().isMapFeatureMapAsComponent()) {
 			final String name = getHbmContext().getPropertyName(paAttribute.getModelEAttribute());
 			final FeatureMapMapping fmm = new FeatureMapMapping(getHbmContext(), paAttribute);
-			final Element element = getHbmContext().getCurrent().addElement("component").addAttribute("name", name);
+			final Element element = getHbmContext().getCurrent().addElement("component")
+					.addAttribute("name", name);
 			fmm.setCompositeElement(element);
 			fmm.process();
 		} else {
 			FeatureMapMapping fmm = new FeatureMapMapping(getHbmContext(), paAttribute);
 			getHbmContext().addFeatureMapMapper(fmm);
 			final String name = getHbmContext().getPropertyName(paAttribute.getModelEAttribute());
-			getHbmContext().getCurrent().addElement("many-to-one").addAttribute("name", name).addAttribute(
-					"entity-name", fmm.getEntityName()).addAttribute("cascade", "all")
+			getHbmContext().getCurrent().addElement("many-to-one").addAttribute("name", name)
+					.addAttribute("entity-name", fmm.getEntityName()).addAttribute("cascade", "all")
 					.addAttribute("not-null", "false");
 		}
 	}
@@ -105,7 +108,8 @@ public class BasicMapper extends AbstractMapper implements ExtensionPoint {
 
 		final EReference eref = paReference.getModelEReference();
 		final String propName = getHbmContext().getPropertyName(eref);
-		final Element propElement = getHbmContext().getCurrent().addElement("property").addAttribute("name", propName);
+		final Element propElement = getHbmContext().getCurrent().addElement("property")
+				.addAttribute("name", propName);
 
 		ManyToOne mto = paReference.getManyToOne();
 		if (mto == null) {
@@ -138,7 +142,8 @@ public class BasicMapper extends AbstractMapper implements ExtensionPoint {
 		final String attrName = getHbmContext().getPropertyName(paAttribute.getModelEAttribute());
 		log.debug("addProperty: " + attrName + " temporal " + tt.getName());
 
-		final Element propElement = getHbmContext().getCurrent().addElement("property").addAttribute("name", attrName);
+		final Element propElement = getHbmContext().getCurrent().addElement("property")
+				.addAttribute("name", attrName);
 
 		Basic basic = paAttribute.getBasic();
 		if (basic == null) {
@@ -146,15 +151,16 @@ public class BasicMapper extends AbstractMapper implements ExtensionPoint {
 		}
 
 		propElement.addAttribute("lazy", FetchType.LAZY.equals(basic.getFetch()) ? "true" : "false");
-		addColumnsAndFormula(propElement, paAttribute, getColumns(paAttribute), isNullable(basic, paAttribute), true);
+		addColumnsAndFormula(propElement, paAttribute, getColumns(paAttribute),
+				isNullable(basic, paAttribute), true);
 		// todo check: not-null is also set in the call to addcolumns, decide
 		// were to do what!
 		propElement.addAttribute("not-null", isNullable(basic, paAttribute) ? "false" : "true");
 
 		if (((HbAnnotatedEAttribute) paAttribute).getGenerated() != null
 				&& ((HbAnnotatedEAttribute) paAttribute).getGenerated().getValue() != null) {
-			propElement.addAttribute("generated", ((HbAnnotatedEAttribute) paAttribute).getGenerated().getValue()
-					.getName().toLowerCase());
+			propElement.addAttribute("generated", ((HbAnnotatedEAttribute) paAttribute).getGenerated()
+					.getValue().getName().toLowerCase());
 		}
 
 		// #191463
@@ -180,9 +186,10 @@ public class BasicMapper extends AbstractMapper implements ExtensionPoint {
 		}
 
 		propElement.addAttribute("lazy", FetchType.LAZY.equals(basic.getFetch()) ? "true" : "false");
-		addColumnsAndFormula(propElement, paAttribute, getColumns(paAttribute), isNullable(basic, paAttribute), true);
+		addColumnsAndFormula(propElement, paAttribute, getColumns(paAttribute),
+				isNullable(basic, paAttribute), true);
 		final boolean isNullable = isNullable(basic, paAttribute);
-//		final boolean isNullable2 = isNullable(basic, paAttribute);
+		// final boolean isNullable2 = isNullable(basic, paAttribute);
 		propElement.addAttribute("not-null", isNullable ? "false" : "true");
 		setType(paAttribute, propElement);
 
@@ -202,8 +209,8 @@ public class BasicMapper extends AbstractMapper implements ExtensionPoint {
 		}
 
 		final List<Column> columns = getColumns(paAttribute);
-		final Element propElement = getHbmContext().getCurrent().addElement("property").addAttribute("name",
-				getHbmContext().getPropertyName(paAttribute.getModelEAttribute()));
+		final Element propElement = getHbmContext().getCurrent().addElement("property")
+				.addAttribute("name", getHbmContext().getPropertyName(paAttribute.getModelEAttribute()));
 		propElement.addAttribute("lazy", FetchType.LAZY.equals(basic.getFetch()) ? "true" : "false");
 		propElement.addAttribute("not-null", isNullable(basic, paAttribute) ? "false" : "true");
 		addColumnsAndFormula(propElement, paAttribute, columns, isNullable(basic, paAttribute)
@@ -222,14 +229,15 @@ public class BasicMapper extends AbstractMapper implements ExtensionPoint {
 			log.debug("Generating version for " + paAttribute.getModelEAttribute().getName());
 		}
 		final EAttribute eAttribute = paAttribute.getModelEAttribute();
-		final Element propElement = getHbmContext().getCurrent().addElement("version").addAttribute("name",
-				eAttribute.getName());
+		final Element propElement = getHbmContext().getCurrent().addElement("version")
+				.addAttribute("name", eAttribute.getName());
 		List<Column> columns = getColumns(paAttribute);
 		if (columns.size() > 1) {
 			log.warn("Version has more than one attribute, only using the first one, eclass: "
 					+ paAttribute.getModelEAttribute().getEContainingClass().getName());
 		}
-		addColumnsAndFormula(propElement, paAttribute, columns, getHbmContext().isCurrentElementFeatureMap(), false);
+		addColumnsAndFormula(propElement, paAttribute, columns, getHbmContext()
+				.isCurrentElementFeatureMap(), false);
 		setType(paAttribute, propElement);
 
 		addAccessor(propElement, hbmContext.getVersionPropertyHandlerName());
@@ -239,9 +247,8 @@ public class BasicMapper extends AbstractMapper implements ExtensionPoint {
 	protected void addNaturalId(HbAnnotatedEAttribute hbAttr, Element element) {
 
 		if (hbAttr.getNaturalId() != null) {
-			element
-					.addAttribute(HbMapperConstants.NATURAL_ID_ATTR, Boolean
-							.toString(hbAttr.getNaturalId().isMutable()));
+			element.addAttribute(HbMapperConstants.NATURAL_ID_ATTR,
+					Boolean.toString(hbAttr.getNaturalId().isMutable()));
 		}
 
 	}
@@ -251,13 +258,15 @@ public class BasicMapper extends AbstractMapper implements ExtensionPoint {
 	 */
 	public void processTransient(PAnnotatedEStructuralFeature paFeature) {
 		if (log.isDebugEnabled()) {
-			log.debug("Skipping transient feature for " + paFeature.getModelEStructuralFeature().getName());
+			log.debug("Skipping transient feature for "
+					+ paFeature.getModelEStructuralFeature().getName());
 		}
 	}
 
 	/**
-	 * A prop is nullable if the basic is optional or the feature is part of a featuremap. The last reason is because
-	 * featuremapentries will have all the features of the featuremap with only one of them filled.
+	 * A prop is nullable if the basic is optional or the feature is part of a featuremap. The last
+	 * reason is because featuremapentries will have all the features of the featuremap with only one
+	 * of them filled.
 	 */
 	private boolean isNullable(Basic basic, PAnnotatedEAttribute aattr) {
 		// actually aattr.getColumn() should never be null as the default
@@ -286,8 +295,8 @@ public class BasicMapper extends AbstractMapper implements ExtensionPoint {
 		// getHbmContext().isCurrentElementFeatureMap() &&
 		// (aattr.getColumn() != null || aattr.getColumn().isNullable());
 		return getHbmContext().isDoForceOptional(paFeature)
-				|| ((paFeature.getColumn() == null || !paFeature.getColumn().isSetNullable()) && mto.isOptional())
-				|| getHbmContext().isCurrentElementFeatureMap()
+				|| ((paFeature.getColumn() == null || !paFeature.getColumn().isSetNullable()) && mto
+						.isOptional()) || getHbmContext().isCurrentElementFeatureMap()
 				|| (paFeature.getColumn() != null && paFeature.getColumn().isNullable());
 	}
 }
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/EmbeddedMapper.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/EmbeddedMapper.java
index f937d7765..e5beb7c3f 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/EmbeddedMapper.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/EmbeddedMapper.java
@@ -43,10 +43,8 @@ public class EmbeddedMapper extends AbstractMapper implements ExtensionPoint {
 		// push the current overrides
 		getHbmContext().pushOverrideOnStack();
 		// and add our own
-		getHbmContext().addAttributeOverrides(
-				paReference.getAttributeOverrides());
-		getHbmContext().addAssociationOverrides(
-				paReference.getAssociationOverrides());
+		getHbmContext().addAttributeOverrides(paReference.getAttributeOverrides());
+		getHbmContext().addAssociationOverrides(paReference.getAssociationOverrides());
 
 		// push the feature is used for automatic renaming
 		getHbmContext().pushEmbeddingFeature(paReference);
@@ -54,20 +52,15 @@ public class EmbeddedMapper extends AbstractMapper implements ExtensionPoint {
 			// make a difference between a many-to-one component and
 			// multi-component
 			if (paReference.getManyToOne() != null) {
-				processSingleEmbedded(paReference, paReference
-						.getModelEReference().getEReferenceType());
+				processSingleEmbedded(paReference, paReference.getModelEReference().getEReferenceType());
 			} else if (paReference.getOneToOne() != null) {
-				processSingleEmbedded(paReference, paReference
-						.getModelEReference().getEReferenceType());
+				processSingleEmbedded(paReference, paReference.getModelEReference().getEReferenceType());
 			} else {
 				if (paReference.getManyToMany() != null) {
-					throw new MappingException(
-							"ManyToMany can not be combined with Embedded "
-									+ paReference);
+					throw new MappingException("ManyToMany can not be combined with Embedded " + paReference);
 				} else if (paReference.getOneToMany() == null) {
-					throw new MappingException(
-							"OneToMany must be set for embedded elist type: "
-									+ paReference);
+					throw new MappingException("OneToMany must be set for embedded elist type: "
+							+ paReference);
 				}
 
 				// only one to many
@@ -81,23 +74,21 @@ public class EmbeddedMapper extends AbstractMapper implements ExtensionPoint {
 	}
 
 	/** Process a many-to-one component */
-	private void processSingleEmbedded(PAnnotatedEReference paReference,
-			EClass target) {
+	private void processSingleEmbedded(PAnnotatedEReference paReference, EClass target) {
 		log.debug("Processing single embedded: " + paReference.toString());
 
-		final Element componentElement = getHbmContext().getCurrent()
-				.addElement("component").addAttribute("name",
-						paReference.getModelEReference().getName());
+		final Element componentElement = getHbmContext().getCurrent().addElement("component")
+				.addAttribute("name", paReference.getModelEReference().getName());
 
 		// todo: change recognizing a component to using metadata!
 		// then the class tag can point to a real impl. class@
-		componentElement.addAttribute("class", getHbmContext()
-				.getInstanceClassName(target)); // implClass
-		
+		componentElement.addAttribute("class", getHbmContext().getInstanceClassName(target)); // implClass
+
 		final Element meta1 = new Element("meta");
-		meta1.addAttribute("attribute", HbMapperConstants.ECLASS_NAME_META).addText(paReference.getEReferenceType().getName());
+		meta1.addAttribute("attribute", HbMapperConstants.ECLASS_NAME_META).addText(
+				paReference.getEReferenceType().getName());
 		meta1.addAttribute("inherit", "false");
-		
+
 		final Element meta2 = new Element("meta");
 		meta2.addAttribute("attribute", HbMapperConstants.EPACKAGE_META).addText(
 				paReference.getEReferenceType().getEPackage().getNsURI());
@@ -114,18 +105,15 @@ public class EmbeddedMapper extends AbstractMapper implements ExtensionPoint {
 		getHbmContext().setCurrent(componentElement);
 		try {
 			// process the features of the target
-			final PAnnotatedEClass componentAClass = paReference.getPaModel()
-					.getPAnnotated(
-							paReference.getModelEReference()
-									.getEReferenceType());
+			final PAnnotatedEClass componentAClass = paReference.getPaModel().getPAnnotated(
+					paReference.getModelEReference().getEReferenceType());
 
 			getHbmContext().processFeatures(getAllFeatures(componentAClass));
 		} finally {
 			getHbmContext().setCurrent(componentElement.getParent());
 		}
 
-		addAccessor(componentElement, hbmContext
-				.getComponentPropertyHandlerName());
+		addAccessor(componentElement, hbmContext.getComponentPropertyHandlerName());
 	}
 
 	/** Process a list of components */
@@ -134,7 +122,6 @@ public class EmbeddedMapper extends AbstractMapper implements ExtensionPoint {
 
 		// let the featureprocessor handle this, the one to many is handled by
 		// the OneToManyMapper
-		getHbmContext().getFeatureMapper().getOneToManyMapper().process(
-				paReference);
+		getHbmContext().getFeatureMapper().getOneToManyMapper().process(paReference);
 	}
 }
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/EntityMapper.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/EntityMapper.java
index cdbda5053..92af40201 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/EntityMapper.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/EntityMapper.java
@@ -41,8 +41,7 @@ import org.eclipse.emf.teneo.simpledom.DocumentHelper;
 import org.eclipse.emf.teneo.simpledom.Element;
 
 /**
- * Maps the entity and its features, also takes care of embedded superclass
- * mapping.
+ * Maps the entity and its features, also takes care of embedded superclass mapping.
  * 
  * @author <a href="mailto:mtaal at elver.org">Martin Taal</a>
  */
@@ -73,9 +72,8 @@ public class EntityMapper extends AbstractMapper implements ExtensionPoint {
 	private final String PRIMARY_TABLE_KEY = null;
 
 	/**
-	 * @return Return the name used by hibernate to denote the given inheritance
-	 *         type. If the argument is null, the default inheritance type
-	 *         (SINGLE_TABLE) is used instead.
+	 * @return Return the name used by hibernate to denote the given inheritance type. If the argument
+	 *         is null, the default inheritance type (SINGLE_TABLE) is used instead.
 	 */
 	private static String hbInheritanceName(InheritanceType inheritanceType) {
 		return EntityMapper.INHERITANCE_STRATEGY_NAMES[inheritanceType != null ? inheritanceType
@@ -93,17 +91,15 @@ public class EntityMapper extends AbstractMapper implements ExtensionPoint {
 	/**
 	 * @return Returns a new hibernate element for the given entity.
 	 */
-	private Element createEntity(PAnnotatedEClass entity,
-			InheritanceType inhStrategy, PAnnotatedEClass superEntity,
-			DiscriminatorValue dValue, Table table) {
+	private Element createEntity(PAnnotatedEClass entity, InheritanceType inhStrategy,
+			PAnnotatedEClass superEntity, DiscriminatorValue dValue, Table table) {
 		// determine what type of hibernate tag should be used
 		final InheritanceType inheritanceStrategy = inhStrategy != null ? inhStrategy
 				: InheritanceType.SINGLE_TABLE;
 		final EClass eclass = entity.getModelEClass();
 		final String hbClassName;
 		if (entity.getEavMapping() != null) {
-			hbClassName = EntityMapper
-					.hbInheritanceName(InheritanceType.SINGLE_TABLE);
+			hbClassName = EntityMapper.hbInheritanceName(InheritanceType.SINGLE_TABLE);
 		} else if (superEntity == null) {
 			hbClassName = "class";
 		} else {
@@ -120,8 +116,7 @@ public class EntityMapper extends AbstractMapper implements ExtensionPoint {
 				&& ((HbAnnotatedEClass) entity).getHbProxy().isLazy();
 		if (entity.isOnlyMapAsEntity()) {
 			target = getHbmContext().getCurrent().addElement(hbClassName)
-					.addAttribute("entity-name", entityName)
-					.addAttribute("abstract", isAbstractStr)
+					.addAttribute("entity-name", entityName).addAttribute("abstract", isAbstractStr)
 					.addAttribute("lazy", "false");
 
 			// note for composite ids the name must be set always!
@@ -131,44 +126,29 @@ public class EntityMapper extends AbstractMapper implements ExtensionPoint {
 			if (hasCompositeID(entity)) { // only for this specific case
 				// it is
 				// required to have the impl.name
-				target.addAttribute("name", hbmContext
-						.getInstanceClassName(entity.getModelEClass()));
+				target.addAttribute("name", hbmContext.getInstanceClassName(entity.getModelEClass()));
 			}
 		} else if (getHbmContext().forceUseOfInstance(entity)) {
 
 			final Element importElement = new Element("import");
 
-			importElement.addAttribute("class",
-					hbmContext.getInstanceClassName(entity.getModelEClass()))
+			importElement.addAttribute("class", hbmContext.getInstanceClassName(entity.getModelEClass()))
 					.addAttribute("rename", entityName);
 			getHbmContext().getCurrent().add(getImportIndex(), importElement);
 
-			target = getHbmContext()
-					.getCurrent()
-					.addElement(hbClassName)
-					.addAttribute(
-							"name",
-							hbmContext.getInstanceClassName(entity
-									.getModelEClass()))
-					.addAttribute("abstract", isAbstractStr)
-					.addAttribute("lazy", doProxy ? "true" : "false");
+			target = getHbmContext().getCurrent().addElement(hbClassName)
+					.addAttribute("name", hbmContext.getInstanceClassName(entity.getModelEClass()))
+					.addAttribute("abstract", isAbstractStr).addAttribute("lazy", doProxy ? "true" : "false");
 		} else {
 			// don't specify the name as it is a dynamic eobject
 			if (getHbmContext().getInstanceClass(entity.getModelEClass()) == null) {
 				target = getHbmContext().getCurrent().addElement(hbClassName)
-						.addAttribute("entity-name", entityName)
-						.addAttribute("abstract", isAbstractStr)
+						.addAttribute("entity-name", entityName).addAttribute("abstract", isAbstractStr)
 						.addAttribute("lazy", doProxy ? "true" : "false");
 			} else {
-				target = getHbmContext()
-						.getCurrent()
-						.addElement(hbClassName)
-						.addAttribute(
-								"name",
-								hbmContext.getInstanceClassName(entity
-										.getModelEClass()))
-						.addAttribute("entity-name", entityName)
-						.addAttribute("abstract", isAbstractStr)
+				target = getHbmContext().getCurrent().addElement(hbClassName)
+						.addAttribute("name", hbmContext.getInstanceClassName(entity.getModelEClass()))
+						.addAttribute("entity-name", entityName).addAttribute("abstract", isAbstractStr)
 						.addAttribute("lazy", doProxy ? "true" : "false");
 			}
 		}
@@ -181,24 +161,22 @@ public class EntityMapper extends AbstractMapper implements ExtensionPoint {
 		}
 
 		if (hbEntity.getBatchSize() != null) {
-			target.addAttribute("batch-size", ""
-					+ hbEntity.getBatchSize().getSize());
+			target.addAttribute("batch-size", "" + hbEntity.getBatchSize().getSize());
 		}
 
 		if (hbEntity.getHbEntity() != null) {
 			final HbEntity hbEntityAnnon = hbEntity.getHbEntity();
 			if (superEntity == null) {
-				if (!hbEntityAnnon.isMutable()
-						&& target.getAttributeValue("mutable") == null) {
+				if (!hbEntityAnnon.isMutable() && target.getAttributeValue("mutable") == null) {
 					target.addAttribute("mutable", "false");
 				}
 				if (hbEntityAnnon.getPolymorphism() != null) {
-					target.addAttribute("polymorphism", hbEntityAnnon
-							.getPolymorphism().getName().toLowerCase());
+					target.addAttribute("polymorphism", hbEntityAnnon.getPolymorphism().getName()
+							.toLowerCase());
 				}
 				if (hbEntityAnnon.getOptimisticLock() != null) {
-					target.addAttribute("optimistic-lock", hbEntityAnnon
-							.getOptimisticLock().getName().toLowerCase());
+					target.addAttribute("optimistic-lock", hbEntityAnnon.getOptimisticLock().getName()
+							.toLowerCase());
 				}
 			}
 			if (hbEntityAnnon.isDynamicInsert()) {
@@ -218,13 +196,10 @@ public class EntityMapper extends AbstractMapper implements ExtensionPoint {
 
 		if (superEntity != null) {
 			final String extendsEntity;
-			if (superEntity.isOnlyMapAsEntity()
-					|| !getHbmContext().forceUseOfInstance(superEntity)) {
-				extendsEntity = getHbmContext().getEntityName(
-						superEntity.getModelEClass());
+			if (superEntity.isOnlyMapAsEntity() || !getHbmContext().forceUseOfInstance(superEntity)) {
+				extendsEntity = getHbmContext().getEntityName(superEntity.getModelEClass());
 			} else {
-				extendsEntity = getHbmContext().getInstanceClassName(
-						superEntity.getModelEClass());
+				extendsEntity = getHbmContext().getInstanceClassName(superEntity.getModelEClass());
 			}
 			target.addAttribute("extends", extendsEntity);
 			log.debug("Extends " + extendsEntity);
@@ -232,17 +207,14 @@ public class EntityMapper extends AbstractMapper implements ExtensionPoint {
 
 		if (entity.getEavMapping() != null) {
 			if (superEntity == null) {
-				target.addAttribute("extends",
-						Constants.EAV_EOBJECT_ENTITY_NAME);
+				target.addAttribute("extends", Constants.EAV_EOBJECT_ENTITY_NAME);
 			}
 
 			target.addAttribute("discriminator-value", dValue.getValue());
 
 			if (((HbAnnotatedEClass) entity).getHbProxy() != null
-					&& ((HbAnnotatedEClass) entity).getHbProxy()
-							.getProxyClass() != null) {
-				final String proxyInterfaceName = ((HbAnnotatedEClass) entity)
-						.getHbProxy().getProxyClass();
+					&& ((HbAnnotatedEClass) entity).getHbProxy().getProxyClass() != null) {
+				final String proxyInterfaceName = ((HbAnnotatedEClass) entity).getHbProxy().getProxyClass();
 				target.addAttribute("proxy", proxyInterfaceName);
 			}
 			// stop here for eav
@@ -250,49 +222,40 @@ public class EntityMapper extends AbstractMapper implements ExtensionPoint {
 		}
 
 		if (dValue != null
-				&& !target.getName().equals(
-						INHERITANCE_STRATEGY_NAMES[InheritanceType.JOINED
-								.getValue()])
-				&& !target.getName().equals(
-						InheritanceType.TABLE_PER_CLASS.getValue())) {
+				&& !target.getName().equals(INHERITANCE_STRATEGY_NAMES[InheritanceType.JOINED.getValue()])
+				&& !target.getName().equals(InheritanceType.TABLE_PER_CLASS.getValue())) {
 			target.addAttribute("discriminator-value", dValue.getValue());
 			log.debug("DValue " + dValue.getValue());
 		}
 
 		if (table != null
 				&& hbClassName
-						.compareTo(INHERITANCE_STRATEGY_NAMES[InheritanceType.SINGLE_TABLE
-								.getValue()]) == 0) {
+						.compareTo(INHERITANCE_STRATEGY_NAMES[InheritanceType.SINGLE_TABLE.getValue()]) == 0) {
 			log.warn("EClass/Entity ("
 					+ entityName
 					+ ") is mapped as subclass in a single table with its superclass but it also has a table annotation. This table annotation is ignored.");
 		} else if (table != null) {
 			if (table.getName() != null) {
-				target.addAttribute("table",
-						getHbmContext().trunc(table, table.getName(), false));
+				target.addAttribute("table", getHbmContext().trunc(table, table.getName(), false));
 				log.debug("Table " + table.getName());
 			}
 			if (table.getSchema() != null) {
-				target.addAttribute("schema",
-						getHbmContext().trunc(table.getSchema(), false));
+				target.addAttribute("schema", getHbmContext().trunc(null, table.getSchema(), false));
 				log.debug("Schema " + table.getSchema());
 			}
 			if (table.getCatalog() != null) {
-				target.addAttribute("catalog",
-						getHbmContext().trunc(table.getCatalog(), false));
+				target.addAttribute("catalog", getHbmContext().trunc(null, table.getCatalog(), false));
 				log.debug("Catalog " + table.getCatalog());
 			}
 		}
 
 		if (((HbAnnotatedEClass) entity).getHbWhere() != null) {
-			target.addAttribute("where", ((HbAnnotatedEClass) entity)
-					.getHbWhere().getClause());
+			target.addAttribute("where", ((HbAnnotatedEClass) entity).getHbWhere().getClause());
 		}
 
 		if (((HbAnnotatedEClass) entity).getHbProxy() != null
 				&& ((HbAnnotatedEClass) entity).getHbProxy().getProxyClass() != null) {
-			final String proxyInterfaceName = ((HbAnnotatedEClass) entity)
-					.getHbProxy().getProxyClass();
+			final String proxyInterfaceName = ((HbAnnotatedEClass) entity).getHbProxy().getProxyClass();
 			target.addAttribute("proxy", proxyInterfaceName);
 		}
 
@@ -307,8 +270,7 @@ public class EntityMapper extends AbstractMapper implements ExtensionPoint {
 			final Element e = (Element) children.get(i);
 			final String name = e.getName();
 			if (name.compareTo("class") == 0 || name.compareTo("subclass") == 0
-					|| name.compareTo("joined-subclass") == 0
-					|| name.compareTo("union-subclass") == 0) {
+					|| name.compareTo("joined-subclass") == 0 || name.compareTo("union-subclass") == 0) {
 				return i;
 			}
 			if (name.compareTo("typedef") == 0 || name.compareTo("meta") == 0) {
@@ -332,8 +294,7 @@ public class EntityMapper extends AbstractMapper implements ExtensionPoint {
 			}
 		}
 		{
-			List<PAnnotatedEStructuralFeature> features = aClass
-					.getPaEStructuralFeatures();
+			List<PAnnotatedEStructuralFeature> features = aClass.getPaEStructuralFeatures();
 			for (PAnnotatedEStructuralFeature feature : features) {
 				if (feature instanceof PAnnotatedEReference
 						&& ((PAnnotatedEReference) feature).getEmbeddedId() != null) {
@@ -353,9 +314,8 @@ public class EntityMapper extends AbstractMapper implements ExtensionPoint {
 		}
 
 		final HbAnnotatedEClass hbEntity = (HbAnnotatedEClass) entity;
-		Element entityElement = createEntity(entity,
-				entity.getInheritanceStrategy(), entity.getPaSuperEntity(),
-				entity.getDiscriminatorValue(), entity.getTable());
+		Element entityElement = createEntity(entity, entity.getInheritanceStrategy(),
+				entity.getPaSuperEntity(), entity.getDiscriminatorValue(), entity.getTable());
 
 		if (entity.getEavMapping() != null) {
 			return;
@@ -369,29 +329,23 @@ public class EntityMapper extends AbstractMapper implements ExtensionPoint {
 		// the id
 		// element has been placed
 
-		if (entity.getPaSuperEntity() == null
-				&& entity.getPrimaryKeyJoinColumns() != null
+		if (entity.getPaSuperEntity() == null && entity.getPrimaryKeyJoinColumns() != null
 				&& entity.getPrimaryKeyJoinColumns().size() > 0) {
-			log.warn("This entity ("
-					+ entity.getEntity().getName()
+			log.warn("This entity (" + entity.getEntity().getName()
 					+ " is the root in the class hierarchy and "
 					+ "has a pk joincolum annotation, this is not correct, ignoring pk joincolumn annotation");
-		} else if (InheritanceType.SINGLE_TABLE.equals(entity
-				.getInheritanceStrategy())
+		} else if (InheritanceType.SINGLE_TABLE.equals(entity.getInheritanceStrategy())
 				&& entity.getPrimaryKeyJoinColumns() != null
 				&& entity.getPrimaryKeyJoinColumns().size() > 0) {
-			log.warn("Single table inheritance strategy (entity "
-					+ entity.getEntity().getName()
+			log.warn("Single table inheritance strategy (entity " + entity.getEntity().getName()
 					+ ", primary key join column annotation is ignored for subclass");
 		} else if (entity.getPrimaryKeyJoinColumns() != null
 				&& entity.getPrimaryKeyJoinColumns().size() > 0) {
 			addPrimaryKeyJoinColumn(entity.getPrimaryKeyJoinColumns(), entity);
 		} else if (entity.getPaSuperEntity() != null
-				&& InheritanceType.JOINED.equals(entity
-						.getInheritanceStrategy())) {
+				&& InheritanceType.JOINED.equals(entity.getInheritanceStrategy())) {
 			final ArrayList<PrimaryKeyJoinColumn> list = new ArrayList<PrimaryKeyJoinColumn>();
-			final PrimaryKeyJoinColumn pkjc = PannotationFactory.eINSTANCE
-					.createPrimaryKeyJoinColumn();
+			final PrimaryKeyJoinColumn pkjc = PannotationFactory.eINSTANCE.createPrimaryKeyJoinColumn();
 			final String entityName = mc.getEntityName(entity.getModelEClass());
 			mc.trunc(pkjc, entityName + "id"); // TODO improve name
 			// creation here
@@ -400,27 +354,24 @@ public class EntityMapper extends AbstractMapper implements ExtensionPoint {
 		}
 
 		try {
-			final List<PAnnotatedEStructuralFeature> inheritedFeatures = mc
-					.getInheritedFeatures(entity);
+			final List<PAnnotatedEStructuralFeature> inheritedFeatures = mc.getInheritedFeatures(entity);
 
 			mc.setForceOptional(entity.getPaSuperEntity() != null
-					&& (entity.getInheritanceStrategy() == null || InheritanceType.SINGLE_TABLE
-							.equals(entity.getInheritanceStrategy())));
+					&& (entity.getInheritanceStrategy() == null || InheritanceType.SINGLE_TABLE.equals(entity
+							.getInheritanceStrategy())));
 
 			mc.pushOverrideOnStack();
 			mc.addAttributeOverrides(entity.getAttributeOverrides());
 			mc.addAssociationOverrides(entity.getAssociationOverrides());
 
 			if (inheritedFeatures.size() > 0) {
-				log.debug("There are " + inheritedFeatures.size()
-						+ " inherited features ");
+				log.debug("There are " + inheritedFeatures.size() + " inherited features ");
 			}
 
 			try {
 				processFeatures(inheritedFeatures);
 
-				final EList<SecondaryTable> secondaryTables = entity
-						.getSecondaryTables();
+				final EList<SecondaryTable> secondaryTables = entity.getSecondaryTables();
 				if (secondaryTables == null || secondaryTables.isEmpty()) {
 					// Process features normally.
 					processFeatures(entity.getPaEStructuralFeatures());
@@ -455,16 +406,13 @@ public class EntityMapper extends AbstractMapper implements ExtensionPoint {
 				if (((HbAnnotatedEClass) entity).getDiscriminatorFormula() != null) {
 					entityElement.add(
 							index++,
-							createDiscriminatorElement(
-									hbEntity.getDiscriminatorFormula(),
-									entity.getDiscriminatorColumn(),
-									hbEntity.getForceDiscriminator() != null));
+							createDiscriminatorElement(hbEntity.getDiscriminatorFormula(),
+									entity.getDiscriminatorColumn(), hbEntity.getForceDiscriminator() != null));
 				} else if (entity.getDiscriminatorColumn() != null) {
 					// add discriminator element immediately after id element
 					entityElement.add(
 							index++,
-							createDiscriminatorElement(
-									entity.getDiscriminatorColumn(),
+							createDiscriminatorElement(entity.getDiscriminatorColumn(),
 									hbEntity.getForceDiscriminator() != null));
 				}
 
@@ -498,8 +446,7 @@ public class EntityMapper extends AbstractMapper implements ExtensionPoint {
 		}
 
 		// initially the comment is placed at the back, move it to the front
-		final Element comment = addCommentElement(entity.getModelEClass(),
-				entityElement);
+		final Element comment = addCommentElement(entity.getModelEClass(), entityElement);
 		if (comment != null) {
 			entityElement.remove(comment);
 			entityElement.add(0, comment);
@@ -508,22 +455,20 @@ public class EntityMapper extends AbstractMapper implements ExtensionPoint {
 		// place the tuplizer at the front
 		mc.addTuplizerElement(entityElement, entity);
 
-		if ((entity.getPaSuperEntity() == null || entity.getPaSuperEntity()
-				.getMappedSuperclass() != null)
+		if ((entity.getPaSuperEntity() == null || entity.getPaSuperEntity().getMappedSuperclass() != null)
 				&& ((HbAnnotatedEClass) entity).getHbCache() != null) {
 			// then add the cache at the front
-			addCacheElement(entityElement,
-					((HbAnnotatedEClass) entity).getHbCache());
+			addCacheElement(entityElement, ((HbAnnotatedEClass) entity).getHbCache());
 		}
 
 		// and add the metas at the front
 		final Element meta1 = new Element("meta");
-		meta1.addAttribute("attribute", HbMapperConstants.ECLASS_NAME_META)
-				.addText(entity.getModelEClass().getName());
+		meta1.addAttribute("attribute", HbMapperConstants.ECLASS_NAME_META).addText(
+				entity.getModelEClass().getName());
 		meta1.addAttribute("inherit", "false");
 		final Element meta2 = new Element("meta");
-		meta2.addAttribute("attribute", HbMapperConstants.EPACKAGE_META)
-				.addText(entity.getModelEClass().getEPackage().getNsURI());
+		meta2.addAttribute("attribute", HbMapperConstants.EPACKAGE_META).addText(
+				entity.getModelEClass().getEPackage().getNsURI());
 		meta2.addAttribute("inherit", "false");
 
 		entityElement.add(0, meta1);
@@ -548,8 +493,7 @@ public class EntityMapper extends AbstractMapper implements ExtensionPoint {
 		boolean mutable = false;
 		for (Element element : parentElement.getChildren()) {
 			String value;
-			if ((value = element
-					.getAttributeValue(HbMapperConstants.NATURAL_ID_ATTR)) != null) {
+			if ((value = element.getAttributeValue(HbMapperConstants.NATURAL_ID_ATTR)) != null) {
 				if (naturalIdElements.isEmpty()) {
 					log.debug("Found natural-id, mutable: " + mutable);
 					mutable = Boolean.parseBoolean(value);
@@ -559,8 +503,7 @@ public class EntityMapper extends AbstractMapper implements ExtensionPoint {
 			}
 		}
 		if (!naturalIdElements.isEmpty()) {
-			log.debug("Found "
-					+ naturalIdElements.size()
+			log.debug("Found " + naturalIdElements.size()
 					+ " naturalid properies, putting them inside a natural-id tag");
 			parentElement.getChildren().removeAll(naturalIdElements);
 			final Element naturalId = parentElement.addElement("natural-id");
@@ -584,8 +527,7 @@ public class EntityMapper extends AbstractMapper implements ExtensionPoint {
 		// added
 		// to the featuremapmappers in the context, therefore this process walks
 		// on
-		List<FeatureMapMapping> featureMapMappers = getHbmContext()
-				.getClearFeatureMapMappers();
+		List<FeatureMapMapping> featureMapMappers = getHbmContext().getClearFeatureMapMappers();
 		while (featureMapMappers.size() > 0) {
 
 			for (FeatureMapMapping fmm : featureMapMappers) {
@@ -599,8 +541,7 @@ public class EntityMapper extends AbstractMapper implements ExtensionPoint {
 	}
 
 	/**
-	 * Process the features of the mapped superclass so that they are added to
-	 * the current mapping
+	 * Process the features of the mapped superclass so that they are added to the current mapping
 	 */
 	protected void processMappedSuper(PAnnotatedEClass paMappedSuper) {
 		processFeatures(paMappedSuper.getPaEStructuralFeatures());
@@ -625,22 +566,17 @@ public class EntityMapper extends AbstractMapper implements ExtensionPoint {
 			tableNames.add(secondaryTable.getName());
 		}
 		final Map<String, List<PAnnotatedEStructuralFeature>> featuresByTable = new HashMap<String, List<PAnnotatedEStructuralFeature>>();
-		for (PAnnotatedEStructuralFeature feature : entity
-				.getPaEStructuralFeatures()) {
+		for (PAnnotatedEStructuralFeature feature : entity.getPaEStructuralFeatures()) {
 			// find the table for the feature
-			final String tableName = getHbmContext().getSecondaryTableName(
-					feature);
+			final String tableName = getHbmContext().getSecondaryTableName(feature);
 			// if there put it in the correct list
 			if (!tableNames.contains(tableName)) {
-				final String message = "Feature \""
-						+ feature.getModelElement().getName()
-						+ "\" was mapped to undeclared secondary table \""
-						+ tableName + "\".";
+				final String message = "Feature \"" + feature.getModelElement().getName()
+						+ "\" was mapped to undeclared secondary table \"" + tableName + "\".";
 				log.error(message);
 				throw new MappingException(message);
 			}
-			List<PAnnotatedEStructuralFeature> featuresInTable = featuresByTable
-					.get(tableName);
+			List<PAnnotatedEStructuralFeature> featuresInTable = featuresByTable.get(tableName);
 			if (featuresInTable == null) {
 				featuresInTable = new ArrayList<PAnnotatedEStructuralFeature>();
 				featuresByTable.put(tableName, featuresInTable);
@@ -667,44 +603,34 @@ public class EntityMapper extends AbstractMapper implements ExtensionPoint {
 				// The table was listed in the SecondaryTable annotation, but no
 				// features were actually mapped to this
 				// table.
-				log.warn("No features mapped to secondary table "
-						+ secondaryTable.getName());
+				log.warn("No features mapped to secondary table " + secondaryTable.getName());
 				continue;
 			}
-			final List<PAnnotatedEStructuralFeature> featuresInTable = featuresByTable
-					.get(secondaryTable.getName());
+			final List<PAnnotatedEStructuralFeature> featuresInTable = featuresByTable.get(secondaryTable
+					.getName());
 
 			// Create <join> element
 			// See
 			// http://www.hibernate.org/hib_docs/v3/reference/en/html/mapping.html#mapping-declaration
 			// -join
-			final Element joinElement = getHbmContext().getCurrent()
-					.addElement("join");
-			joinElement.addAttribute(
-					"table",
-					getHbmContext().trunc(
-							secondaryTable.getName().toUpperCase(), false));
-			log.debug("Mapping features to secondary table \""
-					+ secondaryTable.getName() + "\"");
+			final Element joinElement = getHbmContext().getCurrent().addElement("join");
+			joinElement.addAttribute("table",
+					getHbmContext().trunc(null, secondaryTable.getName().toUpperCase(), false));
+			log.debug("Mapping features to secondary table \"" + secondaryTable.getName() + "\"");
 			if (secondaryTable.getCatalog() != null) {
-				joinElement
-						.addAttribute("catalog", secondaryTable.getCatalog());
+				joinElement.addAttribute("catalog", secondaryTable.getCatalog());
 			}
 			if (secondaryTable.getSchema() != null) {
 				joinElement.addAttribute("schema", secondaryTable.getSchema());
 			}
 			entity.getModelEClass().getEIDAttribute();
-			final List<PrimaryKeyJoinColumn> pkJoinColumns = secondaryTable
-					.getPkJoinColumns();
+			final List<PrimaryKeyJoinColumn> pkJoinColumns = secondaryTable.getPkJoinColumns();
 			final Element keyElement = joinElement.addElement("key");
 			for (PrimaryKeyJoinColumn pkJoinColumn : pkJoinColumns) {
-				keyElement.addElement("column").addAttribute(
-						"name",
-						getHbmContext().trunc(pkJoinColumn,
-								pkJoinColumn.getName()));
+				keyElement.addElement("column").addAttribute("name",
+						getHbmContext().trunc(pkJoinColumn, pkJoinColumn.getName()));
 			}
-			handleOndelete(keyElement,
-					((HbAnnotatedEClass) entity).getHbOnDelete());
+			handleOndelete(keyElement, ((HbAnnotatedEClass) entity).getHbOnDelete());
 
 			// Process features in this secondary table.
 			try {
@@ -726,69 +652,56 @@ public class EntityMapper extends AbstractMapper implements ExtensionPoint {
 	}
 
 	/**
-	 * Adds a key element to the current entity mapping, is for example used to
-	 * join to the super class table.
+	 * Adds a key element to the current entity mapping, is for example used to join to the super
+	 * class table.
 	 */
-	private void addPrimaryKeyJoinColumn(List<PrimaryKeyJoinColumn> pkJCs,
-			PAnnotatedEClass entity) {
+	private void addPrimaryKeyJoinColumn(List<PrimaryKeyJoinColumn> pkJCs, PAnnotatedEClass entity) {
 		log.debug("Adding primary key join column");
 
-		final Element jcElement = getHbmContext().getCurrent()
-				.addElement("key");
+		final Element jcElement = getHbmContext().getCurrent().addElement("key");
 		handleOndelete(jcElement, ((HbAnnotatedEClass) entity).getHbOnDelete());
 
 		for (PrimaryKeyJoinColumn pkJC : pkJCs) {
 			final Element columnElement = jcElement.addElement("column");
 
 			if (pkJC.getColumnDefinition() != null) {
-				log.error("Unsupported column definition in primary key join column "
-						+ pkJC);
-				throw new MappingException(
-						"Unsupported column definition in primary key join column",
-						pkJC);
+				log.error("Unsupported column definition in primary key join column " + pkJC);
+				throw new MappingException("Unsupported column definition in primary key join column", pkJC);
 			}
 
 			if (pkJC.getName() != null) {
-				columnElement.addAttribute("name",
-						getHbmContext().trunc(pkJC, pkJC.getName()));
+				columnElement.addAttribute("name", getHbmContext().trunc(pkJC, pkJC.getName()));
 			}
 			if (pkJC.getReferencedColumnName() != null) {
-				columnElement.addAttribute("property-ref",
-						pkJC.getReferencedColumnName());
+				columnElement.addAttribute("property-ref", pkJC.getReferencedColumnName());
 			}
 		}
 	}
 
 	/**
-	 * Creates a discriminator element and returns it, so the caller should add
-	 * it to the parent element
+	 * Creates a discriminator element and returns it, so the caller should add it to the parent
+	 * element
 	 */
-	private Element createDiscriminatorElement(DiscriminatorColumn dColumn,
-			boolean force) {
+	private Element createDiscriminatorElement(DiscriminatorColumn dColumn, boolean force) {
 		Element dcElement = DocumentHelper.createElement("discriminator");
 		if (dColumn.getColumn() != null) {
 			final Column col = dColumn.getColumn();
 			final Element colElement = dcElement.addElement("column");
-			colElement.addAttribute("name",
-					getHbmContext().trunc(dColumn, col.getName()));
+			colElement.addAttribute("name", getHbmContext().trunc(dColumn, col.getName()));
 			if (col.getIndex() != null) {
 				colElement.addAttribute("index", col.getIndex());
 			}
-			if (hbDiscriminatorType(dColumn.getDiscriminatorType()).equals(
-					"string")
+			if (hbDiscriminatorType(dColumn.getDiscriminatorType()).equals("string")
 					&& col.getLength() > 0) {
-				colElement.addAttribute("length",
-						Integer.toString(col.getLength()));
+				colElement.addAttribute("length", Integer.toString(col.getLength()));
 			}
 			if (!col.isNullable()) {
 				colElement.addAttribute("not-null", "true");
 			}
 		} else if (dColumn.getName() != null) {
-			dcElement.addAttribute("column",
-					getHbmContext().trunc(dColumn, dColumn.getName()));
+			dcElement.addAttribute("column", getHbmContext().trunc(dColumn, dColumn.getName()));
 		}
-		dcElement.addAttribute("type",
-				hbDiscriminatorType(dColumn.getDiscriminatorType()));
+		dcElement.addAttribute("type", hbDiscriminatorType(dColumn.getDiscriminatorType()));
 
 		if (force) {
 			dcElement.addAttribute("force", "true");
@@ -799,18 +712,15 @@ public class EntityMapper extends AbstractMapper implements ExtensionPoint {
 		}
 
 		if (dColumn.getColumnDefinition() != null) {
-			log.error("Unsupported column definition in discriminator column "
-					+ dColumn);
-			throw new MappingException(
-					"Unsupported column definition in discriminator column",
-					dColumn);
+			log.error("Unsupported column definition in discriminator column " + dColumn);
+			throw new MappingException("Unsupported column definition in discriminator column", dColumn);
 		}
 		return dcElement;
 	}
 
 	// note dc can be null
-	private Element createDiscriminatorElement(DiscriminatorFormula formula,
-			DiscriminatorColumn dc, boolean force) {
+	private Element createDiscriminatorElement(DiscriminatorFormula formula, DiscriminatorColumn dc,
+			boolean force) {
 		Element dcElement = DocumentHelper.createElement("discriminator");
 		dcElement.addAttribute("formula", formula.getValue());
 
@@ -819,8 +729,7 @@ public class EntityMapper extends AbstractMapper implements ExtensionPoint {
 		}
 
 		if (dc != null && dc.getDiscriminatorType() != null) {
-			dcElement.addAttribute("type",
-					hbDiscriminatorType(dc.getDiscriminatorType()));
+			dcElement.addAttribute("type", hbDiscriminatorType(dc.getDiscriminatorType()));
 		}
 		return dcElement;
 	}
@@ -836,15 +745,12 @@ public class EntityMapper extends AbstractMapper implements ExtensionPoint {
 		}
 
 		// if none optimistic lock then return
-		if (aClass.getHbEntity() != null
-				&& aClass.getHbEntity().getOptimisticLock() != null
-				&& aClass.getHbEntity().getOptimisticLock()
-						.equals(OptimisticLockType.NONE)) {
+		if (aClass.getHbEntity() != null && aClass.getHbEntity().getOptimisticLock() != null
+				&& aClass.getHbEntity().getOptimisticLock().equals(OptimisticLockType.NONE)) {
 			return null;
 		}
 
-		final boolean skipVersionOnImmutable = !getHbmContext()
-				.getPersistenceOptions()
+		final boolean skipVersionOnImmutable = !getHbmContext().getPersistenceOptions()
 				.isDiscriminatorVersionOnImmutableEClass();
 		if (aClass.getImmutable() != null && skipVersionOnImmutable) {
 			return null;
@@ -853,18 +759,15 @@ public class EntityMapper extends AbstractMapper implements ExtensionPoint {
 		// note specific accessor is required because version accessor is not
 		// retrieved through
 		// emf tuplizer
-		final Element versionElement = getHbmContext().getCurrent()
-				.addElement("version")
+		final Element versionElement = getHbmContext().getCurrent().addElement("version")
 				.addAttribute("name", getHbmContext().getVersionColumnName())
 				.addAttribute("column", getHbmContext().getVersionColumnName());
 		final Element meta = new Element("meta");
-		meta.addAttribute("attribute", HbMapperConstants.VERSION_META).addText(
-				"true");
+		meta.addAttribute("attribute", HbMapperConstants.VERSION_META).addText("true");
 		meta.addAttribute("inherit", "false");
 		versionElement.add(0, meta);
 
-		versionElement.addAttribute("access", getHbmContext()
-				.getSyntheticVersionPropertyHandlerName());
+		versionElement.addAttribute("access", getHbmContext().getSyntheticVersionPropertyHandlerName());
 
 		return versionElement;
 	}
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/FeatureMapMapping.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/FeatureMapMapping.java
index b4594f622..d9c2e76ba 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/FeatureMapMapping.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/FeatureMapMapping.java
@@ -24,10 +24,10 @@ import org.eclipse.emf.teneo.simpledom.Element;
 import org.eclipse.emf.teneo.util.StoreUtil;
 
 /**
- * The feature map mapping handles the mapping of a feature map feature, this includes group and mixed types. It is
- * created for each feature map feature during the mapping of the features of an entity. At the end of the entity
- * processing the feature map mapping instances are used to create a hibernate specific mapping and add it to the
- * resulting document.
+ * The feature map mapping handles the mapping of a feature map feature, this includes group and
+ * mixed types. It is created for each feature map feature during the mapping of the features of an
+ * entity. At the end of the entity processing the feature map mapping instances are used to create
+ * a hibernate specific mapping and add it to the resulting document.
  * 
  * @author <a href="mailto:mtaal at elver.org">Martin Taal</a>
  */
@@ -46,7 +46,7 @@ public class FeatureMapMapping extends AbstractMapper {
 
 	/**
 	 * @param hbmContext
-	 *            The context in which the mapping takes place
+	 *          The context in which the mapping takes place
 	 */
 	public FeatureMapMapping(MappingContext hbmContext, PAnnotatedEAttribute paAttribute) {
 		super.setHbmContext(hbmContext);
@@ -59,37 +59,49 @@ public class FeatureMapMapping extends AbstractMapper {
 
 	/** Returns the entityName */
 	public String getEntityName() {
-		return StoreUtil.getEntityName(hbmContext.getEntityNameStrategy(), paAttribute.getModelEAttribute());
+		return StoreUtil.getEntityName(hbmContext.getEntityNameStrategy(),
+				paAttribute.getModelEAttribute());
 	}
 
 	/** Processes the features of this featuremap entry */
 	public void process() {
-		final String entityName = StoreUtil.getEntityName(hbmContext.getEntityNameStrategy(), paAttribute.getModelEAttribute());
+		final String entityName = StoreUtil.getEntityName(hbmContext.getEntityNameStrategy(),
+				paAttribute.getModelEAttribute());
 		log.debug("Processing feature map feature: " + entityName);
 		Element mainElement;
 		if (getHbmContext().getPersistenceOptions().isMapFeatureMapAsComponent()) {
 			mainElement = getCompositeElement();
 
-			mainElement.addElement("meta").addAttribute("attribute", HbMapperConstants.FEATUREMAP_META).addAttribute("inherit", "false").addText(
-					hbmContext.getEntityNameStrategy().toEntityName(
-							paAttribute.getModelEAttribute().getEContainingClass()));
+			mainElement
+					.addElement("meta")
+					.addAttribute("attribute", HbMapperConstants.FEATUREMAP_META)
+					.addAttribute("inherit", "false")
+					.addText(
+							hbmContext.getEntityNameStrategy().toEntityName(
+									paAttribute.getModelEAttribute().getEContainingClass()));
 		} else {
-			mainElement = hbmContext.getCurrent().addElement("class").addAttribute("entity-name", entityName)
-					.addAttribute("lazy", "false").addAttribute("table",
-							hbmContext.trunc(entityName.toUpperCase(), false));
-
-			mainElement.addElement("meta").addAttribute("attribute", HbMapperConstants.FEATUREMAP_META).addAttribute("inherit", "false").addText(
-					hbmContext.getEntityNameStrategy().toEntityName(
-							paAttribute.getModelEAttribute().getEContainingClass()));
+			mainElement = hbmContext.getCurrent().addElement("class")
+					.addAttribute("entity-name", entityName).addAttribute("lazy", "false")
+					.addAttribute("table", hbmContext.trunc(null, entityName.toUpperCase(), false));
+
+			mainElement
+					.addElement("meta")
+					.addAttribute("attribute", HbMapperConstants.FEATUREMAP_META)
+					.addAttribute("inherit", "false")
+					.addText(
+							hbmContext.getEntityNameStrategy().toEntityName(
+									paAttribute.getModelEAttribute().getEContainingClass()));
 
 			// TODO: check if id of parent can be used instead
-			mainElement.addElement("id").addAttribute("type", "long").addElement("generator").addAttribute("class",
-					"native");
+			mainElement.addElement("id").addAttribute("type", "long").addElement("generator")
+					.addAttribute("class", "native");
 
 			if (hbmContext.alwaysVersion()) {
-				final Element versionElement = mainElement.addElement("version").addAttribute("name",
-						hbmContext.getVersionColumnName()).addAttribute("access",
-						"org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler");
+				final Element versionElement = mainElement
+						.addElement("version")
+						.addAttribute("name", hbmContext.getVersionColumnName())
+						.addAttribute("access",
+								"org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler");
 				final Element meta = new Element("meta");
 				meta.addAttribute("attribute", HbMapperConstants.VERSION_META).addText("true");
 				meta.addAttribute("inherit", "false");
@@ -101,14 +113,14 @@ public class FeatureMapMapping extends AbstractMapper {
 		hbmContext.setCurrent(mainElement);
 		hbmContext.setCurrentElementFeatureMap(true);
 		if (getHbmContext().getPersistenceOptions().isMapFeatureMapAsComponent()) {
-			mainElement.addElement("tuplizer").addAttribute("entity-mode", "pojo").addAttribute("class",
-					getHbmContext().getComponentFeatureMapTuplizer());
-			mainElement.addElement("tuplizer").addAttribute("entity-mode", "dynamic-map").addAttribute("class",
-					getHbmContext().getComponentFeatureMapTuplizer());
+			mainElement.addElement("tuplizer").addAttribute("entity-mode", "pojo")
+					.addAttribute("class", getHbmContext().getComponentFeatureMapTuplizer());
+			mainElement.addElement("tuplizer").addAttribute("entity-mode", "dynamic-map")
+					.addAttribute("class", getHbmContext().getComponentFeatureMapTuplizer());
 		}
 
-		mainElement.addElement("property").addAttribute("name", HbMapperConstants.PROPERTY_FEATURE).addAttribute(
-				"type", "java.lang.String");
+		mainElement.addElement("property").addAttribute("name", HbMapperConstants.PROPERTY_FEATURE)
+				.addAttribute("type", "java.lang.String");
 
 		// and now process the features of this group
 		final PAnnotatedEClass paClass = paAttribute.getPaEClass();
@@ -125,12 +137,14 @@ public class FeatureMapMapping extends AbstractMapper {
 				// note with mixed everyone is part of the group except the
 				// mixed feature itself
 				if ((isMixed && !isEFeatureMixed)
-						|| (modelGroupFeature != null && modelGroupFeature == paAttribute.getModelEStructuralFeature())) {
+						|| (modelGroupFeature != null && modelGroupFeature == paAttribute
+								.getModelEStructuralFeature())) {
 					log.debug("Feature " + StoreUtil.toString(eFeature) + " belongs to this featuremap");
 
 					// continue if it is a id
 					Id id = null;
-					if (paFeature instanceof PAnnotatedEAttribute && ((PAnnotatedEAttribute) paFeature).getId() != null) {
+					if (paFeature instanceof PAnnotatedEAttribute
+							&& ((PAnnotatedEAttribute) paFeature).getId() != null) {
 						// Feature is an id, temporarily removing the id, otherwise
 						// the fm gets confused
 						id = ((PAnnotatedEAttribute) paFeature).getId();
@@ -156,11 +170,14 @@ public class FeatureMapMapping extends AbstractMapper {
 		}
 
 		if (StoreUtil.isMixed(paAttribute.getModelEAttribute())) {
-			mainElement.addElement("property").addAttribute("name", HbMapperConstants.PROPERTY_MIXED_TEXT)
+			mainElement.addElement("property")
+					.addAttribute("name", HbMapperConstants.PROPERTY_MIXED_TEXT)
 					.addAttribute("type", "java.lang.String");
-			mainElement.addElement("property").addAttribute("name", HbMapperConstants.PROPERTY_MIXED_CDATA)
+			mainElement.addElement("property")
+					.addAttribute("name", HbMapperConstants.PROPERTY_MIXED_CDATA)
 					.addAttribute("type", "java.lang.String");
-			mainElement.addElement("property").addAttribute("name", HbMapperConstants.PROPERTY_MIXED_COMMENT)
+			mainElement.addElement("property")
+					.addAttribute("name", HbMapperConstants.PROPERTY_MIXED_COMMENT)
 					.addAttribute("type", "java.lang.String");
 		}
 		hbmContext.setCurrent(mainElement.getParent());
@@ -169,13 +186,18 @@ public class FeatureMapMapping extends AbstractMapper {
 	}
 
 	private void addWildCardFeatureMapping(Element mainElement, PAnnotatedEStructuralFeature paFeature) {
-		mainElement.addElement("property").addAttribute("name",
-				paFeature.getModelEStructuralFeature().getName() + "_" + HbMapperConstants.PROPERTY_ANY_PRIMITIVE)
+		mainElement
+				.addElement("property")
+				.addAttribute(
+						"name",
+						paFeature.getModelEStructuralFeature().getName() + "_"
+								+ HbMapperConstants.PROPERTY_ANY_PRIMITIVE)
 				.addAttribute("type", "java.lang.String");
 		final HbAnnotatedEAttribute hbAttribute = (HbAnnotatedEAttribute) paAttribute;
-		final String assocName = getHbmContext().getPropertyName(paFeature.getModelEStructuralFeature());
-		mainElement.addElement(createAny(assocName + "_" + HbMapperConstants.PROPERTY_ANY_REFERENCE, paFeature,
-				hbAttribute.getAny(), hbAttribute.getAnyMetaDef(), false));
+		final String assocName = getHbmContext()
+				.getPropertyName(paFeature.getModelEStructuralFeature());
+		mainElement.addElement(createAny(assocName + "_" + HbMapperConstants.PROPERTY_ANY_REFERENCE,
+				paFeature, hbAttribute.getAny(), hbAttribute.getAnyMetaDef(), false));
 	}
 
 	/** Returns the eattribute */
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/FeatureMapper.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/FeatureMapper.java
index 9c01132c4..2a818d867 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/FeatureMapper.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/FeatureMapper.java
@@ -55,8 +55,7 @@ public class FeatureMapper implements ExtensionPoint {
 			PamodelPackage.eINSTANCE.getPAnnotatedEReference_OneToOne() };
 
 	/**
-	 * Different Mappers used in the switches below, each Mapper handles a
-	 * specific annotation case
+	 * Different Mappers used in the switches below, each Mapper handles a specific annotation case
 	 */
 	private BasicMapper basicMapper = null;
 
@@ -81,11 +80,10 @@ public class FeatureMapper implements ExtensionPoint {
 	private MappingContext hbmContext = null;
 
 	/**
-	 * Used to signal the end of a class or mapped superclass. public void end()
-	 * { if (nestedBegin <= 0) throw new
-	 * IllegalStateException("Unexpected end"); nestedBegin--; if (idStrategy !=
-	 * null) idStrategy.end(); // can happen in case of featuremap if
-	 * (nestedBegin == 0) idStrategy = null; }
+	 * Used to signal the end of a class or mapped superclass. public void end() { if (nestedBegin <=
+	 * 0) throw new IllegalStateException("Unexpected end"); nestedBegin--; if (idStrategy != null)
+	 * idStrategy.end(); // can happen in case of featuremap if (nestedBegin == 0) idStrategy = null;
+	 * }
 	 */
 
 	/** Find the feature to switch on */
@@ -115,19 +113,15 @@ public class FeatureMapper implements ExtensionPoint {
 	}
 
 	/** Process the eattribute */
-	private void processPAnnotatedEAttribute(
-			PAnnotatedEAttribute pAnnotatedEAttribute) {
+	private void processPAnnotatedEAttribute(PAnnotatedEAttribute pAnnotatedEAttribute) {
 		final EStructuralFeature discrFeature;
 		if (pAnnotatedEAttribute.getAnnotations().isEmpty()) {
-			discrFeature = PamodelPackage.eINSTANCE
-					.getPAnnotatedEAttribute_Basic();
+			discrFeature = PamodelPackage.eINSTANCE.getPAnnotatedEAttribute_Basic();
 		} else {
-			discrFeature = getSwitchFeature(pAnnotatedEAttribute,
-					PAEATTRIBUTE_DISCR_FEATURES);
+			discrFeature = getSwitchFeature(pAnnotatedEAttribute, PAEATTRIBUTE_DISCR_FEATURES);
 		}
 		if (discrFeature == null) {
-			throw new MappingException("Can not map this paElement",
-					pAnnotatedEAttribute);
+			throw new MappingException("Can not map this paElement", pAnnotatedEAttribute);
 		} else {
 			switch (discrFeature.getFeatureID()) {
 			case PamodelPackage.PANNOTATED_ESTRUCTURAL_FEATURE__TRANSIENT:
@@ -154,14 +148,12 @@ public class FeatureMapper implements ExtensionPoint {
 	}
 
 	/** Process the ereference */
-	private void processPAnnotatedEReference(
-			PAnnotatedEReference pAnnotatedEReference) {
+	private void processPAnnotatedEReference(PAnnotatedEReference pAnnotatedEReference) {
 
 		final HbAnnotatedEReference hbReference = (HbAnnotatedEReference) pAnnotatedEReference;
 		final HbAnnotatedEClass hbClass = hbReference.getTransient() == null ? (HbAnnotatedEClass) pAnnotatedEReference
 				.getAReferenceType() : null;
-		if (hbReference.getHbType() != null
-				|| (hbClass != null && hbClass.getHbType() != null)) {
+		if (hbReference.getHbType() != null || (hbClass != null && hbClass.getHbType() != null)) {
 			if (hbReference.getHbType() == null) {
 				hbReference.setHbType(EcoreUtil.copy(hbClass.getHbType()));
 			}
@@ -171,21 +163,17 @@ public class FeatureMapper implements ExtensionPoint {
 
 		final EStructuralFeature discrFeature;
 		if (pAnnotatedEReference.getAnnotations().isEmpty()) {
-			discrFeature = PamodelPackage.eINSTANCE
-					.getPAnnotatedEReference_Embedded();
+			discrFeature = PamodelPackage.eINSTANCE.getPAnnotatedEReference_Embedded();
 		} else {
-			discrFeature = getSwitchFeature(pAnnotatedEReference,
-					PAEREFERENCE_DISCR_FEATURES);
+			discrFeature = getSwitchFeature(pAnnotatedEReference, PAEREFERENCE_DISCR_FEATURES);
 		}
 		if (discrFeature == null) {
-			throw new MappingException("Can not map this paElement",
-					pAnnotatedEReference);
+			throw new MappingException("Can not map this paElement", pAnnotatedEReference);
 		} else {
 			switch (discrFeature.getFeatureID()) {
 			case PamodelPackage.PANNOTATED_EREFERENCE__EXTERNAL:
 				if (pAnnotatedEReference.getModelEReference().isMany()) {
-					manyExternalReferenceMapper
-							.processManyReference(pAnnotatedEReference);
+					manyExternalReferenceMapper.processManyReference(pAnnotatedEReference);
 				} else {
 					basicMapper.processExternalEReference(pAnnotatedEReference);
 				}
@@ -273,7 +261,7 @@ public class FeatureMapper implements ExtensionPoint {
 
 	/**
 	 * @param hbmContext
-	 *            the hbmContext to set
+	 *          the hbmContext to set
 	 */
 	public void setHbmContext(MappingContext hbmContext) {
 		this.hbmContext = hbmContext;
@@ -288,10 +276,9 @@ public class FeatureMapper implements ExtensionPoint {
 
 	/**
 	 * @param manyExternalReferenceMapper
-	 *            the manyExternalReferenceMapper to set
+	 *          the manyExternalReferenceMapper to set
 	 */
-	public void setManyExternalReferenceMapper(
-			ManyExternalReferenceMapper manyExternalReferenceMapper) {
+	public void setManyExternalReferenceMapper(ManyExternalReferenceMapper manyExternalReferenceMapper) {
 		this.manyExternalReferenceMapper = manyExternalReferenceMapper;
 	}
 
@@ -299,8 +286,7 @@ public class FeatureMapper implements ExtensionPoint {
 		return typedEReferenceMapper;
 	}
 
-	public void setTypedEReferenceMapper(
-			TypedEReferenceMapper typedEReferenceMapper) {
+	public void setTypedEReferenceMapper(TypedEReferenceMapper typedEReferenceMapper) {
 		this.typedEReferenceMapper = typedEReferenceMapper;
 	}
 }
\ No newline at end of file
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/GenerateHBM.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/GenerateHBM.java
index 29a5bc41c..ac312fb7c 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/GenerateHBM.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/GenerateHBM.java
@@ -29,8 +29,8 @@ import org.eclipse.emf.teneo.extension.ExtensionManager;
 import org.eclipse.emf.teneo.extension.ExtensionManagerFactory;
 
 /**
- * Class is responsible for generating the hbm file. Is run through a launcher
- * therefore the main methods.
+ * Class is responsible for generating the hbm file. Is run through a launcher therefore the main
+ * methods.
  * 
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
  * @version $Revision: 1.17 $
@@ -59,19 +59,15 @@ public class GenerateHBM {
 				// when loading the epackage should be loaded
 				for (String element : epacks) {
 					try {
-						log.debug("Loading class " + element
-								+ " should be an epackage");
+						log.debug("Loading class " + element + " should be an epackage");
 
 						Class<?> epack = Class.forName(element);
 						if (!EPackage.class.isAssignableFrom(epack)) {
-							log
-									.warn("HBM Generator found "
-											+ epack.getName()
-											+ " but this is not an EPackage, ignoring it");
+							log.warn("HBM Generator found " + epack.getName()
+									+ " but this is not an EPackage, ignoring it");
 						}
 					} catch (Throwable t) { // ignore everything but log it
-						log.error("Exception while instantiating " + element
-								+ ", message: " + t.getMessage());
+						log.error("Exception while instantiating " + element + ", message: " + t.getMessage());
 					}
 				}
 			} else {
@@ -79,19 +75,16 @@ public class GenerateHBM {
 			}
 		}
 
-		createORMapperFile(targetFileName, ecores.toArray(new String[ecores
-				.size()]), options);
+		createORMapperFile(targetFileName, ecores.toArray(new String[ecores.size()]), options);
 	}
 
 	/** Creates the mapping file */
-	private static void createORMapperFile(String targetFileName,
-			String[] ecores, Properties options) {
+	private static void createORMapperFile(String targetFileName, String[] ecores, Properties options) {
 		try {
 			// get the first ecore file
 			File firstEcore = new File(ecores[0]);
 			File file = new File(firstEcore.getParentFile(), targetFileName);
-			final File archiveFile = new File(firstEcore.getParentFile(),
-					targetFileName + "_old");
+			final File archiveFile = new File(firstEcore.getParentFile(), targetFileName + "_old");
 
 			if (file.exists()) {
 				if (archiveFile.exists()) {
@@ -102,25 +95,23 @@ public class GenerateHBM {
 			}
 			file.createNewFile();
 
-			final ExtensionManager extensionManager = ExtensionManagerFactory
-					.getInstance().create();
+			final ExtensionManager extensionManager = ExtensionManagerFactory.getInstance().create();
 			MappingUtil.registerHbExtensions(extensionManager);
 
-			final PersistenceOptions po = extensionManager.getExtension(
-					PersistenceOptions.class, new Object[] { options });
-			final PAnnotatedModel paModel = extensionManager.getExtension(
-					PersistenceMappingBuilder.class).buildMapping(ecores, po,
-					extensionManager);
+			final PersistenceOptions po = extensionManager.getExtension(PersistenceOptions.class,
+					new Object[] { options });
+			final PAnnotatedModel paModel = extensionManager
+					.getExtension(PersistenceMappingBuilder.class).buildMapping(ecores, po, extensionManager);
 			final HibernateMappingGenerator hmg = extensionManager
 					.getExtension(HibernateMappingGenerator.class);
 			hmg.setPersistenceOptions(po);
 			FileWriter writer = new FileWriter(file);
 			writer.write(hmg.generateToString(paModel));
 			writer.flush();
+			writer.close();
 		} catch (IOException e) {
 			log.error(e);
-			throw new TeneoException(
-					"IOException when creating or mapping file", e);
+			throw new TeneoException("IOException when creating or mapping file", e);
 		}
 	}
 
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/HbMapperConstants.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/HbMapperConstants.java
index 64b579a5b..9d64b56b2 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/HbMapperConstants.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/HbMapperConstants.java
@@ -35,7 +35,8 @@ public class HbMapperConstants {
 	public static final String ECLASSIFIER_PARAM = "eclassifier";
 
 	/**
-	 * Name of the Hibernate type param that holds the name of the EMF attribute for the EMF custom data type.
+	 * Name of the Hibernate type param that holds the name of the EMF attribute for the EMF custom
+	 * data type.
 	 */
 	public static final String EDATATYPE_PARAM = "edatatype";
 
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/HibernateMappingGenerator.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/HibernateMappingGenerator.java
index f1972c953..22c2ea7b5 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/HibernateMappingGenerator.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/HibernateMappingGenerator.java
@@ -49,17 +49,14 @@ import org.eclipse.emf.teneo.simpledom.Element;
 import org.eclipse.emf.teneo.util.StoreUtil;
 
 /**
- * The main starting point for generating a hibernate mapping from a PAnnotated
- * model.
+ * The main starting point for generating a hibernate mapping from a PAnnotated model.
  * 
  * @author <a href="mailto:mtaal at elver.org">Martin Taal</a>
  */
-public class HibernateMappingGenerator implements ExtensionPoint,
-		ExtensionManagerAware {
+public class HibernateMappingGenerator implements ExtensionPoint, ExtensionManagerAware {
 
 	/** The logger */
-	private static final Log log = LogFactory
-			.getLog(HibernateMappingGenerator.class);
+	private static final Log log = LogFactory.getLog(HibernateMappingGenerator.class);
 
 	/** The list of processed annotated classes */
 	private Set<PAnnotatedEClass> processedPAClasses = null;
@@ -76,13 +73,11 @@ public class HibernateMappingGenerator implements ExtensionPoint,
 	/**
 	 * Register the entity names in context.
 	 */
-	protected void initEntityNames(MappingContext hbmContext,
-			PAnnotatedModel paModel) {
+	protected void initEntityNames(MappingContext hbmContext, PAnnotatedModel paModel) {
 		for (PAnnotatedEPackage pae : paModel.getPaEPackages()) {
 			for (PAnnotatedEClass paClass : pae.getPaEClasses()) {
 				if (paClass.getEntity() != null) {
-					hbmContext.setEntityName(paClass.getModelEClass(),
-							getEntityName(paClass));
+					hbmContext.setEntityName(paClass.getModelEClass(), getEntityName(paClass));
 				}
 			}
 		}
@@ -114,8 +109,7 @@ public class HibernateMappingGenerator implements ExtensionPoint,
 			log.debug("Geneting Hibernate mapping for " + paModel);
 		}
 		try {
-			this.hbmContext = getExtensionManager().getExtension(
-					MappingContext.class);
+			this.hbmContext = getExtensionManager().getExtension(MappingContext.class);
 			this.hbmContext.setMappingProperties(getPersistenceOptions());
 			hbmContext.setPaModel(paModel);
 			hbmContext.beginDocument(createDocument());
@@ -136,16 +130,14 @@ public class HibernateMappingGenerator implements ExtensionPoint,
 			}
 			return hbmContext.endDocument();
 		} catch (MappingException exc) {
-			throw new MappingException("Hibernate mapping generation failed",
-					exc);
+			throw new MappingException("Hibernate mapping generation failed", exc);
 		}
 	}
 
 	/**
 	 * Generate the hibernate mapping xml as a string
 	 */
-	public String generateToString(PAnnotatedModel annotatedModel)
-			throws MappingException {
+	public String generateToString(PAnnotatedModel annotatedModel) throws MappingException {
 		return generate(annotatedModel).emitXML();
 	}
 
@@ -161,8 +153,7 @@ public class HibernateMappingGenerator implements ExtensionPoint,
 		// set auto-import is false if the default eclass naming strategy is not
 		// used
 		if (!(hbmContext.getEntityNameStrategy() instanceof ClassicEntityNameStrategy)) {
-			log
-					.debug("Setting auto-import=false because eclassnamingstrategy is not the defaulteclassnamestrategy");
+			log.debug("Setting auto-import=false because eclassnamingstrategy is not the defaulteclassnamestrategy");
 			mappingDoc.getRoot().addAttribute("auto-import", "false");
 		}
 		return mappingDoc;
@@ -175,24 +166,20 @@ public class HibernateMappingGenerator implements ExtensionPoint,
 			for (PAnnotatedEPackage paPackage : paModel.getPaEPackages()) {
 				for (PAnnotatedEClass paEClass : paPackage.getPaEClasses()) {
 					// here, we eliminate map.enties
-					if (!hbmContext.isMapEMapAsTrueMap()
-							|| !StoreUtil.isMapEntry(paEClass.getModelEClass())) {
+					if (!hbmContext.isMapEMapAsTrueMap() || !StoreUtil.isMapEntry(paEClass.getModelEClass())) {
 						processPAClass(paEClass);
 
 					}
-					mapFilterDef(hbmContext.getCurrent(),
-							((HbAnnotatedEClass) paEClass).getFilterDef());
+					mapFilterDef(hbmContext.getCurrent(), ((HbAnnotatedEClass) paEClass).getFilterDef());
 				}
-				mapFilterDef(hbmContext.getCurrent(),
-						((HbAnnotatedEPackage) paPackage).getFilterDef());
+				mapFilterDef(hbmContext.getCurrent(), ((HbAnnotatedEPackage) paPackage).getFilterDef());
 			}
 		} finally {
 			processedPAClasses = null;
 		}
 	}
 
-	protected void mapFilterDef(Element parentElement,
-			List<FilterDef> filterDefs) {
+	protected void mapFilterDef(Element parentElement, List<FilterDef> filterDefs) {
 		for (FilterDef fd : filterDefs) {
 			final Element fdElement = parentElement.addElement("filter-def");
 			fdElement.addAttribute("name", fd.getName());
@@ -208,14 +195,13 @@ public class HibernateMappingGenerator implements ExtensionPoint,
 	}
 
 	/**
-	 * Process the given class, ensures that processing order is consistent with
-	 * inheritance order. The given paEClass is added to the processedPAClasses.
+	 * Process the given class, ensures that processing order is consistent with inheritance order.
+	 * The given paEClass is added to the processedPAClasses.
 	 */
 	protected void processPAClass(PAnnotatedEClass paEClass) {
 		if (processedPAClasses.add(paEClass)) {
 			// also mapped superclasses can have an entity but ignore them here
-			if (paEClass.getEntity() != null
-					&& paEClass.getMappedSuperclass() == null) {
+			if (paEClass.getEntity() != null && paEClass.getMappedSuperclass() == null) {
 				// this is a persistent entity
 				PAnnotatedEClass paSuperEntity = paEClass.getPaSuperEntity();
 				if (paSuperEntity != null) {
@@ -227,20 +213,18 @@ public class HibernateMappingGenerator implements ExtensionPoint,
 				// ignore the map entries which do not have an explicit entity
 				if (paEClass.getModelEClass().getInstanceClass() == Map.Entry.class
 						&& paEClass.getEntity() == null) {
-					log.debug("Ignoring " + paEClass.getModelEClass().getName()
-							+ " ignored, is a map entry");
-					paEClass.setTransient(PannotationFactory.eINSTANCE
-							.createTransient());
+					log.debug("Ignoring " + paEClass.getModelEClass().getName() + " ignored, is a map entry");
+					paEClass.setTransient(PannotationFactory.eINSTANCE.createTransient());
 					return;
 				}
-				
+
 				// persisted externally
 				if (paEClass.getExternal() != null) {
 					return;
 				}
-				
+
 				// it has a type is persisted differently
-				if (((HbAnnotatedEClass)paEClass).getHbType() != null) {
+				if (((HbAnnotatedEClass) paEClass).getHbType() != null) {
 					return;
 				}
 
@@ -254,8 +238,7 @@ public class HibernateMappingGenerator implements ExtensionPoint,
 	}
 
 	/**
-	 * Processes the typedef annotations and creates corresponding typedef
-	 * instances in the mapping.
+	 * Processes the typedef annotations and creates corresponding typedef instances in the mapping.
 	 */
 	protected void processTypedefs(PAnnotatedModel paModel) {
 		// Walk thru all the packages looking for custom EDataTypes.
@@ -268,8 +251,7 @@ public class HibernateMappingGenerator implements ExtensionPoint,
 			}
 
 			// Walk thru all the classifiers of the given package.
-			for (PAnnotatedEDataType annotatedEDataType : paPackage
-					.getPaEDataTypes()) {
+			for (PAnnotatedEDataType annotatedEDataType : paPackage.getPaEDataTypes()) {
 				final HbAnnotatedEDataType hed = (HbAnnotatedEDataType) annotatedEDataType;
 				if (hed.getHbTypeDef() != null) {
 					emitTypeDef(hed.getHbTypeDef());
@@ -279,36 +261,28 @@ public class HibernateMappingGenerator implements ExtensionPoint,
 	}
 
 	/**
-	 * Process the given class and declare named queries that are annotated as
-	 * Model Annotations
+	 * Process the given class and declare named queries that are annotated as Model Annotations
 	 * 
-	 * @author PhaneeshN <a
-	 *         href="mailto:phaneesh.nagararaja@sos.sungard.com">phaneesh
-	 *         .nagararaja@sos.sungard.com</a> <a
-	 *         href="http://www.sungardhe.com">SunGard Higher Education</a>
+	 * @author PhaneeshN <a href="mailto:phaneesh.nagararaja@sos.sungard.com">phaneesh
+	 *         .nagararaja@sos.sungard.com</a> <a href="http://www.sungardhe.com">SunGard Higher
+	 *         Education</a>
 	 */
 	protected void processPANamedQueries(PAnnotatedEClass paEClass) {
 		// TODO: Should be refactored into a NamedQueryMapper Extension and
 		// register it into
 		// extension Manager
 		if (log.isDebugEnabled()) {
-			log.debug("Processing Queries for "
-					+ paEClass.getModelEClass().getName());
+			log.debug("Processing Queries for " + paEClass.getModelEClass().getName());
 		}
 		if (log.isDebugEnabled()) {
-			log
-					.debug("********************** Named Queries ***************************");
-			for (NamedQuery namedQuery : ((HbAnnotatedEClass) paEClass)
-					.getHbNamedQuery()) {
+			log.debug("********************** Named Queries ***************************");
+			for (NamedQuery namedQuery : ((HbAnnotatedEClass) paEClass).getHbNamedQuery()) {
 				log.info(namedQuery.getName() + ":" + namedQuery.getQuery());
 			}
-			log
-					.debug("****************************************************************");
+			log.debug("****************************************************************");
 		}
-		for (NamedQuery namedQuery : ((HbAnnotatedEClass) paEClass)
-				.getHbNamedQuery()) {
-			final Element target = this.hbmContext.getCurrent().addElement(
-					"query");
+		for (NamedQuery namedQuery : ((HbAnnotatedEClass) paEClass).getHbNamedQuery()) {
+			final Element target = this.hbmContext.getCurrent().addElement("query");
 			target.addAttribute("name", namedQuery.getName());
 			target.addText("<![CDATA[" + namedQuery.getQuery() + "]]>");
 		}
@@ -319,23 +293,17 @@ public class HibernateMappingGenerator implements ExtensionPoint,
 		// register it into
 		// extension Manager
 		if (log.isDebugEnabled()) {
-			log.debug("Processing Queries for "
-					+ paEPackage.getModelEPackage().getName());
+			log.debug("Processing Queries for " + paEPackage.getModelEPackage().getName());
 		}
 		if (log.isDebugEnabled()) {
-			log
-					.debug("********************** Named Queries ***************************");
-			for (NamedQuery namedQuery : ((HbAnnotatedEPackage) paEPackage)
-					.getHbNamedQuery()) {
+			log.debug("********************** Named Queries ***************************");
+			for (NamedQuery namedQuery : ((HbAnnotatedEPackage) paEPackage).getHbNamedQuery()) {
 				log.info(namedQuery.getName() + ":" + namedQuery.getQuery());
 			}
-			log
-					.debug("****************************************************************");
+			log.debug("****************************************************************");
 		}
-		for (NamedQuery namedQuery : ((HbAnnotatedEPackage) paEPackage)
-				.getHbNamedQuery()) {
-			final Element target = this.hbmContext.getCurrent().addElement(
-					"query");
+		for (NamedQuery namedQuery : ((HbAnnotatedEPackage) paEPackage).getHbNamedQuery()) {
+			final Element target = this.hbmContext.getCurrent().addElement("query");
 			target.addAttribute("name", namedQuery.getName());
 			target.addText("<![CDATA[" + namedQuery.getQuery() + "]]>");
 		}
@@ -343,13 +311,11 @@ public class HibernateMappingGenerator implements ExtensionPoint,
 
 	/** Emit a typedef */
 	protected void emitTypeDef(TypeDef td) {
-		final Element target = this.hbmContext.getCurrent().addElement(
-				"typedef");
+		final Element target = this.hbmContext.getCurrent().addElement("typedef");
 		target.addAttribute("name", td.getName());
 		target.addAttribute("class", td.getTypeClass());
 		for (Parameter param : td.getParameters()) {
-			target.addElement("param").addAttribute("name", param.getName())
-					.addText(param.getValue());
+			target.addElement("param").addAttribute("name", param.getName()).addText(param.getValue());
 		}
 	}
 
@@ -362,7 +328,7 @@ public class HibernateMappingGenerator implements ExtensionPoint,
 
 	/**
 	 * @param extensionManager
-	 *            the extensionManager to set
+	 *          the extensionManager to set
 	 */
 	public void setExtensionManager(ExtensionManager extensionManager) {
 
@@ -380,7 +346,7 @@ public class HibernateMappingGenerator implements ExtensionPoint,
 
 	/**
 	 * @param persistenceOptions
-	 *            the persistenceOptions to set
+	 *          the persistenceOptions to set
 	 */
 	public void setPersistenceOptions(PersistenceOptions persistenceOptions) {
 		this.persistenceOptions = persistenceOptions;
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/IdMapper.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/IdMapper.java
index 78c942885..d943d5988 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/IdMapper.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/IdMapper.java
@@ -40,14 +40,13 @@ import org.eclipse.emf.teneo.simpledom.DocumentHelper;
 import org.eclipse.emf.teneo.simpledom.Element;
 
 /**
- * Mapper generating id entry for Hibernate from PAnnotatedElements. Throws an
- * error if called for non-root entities.
+ * Mapper generating id entry for Hibernate from PAnnotatedElements. Throws an error if called for
+ * non-root entities.
  * 
  * @author <a href="mailto:marchign at elver.org">Davide Marchignoli</a>
  * @author <a href="mailto:mtaal at elver.org">Martin Taal</a>
  */
-public class IdMapper extends AbstractAssociationMapper implements
-		ExtensionPoint {
+public class IdMapper extends AbstractAssociationMapper implements ExtensionPoint {
 
 	/** The logger */
 	private static final Log log = LogFactory.getLog(IdMapper.class);
@@ -67,17 +66,15 @@ public class IdMapper extends AbstractAssociationMapper implements
 	}
 
 	/** Util method to create an id or composite-id element */
-	public static Element getCreateIdElement(Element entityElement,
-			PAnnotatedEClass aClass) {
+	public static Element getCreateIdElement(Element entityElement, PAnnotatedEClass aClass) {
 		if (aClass.getIdClass() != null || hasMultipleIdFeatures(aClass)) { // composite
-																			// id
+			// id
 			Element element = entityElement.element("composite-id");
 			if (element == null) {
 				element = DocumentHelper.createElement("composite-id");
 				if (aClass.getIdClass() != null) {
-					element.addAttribute("class",
-							aClass.getIdClass().getValue()).addAttribute(
-							"mapped", "true");
+					element.addAttribute("class", aClass.getIdClass().getValue()).addAttribute("mapped",
+							"true");
 				}
 				entityElement.add(0, element);
 			}
@@ -95,12 +92,9 @@ public class IdMapper extends AbstractAssociationMapper implements
 	/**
 	 * Add synthetic id to the class
 	 */
-	public static Element addSyntheticId(MappingContext mc,
-			Element entityElement) {
-		if (entityElement.element("id") != null
-				|| entityElement.element("composite-id") != null) {
-			throw new MappingException(
-					"Syntheticid should only be called if there is no id element");
+	public static Element addSyntheticId(MappingContext mc, Element entityElement) {
+		if (entityElement.element("id") != null || entityElement.element("composite-id") != null) {
+			throw new MappingException("Syntheticid should only be called if there is no id element");
 		}
 
 		final Element idElement = DocumentHelper.createElement("id");
@@ -111,19 +105,16 @@ public class IdMapper extends AbstractAssociationMapper implements
 				// NOTE: the name is also set so that the property name can be
 				// used later to identify an id prop,
 				// TODO: improve this
-				addAttribute("name", mc.getIdColumnName())
-				.addAttribute("column", mc.getIdColumnName())
+				addAttribute("name", mc.getIdColumnName()).addAttribute("column", mc.getIdColumnName())
 				.addElement("generator").addAttribute("class", "native");
 
 		final Element meta = new Element("meta");
-		meta.addAttribute("attribute", HbMapperConstants.ID_META).addText(
-				"true");
+		meta.addAttribute("attribute", HbMapperConstants.ID_META).addText("true");
 		meta.addAttribute("inherit", "false");
 		idElement.add(0, meta);
 
 		if (mc.getSyntheticIdPropertyHandlerName() != null) {
-			idElement.addAttribute("access",
-					mc.getSyntheticIdPropertyHandlerName());
+			idElement.addAttribute("access", mc.getSyntheticIdPropertyHandlerName());
 		}
 
 		return idElement;
@@ -133,8 +124,8 @@ public class IdMapper extends AbstractAssociationMapper implements
 	 * @return Returns the hibernate generator class for the given strategy.
 	 */
 	private static String hbGeneratorClass(GenerationType strategy) {
-		return IdMapper.GENERATOR_CLASS_NAMES[strategy != null ? strategy
-				.getValue() : GenerationType.AUTO.getValue()];
+		return IdMapper.GENERATOR_CLASS_NAMES[strategy != null ? strategy.getValue()
+				: GenerationType.AUTO.getValue()];
 	}
 
 	/**
@@ -143,32 +134,25 @@ public class IdMapper extends AbstractAssociationMapper implements
 	 * @param aReference
 	 */
 	public void processMultipleIds(PAnnotatedEClass aClass) {
-		final Element compositeIdElement = DocumentHelper
-				.createElement("composite-id");
+		final Element compositeIdElement = DocumentHelper.createElement("composite-id");
 		getHbmContext().getCurrent().add(0, compositeIdElement);
 
 		getHbmContext().setCurrent(compositeIdElement);
 
-		for (PAnnotatedEStructuralFeature aFeature : aClass
-				.getPaEStructuralFeatures()) {
+		for (PAnnotatedEStructuralFeature aFeature : aClass.getPaEStructuralFeatures()) {
 			if (aFeature instanceof PAnnotatedEAttribute) {
 				PAnnotatedEAttribute aAttribute = (PAnnotatedEAttribute) aFeature;
-				final Element keyPropertyElement = compositeIdElement
-						.addElement("key-property");
-				keyPropertyElement.addAttribute("name", aFeature
-						.getModelEStructuralFeature().getName());
-				addColumnsAndFormula(keyPropertyElement, aAttribute,
-						getColumns(aAttribute), getHbmContext()
-								.isCurrentElementFeatureMap(), false);
+				final Element keyPropertyElement = compositeIdElement.addElement("key-property");
+				keyPropertyElement.addAttribute("name", aFeature.getModelEStructuralFeature().getName());
+				addColumnsAndFormula(keyPropertyElement, aAttribute, getColumns(aAttribute),
+						getHbmContext().isCurrentElementFeatureMap(), false);
 				setType(aAttribute, keyPropertyElement);
 
 				// keyPropertyElement.addAttribute("access",
 				// "org.eclipse.emf.teneo.hibernate.mapping.property.EAttributePropertyHandler");
 			} else if (aFeature instanceof PAnnotatedEReference
-					&& !((PAnnotatedEReference) aFeature).getModelEReference()
-							.isMany()) {
-				addKeyManyToOne(compositeIdElement,
-						(PAnnotatedEReference) aFeature);
+					&& !((PAnnotatedEReference) aFeature).getModelEReference().isMany()) {
+				addKeyManyToOne(compositeIdElement, (PAnnotatedEReference) aFeature);
 			}
 		}
 
@@ -185,12 +169,10 @@ public class IdMapper extends AbstractAssociationMapper implements
 		final EReference eReference = aReference.getModelEReference();
 		final PAnnotatedEClass aClass = aReference.getPaModel().getPAnnotated(
 				eReference.getEReferenceType());
-		final Element compositeIdElement = DocumentHelper
-				.createElement("composite-id");
+		final Element compositeIdElement = DocumentHelper.createElement("composite-id");
 		getHbmContext().getCurrent().add(0, compositeIdElement);
 		compositeIdElement.addAttribute("name", eReference.getName());
-		String className = getHbmContext().getInstanceClassName(
-				aClass.getModelEClass());
+		String className = getHbmContext().getInstanceClassName(aClass.getModelEClass());
 		if (className.equals(DynamicEObjectImpl.class.getName())) {
 			// note, can't use the class instance to get the class name because
 			// the
@@ -202,60 +184,49 @@ public class IdMapper extends AbstractAssociationMapper implements
 		getHbmContext().setCurrent(compositeIdElement);
 
 		final Element meta1 = new Element("meta");
-		meta1.addAttribute("attribute", HbMapperConstants.ECLASS_NAME_META)
-				.addText(eReference.getEReferenceType().getName());
+		meta1.addAttribute("attribute", HbMapperConstants.ECLASS_NAME_META).addText(
+				eReference.getEReferenceType().getName());
 		meta1.addAttribute("inherit", "false");
 		final Element meta2 = new Element("meta");
-		meta2.addAttribute("attribute", HbMapperConstants.EPACKAGE_META)
-				.addText(
-						eReference.getEReferenceType().getEPackage().getNsURI());
+		meta2.addAttribute("attribute", HbMapperConstants.EPACKAGE_META).addText(
+				eReference.getEReferenceType().getEPackage().getNsURI());
 		meta2.addAttribute("inherit", "false");
 		compositeIdElement.addElement(meta1);
 		compositeIdElement.addElement(meta2);
 
-		compositeIdElement
-				.addAttribute("access",
-						"org.eclipse.emf.teneo.hibernate.mapping.property.EReferencePropertyHandler");
+		compositeIdElement.addAttribute("access",
+				"org.eclipse.emf.teneo.hibernate.mapping.property.EReferencePropertyHandler");
 
-		for (PAnnotatedEStructuralFeature aFeature : aClass
-				.getPaEStructuralFeatures()) {
+		for (PAnnotatedEStructuralFeature aFeature : aClass.getPaEStructuralFeatures()) {
 			if (aFeature instanceof PAnnotatedEAttribute) {
 				PAnnotatedEAttribute aAttribute = (PAnnotatedEAttribute) aFeature;
-				final Element keyPropertyElement = compositeIdElement
-						.addElement("key-property");
-				keyPropertyElement.addAttribute("name", aFeature
-						.getModelEStructuralFeature().getName());
-				addColumnsAndFormula(keyPropertyElement, aAttribute,
-						getColumns(aAttribute), getHbmContext()
-								.isCurrentElementFeatureMap(), false);
+				final Element keyPropertyElement = compositeIdElement.addElement("key-property");
+				keyPropertyElement.addAttribute("name", aFeature.getModelEStructuralFeature().getName());
+				addColumnsAndFormula(keyPropertyElement, aAttribute, getColumns(aAttribute),
+						getHbmContext().isCurrentElementFeatureMap(), false);
 				setType(aAttribute, keyPropertyElement);
 
 				// keyPropertyElement.addAttribute("access",
 				// "org.eclipse.emf.teneo.hibernate.mapping.property.EAttributePropertyHandler");
 			} else if (aFeature instanceof PAnnotatedEReference
-					&& !((PAnnotatedEReference) aFeature).getModelEReference()
-							.isMany()) {
-				addKeyManyToOne(compositeIdElement,
-						(PAnnotatedEReference) aFeature);
+					&& !((PAnnotatedEReference) aFeature).getModelEReference().isMany()) {
+				addKeyManyToOne(compositeIdElement, (PAnnotatedEReference) aFeature);
 			}
 		}
 		getHbmContext().setCurrent(compositeIdElement.getParent());
 
-		addAccessor(compositeIdElement,
-				hbmContext.getComponentPropertyHandlerName());
+		addAccessor(compositeIdElement, hbmContext.getComponentPropertyHandlerName());
 
 		// also a composite id can be handled by a foreign generator
 		checkAddForeignGenerator(compositeIdElement, aReference.getPaEClass());
 	}
 
-	private void addKeyManyToOne(Element currentParent,
-			PAnnotatedEReference paReference) {
+	private void addKeyManyToOne(Element currentParent, PAnnotatedEReference paReference) {
 		log.debug("Process many-to-one " + paReference);
 
 		final List<JoinColumn> jcs = getJoinColumns(paReference);
 
-		final EClass referedTo = paReference.getModelEReference()
-				.getEReferenceType();
+		final EClass referedTo = paReference.getModelEReference().getEReferenceType();
 		final ManyToOne mto = paReference.getManyToOne();
 		String targetName = mto.getTargetEntity();
 		if (targetName == null) {
@@ -264,16 +235,14 @@ public class IdMapper extends AbstractAssociationMapper implements
 
 		log.debug("Target " + targetName);
 
-		final Element associationElement = addManyToOne(currentParent,
-				paReference, targetName, true);
+		final Element associationElement = addManyToOne(currentParent, paReference, targetName, true);
 
 		addForeignKeyAttribute(associationElement, paReference);
 		addLazyProxy(associationElement, mto.getFetch(), paReference);
 
-		addJoinColumns(paReference, associationElement, jcs, getHbmContext()
-				.isDoForceOptional(paReference)
-				|| mto.isOptional()
-				|| getHbmContext().isCurrentElementFeatureMap());
+		addJoinColumns(paReference, associationElement, jcs,
+				getHbmContext().isDoForceOptional(paReference) || mto.isOptional()
+						|| getHbmContext().isCurrentElementFeatureMap());
 
 		// MT: TODO; the characteristic of the other side should be checked (if
 		// present), if the otherside is a onetoone
@@ -290,8 +259,7 @@ public class IdMapper extends AbstractAssociationMapper implements
 	public void processIdProperty(PAnnotatedEAttribute id) {
 		final PAnnotatedEClass aClass = id.getPaEClass();
 		// check precondition
-		if (aClass.getPaSuperEntity() != null
-				&& aClass.getPaSuperEntity().hasIdAnnotatedFeature()) {
+		if (aClass.getPaSuperEntity() != null && aClass.getPaSuperEntity().hasIdAnnotatedFeature()) {
 			log.error("The annotated eclass: "
 					+ aClass
 					+ " has an id-annotated feature: "
@@ -322,8 +290,7 @@ public class IdMapper extends AbstractAssociationMapper implements
 		// throw new MappingException("Unsupported, SecondaryTable", column);
 		// }
 
-		final Element idElement = getCreateIdElement(getHbmContext()
-				.getCurrent(), aClass);
+		final Element idElement = getCreateIdElement(getHbmContext().getCurrent(), aClass);
 		final boolean isCompositeId = aClass.getIdClass() != null;
 
 		final Element usedIdElement;
@@ -336,62 +303,40 @@ public class IdMapper extends AbstractAssociationMapper implements
 		// if idclass != null then this is a composite id which can not have a
 		// unique constraint
 		// on an id column
-		addColumnsAndFormula(usedIdElement, id, columns, false, false,
-				aClass.getIdClass() == null, true);
+		addColumnsAndFormula(usedIdElement, id, columns, false, false, aClass.getIdClass() == null,
+				true);
 
 		usedIdElement.addAttribute("name", eAttribute.getName());
 		if (id.getEnumerated() == null) {
 			setType(id, usedIdElement);
 
 			if (eAttribute.getDefaultValue() != null) {
-				usedIdElement.addAttribute("unsaved-value", eAttribute
-						.getDefaultValue().toString());
+				usedIdElement.addAttribute("unsaved-value", eAttribute.getDefaultValue().toString());
 			} else if (eAttribute.getEType().getDefaultValue() != null) {
-				usedIdElement.addAttribute("unsaved-value", eAttribute
-						.getEType().getDefaultValue().toString());
+				usedIdElement.addAttribute("unsaved-value", eAttribute.getEType().getDefaultValue()
+						.toString());
 			}
 
 		} else { // enumerated id
 			final EClassifier eclassifier = id.getModelEAttribute().getEType();
-			if (!getHbmContext().isGeneratedByEMF()
-					&& !getHbmContext().isDynamic(eclassifier)) {
+			if (!getHbmContext().isGeneratedByEMF() && !getHbmContext().isDynamic(eclassifier)) {
 				final String typeName = getEnumUserType(id.getEnumerated());
-				final Class<?> instanceClass = getHbmContext()
-						.getInstanceClass(eclassifier);
-				usedIdElement.addElement("type").addAttribute("name", typeName)
-						.addElement("param")
-						.addAttribute("name", "enumClassName")
-						.addText(instanceClass.getName());
-			} else if (!getHbmContext().isGeneratedByEMF()
-					&& getHbmContext().isDynamic(eclassifier)) {
-				throw new UnsupportedOperationException(
-						"DYNAMIC WITH ENUM ID NOT YET SUPPORTED");
+				final Class<?> instanceClass = getHbmContext().getInstanceClass(eclassifier);
+				usedIdElement.addElement("type").addAttribute("name", typeName).addElement("param")
+						.addAttribute("name", "enumClassName").addText(instanceClass.getName());
+			} else if (!getHbmContext().isGeneratedByEMF() && getHbmContext().isDynamic(eclassifier)) {
+				throw new UnsupportedOperationException("DYNAMIC WITH ENUM ID NOT YET SUPPORTED");
 			} else if (id.getModelEAttribute().getEType().getInstanceClass() != null) {
-				usedIdElement
-						.addElement("type")
-						.addAttribute("name",
-								getEnumUserType(id.getEnumerated()))
-						.addElement("param")
-						.addAttribute("name",
-								HbMapperConstants.ENUM_CLASS_PARAM)
-						.addText(
-								eAttribute.getEType().getInstanceClass()
-										.getName());
+				usedIdElement.addElement("type").addAttribute("name", getEnumUserType(id.getEnumerated()))
+						.addElement("param").addAttribute("name", HbMapperConstants.ENUM_CLASS_PARAM)
+						.addText(eAttribute.getEType().getInstanceClass().getName());
 			} else {
-				final Element typeElement = usedIdElement.addElement("type")
-						.addAttribute("name",
-								hbDynamicEnumType(id.getEnumerated()));
-				typeElement
-						.addElement("param")
-						.addAttribute("name",
-								HbMapperConstants.ECLASSIFIER_PARAM)
+				final Element typeElement = usedIdElement.addElement("type").addAttribute("name",
+						hbDynamicEnumType(id.getEnumerated()));
+				typeElement.addElement("param").addAttribute("name", HbMapperConstants.ECLASSIFIER_PARAM)
 						.addText(id.getModelEAttribute().getEType().getName());
-				typeElement
-						.addElement("param")
-						.addAttribute("name", HbMapperConstants.EPACKAGE_PARAM)
-						.addText(
-								id.getModelEAttribute().getEType()
-										.getEPackage().getNsURI());
+				typeElement.addElement("param").addAttribute("name", HbMapperConstants.EPACKAGE_PARAM)
+						.addText(id.getModelEAttribute().getEType().getEPackage().getNsURI());
 			}
 		}
 
@@ -400,71 +345,52 @@ public class IdMapper extends AbstractAssociationMapper implements
 
 		if (generatedValue != null) {
 			if (isCompositeId) {
-				throw new MappingException(
-						"Composite id can not have a generated value "
-								+ id.getModelEAttribute().getEContainingClass()
-										.getName() + "/"
-								+ id.getModelEAttribute().getName());
+				throw new MappingException("Composite id can not have a generated value "
+						+ id.getModelEAttribute().getEContainingClass().getName() + "/"
+						+ id.getModelEAttribute().getName());
 			}
 
-			final Element generatorElement = usedIdElement
-					.addElement("generator");
+			final Element generatorElement = usedIdElement.addElement("generator");
 
 			GenericGenerator gg;
 			if (generatedValue.getGenerator() != null
-					&& (gg = getGenericGenerator(id.getPaModel(),
-							generatedValue.getGenerator())) != null) {
+					&& (gg = getGenericGenerator(id.getPaModel(), generatedValue.getGenerator())) != null) {
 				log.debug("GenericGenerator the strategy in the GeneratedValue is ignored (if even set)");
 				generatorElement.addAttribute("class", gg.getStrategy());
 				if (gg.getParameters() != null) {
 					for (Parameter param : gg.getParameters()) {
-						generatorElement.addElement("param")
-								.addAttribute("name", param.getName())
+						generatorElement.addElement("param").addAttribute("name", param.getName())
 								.addText(param.getValue());
 					}
 				}
-			} else if (GenerationType.IDENTITY.equals(generatedValue
-					.getStrategy())) {
+			} else if (GenerationType.IDENTITY.equals(generatedValue.getStrategy())) {
 				generatorElement.addAttribute("class", "identity");
-			} else if (GenerationType.TABLE
-					.equals(generatedValue.getStrategy())) {
-				generatorElement
-						.addAttribute("class", IdMapper
-								.hbGeneratorClass(generatedValue.getStrategy()));
+			} else if (GenerationType.TABLE.equals(generatedValue.getStrategy())) {
+				generatorElement.addAttribute("class",
+						IdMapper.hbGeneratorClass(generatedValue.getStrategy()));
 				if (generatedValue.getGenerator() != null) { // table
 					// generator
-					final TableGenerator tg = id.getPaModel()
-							.getTableGenerator(id.getModelEAttribute(),
-									generatedValue.getGenerator());
-					generatorElement
-							.addElement("param")
-							.addAttribute("name", "table")
-							.setText(
-									(tg.getTable() != null ? tg.getTable()
-											: "uid_table")); // externalize
+					final TableGenerator tg = id.getPaModel().getTableGenerator(id.getModelEAttribute(),
+							generatedValue.getGenerator());
+					generatorElement.addElement("param").addAttribute("name", "table")
+							.setText((tg.getTable() != null ? tg.getTable() : "uid_table")); // externalize
 					generatorElement
 							.addElement("param")
 							.addAttribute("name", "column")
 							.setText(
-									tg.getValueColumnName() != null ? tg
-											.getValueColumnName()
+									tg.getValueColumnName() != null ? tg.getValueColumnName()
 											: "next_hi_value_column"); // externalize
-					generatorElement.addElement("param")
-							.addAttribute("name", "max_lo")
+					generatorElement.addElement("param").addAttribute("name", "max_lo")
 							.setText((tg.getAllocationSize() - 1) + "");
 				} else {
-					generatorElement.addElement("param")
-							.addAttribute("name", "table").setText("uid_table"); // externalize
-					generatorElement.addElement("param")
-							.addAttribute("name", "column")
+					generatorElement.addElement("param").addAttribute("name", "table").setText("uid_table"); // externalize
+					generatorElement.addElement("param").addAttribute("name", "column")
 							.setText("next_hi_value_column"); // externalize
 				}
-			} else if (GenerationType.SEQUENCE.equals(generatedValue
-					.getStrategy())) {
+			} else if (GenerationType.SEQUENCE.equals(generatedValue.getStrategy())) {
 				if (generatedValue.getGenerator() != null) {
-					final SequenceGenerator sg = id.getPaModel()
-							.getSequenceGenerator(id.getModelEAttribute(),
-									generatedValue.getGenerator());
+					final SequenceGenerator sg = id.getPaModel().getSequenceGenerator(
+							id.getModelEAttribute(), generatedValue.getGenerator());
 					if (sg.getCatalog() != null) {
 						generatorElement.addAttribute("catalog", sg.getCatalog());
 					}
@@ -473,66 +399,46 @@ public class IdMapper extends AbstractAssociationMapper implements
 					}
 					if (sg.isSetAllocationSize()) {
 						generatorElement.addAttribute("class", "seqhilo");
-						generatorElement.addElement("param")
-								.addAttribute("name", "sequence")
+						generatorElement.addElement("param").addAttribute("name", "sequence")
 								.setText(sg.getSequenceName());
 						// generatorElement.addElement("param").addAttribute("name",
 						// "initialValue").setText(
 						// Integer.toString(sg.getInitialValue()));
-						generatorElement
-								.addElement("param")
-								.addAttribute("name", "max_lo")
-								.setText(
-										Integer.toString(sg.getAllocationSize() - 1));
+						generatorElement.addElement("param").addAttribute("name", "max_lo")
+								.setText(Integer.toString(sg.getAllocationSize() - 1));
 					} else {
-						generatorElement
-								.addAttribute("class", IdMapper
-										.hbGeneratorClass(generatedValue
-												.getStrategy()));
-						generatorElement.addElement("param")
-								.addAttribute("name", "sequence")
+						generatorElement.addAttribute("class",
+								IdMapper.hbGeneratorClass(generatedValue.getStrategy()));
+						generatorElement.addElement("param").addAttribute("name", "sequence")
 								.setText(sg.getSequenceName());
 					}
 				} else {
-					generatorElement.addAttribute("class", IdMapper
-							.hbGeneratorClass(generatedValue.getStrategy()));
+					generatorElement.addAttribute("class",
+							IdMapper.hbGeneratorClass(generatedValue.getStrategy()));
 				}
-			} else if (GenerationType.SEQUENCESTYLE.equals(generatedValue
-					.getStrategy())) {
-				generatorElement
-						.addAttribute("class", IdMapper
-								.hbGeneratorClass(generatedValue.getStrategy()));
+			} else if (GenerationType.SEQUENCESTYLE.equals(generatedValue.getStrategy())) {
+				generatorElement.addAttribute("class",
+						IdMapper.hbGeneratorClass(generatedValue.getStrategy()));
 				if (generatedValue.getGenerator() != null) {
-					final SequenceStyleGenerator sg = id.getPaModel()
-							.getSequenceStyleGenerator(id.getModelEAttribute(),
-									generatedValue.getGenerator());
-					generatorElement.addElement("param")
-							.addAttribute("name", "sequence_name")
+					final SequenceStyleGenerator sg = id.getPaModel().getSequenceStyleGenerator(
+							id.getModelEAttribute(), generatedValue.getGenerator());
+					generatorElement.addElement("param").addAttribute("name", "sequence_name")
 							.setText(sg.getSequenceName());
-					if (sg.getOptimizerClass() != null
-							&& sg.getOptimizerClass().trim().length() > 0) {
-						generatorElement.addElement("param")
-								.addAttribute("name", "optimizer")
+					if (sg.getOptimizerClass() != null && sg.getOptimizerClass().trim().length() > 0) {
+						generatorElement.addElement("param").addAttribute("name", "optimizer")
 								.setText(sg.getOptimizerClass());
 					} else if (sg.getOptimizer() != OptimizerType.DEFAULT) {
-						generatorElement
-								.addElement("param")
-								.addAttribute("name", "optimizer")
-								.setText(
-										sg.getOptimizer().getLiteral()
-												.toLowerCase());
+						generatorElement.addElement("param").addAttribute("name", "optimizer")
+								.setText(sg.getOptimizer().getLiteral().toLowerCase());
 					}
-					generatorElement.addElement("param")
-							.addAttribute("name", "initial_value")
+					generatorElement.addElement("param").addAttribute("name", "initial_value")
 							.setText(Integer.toString(sg.getInitialValue()));
-					generatorElement.addElement("param")
-							.addAttribute("name", "increment_size")
+					generatorElement.addElement("param").addAttribute("name", "increment_size")
 							.setText(Integer.toString(sg.getIncrementSize()));
 				}
 			} else {
-				generatorElement
-						.addAttribute("class", IdMapper
-								.hbGeneratorClass(generatedValue.getStrategy()));
+				generatorElement.addAttribute("class",
+						IdMapper.hbGeneratorClass(generatedValue.getStrategy()));
 			}
 		} else {
 			// check if there is a one-to-one with pk
@@ -543,12 +449,9 @@ public class IdMapper extends AbstractAssociationMapper implements
 	// check if one of the ereferences has a one-to-one and a
 	// primarykeyjoincolumn
 	// then use a special generator
-	protected boolean checkAddForeignGenerator(Element idElement,
-			PAnnotatedEClass aClass) {
-		for (PAnnotatedEStructuralFeature aFeature : aClass
-				.getPaEStructuralFeatures()) {
-			if (aFeature.getMapsId() != null
-					&& aFeature.getMapsId().getValue() == null) {
+	protected boolean checkAddForeignGenerator(Element idElement, PAnnotatedEClass aClass) {
+		for (PAnnotatedEStructuralFeature aFeature : aClass.getPaEStructuralFeatures()) {
+			if (aFeature.getMapsId() != null && aFeature.getMapsId().getValue() == null) {
 				final Element genElement = idElement.addElement("generator");
 				genElement.addAttribute("class", "foreign");
 				final Element paramElement = genElement.addElement("param");
@@ -557,15 +460,12 @@ public class IdMapper extends AbstractAssociationMapper implements
 				return true;
 			} else if (aFeature instanceof PAnnotatedEReference) {
 				final PAnnotatedEReference aReference = (PAnnotatedEReference) aFeature;
-				if (aReference.getOneToOne() != null
-						&& !aReference.getPrimaryKeyJoinColumns().isEmpty()) {
-					final Element genElement = idElement
-							.addElement("generator");
+				if (aReference.getOneToOne() != null && !aReference.getPrimaryKeyJoinColumns().isEmpty()) {
+					final Element genElement = idElement.addElement("generator");
 					genElement.addAttribute("class", "foreign");
 					final Element paramElement = genElement.addElement("param");
 					paramElement.addAttribute("name", "property");
-					paramElement
-							.addText(aReference.getModelElement().getName());
+					paramElement.addText(aReference.getModelElement().getName());
 					return true;
 				}
 			}
@@ -574,18 +474,16 @@ public class IdMapper extends AbstractAssociationMapper implements
 	}
 
 	/**
-	 * Returns a sequence generator on the basis of its name, if not found then
-	 * null is returned.
+	 * Returns a sequence generator on the basis of its name, if not found then null is returned.
 	 */
-	public GenericGenerator getGenericGenerator(PAnnotatedModel paModel,
-			String name) {
+	public GenericGenerator getGenericGenerator(PAnnotatedModel paModel, String name) {
 		for (PAnnotatedEPackage annotatedEPackage : paModel.getPaEPackages()) {
 			final HbAnnotatedEPackage pae = (HbAnnotatedEPackage) annotatedEPackage;
 			for (GenericGenerator gg : pae.getHbGenericGenerators()) {
 				if (gg.getName() != null && gg.getName().compareTo(name) == 0) {
 					if (gg.getStrategy() == null) {
-						throw new MappingException("The GenericGenerator: "
-								+ name + " has no strategy defined!");
+						throw new MappingException("The GenericGenerator: " + name
+								+ " has no strategy defined!");
 					}
 
 					return gg;
@@ -598,8 +496,7 @@ public class IdMapper extends AbstractAssociationMapper implements
 
 	private static boolean hasMultipleIdFeatures(PAnnotatedEClass aClass) {
 		boolean foundIdFeature = false;
-		for (PAnnotatedEStructuralFeature paFeature : aClass
-				.getPaEStructuralFeatures()) {
+		for (PAnnotatedEStructuralFeature paFeature : aClass.getPaEStructuralFeatures()) {
 			if (paFeature.getId() != null) {
 				if (foundIdFeature) {
 					return true;
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/ManyAttributeMapper.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/ManyAttributeMapper.java
index f12765558..1f9bb6002 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/ManyAttributeMapper.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/ManyAttributeMapper.java
@@ -62,9 +62,11 @@ public class ManyAttributeMapper extends AbstractAssociationMapper implements Ex
 		final Element collElement = addCollectionElement(paAttribute);
 		final Element keyElement = collElement.addElement("key");
 
-		final JoinTable jt = paAttribute.getCollectionTable() != null ? paAttribute.getCollectionTable() : paAttribute.getJoinTable();
-		final List<JoinColumn> jcs = jt != null && jt.getJoinColumns().size() > 0 ? jt.getJoinColumns() : (paAttribute.getJoinColumns() == null ? new ArrayList<JoinColumn>() : paAttribute
-				.getJoinColumns());
+		final JoinTable jt = paAttribute.getCollectionTable() != null ? paAttribute
+				.getCollectionTable() : paAttribute.getJoinTable();
+		final List<JoinColumn> jcs = jt != null && jt.getJoinColumns().size() > 0 ? jt.getJoinColumns()
+				: (paAttribute.getJoinColumns() == null ? new ArrayList<JoinColumn>() : paAttribute
+						.getJoinColumns());
 		final OneToMany otm = paAttribute.getOneToMany();
 
 		if (jt != null) {
@@ -86,7 +88,8 @@ public class ManyAttributeMapper extends AbstractAssociationMapper implements Ex
 		if (!isArray) {
 			addFetchType(collElement, otm.getFetch());
 		}
-		addCascadesForMany(collElement, getCascades(hbAttribute.getHbCascade(), otm.getCascade(), false));
+		addCascadesForMany(collElement,
+				getCascades(hbAttribute.getHbCascade(), otm.getCascade(), false));
 
 		if (FeatureMapUtil.isFeatureMap(paAttribute.getModelEAttribute())) {
 			if (getHbmContext().getPersistenceOptions().isMapFeatureMapAsComponent()) {
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/ManyExternalReferenceMapper.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/ManyExternalReferenceMapper.java
index c5cc178dc..6ac919859 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/ManyExternalReferenceMapper.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/ManyExternalReferenceMapper.java
@@ -27,19 +27,17 @@ import org.eclipse.emf.teneo.simpledom.Element;
  * 
  * @author <a href="mailto:mtaal at elver.org">Martin Taal</a>
  */
-public class ManyExternalReferenceMapper extends AbstractAssociationMapper
-		implements ExtensionPoint {
+public class ManyExternalReferenceMapper extends AbstractAssociationMapper implements
+		ExtensionPoint {
 
-	private static final Log log = LogFactory
-			.getLog(ManyExternalReferenceMapper.class);
+	private static final Log log = LogFactory.getLog(ManyExternalReferenceMapper.class);
 
 	/**
 	 * Process a many=true EReference with URI attribute.
 	 */
 	public void processManyReference(PAnnotatedEReference paReference) {
 		if (log.isDebugEnabled()) {
-			log.debug("Generating many valued attribute mapping for "
-					+ paReference);
+			log.debug("Generating many valued attribute mapping for " + paReference);
 		}
 
 		final HbAnnotatedEReference hbReference = (HbAnnotatedEReference) paReference;
@@ -65,15 +63,13 @@ public class ManyExternalReferenceMapper extends AbstractAssociationMapper
 		}
 
 		addFetchType(collElement, otm.getFetch());
-		addCascadesForMany(collElement, getCascades(hbReference.getHbCascade(),
-				otm.getCascade(), false));
+		addCascadesForMany(collElement,
+				getCascades(hbReference.getHbCascade(), otm.getCascade(), false));
 
-		addElementElement(collElement, paReference, getColumns(paReference),
-				otm.getTargetEntity());
+		addElementElement(collElement, paReference, getColumns(paReference), otm.getTargetEntity());
 
 		addAccessor(collElement);
 
-		mapFilter(collElement, ((HbAnnotatedETypeElement) hbReference)
-				.getFilter());
+		mapFilter(collElement, ((HbAnnotatedETypeElement) hbReference).getFilter());
 	}
 }
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/ManyToManyMapper.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/ManyToManyMapper.java
index 74ec6e4c0..a81c71fce 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/ManyToManyMapper.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/ManyToManyMapper.java
@@ -27,8 +27,7 @@ import org.eclipse.emf.teneo.util.StoreUtil;
  * 
  * @author <a href="mailto:mtaal at elver.org">Martin Taal</a>
  */
-public class ManyToManyMapper extends AbstractAssociationMapper implements
-		ExtensionPoint {
+public class ManyToManyMapper extends AbstractAssociationMapper implements ExtensionPoint {
 
 	/** Logger */
 	private static final Log log = LogFactory.getLog(ManyToManyMapper.class);
@@ -45,8 +44,7 @@ public class ManyToManyMapper extends AbstractAssociationMapper implements
 		final ManyToMany mtm = hbReference.getManyToMany();
 
 		if (jt == null) {
-			throw new MappingException("Jointable is mandatory "
-					+ StoreUtil.toString(eref));
+			throw new MappingException("Jointable is mandatory " + StoreUtil.toString(eref));
 		}
 
 		final Element collElement = addCollectionElement(hbReference);
@@ -56,19 +54,16 @@ public class ManyToManyMapper extends AbstractAssociationMapper implements
 		}
 
 		if (((HbAnnotatedEReference) paReference).getHbCache() != null) {
-			addCacheElement(collElement,
-					((HbAnnotatedEReference) paReference).getHbCache());
+			addCacheElement(collElement, ((HbAnnotatedEReference) paReference).getHbCache());
 		}
 
 		final Element keyElement = collElement.addElement("key");
 		handleOndelete(keyElement, hbReference.getHbOnDelete());
 
-		boolean isMap = StoreUtil.isMap(eref)
-				&& getHbmContext().isMapEMapAsTrueMap();
+		boolean isMap = StoreUtil.isMap(eref) && getHbmContext().isMapEMapAsTrueMap();
 		if (mtm.isIndexed() && hbReference.getHbIdBag() == null) {
 			// now we check if it is a list or a map
-			if (hbReference.getMapKey() != null
-					|| hbReference.getHbMapKey() != null
+			if (hbReference.getMapKey() != null || hbReference.getHbMapKey() != null
 					|| hbReference.getMapKeyManyToMany() != null) {
 				addMapKey(collElement, paReference);
 			} else if (isMap) {
@@ -79,45 +74,37 @@ public class ManyToManyMapper extends AbstractAssociationMapper implements
 		}
 
 		addFetchType(collElement, mtm.getFetch());
-		addCascades(collElement,
-				getCascades(hbReference.getHbCascade(), mtm.getCascade(), false),
+		addCascades(collElement, getCascades(hbReference.getHbCascade(), mtm.getCascade(), false),
 				false);
 
-		final PAnnotatedEClass referedToAClass = hbReference
-				.getAReferenceType();
+		final PAnnotatedEClass referedToAClass = hbReference.getAReferenceType();
 		String targetName = mtm.getTargetEntity();
 		if (targetName == null) {
-			targetName = getHbmContext().getEntityName(
-					hbReference.getEReferenceType());
+			targetName = getHbmContext().getEntityName(hbReference.getEReferenceType());
 		}
 		log.debug("Target entity-name " + targetName);
 
 		final Element mtmElement;
-		if (referedToAClass.isOnlyMapAsEntity()
-				|| !getHbmContext().forceUseOfInstance(referedToAClass)) {
-			mtmElement = collElement.addElement("many-to-many")
-					.addAttribute("entity-name", targetName)
+		if (referedToAClass.isOnlyMapAsEntity() || !getHbmContext().forceUseOfInstance(referedToAClass)) {
+			mtmElement = collElement.addElement("many-to-many").addAttribute("entity-name", targetName)
 					.addAttribute("unique", "false");
 		} else {
 			mtmElement = collElement
 					.addElement("many-to-many")
-					.addAttribute(
-							"class",
-							getHbmContext().getInstanceClassName(
-									hbReference.getEReferenceType()))
+					.addAttribute("class",
+							getHbmContext().getInstanceClassName(hbReference.getEReferenceType()))
 					.addAttribute("unique", "false");
 		}
 
 		if (hbReference.getNotFound() != null) {
-			mtmElement.addAttribute("not-found", hbReference.getNotFound()
-					.getAction().getName().toLowerCase());
+			mtmElement.addAttribute("not-found", hbReference.getNotFound().getAction().getName()
+					.toLowerCase());
 		}
 
 		addForeignKeyAttribute(mtmElement, hbReference);
 
 		// inverse is not supported by indexed lists
-		if ((!mtm.isIndexed() && hbReference.getHbIdBag() == null && mtm
-				.getMappedBy() != null)) {
+		if ((!mtm.isIndexed() && hbReference.getHbIdBag() == null && mtm.getMappedBy() != null)) {
 			// note inverse is required for many-to-many to work, otherwise
 			// hibernate will insert
 			// both sides of the relation twice.
@@ -129,15 +116,12 @@ public class ManyToManyMapper extends AbstractAssociationMapper implements
 		// check for a special case that mapped by is set on both sides
 		// should always be unequal to null
 		if (hbReference.getModelEReference().getEOpposite() != null) {
-			final PAnnotatedEReference aOpposite = hbReference.getPaModel()
-					.getPAnnotated(
-							hbReference.getModelEReference().getEOpposite());
-			if (aOpposite.getManyToMany() != null
-					&& aOpposite.getManyToMany().getMappedBy() != null
+			final PAnnotatedEReference aOpposite = hbReference.getPaModel().getPAnnotated(
+					hbReference.getModelEReference().getEOpposite());
+			if (aOpposite.getManyToMany() != null && aOpposite.getManyToMany().getMappedBy() != null
 					&& mtm.getMappedBy() != null) {
 				log.error("Mappedby is set on both sides of the many-to-many relation, this does not work, see the efeature: "
-						+ hbReference.getModelElement().toString()
-						+ ". Ignoring the mappedby in this efeature");
+						+ hbReference.getModelElement().toString() + ". Ignoring the mappedby in this efeature");
 				mtm.setMappedBy(null);
 			}
 		}
@@ -145,22 +129,15 @@ public class ManyToManyMapper extends AbstractAssociationMapper implements
 		addJoinTable(hbReference, collElement, keyElement, jt);
 		if (jt.getInverseJoinColumns() != null) {
 			for (JoinColumn joinColumn : jt.getInverseJoinColumns()) {
-				mtmElement
-						.addElement("column")
-						.addAttribute(
-								"name",
-								getHbmContext().trunc(joinColumn,
-										joinColumn.getName()))
-						.addAttribute("not-null",
-								joinColumn.isNullable() ? "false" : "true")
-						.addAttribute("unique",
-								joinColumn.isUnique() ? "true" : "false");
+				mtmElement.addElement("column")
+						.addAttribute("name", getHbmContext().trunc(joinColumn, joinColumn.getName()))
+						.addAttribute("not-null", joinColumn.isNullable() ? "false" : "true")
+						.addAttribute("unique", joinColumn.isUnique() ? "true" : "false");
 			}
 		}
 
 		addAccessor(collElement);
 
-		mapFilter(collElement,
-				((HbAnnotatedETypeElement) paReference).getFilter());
+		mapFilter(collElement, ((HbAnnotatedETypeElement) paReference).getFilter());
 	}
 }
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/ManyToOneMapper.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/ManyToOneMapper.java
index 9847005b5..26eb4b65d 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/ManyToOneMapper.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/ManyToOneMapper.java
@@ -27,8 +27,7 @@ import org.eclipse.emf.teneo.simpledom.Element;
 /**
  * Maps a {@link ManyToOne} element to its {@link MappingContext}.
  * <p>
- * Assumes that the given {@link PAnnotatedEStructuralFeature} is a normal
- * ManyToOne, i.e.
+ * Assumes that the given {@link PAnnotatedEStructuralFeature} is a normal ManyToOne, i.e.
  * <ul>
  * <li>it is a {@link PAnnotatedEReference};
  * <li>it has a {@link ManyToOne} annotation;
@@ -36,8 +35,7 @@ import org.eclipse.emf.teneo.simpledom.Element;
  * 
  * @author <a href="mailto:mtaal at elver.org">Martin Taal</a>
  */
-public class ManyToOneMapper extends AbstractAssociationMapper implements
-		ExtensionPoint {
+public class ManyToOneMapper extends AbstractAssociationMapper implements ExtensionPoint {
 
 	/** Log it */
 	private static final Log log = LogFactory.getLog(ManyToOneMapper.class);
@@ -52,21 +50,20 @@ public class ManyToOneMapper extends AbstractAssociationMapper implements
 
 		final List<JoinColumn> jcs = getJoinColumns(paReference);
 
-		final EClass referedTo = paReference.getModelEReference()
-				.getEReferenceType();
+		final EClass referedTo = paReference.getModelEReference().getEReferenceType();
 		final ManyToOne mto = paReference.getManyToOne();
 		String targetName = mto.getTargetEntity();
 		if (targetName == null) {
 			targetName = getHbmContext().getEntityName(referedTo);
 		}
 
-		final boolean isAny = hbReference.getAny() != null
-				|| hbReference.getAnyMetaDef() != null || isEObject(targetName);
+		final boolean isAny = hbReference.getAny() != null || hbReference.getAnyMetaDef() != null
+				|| isEObject(targetName);
 		if (isAny) {
 			final String assocName = getHbmContext().getPropertyName(
 					hbReference.getModelEStructuralFeature());
-			final Element anyElement = createAny(assocName, hbReference,
-					hbReference.getAny(), hbReference.getAnyMetaDef(), false);
+			final Element anyElement = createAny(assocName, hbReference, hbReference.getAny(),
+					hbReference.getAnyMetaDef(), false);
 			getHbmContext().getCurrent().add(anyElement);
 			return;
 		}
@@ -79,31 +76,22 @@ public class ManyToOneMapper extends AbstractAssociationMapper implements
 			aOpposite = paReference.getPaModel().getPAnnotated(
 					paReference.getModelEReference().getEOpposite());
 			if (aOpposite.getOneToMany() != null
-					&& (!aOpposite.getOneToMany().isList() || aOpposite
-							.getOneToMany().getFetch().equals(FetchType.EXTRA))
-					&& getJoinTable(aOpposite) != null) {
+					&& (!aOpposite.getOneToMany().isList() || aOpposite.getOneToMany().getFetch()
+							.equals(FetchType.EXTRA)) && getJoinTable(aOpposite) != null) {
 				joinTable = getJoinTable(aOpposite);
 			}
 		}
 
 		final Element currentElement;
 		if (joinTable != null) {
-			final boolean addInverse = aOpposite != null
-					&& aOpposite.getOneToMany() != null
+			final boolean addInverse = aOpposite != null && aOpposite.getOneToMany() != null
 					&& aOpposite.getOneToMany().getMappedBy() == null
-					&& !aOpposite.getOneToMany().getFetch()
-							.equals(FetchType.EXTRA);
-
-			currentElement = getHbmContext()
-					.getCurrent()
-					.addElement("join")
-					.addAttribute(
-							"table",
-							getHbmContext().trunc(joinTable,
-									joinTable.getName()))
+					&& !aOpposite.getOneToMany().getFetch().equals(FetchType.EXTRA);
+
+			currentElement = getHbmContext().getCurrent().addElement("join")
+					.addAttribute("table", getHbmContext().trunc(joinTable, joinTable.getName()))
 					.addAttribute("inverse", Boolean.toString(addInverse))
-					.addAttribute("optional",
-							Boolean.toString(mto.isOptional()));
+					.addAttribute("optional", Boolean.toString(mto.isOptional()));
 
 		} else {
 			currentElement = getHbmContext().getCurrent();
@@ -115,8 +103,7 @@ public class ManyToOneMapper extends AbstractAssociationMapper implements
 					joinTable.getInverseJoinColumns());
 		}
 
-		final Element associationElement = addManyToOne(currentElement,
-				paReference, targetName, false);
+		final Element associationElement = addManyToOne(currentElement, paReference, targetName, false);
 		addAccessor(associationElement);
 
 		final boolean isProperty = hbReference.getHbType() != null;
@@ -127,10 +114,9 @@ public class ManyToOneMapper extends AbstractAssociationMapper implements
 		}
 
 		if (!isProperty && joinTable != null) {
-			addJoinColumns(paReference, associationElement,
-					joinTable.getJoinColumns(), mto.isOptional()
-							|| getHbmContext().isDoForceOptional(paReference)
-							|| getHbmContext().isCurrentElementFeatureMap());
+			addJoinColumns(paReference, associationElement, joinTable.getJoinColumns(), mto.isOptional()
+					|| getHbmContext().isDoForceOptional(paReference)
+					|| getHbmContext().isCurrentElementFeatureMap());
 		}
 
 		if (!isProperty) {
@@ -139,12 +125,11 @@ public class ManyToOneMapper extends AbstractAssociationMapper implements
 		}
 
 		if (hbReference.getHbFetch() != null) {
-			associationElement.addAttribute("fetch", hbReference.getHbFetch()
-					.getValue().getName().toLowerCase());
+			associationElement.addAttribute("fetch", hbReference.getHbFetch().getValue().getName()
+					.toLowerCase());
 		}
 
-		final boolean nullable = getHbmContext().isDoForceOptional(paReference)
-				|| mto.isOptional()
+		final boolean nullable = getHbmContext().isDoForceOptional(paReference) || mto.isOptional()
 				|| getHbmContext().isCurrentElementFeatureMap();
 
 		if (!isProperty) {
@@ -153,12 +138,10 @@ public class ManyToOneMapper extends AbstractAssociationMapper implements
 
 			if (joinTable == null) {
 				addJoinColumns(paReference, associationElement, jcs, nullable);
-				associationElement.addAttribute("not-null", nullable ? "false"
-						: "true");
+				associationElement.addAttribute("not-null", nullable ? "false" : "true");
 			}
 		} else if (isProperty) {
-			associationElement.addAttribute("not-null", nullable ? "false"
-					: "true");
+			associationElement.addAttribute("not-null", nullable ? "false" : "true");
 		}
 
 		// note that the reference must be required, nullable and unique columns
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/MappingContext.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/MappingContext.java
index d5c11c839..6c63392a4 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/MappingContext.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/MappingContext.java
@@ -49,8 +49,8 @@ import org.eclipse.emf.teneo.simpledom.Element;
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
  * @version $Revision: 1.39 $
  */
-public class MappingContext extends AbstractProcessingContext implements
-		ExtensionPoint, ExtensionInitializable, ExtensionManagerAware {
+public class MappingContext extends AbstractProcessingContext implements ExtensionPoint,
+		ExtensionInitializable, ExtensionManagerAware {
 
 	/** The xml document to which all elements are added */
 	private Document mappingDoc;
@@ -62,8 +62,7 @@ public class MappingContext extends AbstractProcessingContext implements
 	private Map<EClass, String> entityNames = null;
 
 	/**
-	 * Keeps track of the list of featuremapmappers created for the current
-	 * entity
+	 * Keeps track of the list of featuremapmappers created for the current entity
 	 */
 	private final List<FeatureMapMapping> featureMapMappers = new ArrayList<FeatureMapMapping>();
 
@@ -74,9 +73,8 @@ public class MappingContext extends AbstractProcessingContext implements
 	private FeatureMapper featureMapper;
 
 	/**
-	 * Is the current element a mixed or a feature map, in this case all
-	 * features should be not required. TODO: check, does this work with
-	 * embedded components in a feature map?
+	 * Is the current element a mixed or a feature map, in this case all features should be not
+	 * required. TODO: check, does this work with embedded components in a feature map?
 	 */
 	private boolean currentElementFeatureMap = false;
 
@@ -84,8 +82,7 @@ public class MappingContext extends AbstractProcessingContext implements
 	private Table currentTable = null;
 
 	/**
-	 * The current column prefix, is used in case of multiple mixed types in one
-	 * eclass.
+	 * The current column prefix, is used in case of multiple mixed types in one eclass.
 	 */
 	private String namePrefix = "";
 
@@ -126,9 +123,8 @@ public class MappingContext extends AbstractProcessingContext implements
 	private boolean adaptManualNames = false;
 
 	/**
-	 * Set force optional, force optional is used in case a subclass is stored
-	 * in the same table as its superclass, in this case all properties of the
-	 * subclass are denoted as optional.
+	 * Set force optional, force optional is used in case a subclass is stored in the same table as
+	 * its superclass, in this case all properties of the subclass are denoted as optional.
 	 */
 	private boolean forceOptional = false;
 
@@ -198,9 +194,7 @@ public class MappingContext extends AbstractProcessingContext implements
 			}
 		}
 		if (throwCheckException && name == null) {
-			throw new IllegalStateException(
-					"An entity name has not been registered for "
-							+ entityEClass);
+			throw new IllegalStateException("An entity name has not been registered for " + entityEClass);
 		}
 		return name;
 	}
@@ -246,8 +240,7 @@ public class MappingContext extends AbstractProcessingContext implements
 	 * @return the featureMapMappers gathered during the entity processing
 	 */
 	public List<FeatureMapMapping> getClearFeatureMapMappers() {
-		final ArrayList<FeatureMapMapping> result = new ArrayList<FeatureMapMapping>(
-				featureMapMappers); // clone
+		final ArrayList<FeatureMapMapping> result = new ArrayList<FeatureMapMapping>(featureMapMappers); // clone
 		// the
 		// list!
 		featureMapMappers.clear();
@@ -256,11 +249,10 @@ public class MappingContext extends AbstractProcessingContext implements
 
 	/**
 	 * @param Adds
-	 *            a featureMapMapper to the featuremapp mapper list
+	 *          a featureMapMapper to the featuremapp mapper list
 	 */
 	public void addFeatureMapMapper(FeatureMapMapping featureMapMapper) {
-		if (!handledFeatureMapEAttributes.contains(featureMapMapper
-				.getEAttribute())) {
+		if (!handledFeatureMapEAttributes.contains(featureMapMapper.getEAttribute())) {
 			featureMapMappers.add(featureMapMapper);
 			handledFeatureMapEAttributes.add(featureMapMapper.getEAttribute());
 		}
@@ -269,9 +261,7 @@ public class MappingContext extends AbstractProcessingContext implements
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see
-	 * org.eclipse.emf.teneo.extension.ExtensionInitializable#initializeExtension
-	 * ()
+	 * @see org.eclipse.emf.teneo.extension.ExtensionInitializable#initializeExtension ()
 	 */
 	public void initializeExtension() {
 		featureMapper = createFeatureMapper();
@@ -283,23 +273,19 @@ public class MappingContext extends AbstractProcessingContext implements
 	 * @return The builder used by entity mapped that maps features to hbm.
 	 */
 	private FeatureMapper createFeatureMapper() {
-		final FeatureMapper featureMapper = getExtensionManager().getExtension(
-				FeatureMapper.class);
+		final FeatureMapper featureMapper = getExtensionManager().getExtension(FeatureMapper.class);
 		featureMapper.setHbmContext(this);
 
 		featureMapper.setBasicMapper(createMapper(BasicMapper.class));
-		featureMapper
-				.setManyAttributeMapper(createMapper(ManyAttributeMapper.class));
+		featureMapper.setManyAttributeMapper(createMapper(ManyAttributeMapper.class));
 		featureMapper.setEmbeddedMapper(createMapper(EmbeddedMapper.class));
 		featureMapper.setIdMapper(createMapper(IdMapper.class));
 		featureMapper.setManyToManyMapper(createMapper(ManyToManyMapper.class));
 		featureMapper.setManyToOneMapper(createMapper(ManyToOneMapper.class));
 		featureMapper.setOneToManyMapper(createMapper(OneToManyMapper.class));
 		featureMapper.setOneToOneMapper(createMapper(OneToOneMapper.class));
-		featureMapper
-				.setManyExternalReferenceMapper(createMapper(ManyExternalReferenceMapper.class));
-		featureMapper
-				.setTypedEReferenceMapper(createMapper(TypedEReferenceMapper.class));
+		featureMapper.setManyExternalReferenceMapper(createMapper(ManyExternalReferenceMapper.class));
+		featureMapper.setTypedEReferenceMapper(createMapper(TypedEReferenceMapper.class));
 		return featureMapper;
 	}
 
@@ -336,7 +322,7 @@ public class MappingContext extends AbstractProcessingContext implements
 
 	/**
 	 * @param currentElementFeatureMap
-	 *            the currentElementFeatureMap to set
+	 *          the currentElementFeatureMap to set
 	 */
 	public void setCurrentElementFeatureMap(boolean currentElementFeatureMap) {
 		this.currentElementFeatureMap = currentElementFeatureMap;
@@ -351,7 +337,7 @@ public class MappingContext extends AbstractProcessingContext implements
 
 	/**
 	 * @param currentTable
-	 *            the currentTable to set
+	 *          the currentTable to set
 	 */
 	public void setCurrentTable(Table currentTable) {
 		this.currentTable = currentTable;
@@ -398,7 +384,7 @@ public class MappingContext extends AbstractProcessingContext implements
 
 	/**
 	 * @param versionColumnName
-	 *            the versionColumnName to set
+	 *          the versionColumnName to set
 	 */
 	public void setVersionColumnName(String versionColumnName) {
 		this.versionColumnName = versionColumnName;
@@ -412,8 +398,8 @@ public class MappingContext extends AbstractProcessingContext implements
 	}
 
 	/**
-	 * @return true if {@link PersistenceOptions#isAutoAdaptManualSQLNames()} is
-	 *         true or if the {@link PAnnotation#isGenerated()} is true.
+	 * @return true if {@link PersistenceOptions#isAutoAdaptManualSQLNames()} is true or if the
+	 *         {@link PAnnotation#isGenerated()} is true.
 	 */
 	protected boolean doTrunc(PAnnotation pAnnotation) {
 		if (adaptManualNames) {
@@ -437,35 +423,30 @@ public class MappingContext extends AbstractProcessingContext implements
 	}
 
 	/**
-	 * Calls {@link #trunc(PAnnotation, String, boolean)} with the last
-	 * parameter set to true.
+	 * Calls {@link #trunc(PAnnotation, String, boolean)} with the last parameter set to true.
 	 */
 	protected String trunc(PAnnotation pAnnotation, String name) {
 		return trunc(pAnnotation, name, true);
 	}
 
 	/**
-	 * Utility method to truncate a column/table name. This method also repairs
-	 * the name if an efeature was inherited and really belongs to another
-	 * eclass. In this case jointables and join keys must be renamed to the new
-	 * eclass. TODO: handle the case that the jointable/columns were set
-	 * manually. This procedure will override them (only applies in case of
-	 * multiple inheritance/mappedsuperclass). This renaming is required for the
-	 * case that an ereference is inherited from a mapped superclass, in this
-	 * case the join-column of the e-reference will be placed in another table.
-	 * If one ereference is inherited by multiple subtypes then this goes wrong
-	 * because they then all share the same join column with foreign keys
-	 * relating it to different tables, and multiple foreign keys on one column
-	 * can not point to different directions.
+	 * Utility method to truncate a column/table name. This method also repairs the name if an
+	 * efeature was inherited and really belongs to another eclass. In this case jointables and join
+	 * keys must be renamed to the new eclass. TODO: handle the case that the jointable/columns were
+	 * set manually. This procedure will override them (only applies in case of multiple
+	 * inheritance/mappedsuperclass). This renaming is required for the case that an ereference is
+	 * inherited from a mapped superclass, in this case the join-column of the e-reference will be
+	 * placed in another table. If one ereference is inherited by multiple subtypes then this goes
+	 * wrong because they then all share the same join column with foreign keys relating it to
+	 * different tables, and multiple foreign keys on one column can not point to different
+	 * directions.
 	 * 
 	 * This method is also called for table names.
 	 * 
 	 */
-	protected String trunc(PAnnotation pAnnotation, String truncName,
-			boolean truncPrefix) {
+	protected String trunc(PAnnotation pAnnotation, String truncName, boolean truncPrefix) {
 		if (pAnnotation != null && !doTrunc(pAnnotation)) {
-			if (!truncName.startsWith(escapeCharacter)
-					&& !truncName.endsWith(escapeCharacter)) {
+			if (!truncName.startsWith(escapeCharacter) && !truncName.endsWith(escapeCharacter)) {
 				return escapeCharacter + truncName + escapeCharacter;
 			}
 			return truncName;
@@ -483,25 +464,18 @@ public class MappingContext extends AbstractProcessingContext implements
 				override = getAssociationOverrides((PAnnotatedEReference) currentAFeature) != null;
 			}
 
-			final String otherEntityName = getEntityName(
-					currentEFeature.getEContainingClass(), false);
+			final String otherEntityName = getEntityName(currentEFeature.getEContainingClass(), false);
 			// if the current name starts with the name of the mapped superclass
 			// then
 			// change it back to the current eclass, do not do this in case of
 			// override
-			if (!override
-					&& currentEFeature.getEContainingClass() != currentEClass
+			if (!override && currentEFeature.getEContainingClass() != currentEClass
 					&& otherEntityName != null
-					&& truncName.toUpperCase().startsWith(
-							otherEntityName.toUpperCase())) {
+					&& truncName.toUpperCase().startsWith(otherEntityName.toUpperCase())) {
 				log.debug("Replacing name of table/joincolumn " + truncName);
 				// get rid of the first part
-				useName = getNamePrefix()
-						+ getEntityName(currentEClass)
-						+ truncName
-								.substring(getEntityName(
-										currentEFeature.getEContainingClass())
-										.length());
+				useName = getNamePrefix() + getEntityName(currentEClass)
+						+ truncName.substring(getEntityName(currentEFeature.getEContainingClass()).length());
 				log.debug("with " + useName + " because efeature is inherited");
 				log.debug("This renaming does not work in case of manually specified joincolumn/table names and mappedsuperclass or multiple inheritance!");
 			} else {
@@ -511,13 +485,11 @@ public class MappingContext extends AbstractProcessingContext implements
 			useName = getNamePrefix() + truncName;
 		}
 
-		if (escapeCharacter.length() > 0
-				&& useName.indexOf(escapeCharacter) == 0) {
+		if (escapeCharacter.length() > 0 && useName.indexOf(escapeCharacter) == 0) {
 			return getSqlNameStrategy().convert(useName, false);
 		}
 
-		return escapeCharacter + getSqlNameStrategy().convert(useName, false)
-				+ escapeCharacter;
+		return escapeCharacter + getSqlNameStrategy().convert(useName, false) + escapeCharacter;
 
 	}
 
@@ -579,32 +551,28 @@ public class MappingContext extends AbstractProcessingContext implements
 	}
 
 	/**
-	 * Use the implementation name as the mapping and never use entity-mapping,
-	 * always false in this implementation
+	 * Use the implementation name as the mapping and never use entity-mapping, always false in this
+	 * implementation
 	 */
 	public boolean forceUseOfInstance(PAnnotatedEClass aclass) {
 		return false;
 	}
 
 	/**
-	 * Returns true if the instance classes have been generated by emf. For
-	 * Teneo this is always the case. Overriders can support a different
-	 * generation strategy.
+	 * Returns true if the instance classes have been generated by emf. For Teneo this is always the
+	 * case. Overriders can support a different generation strategy.
 	 */
 	public boolean isGeneratedByEMF() {
 		return true;
 	}
 
 	/**
-	 * There are four cases: EMF generated, EMF Dynamic, Easy EMF Generated,
-	 * Easy EMF Dynamic public boolean isEasyEMFGenerated(EClassifier
-	 * eclassifier) { return
-	 * EModelResolver.instance().hasImplementationClass(eclassifier); } public
-	 * boolean isEasyEMFDynamic(EClassifier eclassifier) { return
-	 * !isEasyEMFGenerated(eclassifier) &&
-	 * EModelResolver.instance().isRegistered( eclassifier.getEPackage()); }
-	 * public boolean isEMFGenerated(EClassifier eclassifier) { return
-	 * eclassifier.getInstanceClass() != null; }
+	 * There are four cases: EMF generated, EMF Dynamic, Easy EMF Generated, Easy EMF Dynamic public
+	 * boolean isEasyEMFGenerated(EClassifier eclassifier) { return
+	 * EModelResolver.instance().hasImplementationClass(eclassifier); } public boolean
+	 * isEasyEMFDynamic(EClassifier eclassifier) { return !isEasyEMFGenerated(eclassifier) &&
+	 * EModelResolver.instance().isRegistered( eclassifier.getEPackage()); } public boolean
+	 * isEMFGenerated(EClassifier eclassifier) { return eclassifier.getInstanceClass() != null; }
 	 */
 	//
 	// public boolean isEMFDynamic(EClassifier eclassifier) {
@@ -622,8 +590,7 @@ public class MappingContext extends AbstractProcessingContext implements
 	// af.getAnnotatedEStructuralFeature().getEContainingClass());
 	// }
 	/** Add a tuplizer element or not */
-	public void addTuplizerElement(Element entityElement,
-			PAnnotatedEClass aclass) {
+	public void addTuplizerElement(Element entityElement, PAnnotatedEClass aclass) {
 	}
 
 	/** Returns the enumusertype class name */
@@ -695,8 +662,7 @@ public class MappingContext extends AbstractProcessingContext implements
 	 */
 	public EntityNameStrategy getEntityNameStrategy() {
 		if (entityNameStrategy == null) {
-			entityNameStrategy = getExtensionManager().getExtension(
-					EntityNameStrategy.class);
+			entityNameStrategy = getExtensionManager().getExtension(EntityNameStrategy.class);
 			entityNameStrategy.setPaModel(getPaModel()); // this call is not
 			// really required
 			// but
@@ -721,7 +687,7 @@ public class MappingContext extends AbstractProcessingContext implements
 
 	/**
 	 * @param currentEClass
-	 *            the currentEClass to set
+	 *          the currentEClass to set
 	 */
 	public void setCurrentEClass(EClass currentEClass) {
 		this.currentEClass = currentEClass;
@@ -736,7 +702,7 @@ public class MappingContext extends AbstractProcessingContext implements
 
 	/**
 	 * @param currentEFeature
-	 *            the currentEFeature to set
+	 *          the currentEFeature to set
 	 */
 	public void setCurrentFeature(PAnnotatedEStructuralFeature currentFeature) {
 		this.currentAFeature = currentFeature;
@@ -761,7 +727,7 @@ public class MappingContext extends AbstractProcessingContext implements
 
 	/**
 	 * @param forceOptional
-	 *            the forceOptional to set
+	 *          the forceOptional to set
 	 */
 	public void setForceOptional(boolean forceOptional) {
 		this.forceOptional = forceOptional;
@@ -776,7 +742,7 @@ public class MappingContext extends AbstractProcessingContext implements
 
 	/**
 	 * @param paModel
-	 *            the paModel to set
+	 *          the paModel to set
 	 */
 	public void setPaModel(PAnnotatedModel paModel) {
 		this.paModel = paModel;
@@ -791,7 +757,7 @@ public class MappingContext extends AbstractProcessingContext implements
 
 	/**
 	 * @param extensionManager
-	 *            the extensionManager to set
+	 *          the extensionManager to set
 	 */
 	public void setExtensionManager(ExtensionManager extensionManager) {
 		this.extensionManager = extensionManager;
@@ -802,8 +768,7 @@ public class MappingContext extends AbstractProcessingContext implements
 	 */
 	public SQLNameStrategy getSqlNameStrategy() {
 		if (sqlNameStrategy == null) {
-			sqlNameStrategy = getExtensionManager().getExtension(
-					SQLNameStrategy.class);
+			sqlNameStrategy = getExtensionManager().getExtension(SQLNameStrategy.class);
 		}
 		return sqlNameStrategy;
 	}
@@ -824,7 +789,7 @@ public class MappingContext extends AbstractProcessingContext implements
 
 	/**
 	 * @param namePrefix
-	 *            the namePrefix to set
+	 *          the namePrefix to set
 	 */
 	public void setNamePrefix(String namePrefix) {
 		this.namePrefix = namePrefix;
@@ -839,7 +804,7 @@ public class MappingContext extends AbstractProcessingContext implements
 
 	/**
 	 * @param escapeCharacter
-	 *            the escapeCharacter to set
+	 *          the escapeCharacter to set
 	 */
 	public void setEscapeCharacter(String escapeCharacter) {
 		this.escapeCharacter = escapeCharacter;
@@ -853,9 +818,8 @@ public class MappingContext extends AbstractProcessingContext implements
 	}
 
 	/**
-	 * Returns the table name from the column annotation or the joincolumn
-	 * annotation Also takes associationoverride or attributeoverride into
-	 * account
+	 * Returns the table name from the column annotation or the joincolumn annotation Also takes
+	 * associationoverride or attributeoverride into account
 	 */
 	public String getSecondaryTableName(PAnnotatedEStructuralFeature pef) {
 		String tableName = null;
@@ -880,8 +844,7 @@ public class MappingContext extends AbstractProcessingContext implements
 					// check the embedded efeatures
 					// take the first feature of the target type
 					// assume that they are all handled in the same table
-					final EClass eClass = per.getModelEReference()
-							.getEReferenceType();
+					final EClass eClass = per.getModelEReference().getEReferenceType();
 					for (EAttribute ea : eClass.getEAllAttributes()) {
 						final Column c = getAttributeOverride(ea.getName());
 						if (c != null && c.getTable() != null) {
@@ -889,15 +852,13 @@ public class MappingContext extends AbstractProcessingContext implements
 						}
 					}
 					for (EReference er : eClass.getEAllReferences()) {
-						tableName = tableNameFromAssociationOverride(er
-								.getName());
+						tableName = tableNameFromAssociationOverride(er.getName());
 						if (tableName != null) {
 							return tableName;
 						}
 					}
 				} else {
-					tableName = tableNameFromAssociationOverride(per
-							.getModelEReference().getName());
+					tableName = tableNameFromAssociationOverride(per.getModelEReference().getName());
 					if (tableName != null) {
 						return tableName;
 					} else if (!per.getJoinColumns().isEmpty()) {
@@ -918,8 +879,7 @@ public class MappingContext extends AbstractProcessingContext implements
 	public String tableNameFromAssociationOverride(String name) {
 		final AssociationOverride override = getAssociationOverrides(name);
 		if (override != null) {
-			if (override.getJoinTable() != null
-					&& override.getJoinTable().getName() != null) {
+			if (override.getJoinTable() != null && override.getJoinTable().getName() != null) {
 				return override.getJoinTable().getName();
 			} else if (override.getJoinTable() != null
 					&& override.getJoinTable().getJoinColumns().size() > 0) {
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/MappingException.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/MappingException.java
index 0573c0af5..6f283f987 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/MappingException.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/MappingException.java
@@ -15,9 +15,9 @@ import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEModelElement;
 import org.eclipse.emf.teneo.annotations.pannotation.PAnnotation;
 
 /**
- * Exception used to signal errors in mapping TODO is there an elver hierarchy
- * of exceptions? MT: no there is no real hierarchy, I tend to use have one
- * general exception which always logs the exception
+ * Exception used to signal errors in mapping TODO is there an elver hierarchy of exceptions? MT: no
+ * there is no real hierarchy, I tend to use have one general exception which always logs the
+ * exception
  * 
  * @author <a href="mailto:mtaal at elver.org">Martin Taal</a>
  */
@@ -39,8 +39,7 @@ public class MappingException extends TeneoException {
 	/** Constructor */
 	public MappingException(String msg, PAnnotatedEModelElement paElement) {
 		super(msg + ", " + paElement);
-		log.error("EXCEPTION: " + msg + " element "
-				+ paElement.getModelElement().getName());
+		log.error("EXCEPTION: " + msg + " element " + paElement.getModelElement().getName());
 	}
 
 	public MappingException(String msg, Exception cause) {
@@ -55,7 +54,7 @@ public class MappingException extends TeneoException {
 				+ " element "
 				+ pAnnotation.eClass().getName()
 				+ " "
-				+ (pAnnotation.getEModelElement() != null ? pAnnotation
-						.getEModelElement().eClass().getName() : ""));
+				+ (pAnnotation.getEModelElement() != null ? pAnnotation.getEModelElement().eClass()
+						.getName() : ""));
 	}
 }
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/MappingUtil.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/MappingUtil.java
index 791babb40..03bd3332c 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/MappingUtil.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/MappingUtil.java
@@ -59,28 +59,26 @@ import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement;
 public class MappingUtil {
 
 	/**
-	 * Separate utility method, generates a hibernate mapping for a set of
-	 * epackages and options. The hibernate.hbm.xml is returned as a string. The
-	 * mapping is not registered or used in any other way by Elver.
+	 * Separate utility method, generates a hibernate mapping for a set of epackages and options. The
+	 * hibernate.hbm.xml is returned as a string. The mapping is not registered or used in any other
+	 * way by Elver.
 	 */
 	public static String generateMapping(EPackage[] epackages, Properties props) {
-		final ExtensionManager extensionManager = ExtensionManagerFactory
-				.getInstance().create();
+		final ExtensionManager extensionManager = ExtensionManagerFactory.getInstance().create();
 		return generateMapping(epackages, props, extensionManager);
 	}
 
-	public static String generateMapping(EPackage[] epackages,
-			Properties props, ExtensionManager extensionManager) {
+	public static String generateMapping(EPackage[] epackages, Properties props,
+			ExtensionManager extensionManager) {
 		registerHbExtensions(extensionManager);
 
 		// DCB: Use Hibernate-specific annotation processing mechanism. This
 		// allows use of
 		// Hibernate-specific annotations.
-		final PersistenceOptions po = extensionManager.getExtension(
-				PersistenceOptions.class, new Object[] { props });
-		final PAnnotatedModel paModel = extensionManager.getExtension(
-				PersistenceMappingBuilder.class).buildMapping(epackages, po,
-				extensionManager);
+		final PersistenceOptions po = extensionManager.getExtension(PersistenceOptions.class,
+				new Object[] { props });
+		final PAnnotatedModel paModel = extensionManager.getExtension(PersistenceMappingBuilder.class)
+				.buildMapping(epackages, po, extensionManager);
 		final HibernateMappingGenerator hmg = extensionManager
 				.getExtension(HibernateMappingGenerator.class);
 		hmg.setPersistenceOptions(po);
@@ -88,8 +86,8 @@ public class MappingUtil {
 	}
 
 	/**
-	 * Determine the collection element set, bag or list. Only used in case
-	 * Teneo operates for non-emf code
+	 * Determine the collection element set, bag or list. Only used in case Teneo operates for non-emf
+	 * code
 	 */
 	public static String getCollectionElement(HbAnnotatedETypeElement hbFeature) {
 		final boolean hasOrderBy = hbFeature instanceof PAnnotatedEReference
@@ -97,8 +95,7 @@ public class MappingUtil {
 
 		if (!hbFeature.getOneToMany().isList() || hasOrderBy) {
 			return "set";
-		} else if (hbFeature.getOneToMany().isList()
-				&& !hbFeature.getOneToMany().isIndexed()) {
+		} else if (hbFeature.getOneToMany().isList() && !hbFeature.getOneToMany().isIndexed()) {
 			return "bag";
 		} else {
 			return "list";
@@ -107,33 +104,27 @@ public class MappingUtil {
 
 	/** Registers default hb extensions */
 	public static void registerHbExtensions(ExtensionManager extensionManager) {
+		extensionManager.registerExtension(ExtensionUtil.createExtension(BasicPamodelBuilder.class,
+				HbAnnotationModelBuilder.class));
 		extensionManager.registerExtension(ExtensionUtil.createExtension(
-				BasicPamodelBuilder.class, HbAnnotationModelBuilder.class));
+				EAnnotationParserImporter.class, HbEAnnotationParserImporter.class));
+		extensionManager.registerExtension(ExtensionUtil.createExtension(XmlPersistenceMapper.class,
+				HbXmlPersistenceMapper.class));
 		extensionManager.registerExtension(ExtensionUtil.createExtension(
-				EAnnotationParserImporter.class,
-				HbEAnnotationParserImporter.class));
+				SingleAttributeAnnotator.class, HbSingleAttributeAnnotator.class));
+		extensionManager.registerExtension(ExtensionUtil.createExtension(EClassAnnotator.class,
+				HbEClassAnnotator.class));
+		extensionManager.registerExtension(ExtensionUtil.createExtension(EFeatureAnnotator.class,
+				HbEFeatureAnnotator.class));
 		extensionManager.registerExtension(ExtensionUtil.createExtension(
-				XmlPersistenceMapper.class, HbXmlPersistenceMapper.class));
+				OneToManyAttributeAnnotator.class, HbOneToManyAttributeAnnotator.class));
+		extensionManager.registerExtension(ExtensionUtil.createExtension(EDataTypeAnnotator.class,
+				HbEDataTypeAnnotator.class));
 		extensionManager.registerExtension(ExtensionUtil.createExtension(
-				SingleAttributeAnnotator.class,
-				HbSingleAttributeAnnotator.class));
+				OneToManyReferenceAnnotator.class, HbOneToManyReferenceAnnotator.class));
 		extensionManager.registerExtension(ExtensionUtil.createExtension(
-				EClassAnnotator.class, HbEClassAnnotator.class));
+				OneToOneReferenceAnnotator.class, HbOneToOneReferenceAnnotator.class));
 		extensionManager.registerExtension(ExtensionUtil.createExtension(
-				EFeatureAnnotator.class, HbEFeatureAnnotator.class));
-		extensionManager.registerExtension(ExtensionUtil.createExtension(
-				OneToManyAttributeAnnotator.class,
-				HbOneToManyAttributeAnnotator.class));
-		extensionManager.registerExtension(ExtensionUtil.createExtension(
-				EDataTypeAnnotator.class, HbEDataTypeAnnotator.class));
-		extensionManager.registerExtension(ExtensionUtil.createExtension(
-				OneToManyReferenceAnnotator.class,
-				HbOneToManyReferenceAnnotator.class));
-		extensionManager.registerExtension(ExtensionUtil.createExtension(
-				OneToOneReferenceAnnotator.class,
-				HbOneToOneReferenceAnnotator.class));
-		extensionManager.registerExtension(ExtensionUtil.createExtension(
-				ManyToOneReferenceAnnotator.class,
-				HbManyToOneReferenceAnnotator.class));
+				ManyToOneReferenceAnnotator.class, HbManyToOneReferenceAnnotator.class));
 	}
 }
\ No newline at end of file
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 d1f613bcc..a04a7005c 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
@@ -44,8 +44,7 @@ import org.eclipse.emf.teneo.util.StoreUtil;
  * 
  * @author <a href="mailto:mtaal at elver.org">Martin Taal</a>
  */
-public class OneToManyMapper extends AbstractAssociationMapper implements
-		ExtensionPoint {
+public class OneToManyMapper extends AbstractAssociationMapper implements ExtensionPoint {
 
 	/** The log */
 	private static final Log log = LogFactory.getLog(OneToManyMapper.class);
@@ -75,22 +74,19 @@ public class OneToManyMapper extends AbstractAssociationMapper implements
 	}
 
 	/**
-	 * joinTable.getInverseJoinColumns must be null TODO choose appropriate
-	 * mapping according to the presence of JoinTable
+	 * joinTable.getInverseJoinColumns must be null TODO choose appropriate mapping according to the
+	 * presence of JoinTable
 	 */
 	private void processOtMUni(PAnnotatedEReference paReference) {
 		if (log.isDebugEnabled()) {
-			log.debug("Generating one to many unidirectional mapping for "
-					+ paReference);
+			log.debug("Generating one to many unidirectional mapping for " + paReference);
 		}
 
 		final HbAnnotatedEReference hbReference = (HbAnnotatedEReference) paReference;
 		final EReference eref = hbReference.getModelEReference();
 		final EClass refType = eref.getEReferenceType();
-		final PAnnotatedEClass referedToAClass = hbReference
-				.getAReferenceType();
-		boolean isMap = StoreUtil.isMap(eref)
-				&& getHbmContext().isMapEMapAsTrueMap();
+		final PAnnotatedEClass referedToAClass = hbReference.getAReferenceType();
+		boolean isMap = StoreUtil.isMap(eref) && getHbmContext().isMapEMapAsTrueMap();
 
 		// TODO add isUnique on interface
 		// TODO request EMF team to deal correctly with unique attribute on
@@ -103,8 +99,7 @@ public class OneToManyMapper extends AbstractAssociationMapper implements
 		}
 
 		if (((HbAnnotatedEReference) paReference).getHbCache() != null) {
-			addCacheElement(collElement, ((HbAnnotatedEReference) paReference)
-					.getHbCache());
+			addCacheElement(collElement, ((HbAnnotatedEReference) paReference).getHbCache());
 		}
 
 		// .getAnnotatedElement().getName(),
@@ -131,8 +126,7 @@ public class OneToManyMapper extends AbstractAssociationMapper implements
 		// a special case see here:
 		// http://forum.hibernate.org/viewtopic.php?p=2383090
 		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=242479
-		if (!otm.isIndexed() && hbReference.getHbIdBag() == null
-				&& otm.getMappedBy() != null) {
+		if (!otm.isIndexed() && hbReference.getHbIdBag() == null && otm.getMappedBy() != null) {
 			collElement.addAttribute("inverse", "true");
 		} else if (otm.getFetch().equals(FetchType.EXTRA)) {
 			collElement.addAttribute("inverse", "true");
@@ -142,8 +136,7 @@ public class OneToManyMapper extends AbstractAssociationMapper implements
 		boolean isMapValueIsEntity = (eclass.getEStructuralFeature("value") instanceof EReference);
 		if (hbReference.getHbIdBag() == null) {
 			// now we check if it is a list or a map
-			if (hbReference.getMapKey() != null
-					|| hbReference.getHbMapKey() != null
+			if (hbReference.getMapKey() != null || hbReference.getHbMapKey() != null
 					|| hbReference.getMapKeyManyToMany() != null) {
 				addMapKey(collElement, paReference);
 			} else if (isMap) {
@@ -156,10 +149,9 @@ public class OneToManyMapper extends AbstractAssociationMapper implements
 		// TODO OneToMany and CollectionOfElements are mutually exclusive.
 		// Should throw exception if both there?
 		addFetchType(collElement, getFetchType(hbReference, otm.getFetch()));
-		addCascadesForMany(collElement, getCascades(hbReference.getHbCascade(),
-				otm.getCascade(), otm.isOrphanRemoval()));
-		List<JoinColumn> inverseJoinColumns = jt != null
-				&& jt.getInverseJoinColumns() != null ? jt
+		addCascadesForMany(collElement,
+				getCascades(hbReference.getHbCascade(), otm.getCascade(), otm.isOrphanRemoval()));
+		List<JoinColumn> inverseJoinColumns = jt != null && jt.getInverseJoinColumns() != null ? jt
 				.getInverseJoinColumns() : new ArrayList<JoinColumn>();
 
 		String targetName = null;
@@ -180,17 +172,16 @@ public class OneToManyMapper extends AbstractAssociationMapper implements
 		if (hbReference.getEmbedded() != null) {
 			addCompositeElement(collElement, hbReference);
 		} else if (isMap && !isMapValueIsEntity) {
-			final EAttribute valueEAttribute = (EAttribute) eclass
-					.getEStructuralFeature("value");
-			final PAnnotatedEAttribute valuePAttribute = paReference
-					.getPaModel().getPAnnotated(valueEAttribute);
-			
+			final EAttribute valueEAttribute = (EAttribute) eclass.getEStructuralFeature("value");
+			final PAnnotatedEAttribute valuePAttribute = paReference.getPaModel().getPAnnotated(
+					valueEAttribute);
+
 			// Put column at the reference level to the attribute itself
 			if (valuePAttribute.getColumn() == null && paReference.getColumn() != null) {
 				valuePAttribute.setColumn(EcoreUtil.copy(paReference.getColumn()));
 			}
-			addElementElement(collElement, valuePAttribute,
-					getColumns(valuePAttribute), otm.getTargetEntity());
+			addElementElement(collElement, valuePAttribute, getColumns(valuePAttribute),
+					otm.getTargetEntity());
 		} else if (!isEObject(targetName) && jt != null) {
 			// A m2m forces a join table, note that isunique does not completely
 			// follow the semantics of emf, unique on
@@ -201,27 +192,25 @@ public class OneToManyMapper extends AbstractAssociationMapper implements
 			// because an item can occur twice or more in the list.
 			// 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());
+			final Element mtm = addManyToMany(hbReference, referedToAClass, collElement, targetName,
+					inverseJoinColumns, otm.isUnique());
 			addForeignKeyAttribute(mtm, paReference);
 
 			if (hbReference.getNotFound() != null) {
-				mtm.addAttribute("not-found", hbReference.getNotFound()
-						.getAction().getName().toLowerCase());
+				mtm.addAttribute("not-found", hbReference.getNotFound().getAction().getName().toLowerCase());
 			}
 		} else {
-			final Element otmElement = addOneToMany(paReference,
-					referedToAClass, collElement, eref.getName(), targetName);
+			final Element otmElement = addOneToMany(paReference, referedToAClass, collElement,
+					eref.getName(), targetName);
 			addForeignKeyAttribute(keyElement, paReference);
 
 			if (hbReference.getNotFound() != null) {
-				otmElement.addAttribute("not-found", hbReference.getNotFound()
-						.getAction().getName().toLowerCase());
+				otmElement.addAttribute("not-found", hbReference.getNotFound().getAction().getName()
+						.toLowerCase());
 			}
 		}
 
-		mapFilter(collElement, ((HbAnnotatedETypeElement) paReference)
-				.getFilter());
+		mapFilter(collElement, ((HbAnnotatedETypeElement) paReference).getFilter());
 	}
 
 	/**
@@ -229,9 +218,7 @@ public class OneToManyMapper extends AbstractAssociationMapper implements
 	 */
 	private void processOtMBidiInverse(PAnnotatedEReference paReference) {
 		if (log.isDebugEnabled()) {
-			log
-					.debug("Generating one to many bidirectional inverse mapping for "
-							+ paReference);
+			log.debug("Generating one to many bidirectional inverse mapping for " + paReference);
 		}
 
 		// final Element collElement =
@@ -241,8 +228,7 @@ public class OneToManyMapper extends AbstractAssociationMapper implements
 		addAccessor(collElement);
 		final EReference eref = paReference.getModelEReference();
 		final HbAnnotatedEReference hbReference = (HbAnnotatedEReference) paReference;
-		final PAnnotatedEClass referedToAClass = hbReference
-				.getAReferenceType();
+		final PAnnotatedEClass referedToAClass = hbReference.getAReferenceType();
 
 		if (hbReference.getHbCache() != null) {
 			addCacheElement(collElement, hbReference.getHbCache());
@@ -256,8 +242,7 @@ public class OneToManyMapper extends AbstractAssociationMapper implements
 		// collections, see 7.3.3 of the hibernate
 		// manual 3.1.1
 		final OneToMany otm = paReference.getOneToMany();
-		if (!otm.isIndexed() && otm.getMappedBy() != null
-				&& hbReference.getHbIdBag() == null) {
+		if (!otm.isIndexed() && otm.getMappedBy() != null && hbReference.getHbIdBag() == null) {
 			collElement.addAttribute("inverse", "true");
 		} else if (otm.getFetch().equals(FetchType.EXTRA)) {
 			collElement.addAttribute("inverse", "true");
@@ -266,8 +251,7 @@ public class OneToManyMapper extends AbstractAssociationMapper implements
 		}
 
 		final Element keyElement = collElement.addElement("key");
-		handleOndelete(keyElement, ((HbAnnotatedEReference) paReference)
-				.getHbOnDelete());
+		handleOndelete(keyElement, ((HbAnnotatedEReference) paReference).getHbOnDelete());
 
 		final List<JoinColumn> jcs = getJoinColumns(paReference);
 		final JoinTable jt = getJoinTable(paReference);
@@ -278,16 +262,14 @@ public class OneToManyMapper extends AbstractAssociationMapper implements
 		}
 
 		addFetchType(collElement, otm.getFetch());
-		addCascadesForMany(collElement, getCascades(hbReference.getHbCascade(),
-				otm.getCascade(), otm.isOrphanRemoval()));
+		addCascadesForMany(collElement,
+				getCascades(hbReference.getHbCascade(), otm.getCascade(), otm.isOrphanRemoval()));
 
-		boolean isMap = StoreUtil.isMap(eref)
-				&& getHbmContext().isMapEMapAsTrueMap();
+		boolean isMap = StoreUtil.isMap(eref) && getHbmContext().isMapEMapAsTrueMap();
 		boolean isMapValueIsEntity = false;
 		if (hbReference.getHbIdBag() == null && otm.isList()) {
 			// now we check if it is a list or a map
-			if (hbReference.getMapKey() != null
-					|| hbReference.getHbMapKey() != null
+			if (hbReference.getMapKey() != null || hbReference.getHbMapKey() != null
 					|| hbReference.getMapKeyManyToMany() != null) {
 				addMapKey(collElement, paReference);
 			} else if (isMap) {
@@ -301,45 +283,40 @@ public class OneToManyMapper extends AbstractAssociationMapper implements
 
 		String targetName = otm.getTargetEntity();
 		if (targetName == null) {
-			targetName = getHbmContext()
-					.getEntityName(eref.getEReferenceType());
+			targetName = getHbmContext().getEntityName(eref.getEReferenceType());
 		}
 
 		if (paReference.getEmbedded() != null) {
 			addCompositeElement(collElement, paReference);
 		} else if (isMap && !isMapValueIsEntity) {
 			final EClass eclass = eref.getEReferenceType();
-			final EAttribute valueEAttribute = (EAttribute) eclass
-					.getEStructuralFeature("value");
-			final PAnnotatedEAttribute valuePAttribute = paReference
-					.getPaModel().getPAnnotated(valueEAttribute);
-			addElementElement(collElement, valuePAttribute,
-					getColumns(valuePAttribute), otm.getTargetEntity());
+			final EAttribute valueEAttribute = (EAttribute) eclass.getEStructuralFeature("value");
+			final PAnnotatedEAttribute valuePAttribute = paReference.getPaModel().getPAnnotated(
+					valueEAttribute);
+			addElementElement(collElement, valuePAttribute, getColumns(valuePAttribute),
+					otm.getTargetEntity());
 		} else if (jt != null) {
-			final List<JoinColumn> inverseJoinColumns = jt != null
-					&& jt.getInverseJoinColumns() != null ? jt
+			final List<JoinColumn> inverseJoinColumns = jt != null && jt.getInverseJoinColumns() != null ? jt
 					.getInverseJoinColumns() : new ArrayList<JoinColumn>();
 
-			final Element mtm = addManyToMany(hbReference, referedToAClass,
-					collElement, targetName, inverseJoinColumns, otm.isUnique());
+			final Element mtm = addManyToMany(hbReference, referedToAClass, collElement, targetName,
+					inverseJoinColumns, otm.isUnique());
 			addForeignKeyAttribute(mtm, paReference);
 			if (hbReference.getNotFound() != null) {
-				mtm.addAttribute("not-found", hbReference.getNotFound()
-						.getAction().getName().toLowerCase());
+				mtm.addAttribute("not-found", hbReference.getNotFound().getAction().getName().toLowerCase());
 			}
 
 		} else {
-			final Element otmElement = addOneToMany(paReference,
-					referedToAClass, collElement, eref.getName(), targetName);
+			final Element otmElement = addOneToMany(paReference, referedToAClass, collElement,
+					eref.getName(), targetName);
 			addForeignKeyAttribute(keyElement, paReference);
 			if (hbReference.getNotFound() != null) {
-				otmElement.addAttribute("not-found", hbReference.getNotFound()
-						.getAction().getName().toLowerCase());
+				otmElement.addAttribute("not-found", hbReference.getNotFound().getAction().getName()
+						.toLowerCase());
 			}
 		}
 
-		mapFilter(collElement, ((HbAnnotatedETypeElement) paReference)
-				.getFilter());
+		mapFilter(collElement, ((HbAnnotatedETypeElement) paReference).getFilter());
 	}
 
 	/**
@@ -349,15 +326,14 @@ public class OneToManyMapper extends AbstractAssociationMapper implements
 	 * @param targetEntity
 	 */
 	protected Element addOneToMany(PAnnotatedEReference paReference,
-			PAnnotatedEClass referedToAClass, Element collElement,
-			String featureName, String targetEntity) {
+			PAnnotatedEClass referedToAClass, Element collElement, String featureName, String targetEntity) {
 		final HbAnnotatedEReference hbReference = (HbAnnotatedEReference) paReference;
 		if (isEObject(targetEntity) || hbReference.getAny() != null
 				|| hbReference.getAnyMetaDef() != null) { // anytype
 			final String assocName = getHbmContext().getPropertyName(
 					hbReference.getModelEStructuralFeature());
-			return collElement.add(createAny(assocName, hbReference,
-					hbReference.getAny(), hbReference.getAnyMetaDef(), true));
+			return collElement.add(createAny(assocName, hbReference, hbReference.getAny(),
+					hbReference.getAnyMetaDef(), true));
 		} else {
 			String tag = "one-to-many";
 			if (((HbAnnotatedEReference) paReference).getHbIdBag() != null) {
@@ -366,37 +342,31 @@ public class OneToManyMapper extends AbstractAssociationMapper implements
 
 			if (referedToAClass.isOnlyMapAsEntity()
 					|| !getHbmContext().forceUseOfInstance(referedToAClass)) {
-				return collElement.addElement(tag).addAttribute("entity-name",
-						targetEntity);
+				return collElement.addElement(tag).addAttribute("entity-name", targetEntity);
 			} else {
-				return collElement.addElement(tag).addAttribute(
-						"class",
-						getHbmContext().getInstanceClassName(
-								referedToAClass.getModelEClass()));
+				return collElement.addElement(tag).addAttribute("class",
+						getHbmContext().getInstanceClassName(referedToAClass.getModelEClass()));
 			}
 		}
 	}
 
 	/**
-	 * Creates a many-to-many to handle the unidirectional manytomany. A
-	 * unidirectional manytomany is now specified using the one to many
-	 * annotation while its implementation has a join table.
+	 * Creates a many-to-many to handle the unidirectional manytomany. A unidirectional manytomany is
+	 * now specified using the one to many annotation while its implementation has a join table.
 	 */
 	private Element addManyToMany(HbAnnotatedEReference hbReference,
-			PAnnotatedEClass referedToAClass, Element collElement,
-			String targetEntity, List<JoinColumn> invJoinColumns, boolean unique) {
+			PAnnotatedEClass referedToAClass, Element collElement, String targetEntity,
+			List<JoinColumn> invJoinColumns, boolean unique) {
 		final Element manyToMany;
-		if (referedToAClass.isOnlyMapAsEntity()
-				|| !getHbmContext().forceUseOfInstance(referedToAClass)) {
-			manyToMany = collElement.addElement("many-to-many").addAttribute(
-					"entity-name", targetEntity).addAttribute("unique",
-					unique ? "true" : "false");
+		if (referedToAClass.isOnlyMapAsEntity() || !getHbmContext().forceUseOfInstance(referedToAClass)) {
+			manyToMany = collElement.addElement("many-to-many").addAttribute("entity-name", targetEntity)
+					.addAttribute("unique", unique ? "true" : "false");
 		} else {
-			manyToMany = collElement.addElement("many-to-many").addAttribute(
-					"class",
-					getHbmContext().getInstanceClassName(
-							referedToAClass.getModelEClass())).addAttribute(
-					"unique", unique ? "true" : "false");
+			manyToMany = collElement
+					.addElement("many-to-many")
+					.addAttribute("class",
+							getHbmContext().getInstanceClassName(referedToAClass.getModelEClass()))
+					.addAttribute("unique", unique ? "true" : "false");
 		}
 		addKeyColumns(hbReference, manyToMany, invJoinColumns); // pass null for
 		// jointable
@@ -405,32 +375,25 @@ public class OneToManyMapper extends AbstractAssociationMapper implements
 	}
 
 	/** Add composite-element */
-	private Element addCompositeElement(Element collElement,
-			PAnnotatedEReference paReference) {
+	private Element addCompositeElement(Element collElement, PAnnotatedEReference paReference) {
 		// TODO: handle nested components: nested-composite-element
-		final Element componentElement = collElement.addElement(
-				"composite-element").addAttribute(
-				"class",
-				getHbmContext().getInstanceClassName(
-						paReference.getEReferenceType()));
+		final Element componentElement = collElement.addElement("composite-element").addAttribute(
+				"class", getHbmContext().getInstanceClassName(paReference.getEReferenceType()));
 		getHbmContext().setCurrent(componentElement);
 
 		try {
 			// process the features of the target
-			final PAnnotatedEClass componentAClass = paReference
-					.getAReferenceType();
-			getHbmContext().processFeatures(
-					componentAClass.getPaEStructuralFeatures());
+			final PAnnotatedEClass componentAClass = paReference.getAReferenceType();
+			getHbmContext().processFeatures(componentAClass.getPaEStructuralFeatures());
 		} finally {
 			getHbmContext().setCurrent(collElement.getParent());
 		}
 		return componentElement;
 	}
-	
+
 	private FetchType getFetchType(HbAnnotatedEReference hbReference, FetchType defaultFetchType) {
 
-		final CollectionOfElements coe = hbReference
-				.getHbCollectionOfElements();
+		final CollectionOfElements coe = hbReference.getHbCollectionOfElements();
 		if (coe != null) {
 			return coe.getFetch();
 		}
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/OneToOneMapper.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/OneToOneMapper.java
index 88ba05094..be5d17664 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/OneToOneMapper.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/OneToOneMapper.java
@@ -10,8 +10,6 @@ package org.eclipse.emf.teneo.hibernate.mapper;
 
 import java.util.List;
 
-import javax.print.attribute.standard.MediaSize.ISO;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.eclipse.emf.ecore.EReference;
@@ -27,20 +25,18 @@ import org.eclipse.emf.teneo.simpledom.Element;
 /**
  * Maps a {@link OneToOne} element to its {@link MappingContext}.
  * <p>
- * Assumes that the given {@link PAnnotatedEStructuralFeature} is a normal
- * OneToOne, i.e.
+ * Assumes that the given {@link PAnnotatedEStructuralFeature} is a normal OneToOne, i.e.
  * <ul>
  * <li>it is a {@link PAnnotatedEReference};
  * <li>it has a {@link OneToOne} annotation;
- * <li>each attribute on the {@link OneToOne} annotation is set possibly except
- * for {@link OneToOne#getMappedBy()};
+ * <li>each attribute on the {@link OneToOne} annotation is set possibly except for
+ * {@link OneToOne#getMappedBy()};
  * <li>TODO requirements on JoinColumns/PrimaryKeyJoinColumn
  * </ul>
  * 
  * @author <a href="mailto:mtaal at elver.org">Martin Taal</a>
  */
-public class OneToOneMapper extends AbstractAssociationMapper implements
-		ExtensionPoint {
+public class OneToOneMapper extends AbstractAssociationMapper implements ExtensionPoint {
 
 	private static final Log log = LogFactory.getLog(OneToOneMapper.class);
 
@@ -54,8 +50,7 @@ public class OneToOneMapper extends AbstractAssociationMapper implements
 		} else if (opposite != null) {
 			// handle the case of a primary key one-to-one
 			if (!paReference.getPrimaryKeyJoinColumns().isEmpty()
-					|| (opposite != null && !opposite
-							.getPrimaryKeyJoinColumns().isEmpty())) {
+					|| (opposite != null && !opposite.getPrimaryKeyJoinColumns().isEmpty())) {
 				createOneToOne(paReference);
 			} else {
 				// For a non-pk one-to-one, one side is mapped as oto, and the
@@ -101,43 +96,39 @@ public class OneToOneMapper extends AbstractAssociationMapper implements
 		String specifiedName = oto.getTargetEntity();
 
 		if (specifiedName == null) {
-			specifiedName = getHbmContext().getEntityName(
-					eref.getEReferenceType());
+			specifiedName = getHbmContext().getEntityName(eref.getEReferenceType());
 		}
 
 		final HbAnnotatedEReference hbReference = (HbAnnotatedEReference) paReference;
 
-		final boolean isAny = hbReference.getAny() != null
-				|| hbReference.getAnyMetaDef() != null
+		final boolean isAny = hbReference.getAny() != null || hbReference.getAnyMetaDef() != null
 				|| isEObject(oto.getTargetEntity());
 		if (isAny) {
 			final String assocName = getHbmContext().getPropertyName(
 					hbReference.getModelEStructuralFeature());
-			final Element anyElement = createAny(assocName, hbReference,
-					hbReference.getAny(), hbReference.getAnyMetaDef(), false);
+			final Element anyElement = createAny(assocName, hbReference, hbReference.getAny(),
+					hbReference.getAnyMetaDef(), false);
 			getHbmContext().getCurrent().add(anyElement);
 			return;
 		}
 
-		final Element associationElement = addManyToOne(getHbmContext()
-				.getCurrent(), paReference, specifiedName, false);
+		final Element associationElement = addManyToOne(getHbmContext().getCurrent(), paReference,
+				specifiedName, false);
 		addAccessor(associationElement);
 
 		addCascadesForSingle(associationElement,
 				getCascades(hbReference.getHbCascade(), oto.getCascade(), false));
 
-		final boolean isNullable = (oto.isOptional()
-				|| getHbmContext().isDoForceOptional(paReference) || getHbmContext()
+		final boolean isNullable = (oto.isOptional() || getHbmContext().isDoForceOptional(paReference) || getHbmContext()
 				.isCurrentElementFeatureMap());
 
-		associationElement.addAttribute("not-null", (isNullable ? "false"
-				: "true"));
+		associationElement.addAttribute("not-null", (isNullable ? "false" : "true"));
 
 		addLazyProxy(associationElement, oto.getFetch(), paReference);
 
 		if (hbReference.getHbFetch() != null) {
-			associationElement.addAttribute("fetch", hbReference.getHbFetch()
-					.getValue().getName().toLowerCase());
+			associationElement.addAttribute("fetch", hbReference.getHbFetch().getValue().getName()
+					.toLowerCase());
 		}
 
 		addForeignKeyAttribute(associationElement, paReference);
@@ -156,15 +147,13 @@ public class OneToOneMapper extends AbstractAssociationMapper implements
 	/** Create hibernate one-to-one mapping */
 	private void createOneToOne(PAnnotatedEReference paReference) {
 		if (log.isDebugEnabled()) {
-			log.debug("Generating one to one bidirectional inverse mapping for "
-					+ paReference);
+			log.debug("Generating one to one bidirectional inverse mapping for " + paReference);
 		}
 
 		final OneToOne oto = paReference.getOneToOne();
 		String targetName = oto.getTargetEntity();
 		if (targetName == null) {
-			targetName = getHbmContext().getEntityName(
-					paReference.getEReferenceType());
+			targetName = getHbmContext().getEntityName(paReference.getEReferenceType());
 		}
 
 		final HbAnnotatedEReference hbReference = (HbAnnotatedEReference) paReference;
@@ -181,8 +170,7 @@ public class OneToOneMapper extends AbstractAssociationMapper implements
 
 		// place constrained when:
 		// 1) this side has a primary key join column annotation
-		boolean addConstrained = !paReference.getPrimaryKeyJoinColumns()
-				.isEmpty();
+		boolean addConstrained = !paReference.getPrimaryKeyJoinColumns().isEmpty();
 		if (!addConstrained && otherSide == null) {
 			// 2) there is no other side and it is mandatory see here:
 			// http://www.hibernate.org/162.html
@@ -192,15 +180,11 @@ public class OneToOneMapper extends AbstractAssociationMapper implements
 			// this is the case when it does not have a pk join column and
 			// mappedby is
 			// null, or when it has a many-to-one annotation.
-			final PAnnotatedEReference aOpposite = paReference.getPaModel()
-					.getPAnnotated(otherSide);
-			addConstrained = aOpposite.getManyToOne() != null
-					&& eref.isRequired();
+			final PAnnotatedEReference aOpposite = paReference.getPaModel().getPAnnotated(otherSide);
+			addConstrained = aOpposite.getManyToOne() != null && eref.isRequired();
 			if (!addConstrained) {
-				addConstrained = eref.isRequired()
-						&& aOpposite.getPrimaryKeyJoinColumns().isEmpty()
-						&& aOpposite.getOneToOne() != null
-						&& aOpposite.getOneToOne().getMappedBy() == null;
+				addConstrained = eref.isRequired() && aOpposite.getPrimaryKeyJoinColumns().isEmpty()
+						&& aOpposite.getOneToOne() != null && aOpposite.getOneToOne().getMappedBy() == null;
 			}
 		}
 
@@ -208,29 +192,27 @@ public class OneToOneMapper extends AbstractAssociationMapper implements
 			associationElement.addAttribute("constrained", "true");
 		}
 		// }
-		
-		final List<HbCascadeType> cascades = getCascades(hbReference.getHbCascade(), oto.getCascade(), !addConstrained && oto.isOrphanRemoval());
+
+		final List<HbCascadeType> cascades = getCascades(hbReference.getHbCascade(), oto.getCascade(),
+				!addConstrained && oto.isOrphanRemoval());
 		if (addConstrained && cascades.contains(HbCascadeType.DELETE_ORPHAN)) {
 			cascades.remove(HbCascadeType.DELETE_ORPHAN);
 		}
-		
+
 		addCascades(associationElement, cascades, !addConstrained && true);
 		addLazyProxy(associationElement, oto.getFetch(), paReference);
 
 		if (hbReference.getHbFetch() != null) {
-			associationElement.addAttribute("fetch", hbReference.getHbFetch()
-					.getValue().getName().toLowerCase());
+			associationElement.addAttribute("fetch", hbReference.getHbFetch().getValue().getName()
+					.toLowerCase());
 		}
 
 		// add the other-side
-		final boolean primaryKeyJoin = !paReference.getPrimaryKeyJoinColumns()
-				.isEmpty()
-				|| (otherSide != null && !getOtherSide(paReference)
-						.getPrimaryKeyJoinColumns().isEmpty());
+		final boolean primaryKeyJoin = !paReference.getPrimaryKeyJoinColumns().isEmpty()
+				|| (otherSide != null && !getOtherSide(paReference).getPrimaryKeyJoinColumns().isEmpty());
 
 		if (!primaryKeyJoin && otherSide != null && oto.getMappedBy() != null) {
-			associationElement.addAttribute("property-ref", getHbmContext()
-					.getPropertyName(otherSide));
+			associationElement.addAttribute("property-ref", getHbmContext().getPropertyName(otherSide));
 		}
 
 	}
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/TypedEReferenceMapper.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/TypedEReferenceMapper.java
index 02efb2a4a..cfac06c8d 100644
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/TypedEReferenceMapper.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/TypedEReferenceMapper.java
@@ -17,19 +17,17 @@ import org.eclipse.emf.teneo.annotations.pannotation.JoinColumn;
 import org.eclipse.emf.teneo.annotations.pannotation.JoinTable;
 import org.eclipse.emf.teneo.annotations.pannotation.OneToMany;
 import org.eclipse.emf.teneo.extension.ExtensionPoint;
-import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEAttribute;
 import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedEReference;
 import org.eclipse.emf.teneo.hibernate.hbmodel.HbAnnotatedETypeElement;
 import org.eclipse.emf.teneo.simpledom.Element;
 
 /**
- * Maps an EReference with a type annotation. This type of ereference is mapped
- * as an eattribute with a type parameter.
+ * Maps an EReference with a type annotation. This type of ereference is mapped as an eattribute
+ * with a type parameter.
  * 
  * @author <a href="mailto:mtaal at elver.org">Martin Taal</a>
  */
-public class TypedEReferenceMapper extends AbstractAssociationMapper implements
-		ExtensionPoint {
+public class TypedEReferenceMapper extends AbstractAssociationMapper implements ExtensionPoint {
 	public void process(PAnnotatedEReference paReference) {
 		if (paReference.getModelEReference().isMany()) {
 			processMany(paReference);
@@ -39,10 +37,9 @@ public class TypedEReferenceMapper extends AbstractAssociationMapper implements
 	}
 
 	private void processSingle(PAnnotatedEStructuralFeature paEFeature) {
-		final String name = getHbmContext().getPropertyName(
-				paEFeature.getModelEStructuralFeature());
-		final Element propElement = getHbmContext().getCurrent()
-				.addElement("property").addAttribute("name", name);
+		final String name = getHbmContext().getPropertyName(paEFeature.getModelEStructuralFeature());
+		final Element propElement = getHbmContext().getCurrent().addElement("property")
+				.addAttribute("name", name);
 		addColumnsAndFormula(propElement, paEFeature, getColumns(paEFeature), true, true);
 		setType(paEFeature, propElement);
 		addAccessor(propElement);
@@ -74,12 +71,10 @@ public class TypedEReferenceMapper extends AbstractAssociationMapper implements
 		addCascadesForMany(collElement,
 				getCascades(hbReference.getHbCascade(), otm.getCascade(), otm.isOrphanRemoval()));
 
-		addElementElement(collElement, paEFeature, getColumns(paEFeature),
-				otm.getTargetEntity());
+		addElementElement(collElement, paEFeature, getColumns(paEFeature), otm.getTargetEntity());
 
 		addAccessor(collElement);
 
-		mapFilter(collElement,
-				((HbAnnotatedETypeElement) paEFeature).getFilter());
+		mapFilter(collElement, ((HbAnnotatedETypeElement) paEFeature).getFilter());
 	}
 }
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/classic/ClassicMappingContext.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/classic/ClassicMappingContext.java
index 0f9fb857c..5b8aae5ef 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/classic/ClassicMappingContext.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/classic/ClassicMappingContext.java
@@ -22,30 +22,24 @@ import org.eclipse.emf.teneo.hibernate.mapper.MappingContext;
 public class ClassicMappingContext extends MappingContext {
 
 	/**
-	 * Utilit method to truncate a column/table name. This method also repairs
-	 * the name if an efeature was inherited and really belongs to another
-	 * eclass. In this case jointables and join keys must be renamed to the new
-	 * eclass. TODO: handle the case that the jointable/columns were set
-	 * manually. This procedure will override them (only applies in case of
-	 * multiple inheritance/mappedsuperclass).
+	 * Utilit method to truncate a column/table name. This method also repairs the name if an efeature
+	 * was inherited and really belongs to another eclass. In this case jointables and join keys must
+	 * be renamed to the new eclass. TODO: handle the case that the jointable/columns were set
+	 * manually. This procedure will override them (only applies in case of multiple
+	 * inheritance/mappedsuperclass).
 	 * 
-	 * This renaming is required for the case that an ereference is inherited
-	 * from a mapped superclass, in this case the join-column of the e-reference
-	 * will be placed in another table. If one ereference is inherited by
-	 * multiple subtypes then this goes wrong because they then all share the
-	 * same join column with foreign keys relating it to different tables, and
-	 * multiple foreign keys on one column can not point to different
-	 * directions.
+	 * This renaming is required for the case that an ereference is inherited from a mapped
+	 * superclass, in this case the join-column of the e-reference will be placed in another table. If
+	 * one ereference is inherited by multiple subtypes then this goes wrong because they then all
+	 * share the same join column with foreign keys relating it to different tables, and multiple
+	 * foreign keys on one column can not point to different directions.
 	 * 
-	 * TODO: is really only required for eattributes TODO: it ignores
-	 * attributeoverrides
+	 * TODO: is really only required for eattributes TODO: it ignores attributeoverrides
 	 */
 	@Override
-	protected String trunc(PAnnotation pAnnotation, String truncName,
-			boolean truncSuffix) {
+	protected String trunc(PAnnotation pAnnotation, String truncName, boolean truncSuffix) {
 		if (pAnnotation != null && !doTrunc(pAnnotation)) {
-			if (!truncName.startsWith(escapeCharacter)
-					&& !truncName.endsWith(escapeCharacter)) {
+			if (!truncName.startsWith(escapeCharacter) && !truncName.endsWith(escapeCharacter)) {
 				return escapeCharacter + truncName + escapeCharacter;
 			}
 			return truncName;
@@ -60,24 +54,18 @@ public class ClassicMappingContext extends MappingContext {
 				override = getAssociationOverrides((PAnnotatedEReference) currentAFeature) != null;
 			}
 
-			final String otherEntityName = getEntityName(
-					currentEFeature.getEContainingClass(), false);
+			final String otherEntityName = getEntityName(currentEFeature.getEContainingClass(), false);
 			// if the current name starts with the name of the mapped superclass
 			// then
 			// change it back to the current eclass, do not do this in case of
 			// override
-			if (!override
-					&& currentEFeature.getEContainingClass() != currentEClass
+			if (!override && currentEFeature.getEContainingClass() != currentEClass
 					&& otherEntityName != null
-					&& truncName.toUpperCase().startsWith(
-							otherEntityName.toUpperCase())) {
+					&& truncName.toUpperCase().startsWith(otherEntityName.toUpperCase())) {
 				log.debug("Replacing name of table/joincolumn " + truncName);
 				// get rid of the first part
 				useName = getEntityName(currentEClass)
-						+ truncName
-								.substring(getEntityName(
-										currentEFeature.getEContainingClass())
-										.length());
+						+ truncName.substring(getEntityName(currentEFeature.getEContainingClass()).length());
 				log.debug("with " + useName + " because efeature is inherited");
 				log.debug("This renaming does not work in case of manually specified joincolumn/table names and mappedsuperclass or multiple inheritance!");
 			} else {
@@ -101,9 +89,7 @@ public class ClassicMappingContext extends MappingContext {
 			if ((maximumSqlNameLength - usStr.length()) < 0) {
 				return escape(useName);
 			}
-			return escape(useName.substring(0,
-					maximumSqlNameLength - usStr.length())
-					+ usStr);
+			return escape(useName.substring(0, maximumSqlNameLength - usStr.length()) + usStr);
 		}
 
 		return escape(useName.substring(0, maximumSqlNameLength));
@@ -111,13 +97,11 @@ public class ClassicMappingContext extends MappingContext {
 
 	/** Escape the column name */
 	protected String escape(String name) {
-		if (getEscapeCharacter().length() == 0
-				|| name.indexOf(getEscapeCharacter()) == 0) {
+		if (getEscapeCharacter().length() == 0 || name.indexOf(getEscapeCharacter()) == 0) {
 			return getSqlNameStrategy().convert(name);
 		}
 
-		return getEscapeCharacter() + getSqlNameStrategy().convert(name)
-				+ getEscapeCharacter();
+		return getEscapeCharacter() + getSqlNameStrategy().convert(name) + getEscapeCharacter();
 	}
 
 	/**