[304786] Provide additional test cases to verify Map support in CDO

https://bugs.eclipse.org/bugs/show_bug.cgi?id=304786

42 files changed, 10613 insertions, 372 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/model/model2.ecore b/plugins/org.eclipse.emf.cdo.tests.model2/model/model2.ecore
index 1621691080..105efb6eb9 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/model/model2.ecore
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/model/model2.ecore
@@ -116,4 +116,70 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="notUnsettableVAT" eType="ecore:EEnum ../../org.eclipse.emf.cdo.tests.model1/model/model1.ecore#//VAT"
         defaultValueLiteral="vat15"/>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="MapHolder">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="integerToStringMap" upperBound="-1"
+        eType="#//IntegerToStringMap" containment="true" resolveProxies="false"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="stringToStringMap" upperBound="-1"
+        eType="#//StringToStringMap" containment="true" resolveProxies="false"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="stringToVATMap" upperBound="-1"
+        eType="#//StringToVATMap" containment="true" resolveProxies="false"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="stringToAddressContainmentMap"
+        upperBound="-1" eType="#//StringToAddressContainmentMap" containment="true"
+        resolveProxies="false"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="stringToAddressReferenceMap"
+        upperBound="-1" eType="#//StringToAddressReferenceMap" containment="true"
+        resolveProxies="false"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="eObjectToEObjectMap" upperBound="-1"
+        eType="#//EObjectToEObjectMap" containment="true" resolveProxies="false"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="eObjectToEObjectKeyContainedMap"
+        upperBound="-1" eType="#//EObjectToEObjectKeyContainedMap" containment="true"
+        resolveProxies="false"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="eObjectToEObjectBothContainedMap"
+        upperBound="-1" eType="#//EObjectToEObjectBothContainedMap" containment="true"
+        resolveProxies="false"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="eObjectToEObjectValueContainedMap"
+        upperBound="-1" eType="#//EObjectToEObjectValueContainedMap" containment="true"
+        resolveProxies="false"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="StringToStringMap" instanceClassName="java.util.Map$Entry">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="IntegerToStringMap" instanceClassName="java.util.Map$Entry">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="StringToVATMap" instanceClassName="java.util.Map$Entry">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EEnum ../../org.eclipse.emf.cdo.tests.model1/model/model1.ecore#//VAT"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="StringToAddressContainmentMap" instanceClassName="java.util.Map$Entry">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="ecore:EClass ../../org.eclipse.emf.cdo.tests.model1/model/model1.ecore#//Address"
+        containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="StringToAddressReferenceMap" instanceClassName="java.util.Map$Entry">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="ecore:EClass ../../org.eclipse.emf.cdo.tests.model1/model/model1.ecore#//Address"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="EObjectToEObjectMap" instanceClassName="java.util.Map$Entry">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="key" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="EObjectToEObjectKeyContainedMap" instanceClassName="java.util.Map$Entry">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="key" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"
+        containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="EObjectToEObjectBothContainedMap" instanceClassName="java.util.Map$Entry">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="key" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"
+        containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"
+        containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="EObjectToEObjectValueContainedMap" instanceClassName="java.util.Map$Entry">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="key" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"
+        containment="true"/>
+  </eClassifiers>
 </ecore:EPackage>
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/Model2Factory.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/Model2Factory.java
index 8016a780b8..1d23aeb9c3 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/Model2Factory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/Model2Factory.java
@@ -10,6 +10,7 @@
  */
 package org.eclipse.emf.cdo.tests.legacy.model2;
 
+import org.eclipse.emf.cdo.tests.model2.MapHolder;
 import org.eclipse.emf.cdo.tests.model2.NotUnsettable;
 import org.eclipse.emf.cdo.tests.model2.NotUnsettableWithDefault;
 import org.eclipse.emf.cdo.tests.model2.PersistentContainment;
@@ -109,6 +110,14 @@ public interface Model2Factory extends org.eclipse.emf.cdo.tests.model2.Model2Fa
   NotUnsettableWithDefault createNotUnsettableWithDefault();
 
   /**
+   * Returns a new object of class '<em>Map Holder</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return a new object of class '<em>Map Holder</em>'.
+   * @generated
+   */
+  MapHolder createMapHolder();
+
+  /**
    * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
    * @return the package supported by this factory.
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/Model2Package.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/Model2Package.java
index 8681032301..c8ba219759 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/Model2Package.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/Model2Package.java
@@ -732,6 +732,419 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
   int NOT_UNSETTABLE_WITH_DEFAULT_FEATURE_COUNT = 11;
 
   /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.MapHolderImpl <em>Map Holder</em>}'
+   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.MapHolderImpl
+   * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getMapHolder()
+   * @generated
+   */
+  int MAP_HOLDER = 9;
+
+  /**
+   * The feature id for the '<em><b>Integer To String Map</b></em>' map. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int MAP_HOLDER__INTEGER_TO_STRING_MAP = 0;
+
+  /**
+   * The feature id for the '<em><b>String To String Map</b></em>' map. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int MAP_HOLDER__STRING_TO_STRING_MAP = 1;
+
+  /**
+   * The feature id for the '<em><b>String To VAT Map</b></em>' map. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int MAP_HOLDER__STRING_TO_VAT_MAP = 2;
+
+  /**
+   * The feature id for the '<em><b>String To Address Containment Map</b></em>' map. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int MAP_HOLDER__STRING_TO_ADDRESS_CONTAINMENT_MAP = 3;
+
+  /**
+   * The feature id for the '<em><b>String To Address Reference Map</b></em>' map. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int MAP_HOLDER__STRING_TO_ADDRESS_REFERENCE_MAP = 4;
+
+  /**
+   * The feature id for the '<em><b>EObject To EObject Map</b></em>' map. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int MAP_HOLDER__EOBJECT_TO_EOBJECT_MAP = 5;
+
+  /**
+   * The feature id for the '<em><b>EObject To EObject Key Contained Map</b></em>' map. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int MAP_HOLDER__EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP = 6;
+
+  /**
+   * The feature id for the '<em><b>EObject To EObject Both Contained Map</b></em>' map. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int MAP_HOLDER__EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP = 7;
+
+  /**
+   * The feature id for the '<em><b>EObject To EObject Value Contained Map</b></em>' map. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int MAP_HOLDER__EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP = 8;
+
+  /**
+   * The number of structural features of the '<em>Map Holder</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int MAP_HOLDER_FEATURE_COUNT = 9;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.StringToStringMapImpl
+   * <em>String To String Map</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.StringToStringMapImpl
+   * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getStringToStringMap()
+   * @generated
+   */
+  int STRING_TO_STRING_MAP = 10;
+
+  /**
+   * The feature id for the '<em><b>Key</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int STRING_TO_STRING_MAP__KEY = 0;
+
+  /**
+   * The feature id for the '<em><b>Value</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int STRING_TO_STRING_MAP__VALUE = 1;
+
+  /**
+   * The number of structural features of the '<em>String To String Map</em>' class. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int STRING_TO_STRING_MAP_FEATURE_COUNT = 2;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.IntegerToStringMapImpl
+   * <em>Integer To String Map</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.IntegerToStringMapImpl
+   * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getIntegerToStringMap()
+   * @generated
+   */
+  int INTEGER_TO_STRING_MAP = 11;
+
+  /**
+   * The feature id for the '<em><b>Key</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int INTEGER_TO_STRING_MAP__KEY = 0;
+
+  /**
+   * The feature id for the '<em><b>Value</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int INTEGER_TO_STRING_MAP__VALUE = 1;
+
+  /**
+   * The number of structural features of the '<em>Integer To String Map</em>' class. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int INTEGER_TO_STRING_MAP_FEATURE_COUNT = 2;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.StringToVATMapImpl
+   * <em>String To VAT Map</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.StringToVATMapImpl
+   * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getStringToVATMap()
+   * @generated
+   */
+  int STRING_TO_VAT_MAP = 12;
+
+  /**
+   * The feature id for the '<em><b>Key</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int STRING_TO_VAT_MAP__KEY = 0;
+
+  /**
+   * The feature id for the '<em><b>Value</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int STRING_TO_VAT_MAP__VALUE = 1;
+
+  /**
+   * The number of structural features of the '<em>String To VAT Map</em>' class. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int STRING_TO_VAT_MAP_FEATURE_COUNT = 2;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.StringToAddressContainmentMapImpl
+   * <em>String To Address Containment Map</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.StringToAddressContainmentMapImpl
+   * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getStringToAddressContainmentMap()
+   * @generated
+   */
+  int STRING_TO_ADDRESS_CONTAINMENT_MAP = 13;
+
+  /**
+   * The feature id for the '<em><b>Key</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int STRING_TO_ADDRESS_CONTAINMENT_MAP__KEY = 0;
+
+  /**
+   * The feature id for the '<em><b>Value</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int STRING_TO_ADDRESS_CONTAINMENT_MAP__VALUE = 1;
+
+  /**
+   * The number of structural features of the '<em>String To Address Containment Map</em>' class. <!-- begin-user-doc
+   * --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int STRING_TO_ADDRESS_CONTAINMENT_MAP_FEATURE_COUNT = 2;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.StringToAddressReferenceMapImpl
+   * <em>String To Address Reference Map</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.StringToAddressReferenceMapImpl
+   * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getStringToAddressReferenceMap()
+   * @generated
+   */
+  int STRING_TO_ADDRESS_REFERENCE_MAP = 14;
+
+  /**
+   * The feature id for the '<em><b>Key</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int STRING_TO_ADDRESS_REFERENCE_MAP__KEY = 0;
+
+  /**
+   * The feature id for the '<em><b>Value</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int STRING_TO_ADDRESS_REFERENCE_MAP__VALUE = 1;
+
+  /**
+   * The number of structural features of the '<em>String To Address Reference Map</em>' class. <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int STRING_TO_ADDRESS_REFERENCE_MAP_FEATURE_COUNT = 2;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.EObjectToEObjectMapImpl
+   * <em>EObject To EObject Map</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.EObjectToEObjectMapImpl
+   * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getEObjectToEObjectMap()
+   * @generated
+   */
+  int EOBJECT_TO_EOBJECT_MAP = 15;
+
+  /**
+   * The feature id for the '<em><b>Key</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int EOBJECT_TO_EOBJECT_MAP__KEY = 0;
+
+  /**
+   * The feature id for the '<em><b>Value</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int EOBJECT_TO_EOBJECT_MAP__VALUE = 1;
+
+  /**
+   * The number of structural features of the '<em>EObject To EObject Map</em>' class. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int EOBJECT_TO_EOBJECT_MAP_FEATURE_COUNT = 2;
+
+  /**
+   * The meta object id for the '
+   * {@link org.eclipse.emf.cdo.tests.legacy.model2.impl.EObjectToEObjectKeyContainedMapImpl
+   * <em>EObject To EObject Key Contained Map</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.EObjectToEObjectKeyContainedMapImpl
+   * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getEObjectToEObjectKeyContainedMap()
+   * @generated
+   */
+  int EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP = 16;
+
+  /**
+   * The feature id for the '<em><b>Key</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__KEY = 0;
+
+  /**
+   * The feature id for the '<em><b>Value</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__VALUE = 1;
+
+  /**
+   * The number of structural features of the '<em>EObject To EObject Key Contained Map</em>' class. <!-- begin-user-doc
+   * --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP_FEATURE_COUNT = 2;
+
+  /**
+   * The meta object id for the '
+   * {@link org.eclipse.emf.cdo.tests.legacy.model2.impl.EObjectToEObjectBothContainedMapImpl
+   * <em>EObject To EObject Both Contained Map</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.EObjectToEObjectBothContainedMapImpl
+   * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getEObjectToEObjectBothContainedMap()
+   * @generated
+   */
+  int EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP = 17;
+
+  /**
+   * The feature id for the '<em><b>Key</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__KEY = 0;
+
+  /**
+   * The feature id for the '<em><b>Value</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__VALUE = 1;
+
+  /**
+   * The number of structural features of the '<em>EObject To EObject Both Contained Map</em>' class. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP_FEATURE_COUNT = 2;
+
+  /**
+   * The meta object id for the '
+   * {@link org.eclipse.emf.cdo.tests.legacy.model2.impl.EObjectToEObjectValueContainedMapImpl
+   * <em>EObject To EObject Value Contained Map</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.EObjectToEObjectValueContainedMapImpl
+   * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getEObjectToEObjectValueContainedMap()
+   * @generated
+   */
+  int EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP = 18;
+
+  /**
+   * The feature id for the '<em><b>Key</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__KEY = 0;
+
+  /**
+   * The feature id for the '<em><b>Value</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE = 1;
+
+  /**
+   * The number of structural features of the '<em>EObject To EObject Value Contained Map</em>' class. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP_FEATURE_COUNT = 2;
+
+  /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model2.SpecialPurchaseOrder
    * <em>Special Purchase Order</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
@@ -1492,6 +1905,421 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
   EAttribute getNotUnsettableWithDefault_NotUnsettableVAT();
 
   /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model2.MapHolder <em>Map Holder</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>Map Holder</em>'.
+   * @see org.eclipse.emf.cdo.tests.legacy.model2.MapHolder
+   * @generated
+   */
+  EClass getMapHolder();
+
+  /**
+   * Returns the meta object for the map '
+   * {@link org.eclipse.emf.cdo.tests.legacy.model2.MapHolder#getIntegerToStringMap <em>Integer To String Map</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the map '<em>Integer To String Map</em>'.
+   * @see org.eclipse.emf.cdo.tests.legacy.model2.MapHolder#getIntegerToStringMap()
+   * @see #getMapHolder()
+   * @generated
+   */
+  EReference getMapHolder_IntegerToStringMap();
+
+  /**
+   * Returns the meta object for the map '{@link org.eclipse.emf.cdo.tests.legacy.model2.MapHolder#getStringToStringMap
+   * <em>String To String Map</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the map '<em>String To String Map</em>'.
+   * @see org.eclipse.emf.cdo.tests.legacy.model2.MapHolder#getStringToStringMap()
+   * @see #getMapHolder()
+   * @generated
+   */
+  EReference getMapHolder_StringToStringMap();
+
+  /**
+   * Returns the meta object for the map '{@link org.eclipse.emf.cdo.tests.legacy.model2.MapHolder#getStringToVATMap
+   * <em>String To VAT Map</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the map '<em>String To VAT Map</em>'.
+   * @see org.eclipse.emf.cdo.tests.legacy.model2.MapHolder#getStringToVATMap()
+   * @see #getMapHolder()
+   * @generated
+   */
+  EReference getMapHolder_StringToVATMap();
+
+  /**
+   * Returns the meta object for the map '
+   * {@link org.eclipse.emf.cdo.tests.legacy.model2.MapHolder#getStringToAddressContainmentMap
+   * <em>String To Address Containment Map</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the map '<em>String To Address Containment Map</em>'.
+   * @see org.eclipse.emf.cdo.tests.legacy.model2.MapHolder#getStringToAddressContainmentMap()
+   * @see #getMapHolder()
+   * @generated
+   */
+  EReference getMapHolder_StringToAddressContainmentMap();
+
+  /**
+   * Returns the meta object for the map '
+   * {@link org.eclipse.emf.cdo.tests.legacy.model2.MapHolder#getStringToAddressReferenceMap
+   * <em>String To Address Reference Map</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the map '<em>String To Address Reference Map</em>'.
+   * @see org.eclipse.emf.cdo.tests.legacy.model2.MapHolder#getStringToAddressReferenceMap()
+   * @see #getMapHolder()
+   * @generated
+   */
+  EReference getMapHolder_StringToAddressReferenceMap();
+
+  /**
+   * Returns the meta object for the map '
+   * {@link org.eclipse.emf.cdo.tests.legacy.model2.MapHolder#getEObjectToEObjectMap <em>EObject To EObject Map</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the map '<em>EObject To EObject Map</em>'.
+   * @see org.eclipse.emf.cdo.tests.legacy.model2.MapHolder#getEObjectToEObjectMap()
+   * @see #getMapHolder()
+   * @generated
+   */
+  EReference getMapHolder_EObjectToEObjectMap();
+
+  /**
+   * Returns the meta object for the map '
+   * {@link org.eclipse.emf.cdo.tests.legacy.model2.MapHolder#getEObjectToEObjectKeyContainedMap
+   * <em>EObject To EObject Key Contained Map</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the map '<em>EObject To EObject Key Contained Map</em>'.
+   * @see org.eclipse.emf.cdo.tests.legacy.model2.MapHolder#getEObjectToEObjectKeyContainedMap()
+   * @see #getMapHolder()
+   * @generated
+   */
+  EReference getMapHolder_EObjectToEObjectKeyContainedMap();
+
+  /**
+   * Returns the meta object for the map '
+   * {@link org.eclipse.emf.cdo.tests.legacy.model2.MapHolder#getEObjectToEObjectBothContainedMap
+   * <em>EObject To EObject Both Contained Map</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the map '<em>EObject To EObject Both Contained Map</em>'.
+   * @see org.eclipse.emf.cdo.tests.legacy.model2.MapHolder#getEObjectToEObjectBothContainedMap()
+   * @see #getMapHolder()
+   * @generated
+   */
+  EReference getMapHolder_EObjectToEObjectBothContainedMap();
+
+  /**
+   * Returns the meta object for the map '
+   * {@link org.eclipse.emf.cdo.tests.legacy.model2.MapHolder#getEObjectToEObjectValueContainedMap
+   * <em>EObject To EObject Value Contained Map</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the map '<em>EObject To EObject Value Contained Map</em>'.
+   * @see org.eclipse.emf.cdo.tests.legacy.model2.MapHolder#getEObjectToEObjectValueContainedMap()
+   * @see #getMapHolder()
+   * @generated
+   */
+  EReference getMapHolder_EObjectToEObjectValueContainedMap();
+
+  /**
+   * Returns the meta object for class '{@link java.util.Map.Entry <em>String To String Map</em>}'. <!-- begin-user-doc
+   * --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>String To String Map</em>'.
+   * @see java.util.Map.Entry
+   * @model keyDataType="org.eclipse.emf.ecore.EString" valueDataType="org.eclipse.emf.ecore.EString"
+   * @generated
+   */
+  EClass getStringToStringMap();
+
+  /**
+   * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Key</em>}'. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @return the meta object for the attribute '<em>Key</em>'.
+   * @see java.util.Map.Entry
+   * @see #getStringToStringMap()
+   * @generated
+   */
+  EAttribute getStringToStringMap_Key();
+
+  /**
+   * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Value</em>}'. <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * 
+   * @return the meta object for the attribute '<em>Value</em>'.
+   * @see java.util.Map.Entry
+   * @see #getStringToStringMap()
+   * @generated
+   */
+  EAttribute getStringToStringMap_Value();
+
+  /**
+   * Returns the meta object for class '{@link java.util.Map.Entry <em>Integer To String Map</em>}'. <!-- begin-user-doc
+   * --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>Integer To String Map</em>'.
+   * @see java.util.Map.Entry
+   * @model keyDataType="org.eclipse.emf.ecore.EIntegerObject" valueDataType="org.eclipse.emf.ecore.EString"
+   * @generated
+   */
+  EClass getIntegerToStringMap();
+
+  /**
+   * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Key</em>}'. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @return the meta object for the attribute '<em>Key</em>'.
+   * @see java.util.Map.Entry
+   * @see #getIntegerToStringMap()
+   * @generated
+   */
+  EAttribute getIntegerToStringMap_Key();
+
+  /**
+   * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Value</em>}'. <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * 
+   * @return the meta object for the attribute '<em>Value</em>'.
+   * @see java.util.Map.Entry
+   * @see #getIntegerToStringMap()
+   * @generated
+   */
+  EAttribute getIntegerToStringMap_Value();
+
+  /**
+   * Returns the meta object for class '{@link java.util.Map.Entry <em>String To VAT Map</em>}'. <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>String To VAT Map</em>'.
+   * @see java.util.Map.Entry
+   * @model keyDataType="org.eclipse.emf.ecore.EString" valueDataType="org.eclipse.emf.cdo.tests.legacy.model1.VAT"
+   * @generated
+   */
+  EClass getStringToVATMap();
+
+  /**
+   * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Key</em>}'. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @return the meta object for the attribute '<em>Key</em>'.
+   * @see java.util.Map.Entry
+   * @see #getStringToVATMap()
+   * @generated
+   */
+  EAttribute getStringToVATMap_Key();
+
+  /**
+   * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Value</em>}'. <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * 
+   * @return the meta object for the attribute '<em>Value</em>'.
+   * @see java.util.Map.Entry
+   * @see #getStringToVATMap()
+   * @generated
+   */
+  EAttribute getStringToVATMap_Value();
+
+  /**
+   * Returns the meta object for class '{@link java.util.Map.Entry <em>String To Address Containment Map</em>}'. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>String To Address Containment Map</em>'.
+   * @see java.util.Map.Entry
+   * @model keyDataType="org.eclipse.emf.ecore.EString" valueType="org.eclipse.emf.cdo.tests.legacy.model1.Address"
+   *        valueContainment="true"
+   * @generated
+   */
+  EClass getStringToAddressContainmentMap();
+
+  /**
+   * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Key</em>}'. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @return the meta object for the attribute '<em>Key</em>'.
+   * @see java.util.Map.Entry
+   * @see #getStringToAddressContainmentMap()
+   * @generated
+   */
+  EAttribute getStringToAddressContainmentMap_Key();
+
+  /**
+   * Returns the meta object for the containment reference '{@link java.util.Map.Entry <em>Value</em>}'. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the containment reference '<em>Value</em>'.
+   * @see java.util.Map.Entry
+   * @see #getStringToAddressContainmentMap()
+   * @generated
+   */
+  EReference getStringToAddressContainmentMap_Value();
+
+  /**
+   * Returns the meta object for class '{@link java.util.Map.Entry <em>String To Address Reference Map</em>}'. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>String To Address Reference Map</em>'.
+   * @see java.util.Map.Entry
+   * @model keyDataType="org.eclipse.emf.ecore.EString" valueType="org.eclipse.emf.cdo.tests.legacy.model1.Address"
+   * @generated
+   */
+  EClass getStringToAddressReferenceMap();
+
+  /**
+   * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Key</em>}'. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @return the meta object for the attribute '<em>Key</em>'.
+   * @see java.util.Map.Entry
+   * @see #getStringToAddressReferenceMap()
+   * @generated
+   */
+  EAttribute getStringToAddressReferenceMap_Key();
+
+  /**
+   * Returns the meta object for the reference '{@link java.util.Map.Entry <em>Value</em>}'. <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * 
+   * @return the meta object for the reference '<em>Value</em>'.
+   * @see java.util.Map.Entry
+   * @see #getStringToAddressReferenceMap()
+   * @generated
+   */
+  EReference getStringToAddressReferenceMap_Value();
+
+  /**
+   * Returns the meta object for class '{@link java.util.Map.Entry <em>EObject To EObject Map</em>}'. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>EObject To EObject Map</em>'.
+   * @see java.util.Map.Entry
+   * @model keyType="org.eclipse.emf.ecore.EObject" valueType="org.eclipse.emf.ecore.EObject"
+   * @generated
+   */
+  EClass getEObjectToEObjectMap();
+
+  /**
+   * Returns the meta object for the reference '{@link java.util.Map.Entry <em>Key</em>}'. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @return the meta object for the reference '<em>Key</em>'.
+   * @see java.util.Map.Entry
+   * @see #getEObjectToEObjectMap()
+   * @generated
+   */
+  EReference getEObjectToEObjectMap_Key();
+
+  /**
+   * Returns the meta object for the reference '{@link java.util.Map.Entry <em>Value</em>}'. <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * 
+   * @return the meta object for the reference '<em>Value</em>'.
+   * @see java.util.Map.Entry
+   * @see #getEObjectToEObjectMap()
+   * @generated
+   */
+  EReference getEObjectToEObjectMap_Value();
+
+  /**
+   * Returns the meta object for class '{@link java.util.Map.Entry <em>EObject To EObject Key Contained Map</em>}'. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>EObject To EObject Key Contained Map</em>'.
+   * @see java.util.Map.Entry
+   * @model keyType="org.eclipse.emf.ecore.EObject" keyContainment="true" valueType="org.eclipse.emf.ecore.EObject"
+   * @generated
+   */
+  EClass getEObjectToEObjectKeyContainedMap();
+
+  /**
+   * Returns the meta object for the containment reference '{@link java.util.Map.Entry <em>Key</em>}'. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the containment reference '<em>Key</em>'.
+   * @see java.util.Map.Entry
+   * @see #getEObjectToEObjectKeyContainedMap()
+   * @generated
+   */
+  EReference getEObjectToEObjectKeyContainedMap_Key();
+
+  /**
+   * Returns the meta object for the reference '{@link java.util.Map.Entry <em>Value</em>}'. <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * 
+   * @return the meta object for the reference '<em>Value</em>'.
+   * @see java.util.Map.Entry
+   * @see #getEObjectToEObjectKeyContainedMap()
+   * @generated
+   */
+  EReference getEObjectToEObjectKeyContainedMap_Value();
+
+  /**
+   * Returns the meta object for class '{@link java.util.Map.Entry <em>EObject To EObject Both Contained Map</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>EObject To EObject Both Contained Map</em>'.
+   * @see java.util.Map.Entry
+   * @model keyType="org.eclipse.emf.ecore.EObject" keyContainment="true" valueType="org.eclipse.emf.ecore.EObject"
+   *        valueContainment="true"
+   * @generated
+   */
+  EClass getEObjectToEObjectBothContainedMap();
+
+  /**
+   * Returns the meta object for the containment reference '{@link java.util.Map.Entry <em>Key</em>}'. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the containment reference '<em>Key</em>'.
+   * @see java.util.Map.Entry
+   * @see #getEObjectToEObjectBothContainedMap()
+   * @generated
+   */
+  EReference getEObjectToEObjectBothContainedMap_Key();
+
+  /**
+   * Returns the meta object for the containment reference '{@link java.util.Map.Entry <em>Value</em>}'. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the containment reference '<em>Value</em>'.
+   * @see java.util.Map.Entry
+   * @see #getEObjectToEObjectBothContainedMap()
+   * @generated
+   */
+  EReference getEObjectToEObjectBothContainedMap_Value();
+
+  /**
+   * Returns the meta object for class '{@link java.util.Map.Entry <em>EObject To EObject Value Contained Map</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>EObject To EObject Value Contained Map</em>'.
+   * @see java.util.Map.Entry
+   * @model keyType="org.eclipse.emf.ecore.EObject" valueType="org.eclipse.emf.ecore.EObject" valueContainment="true"
+   * @generated
+   */
+  EClass getEObjectToEObjectValueContainedMap();
+
+  /**
+   * Returns the meta object for the reference '{@link java.util.Map.Entry <em>Key</em>}'. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @return the meta object for the reference '<em>Key</em>'.
+   * @see java.util.Map.Entry
+   * @see #getEObjectToEObjectValueContainedMap()
+   * @generated
+   */
+  EReference getEObjectToEObjectValueContainedMap_Key();
+
+  /**
+   * Returns the meta object for the containment reference '{@link java.util.Map.Entry <em>Value</em>}'. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the containment reference '<em>Value</em>'.
+   * @see java.util.Map.Entry
+   * @see #getEObjectToEObjectValueContainedMap()
+   * @generated
+   */
+  EReference getEObjectToEObjectValueContainedMap_Value();
+
+  /**
    * 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.
@@ -2063,6 +2891,330 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa
     EAttribute NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_VAT = eINSTANCE
         .getNotUnsettableWithDefault_NotUnsettableVAT();
 
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.MapHolderImpl
+     * <em>Map Holder</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.MapHolderImpl
+     * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getMapHolder()
+     * @generated
+     */
+    EClass MAP_HOLDER = eINSTANCE.getMapHolder();
+
+    /**
+     * The meta object literal for the '<em><b>Integer To String Map</b></em>' map feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference MAP_HOLDER__INTEGER_TO_STRING_MAP = eINSTANCE.getMapHolder_IntegerToStringMap();
+
+    /**
+     * The meta object literal for the '<em><b>String To String Map</b></em>' map feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference MAP_HOLDER__STRING_TO_STRING_MAP = eINSTANCE.getMapHolder_StringToStringMap();
+
+    /**
+     * The meta object literal for the '<em><b>String To VAT Map</b></em>' map feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference MAP_HOLDER__STRING_TO_VAT_MAP = eINSTANCE.getMapHolder_StringToVATMap();
+
+    /**
+     * The meta object literal for the '<em><b>String To Address Containment Map</b></em>' map feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference MAP_HOLDER__STRING_TO_ADDRESS_CONTAINMENT_MAP = eINSTANCE.getMapHolder_StringToAddressContainmentMap();
+
+    /**
+     * The meta object literal for the '<em><b>String To Address Reference Map</b></em>' map feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference MAP_HOLDER__STRING_TO_ADDRESS_REFERENCE_MAP = eINSTANCE.getMapHolder_StringToAddressReferenceMap();
+
+    /**
+     * The meta object literal for the '<em><b>EObject To EObject Map</b></em>' map feature. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference MAP_HOLDER__EOBJECT_TO_EOBJECT_MAP = eINSTANCE.getMapHolder_EObjectToEObjectMap();
+
+    /**
+     * The meta object literal for the '<em><b>EObject To EObject Key Contained Map</b></em>' map feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference MAP_HOLDER__EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP = eINSTANCE
+        .getMapHolder_EObjectToEObjectKeyContainedMap();
+
+    /**
+     * The meta object literal for the '<em><b>EObject To EObject Both Contained Map</b></em>' map feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference MAP_HOLDER__EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP = eINSTANCE
+        .getMapHolder_EObjectToEObjectBothContainedMap();
+
+    /**
+     * The meta object literal for the '<em><b>EObject To EObject Value Contained Map</b></em>' map feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference MAP_HOLDER__EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP = eINSTANCE
+        .getMapHolder_EObjectToEObjectValueContainedMap();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.StringToStringMapImpl
+     * <em>String To String Map</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.StringToStringMapImpl
+     * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getStringToStringMap()
+     * @generated
+     */
+    EClass STRING_TO_STRING_MAP = eINSTANCE.getStringToStringMap();
+
+    /**
+     * The meta object literal for the '<em><b>Key</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EAttribute STRING_TO_STRING_MAP__KEY = eINSTANCE.getStringToStringMap_Key();
+
+    /**
+     * The meta object literal for the '<em><b>Value</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EAttribute STRING_TO_STRING_MAP__VALUE = eINSTANCE.getStringToStringMap_Value();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.IntegerToStringMapImpl
+     * <em>Integer To String Map</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.IntegerToStringMapImpl
+     * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getIntegerToStringMap()
+     * @generated
+     */
+    EClass INTEGER_TO_STRING_MAP = eINSTANCE.getIntegerToStringMap();
+
+    /**
+     * The meta object literal for the '<em><b>Key</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EAttribute INTEGER_TO_STRING_MAP__KEY = eINSTANCE.getIntegerToStringMap_Key();
+
+    /**
+     * The meta object literal for the '<em><b>Value</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EAttribute INTEGER_TO_STRING_MAP__VALUE = eINSTANCE.getIntegerToStringMap_Value();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.StringToVATMapImpl
+     * <em>String To VAT Map</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.StringToVATMapImpl
+     * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getStringToVATMap()
+     * @generated
+     */
+    EClass STRING_TO_VAT_MAP = eINSTANCE.getStringToVATMap();
+
+    /**
+     * The meta object literal for the '<em><b>Key</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EAttribute STRING_TO_VAT_MAP__KEY = eINSTANCE.getStringToVATMap_Key();
+
+    /**
+     * The meta object literal for the '<em><b>Value</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EAttribute STRING_TO_VAT_MAP__VALUE = eINSTANCE.getStringToVATMap_Value();
+
+    /**
+     * The meta object literal for the '
+     * {@link org.eclipse.emf.cdo.tests.legacy.model2.impl.StringToAddressContainmentMapImpl
+     * <em>String To Address Containment Map</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.StringToAddressContainmentMapImpl
+     * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getStringToAddressContainmentMap()
+     * @generated
+     */
+    EClass STRING_TO_ADDRESS_CONTAINMENT_MAP = eINSTANCE.getStringToAddressContainmentMap();
+
+    /**
+     * The meta object literal for the '<em><b>Key</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EAttribute STRING_TO_ADDRESS_CONTAINMENT_MAP__KEY = eINSTANCE.getStringToAddressContainmentMap_Key();
+
+    /**
+     * The meta object literal for the '<em><b>Value</b></em>' containment reference feature. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference STRING_TO_ADDRESS_CONTAINMENT_MAP__VALUE = eINSTANCE.getStringToAddressContainmentMap_Value();
+
+    /**
+     * The meta object literal for the '
+     * {@link org.eclipse.emf.cdo.tests.legacy.model2.impl.StringToAddressReferenceMapImpl
+     * <em>String To Address Reference Map</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.StringToAddressReferenceMapImpl
+     * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getStringToAddressReferenceMap()
+     * @generated
+     */
+    EClass STRING_TO_ADDRESS_REFERENCE_MAP = eINSTANCE.getStringToAddressReferenceMap();
+
+    /**
+     * The meta object literal for the '<em><b>Key</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EAttribute STRING_TO_ADDRESS_REFERENCE_MAP__KEY = eINSTANCE.getStringToAddressReferenceMap_Key();
+
+    /**
+     * The meta object literal for the '<em><b>Value</b></em>' reference feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference STRING_TO_ADDRESS_REFERENCE_MAP__VALUE = eINSTANCE.getStringToAddressReferenceMap_Value();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.EObjectToEObjectMapImpl
+     * <em>EObject To EObject Map</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.EObjectToEObjectMapImpl
+     * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getEObjectToEObjectMap()
+     * @generated
+     */
+    EClass EOBJECT_TO_EOBJECT_MAP = eINSTANCE.getEObjectToEObjectMap();
+
+    /**
+     * The meta object literal for the '<em><b>Key</b></em>' reference feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference EOBJECT_TO_EOBJECT_MAP__KEY = eINSTANCE.getEObjectToEObjectMap_Key();
+
+    /**
+     * The meta object literal for the '<em><b>Value</b></em>' reference feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference EOBJECT_TO_EOBJECT_MAP__VALUE = eINSTANCE.getEObjectToEObjectMap_Value();
+
+    /**
+     * The meta object literal for the '
+     * {@link org.eclipse.emf.cdo.tests.legacy.model2.impl.EObjectToEObjectKeyContainedMapImpl
+     * <em>EObject To EObject Key Contained Map</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.EObjectToEObjectKeyContainedMapImpl
+     * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getEObjectToEObjectKeyContainedMap()
+     * @generated
+     */
+    EClass EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP = eINSTANCE.getEObjectToEObjectKeyContainedMap();
+
+    /**
+     * The meta object literal for the '<em><b>Key</b></em>' containment reference feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__KEY = eINSTANCE.getEObjectToEObjectKeyContainedMap_Key();
+
+    /**
+     * The meta object literal for the '<em><b>Value</b></em>' reference feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__VALUE = eINSTANCE.getEObjectToEObjectKeyContainedMap_Value();
+
+    /**
+     * The meta object literal for the '
+     * {@link org.eclipse.emf.cdo.tests.legacy.model2.impl.EObjectToEObjectBothContainedMapImpl
+     * <em>EObject To EObject Both Contained Map</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.EObjectToEObjectBothContainedMapImpl
+     * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getEObjectToEObjectBothContainedMap()
+     * @generated
+     */
+    EClass EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP = eINSTANCE.getEObjectToEObjectBothContainedMap();
+
+    /**
+     * The meta object literal for the '<em><b>Key</b></em>' containment reference feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__KEY = eINSTANCE.getEObjectToEObjectBothContainedMap_Key();
+
+    /**
+     * The meta object literal for the '<em><b>Value</b></em>' containment reference feature. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__VALUE = eINSTANCE.getEObjectToEObjectBothContainedMap_Value();
+
+    /**
+     * The meta object literal for the '
+     * {@link org.eclipse.emf.cdo.tests.legacy.model2.impl.EObjectToEObjectValueContainedMapImpl
+     * <em>EObject To EObject Value Contained Map</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.EObjectToEObjectValueContainedMapImpl
+     * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getEObjectToEObjectValueContainedMap()
+     * @generated
+     */
+    EClass EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP = eINSTANCE.getEObjectToEObjectValueContainedMap();
+
+    /**
+     * The meta object literal for the '<em><b>Key</b></em>' reference feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__KEY = eINSTANCE.getEObjectToEObjectValueContainedMap_Key();
+
+    /**
+     * The meta object literal for the '<em><b>Value</b></em>' containment reference feature. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE = eINSTANCE.getEObjectToEObjectValueContainedMap_Value();
+
   }
 
 } // Model2Package
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/EObjectToEObjectBothContainedMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/EObjectToEObjectBothContainedMapImpl.java
new file mode 100644
index 0000000000..41bc3cac54
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/EObjectToEObjectBothContainedMapImpl.java
@@ -0,0 +1,377 @@
+/**
+ * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ *
+ * $Id: EObjectToEObjectBothContainedMapImpl.java,v 1.1 2010-03-11 20:35:06 mfluegge Exp $
+ */
+package org.eclipse.emf.cdo.tests.legacy.model2.impl;
+
+import org.eclipse.emf.cdo.tests.legacy.model2.Model2Package;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.BasicEMap;
+import org.eclipse.emf.common.util.EMap;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>EObject To EObject Both Contained Map</b></em>
+ * '. <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.EObjectToEObjectBothContainedMapImpl#getTypedKey <em>Key
+ * </em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.EObjectToEObjectBothContainedMapImpl#getTypedValue <em>Value
+ * </em>}</li>
+ * </ul>
+ * </p>
+ * 
+ * @generated
+ */
+public class EObjectToEObjectBothContainedMapImpl extends EObjectImpl implements BasicEMap.Entry<EObject, EObject>
+{
+  /**
+   * The cached value of the '{@link #getTypedKey() <em>Key</em>}' containment reference. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @see #getTypedKey()
+   * @generated
+   * @ordered
+   */
+  protected EObject key;
+
+  /**
+   * The cached value of the '{@link #getTypedValue() <em>Value</em>}' containment reference. <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * 
+   * @see #getTypedValue()
+   * @generated
+   * @ordered
+   */
+  protected EObject value;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected EObjectToEObjectBothContainedMapImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Model2Package.Literals.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject getTypedKey()
+  {
+    return key;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public NotificationChain basicSetTypedKey(EObject newKey, NotificationChain msgs)
+  {
+    EObject oldKey = key;
+    key = newKey;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+          Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__KEY, oldKey, newKey);
+      if (msgs == null)
+        msgs = notification;
+      else
+        msgs.add(notification);
+    }
+    return msgs;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setTypedKey(EObject newKey)
+  {
+    if (newKey != key)
+    {
+      NotificationChain msgs = null;
+      if (key != null)
+        msgs = ((InternalEObject)key).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+            - Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__KEY, null, msgs);
+      if (newKey != null)
+        msgs = ((InternalEObject)newKey).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+            - Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__KEY, null, msgs);
+      msgs = basicSetTypedKey(newKey, msgs);
+      if (msgs != null)
+        msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__KEY,
+          newKey, newKey));
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject getTypedValue()
+  {
+    return value;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public NotificationChain basicSetTypedValue(EObject newValue, NotificationChain msgs)
+  {
+    EObject oldValue = value;
+    value = newValue;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+          Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__VALUE, oldValue, newValue);
+      if (msgs == null)
+        msgs = notification;
+      else
+        msgs.add(notification);
+    }
+    return msgs;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setTypedValue(EObject newValue)
+  {
+    if (newValue != value)
+    {
+      NotificationChain msgs = null;
+      if (value != null)
+        msgs = ((InternalEObject)value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+            - Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__VALUE, null, msgs);
+      if (newValue != null)
+        msgs = ((InternalEObject)newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+            - Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__VALUE, null, msgs);
+      msgs = basicSetTypedValue(newValue, msgs);
+      if (msgs != null)
+        msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__VALUE,
+          newValue, newValue));
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+    case Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__KEY:
+      return basicSetTypedKey(null, msgs);
+    case Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__VALUE:
+      return basicSetTypedValue(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 Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__KEY:
+      return getTypedKey();
+    case Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__VALUE:
+      return getTypedValue();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+    case Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__KEY:
+      setTypedKey((EObject)newValue);
+      return;
+    case Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__VALUE:
+      setTypedValue((EObject)newValue);
+      return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+    case Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__KEY:
+      setTypedKey((EObject)null);
+      return;
+    case Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__VALUE:
+      setTypedValue((EObject)null);
+      return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+    case Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__KEY:
+      return key != null;
+    case Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__VALUE:
+      return value != null;
+    }
+    return super.eIsSet(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected int hash = -1;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public int getHash()
+  {
+    if (hash == -1)
+    {
+      Object theKey = getKey();
+      hash = (theKey == null ? 0 : theKey.hashCode());
+    }
+    return hash;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setHash(int hash)
+  {
+    this.hash = hash;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject getKey()
+  {
+    return getTypedKey();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setKey(EObject key)
+  {
+    setTypedKey(key);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject getValue()
+  {
+    return getTypedValue();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject setValue(EObject value)
+  {
+    EObject oldValue = getValue();
+    setTypedValue(value);
+    return oldValue;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  public EMap<EObject, EObject> getEMap()
+  {
+    EObject container = eContainer();
+    return container == null ? null : (EMap<EObject, EObject>)container.eGet(eContainmentFeature());
+  }
+
+} // EObjectToEObjectBothContainedMapImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/EObjectToEObjectKeyContainedMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/EObjectToEObjectKeyContainedMapImpl.java
new file mode 100644
index 0000000000..f47f520698
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/EObjectToEObjectKeyContainedMapImpl.java
@@ -0,0 +1,366 @@
+/**
+ * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ *
+ * $Id: EObjectToEObjectKeyContainedMapImpl.java,v 1.1 2010-03-11 20:35:00 mfluegge Exp $
+ */
+package org.eclipse.emf.cdo.tests.legacy.model2.impl;
+
+import org.eclipse.emf.cdo.tests.legacy.model2.Model2Package;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.BasicEMap;
+import org.eclipse.emf.common.util.EMap;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>EObject To EObject Key Contained Map</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.EObjectToEObjectKeyContainedMapImpl#getTypedKey <em>Key</em>}
+ * </li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.EObjectToEObjectKeyContainedMapImpl#getTypedValue <em>Value
+ * </em>}</li>
+ * </ul>
+ * </p>
+ * 
+ * @generated
+ */
+public class EObjectToEObjectKeyContainedMapImpl extends EObjectImpl implements BasicEMap.Entry<EObject, EObject>
+{
+  /**
+   * The cached value of the '{@link #getTypedKey() <em>Key</em>}' containment reference. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @see #getTypedKey()
+   * @generated
+   * @ordered
+   */
+  protected EObject key;
+
+  /**
+   * The cached value of the '{@link #getTypedValue() <em>Value</em>}' reference. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @see #getTypedValue()
+   * @generated
+   * @ordered
+   */
+  protected EObject value;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected EObjectToEObjectKeyContainedMapImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Model2Package.Literals.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject getTypedKey()
+  {
+    return key;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public NotificationChain basicSetTypedKey(EObject newKey, NotificationChain msgs)
+  {
+    EObject oldKey = key;
+    key = newKey;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+          Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__KEY, oldKey, newKey);
+      if (msgs == null)
+        msgs = notification;
+      else
+        msgs.add(notification);
+    }
+    return msgs;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setTypedKey(EObject newKey)
+  {
+    if (newKey != key)
+    {
+      NotificationChain msgs = null;
+      if (key != null)
+        msgs = ((InternalEObject)key).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+            - Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__KEY, null, msgs);
+      if (newKey != null)
+        msgs = ((InternalEObject)newKey).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+            - Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__KEY, null, msgs);
+      msgs = basicSetTypedKey(newKey, msgs);
+      if (msgs != null)
+        msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__KEY,
+          newKey, newKey));
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject getTypedValue()
+  {
+    if (value != null && value.eIsProxy())
+    {
+      InternalEObject oldValue = (InternalEObject)value;
+      value = eResolveProxy(oldValue);
+      if (value != oldValue)
+      {
+        if (eNotificationRequired())
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+              Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__VALUE, oldValue, value));
+      }
+    }
+    return value;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject basicGetTypedValue()
+  {
+    return value;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setTypedValue(EObject newValue)
+  {
+    EObject oldValue = value;
+    value = newValue;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__VALUE,
+          oldValue, value));
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+    case Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__KEY:
+      return basicSetTypedKey(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 Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__KEY:
+      return getTypedKey();
+    case Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__VALUE:
+      if (resolve)
+        return getTypedValue();
+      return basicGetTypedValue();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+    case Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__KEY:
+      setTypedKey((EObject)newValue);
+      return;
+    case Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__VALUE:
+      setTypedValue((EObject)newValue);
+      return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+    case Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__KEY:
+      setTypedKey((EObject)null);
+      return;
+    case Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__VALUE:
+      setTypedValue((EObject)null);
+      return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+    case Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__KEY:
+      return key != null;
+    case Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__VALUE:
+      return value != null;
+    }
+    return super.eIsSet(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected int hash = -1;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public int getHash()
+  {
+    if (hash == -1)
+    {
+      Object theKey = getKey();
+      hash = (theKey == null ? 0 : theKey.hashCode());
+    }
+    return hash;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setHash(int hash)
+  {
+    this.hash = hash;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject getKey()
+  {
+    return getTypedKey();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setKey(EObject key)
+  {
+    setTypedKey(key);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject getValue()
+  {
+    return getTypedValue();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject setValue(EObject value)
+  {
+    EObject oldValue = getValue();
+    setTypedValue(value);
+    return oldValue;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  public EMap<EObject, EObject> getEMap()
+  {
+    EObject container = eContainer();
+    return container == null ? null : (EMap<EObject, EObject>)container.eGet(eContainmentFeature());
+  }
+
+} // EObjectToEObjectKeyContainedMapImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/EObjectToEObjectMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/EObjectToEObjectMapImpl.java
new file mode 100644
index 0000000000..a62d927722
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/EObjectToEObjectMapImpl.java
@@ -0,0 +1,337 @@
+/**
+ * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ *
+ * $Id: EObjectToEObjectMapImpl.java,v 1.1 2010-03-11 20:35:01 mfluegge Exp $
+ */
+package org.eclipse.emf.cdo.tests.legacy.model2.impl;
+
+import org.eclipse.emf.cdo.tests.legacy.model2.Model2Package;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.BasicEMap;
+import org.eclipse.emf.common.util.EMap;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>EObject To EObject Map</b></em>'. <!--
+ * end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.EObjectToEObjectMapImpl#getTypedKey <em>Key</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.EObjectToEObjectMapImpl#getTypedValue <em>Value</em>}</li>
+ * </ul>
+ * </p>
+ * 
+ * @generated
+ */
+public class EObjectToEObjectMapImpl extends EObjectImpl implements BasicEMap.Entry<EObject, EObject>
+{
+  /**
+   * The cached value of the '{@link #getTypedKey() <em>Key</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc
+   * -->
+   * 
+   * @see #getTypedKey()
+   * @generated
+   * @ordered
+   */
+  protected EObject key;
+
+  /**
+   * The cached value of the '{@link #getTypedValue() <em>Value</em>}' reference. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @see #getTypedValue()
+   * @generated
+   * @ordered
+   */
+  protected EObject value;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected EObjectToEObjectMapImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Model2Package.Literals.EOBJECT_TO_EOBJECT_MAP;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject getTypedKey()
+  {
+    if (key != null && key.eIsProxy())
+    {
+      InternalEObject oldKey = (InternalEObject)key;
+      key = eResolveProxy(oldKey);
+      if (key != oldKey)
+      {
+        if (eNotificationRequired())
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model2Package.EOBJECT_TO_EOBJECT_MAP__KEY, oldKey,
+              key));
+      }
+    }
+    return key;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject basicGetTypedKey()
+  {
+    return key;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setTypedKey(EObject newKey)
+  {
+    EObject oldKey = key;
+    key = newKey;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_MAP__KEY, oldKey, key));
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject getTypedValue()
+  {
+    if (value != null && value.eIsProxy())
+    {
+      InternalEObject oldValue = (InternalEObject)value;
+      value = eResolveProxy(oldValue);
+      if (value != oldValue)
+      {
+        if (eNotificationRequired())
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model2Package.EOBJECT_TO_EOBJECT_MAP__VALUE,
+              oldValue, value));
+      }
+    }
+    return value;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject basicGetTypedValue()
+  {
+    return value;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setTypedValue(EObject newValue)
+  {
+    EObject oldValue = value;
+    value = newValue;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_MAP__VALUE, oldValue,
+          value));
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+    case Model2Package.EOBJECT_TO_EOBJECT_MAP__KEY:
+      if (resolve)
+        return getTypedKey();
+      return basicGetTypedKey();
+    case Model2Package.EOBJECT_TO_EOBJECT_MAP__VALUE:
+      if (resolve)
+        return getTypedValue();
+      return basicGetTypedValue();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+    case Model2Package.EOBJECT_TO_EOBJECT_MAP__KEY:
+      setTypedKey((EObject)newValue);
+      return;
+    case Model2Package.EOBJECT_TO_EOBJECT_MAP__VALUE:
+      setTypedValue((EObject)newValue);
+      return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+    case Model2Package.EOBJECT_TO_EOBJECT_MAP__KEY:
+      setTypedKey((EObject)null);
+      return;
+    case Model2Package.EOBJECT_TO_EOBJECT_MAP__VALUE:
+      setTypedValue((EObject)null);
+      return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+    case Model2Package.EOBJECT_TO_EOBJECT_MAP__KEY:
+      return key != null;
+    case Model2Package.EOBJECT_TO_EOBJECT_MAP__VALUE:
+      return value != null;
+    }
+    return super.eIsSet(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected int hash = -1;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public int getHash()
+  {
+    if (hash == -1)
+    {
+      Object theKey = getKey();
+      hash = (theKey == null ? 0 : theKey.hashCode());
+    }
+    return hash;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setHash(int hash)
+  {
+    this.hash = hash;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject getKey()
+  {
+    return getTypedKey();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setKey(EObject key)
+  {
+    setTypedKey(key);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject getValue()
+  {
+    return getTypedValue();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject setValue(EObject value)
+  {
+    EObject oldValue = getValue();
+    setTypedValue(value);
+    return oldValue;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  public EMap<EObject, EObject> getEMap()
+  {
+    EObject container = eContainer();
+    return container == null ? null : (EMap<EObject, EObject>)container.eGet(eContainmentFeature());
+  }
+
+} // EObjectToEObjectMapImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/EObjectToEObjectValueContainedMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/EObjectToEObjectValueContainedMapImpl.java
new file mode 100644
index 0000000000..80f119494f
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/EObjectToEObjectValueContainedMapImpl.java
@@ -0,0 +1,366 @@
+/**
+ * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ *
+ * $Id: EObjectToEObjectValueContainedMapImpl.java,v 1.1 2010-03-11 20:35:02 mfluegge Exp $
+ */
+package org.eclipse.emf.cdo.tests.legacy.model2.impl;
+
+import org.eclipse.emf.cdo.tests.legacy.model2.Model2Package;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.BasicEMap;
+import org.eclipse.emf.common.util.EMap;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>EObject To EObject Value Contained Map</b></em>
+ * '. <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.EObjectToEObjectValueContainedMapImpl#getTypedKey <em>Key
+ * </em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.EObjectToEObjectValueContainedMapImpl#getTypedValue <em>Value
+ * </em>}</li>
+ * </ul>
+ * </p>
+ * 
+ * @generated
+ */
+public class EObjectToEObjectValueContainedMapImpl extends EObjectImpl implements BasicEMap.Entry<EObject, EObject>
+{
+  /**
+   * The cached value of the '{@link #getTypedKey() <em>Key</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc
+   * -->
+   * 
+   * @see #getTypedKey()
+   * @generated
+   * @ordered
+   */
+  protected EObject key;
+
+  /**
+   * The cached value of the '{@link #getTypedValue() <em>Value</em>}' containment reference. <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * 
+   * @see #getTypedValue()
+   * @generated
+   * @ordered
+   */
+  protected EObject value;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected EObjectToEObjectValueContainedMapImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Model2Package.Literals.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject getTypedKey()
+  {
+    if (key != null && key.eIsProxy())
+    {
+      InternalEObject oldKey = (InternalEObject)key;
+      key = eResolveProxy(oldKey);
+      if (key != oldKey)
+      {
+        if (eNotificationRequired())
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+              Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__KEY, oldKey, key));
+      }
+    }
+    return key;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject basicGetTypedKey()
+  {
+    return key;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setTypedKey(EObject newKey)
+  {
+    EObject oldKey = key;
+    key = newKey;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__KEY,
+          oldKey, key));
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject getTypedValue()
+  {
+    return value;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public NotificationChain basicSetTypedValue(EObject newValue, NotificationChain msgs)
+  {
+    EObject oldValue = value;
+    value = newValue;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+          Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE, oldValue, newValue);
+      if (msgs == null)
+        msgs = notification;
+      else
+        msgs.add(notification);
+    }
+    return msgs;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setTypedValue(EObject newValue)
+  {
+    if (newValue != value)
+    {
+      NotificationChain msgs = null;
+      if (value != null)
+        msgs = ((InternalEObject)value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+            - Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE, null, msgs);
+      if (newValue != null)
+        msgs = ((InternalEObject)newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+            - Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE, null, msgs);
+      msgs = basicSetTypedValue(newValue, msgs);
+      if (msgs != null)
+        msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET,
+          Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE, newValue, newValue));
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+    case Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE:
+      return basicSetTypedValue(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 Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__KEY:
+      if (resolve)
+        return getTypedKey();
+      return basicGetTypedKey();
+    case Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE:
+      return getTypedValue();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+    case Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__KEY:
+      setTypedKey((EObject)newValue);
+      return;
+    case Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE:
+      setTypedValue((EObject)newValue);
+      return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+    case Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__KEY:
+      setTypedKey((EObject)null);
+      return;
+    case Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE:
+      setTypedValue((EObject)null);
+      return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+    case Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__KEY:
+      return key != null;
+    case Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE:
+      return value != null;
+    }
+    return super.eIsSet(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected int hash = -1;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public int getHash()
+  {
+    if (hash == -1)
+    {
+      Object theKey = getKey();
+      hash = (theKey == null ? 0 : theKey.hashCode());
+    }
+    return hash;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setHash(int hash)
+  {
+    this.hash = hash;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject getKey()
+  {
+    return getTypedKey();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setKey(EObject key)
+  {
+    setTypedKey(key);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject getValue()
+  {
+    return getTypedValue();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject setValue(EObject value)
+  {
+    EObject oldValue = getValue();
+    setTypedValue(value);
+    return oldValue;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  public EMap<EObject, EObject> getEMap()
+  {
+    EObject container = eContainer();
+    return container == null ? null : (EMap<EObject, EObject>)container.eGet(eContainmentFeature());
+  }
+
+} // EObjectToEObjectValueContainedMapImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/IntegerToStringMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/IntegerToStringMapImpl.java
new file mode 100644
index 0000000000..3a7a86eea5
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/IntegerToStringMapImpl.java
@@ -0,0 +1,329 @@
+/**
+ * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ *
+ * $Id: IntegerToStringMapImpl.java,v 1.1 2010-03-11 20:35:04 mfluegge Exp $
+ */
+package org.eclipse.emf.cdo.tests.legacy.model2.impl;
+
+import org.eclipse.emf.cdo.tests.legacy.model2.Model2Package;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.BasicEMap;
+import org.eclipse.emf.common.util.EMap;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Integer To String Map</b></em>'. <!--
+ * end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.IntegerToStringMapImpl#getTypedKey <em>Key</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.IntegerToStringMapImpl#getTypedValue <em>Value</em>}</li>
+ * </ul>
+ * </p>
+ * 
+ * @generated
+ */
+public class IntegerToStringMapImpl extends EObjectImpl implements BasicEMap.Entry<Integer, String>
+{
+  /**
+   * The default value of the '{@link #getTypedKey() <em>Key</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+   * -->
+   * 
+   * @see #getTypedKey()
+   * @generated
+   * @ordered
+   */
+  protected static final Integer KEY_EDEFAULT = null;
+
+  /**
+   * The cached value of the '{@link #getTypedKey() <em>Key</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+   * -->
+   * 
+   * @see #getTypedKey()
+   * @generated
+   * @ordered
+   */
+  protected Integer key = KEY_EDEFAULT;
+
+  /**
+   * The default value of the '{@link #getTypedValue() <em>Value</em>}' attribute. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @see #getTypedValue()
+   * @generated
+   * @ordered
+   */
+  protected static final String VALUE_EDEFAULT = null;
+
+  /**
+   * The cached value of the '{@link #getTypedValue() <em>Value</em>}' attribute. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @see #getTypedValue()
+   * @generated
+   * @ordered
+   */
+  protected String value = VALUE_EDEFAULT;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected IntegerToStringMapImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Model2Package.Literals.INTEGER_TO_STRING_MAP;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Integer getTypedKey()
+  {
+    return key;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setTypedKey(Integer newKey)
+  {
+    Integer oldKey = key;
+    key = newKey;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.INTEGER_TO_STRING_MAP__KEY, oldKey, key));
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String getTypedValue()
+  {
+    return value;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setTypedValue(String newValue)
+  {
+    String oldValue = value;
+    value = newValue;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.INTEGER_TO_STRING_MAP__VALUE, oldValue, value));
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+    case Model2Package.INTEGER_TO_STRING_MAP__KEY:
+      return getTypedKey();
+    case Model2Package.INTEGER_TO_STRING_MAP__VALUE:
+      return getTypedValue();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+    case Model2Package.INTEGER_TO_STRING_MAP__KEY:
+      setTypedKey((Integer)newValue);
+      return;
+    case Model2Package.INTEGER_TO_STRING_MAP__VALUE:
+      setTypedValue((String)newValue);
+      return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+    case Model2Package.INTEGER_TO_STRING_MAP__KEY:
+      setTypedKey(KEY_EDEFAULT);
+      return;
+    case Model2Package.INTEGER_TO_STRING_MAP__VALUE:
+      setTypedValue(VALUE_EDEFAULT);
+      return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+    case Model2Package.INTEGER_TO_STRING_MAP__KEY:
+      return KEY_EDEFAULT == null ? key != null : !KEY_EDEFAULT.equals(key);
+    case Model2Package.INTEGER_TO_STRING_MAP__VALUE:
+      return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
+    }
+    return super.eIsSet(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    if (eIsProxy())
+      return super.toString();
+
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (key: ");
+    result.append(key);
+    result.append(", value: ");
+    result.append(value);
+    result.append(')');
+    return result.toString();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected int hash = -1;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public int getHash()
+  {
+    if (hash == -1)
+    {
+      Object theKey = getKey();
+      hash = (theKey == null ? 0 : theKey.hashCode());
+    }
+    return hash;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setHash(int hash)
+  {
+    this.hash = hash;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Integer getKey()
+  {
+    return getTypedKey();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setKey(Integer key)
+  {
+    setTypedKey(key);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String getValue()
+  {
+    return getTypedValue();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String setValue(String value)
+  {
+    String oldValue = getValue();
+    setTypedValue(value);
+    return oldValue;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  public EMap<Integer, String> getEMap()
+  {
+    EObject container = eContainer();
+    return container == null ? null : (EMap<Integer, String>)container.eGet(eContainmentFeature());
+  }
+
+} // IntegerToStringMapImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/MapHolderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/MapHolderImpl.java
new file mode 100644
index 0000000000..b9cff5b1c8
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/MapHolderImpl.java
@@ -0,0 +1,515 @@
+/**
+ * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ *
+ * $Id: MapHolderImpl.java,v 1.1 2010-03-11 20:34:58 mfluegge Exp $
+ */
+package org.eclipse.emf.cdo.tests.legacy.model2.impl;
+
+import org.eclipse.emf.cdo.tests.legacy.model2.Model2Package;
+import org.eclipse.emf.cdo.tests.model1.Address;
+import org.eclipse.emf.cdo.tests.model1.VAT;
+import org.eclipse.emf.cdo.tests.model2.MapHolder;
+
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EMap;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.emf.ecore.util.EcoreEMap;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Map Holder</b></em>'. <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.MapHolderImpl#getIntegerToStringMap <em>Integer To String Map
+ * </em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.MapHolderImpl#getStringToStringMap <em>String To String Map
+ * </em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.MapHolderImpl#getStringToVATMap <em>String To VAT Map</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.MapHolderImpl#getStringToAddressContainmentMap <em>String To
+ * Address Containment Map</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.MapHolderImpl#getStringToAddressReferenceMap <em>String To
+ * Address Reference Map</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.MapHolderImpl#getEObjectToEObjectMap <em>EObject To EObject
+ * Map</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.MapHolderImpl#getEObjectToEObjectKeyContainedMap <em>EObject
+ * To EObject Key Contained Map</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.MapHolderImpl#getEObjectToEObjectBothContainedMap <em>EObject
+ * To EObject Both Contained Map</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.MapHolderImpl#getEObjectToEObjectValueContainedMap <em>
+ * EObject To EObject Value Contained Map</em>}</li>
+ * </ul>
+ * </p>
+ * 
+ * @generated
+ */
+public class MapHolderImpl extends EObjectImpl implements MapHolder
+{
+  /**
+   * The cached value of the '{@link #getIntegerToStringMap() <em>Integer To String Map</em>}' map. <!-- begin-user-doc
+   * --> <!-- end-user-doc -->
+   * 
+   * @see #getIntegerToStringMap()
+   * @generated
+   * @ordered
+   */
+  protected EMap<Integer, String> integerToStringMap;
+
+  /**
+   * The cached value of the '{@link #getStringToStringMap() <em>String To String Map</em>}' map. <!-- begin-user-doc
+   * --> <!-- end-user-doc -->
+   * 
+   * @see #getStringToStringMap()
+   * @generated
+   * @ordered
+   */
+  protected EMap<String, String> stringToStringMap;
+
+  /**
+   * The cached value of the '{@link #getStringToVATMap() <em>String To VAT Map</em>}' map. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @see #getStringToVATMap()
+   * @generated
+   * @ordered
+   */
+  protected EMap<String, VAT> stringToVATMap;
+
+  /**
+   * The cached value of the '{@link #getStringToAddressContainmentMap() <em>String To Address Containment Map</em>}'
+   * map. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see #getStringToAddressContainmentMap()
+   * @generated
+   * @ordered
+   */
+  protected EMap<String, Address> stringToAddressContainmentMap;
+
+  /**
+   * The cached value of the '{@link #getStringToAddressReferenceMap() <em>String To Address Reference Map</em>}' map.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see #getStringToAddressReferenceMap()
+   * @generated
+   * @ordered
+   */
+  protected EMap<String, Address> stringToAddressReferenceMap;
+
+  /**
+   * The cached value of the '{@link #getEObjectToEObjectMap() <em>EObject To EObject Map</em>}' map. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see #getEObjectToEObjectMap()
+   * @generated
+   * @ordered
+   */
+  protected EMap<EObject, EObject> eObjectToEObjectMap;
+
+  /**
+   * The cached value of the '{@link #getEObjectToEObjectKeyContainedMap()
+   * <em>EObject To EObject Key Contained Map</em>}' map. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see #getEObjectToEObjectKeyContainedMap()
+   * @generated
+   * @ordered
+   */
+  protected EMap<EObject, EObject> eObjectToEObjectKeyContainedMap;
+
+  /**
+   * The cached value of the '{@link #getEObjectToEObjectBothContainedMap()
+   * <em>EObject To EObject Both Contained Map</em>}' map. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see #getEObjectToEObjectBothContainedMap()
+   * @generated
+   * @ordered
+   */
+  protected EMap<EObject, EObject> eObjectToEObjectBothContainedMap;
+
+  /**
+   * The cached value of the '{@link #getEObjectToEObjectValueContainedMap()
+   * <em>EObject To EObject Value Contained Map</em>}' map. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see #getEObjectToEObjectValueContainedMap()
+   * @generated
+   * @ordered
+   */
+  protected EMap<EObject, EObject> eObjectToEObjectValueContainedMap;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected MapHolderImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Model2Package.Literals.MAP_HOLDER;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EMap<Integer, String> getIntegerToStringMap()
+  {
+    if (integerToStringMap == null)
+    {
+      integerToStringMap = new EcoreEMap<Integer, String>(Model2Package.Literals.INTEGER_TO_STRING_MAP,
+          IntegerToStringMapImpl.class, this, Model2Package.MAP_HOLDER__INTEGER_TO_STRING_MAP);
+    }
+    return integerToStringMap;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EMap<String, String> getStringToStringMap()
+  {
+    if (stringToStringMap == null)
+    {
+      stringToStringMap = new EcoreEMap<String, String>(Model2Package.Literals.STRING_TO_STRING_MAP,
+          StringToStringMapImpl.class, this, Model2Package.MAP_HOLDER__STRING_TO_STRING_MAP);
+    }
+    return stringToStringMap;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EMap<String, VAT> getStringToVATMap()
+  {
+    if (stringToVATMap == null)
+    {
+      stringToVATMap = new EcoreEMap<String, VAT>(Model2Package.Literals.STRING_TO_VAT_MAP, StringToVATMapImpl.class,
+          this, Model2Package.MAP_HOLDER__STRING_TO_VAT_MAP);
+    }
+    return stringToVATMap;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EMap<String, Address> getStringToAddressContainmentMap()
+  {
+    if (stringToAddressContainmentMap == null)
+    {
+      stringToAddressContainmentMap = new EcoreEMap<String, Address>(
+          Model2Package.Literals.STRING_TO_ADDRESS_CONTAINMENT_MAP, StringToAddressContainmentMapImpl.class, this,
+          Model2Package.MAP_HOLDER__STRING_TO_ADDRESS_CONTAINMENT_MAP);
+    }
+    return stringToAddressContainmentMap;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EMap<String, Address> getStringToAddressReferenceMap()
+  {
+    if (stringToAddressReferenceMap == null)
+    {
+      stringToAddressReferenceMap = new EcoreEMap<String, Address>(
+          Model2Package.Literals.STRING_TO_ADDRESS_REFERENCE_MAP, StringToAddressReferenceMapImpl.class, this,
+          Model2Package.MAP_HOLDER__STRING_TO_ADDRESS_REFERENCE_MAP);
+    }
+    return stringToAddressReferenceMap;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EMap<EObject, EObject> getEObjectToEObjectMap()
+  {
+    if (eObjectToEObjectMap == null)
+    {
+      eObjectToEObjectMap = new EcoreEMap<EObject, EObject>(Model2Package.Literals.EOBJECT_TO_EOBJECT_MAP,
+          EObjectToEObjectMapImpl.class, this, Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_MAP);
+    }
+    return eObjectToEObjectMap;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EMap<EObject, EObject> getEObjectToEObjectKeyContainedMap()
+  {
+    if (eObjectToEObjectKeyContainedMap == null)
+    {
+      eObjectToEObjectKeyContainedMap = new EcoreEMap<EObject, EObject>(
+          Model2Package.Literals.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP, EObjectToEObjectKeyContainedMapImpl.class, this,
+          Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP);
+    }
+    return eObjectToEObjectKeyContainedMap;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EMap<EObject, EObject> getEObjectToEObjectBothContainedMap()
+  {
+    if (eObjectToEObjectBothContainedMap == null)
+    {
+      eObjectToEObjectBothContainedMap = new EcoreEMap<EObject, EObject>(
+          Model2Package.Literals.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP, EObjectToEObjectBothContainedMapImpl.class,
+          this, Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP);
+    }
+    return eObjectToEObjectBothContainedMap;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EMap<EObject, EObject> getEObjectToEObjectValueContainedMap()
+  {
+    if (eObjectToEObjectValueContainedMap == null)
+    {
+      eObjectToEObjectValueContainedMap = new EcoreEMap<EObject, EObject>(
+          Model2Package.Literals.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP, EObjectToEObjectValueContainedMapImpl.class,
+          this, Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP);
+    }
+    return eObjectToEObjectValueContainedMap;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+    case Model2Package.MAP_HOLDER__INTEGER_TO_STRING_MAP:
+      return ((InternalEList<?>)getIntegerToStringMap()).basicRemove(otherEnd, msgs);
+    case Model2Package.MAP_HOLDER__STRING_TO_STRING_MAP:
+      return ((InternalEList<?>)getStringToStringMap()).basicRemove(otherEnd, msgs);
+    case Model2Package.MAP_HOLDER__STRING_TO_VAT_MAP:
+      return ((InternalEList<?>)getStringToVATMap()).basicRemove(otherEnd, msgs);
+    case Model2Package.MAP_HOLDER__STRING_TO_ADDRESS_CONTAINMENT_MAP:
+      return ((InternalEList<?>)getStringToAddressContainmentMap()).basicRemove(otherEnd, msgs);
+    case Model2Package.MAP_HOLDER__STRING_TO_ADDRESS_REFERENCE_MAP:
+      return ((InternalEList<?>)getStringToAddressReferenceMap()).basicRemove(otherEnd, msgs);
+    case Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_MAP:
+      return ((InternalEList<?>)getEObjectToEObjectMap()).basicRemove(otherEnd, msgs);
+    case Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP:
+      return ((InternalEList<?>)getEObjectToEObjectKeyContainedMap()).basicRemove(otherEnd, msgs);
+    case Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP:
+      return ((InternalEList<?>)getEObjectToEObjectBothContainedMap()).basicRemove(otherEnd, msgs);
+    case Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP:
+      return ((InternalEList<?>)getEObjectToEObjectValueContainedMap()).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 Model2Package.MAP_HOLDER__INTEGER_TO_STRING_MAP:
+      if (coreType)
+        return getIntegerToStringMap();
+      else
+        return getIntegerToStringMap().map();
+    case Model2Package.MAP_HOLDER__STRING_TO_STRING_MAP:
+      if (coreType)
+        return getStringToStringMap();
+      else
+        return getStringToStringMap().map();
+    case Model2Package.MAP_HOLDER__STRING_TO_VAT_MAP:
+      if (coreType)
+        return getStringToVATMap();
+      else
+        return getStringToVATMap().map();
+    case Model2Package.MAP_HOLDER__STRING_TO_ADDRESS_CONTAINMENT_MAP:
+      if (coreType)
+        return getStringToAddressContainmentMap();
+      else
+        return getStringToAddressContainmentMap().map();
+    case Model2Package.MAP_HOLDER__STRING_TO_ADDRESS_REFERENCE_MAP:
+      if (coreType)
+        return getStringToAddressReferenceMap();
+      else
+        return getStringToAddressReferenceMap().map();
+    case Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_MAP:
+      if (coreType)
+        return getEObjectToEObjectMap();
+      else
+        return getEObjectToEObjectMap().map();
+    case Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP:
+      if (coreType)
+        return getEObjectToEObjectKeyContainedMap();
+      else
+        return getEObjectToEObjectKeyContainedMap().map();
+    case Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP:
+      if (coreType)
+        return getEObjectToEObjectBothContainedMap();
+      else
+        return getEObjectToEObjectBothContainedMap().map();
+    case Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP:
+      if (coreType)
+        return getEObjectToEObjectValueContainedMap();
+      else
+        return getEObjectToEObjectValueContainedMap().map();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+    case Model2Package.MAP_HOLDER__INTEGER_TO_STRING_MAP:
+      ((EStructuralFeature.Setting)getIntegerToStringMap()).set(newValue);
+      return;
+    case Model2Package.MAP_HOLDER__STRING_TO_STRING_MAP:
+      ((EStructuralFeature.Setting)getStringToStringMap()).set(newValue);
+      return;
+    case Model2Package.MAP_HOLDER__STRING_TO_VAT_MAP:
+      ((EStructuralFeature.Setting)getStringToVATMap()).set(newValue);
+      return;
+    case Model2Package.MAP_HOLDER__STRING_TO_ADDRESS_CONTAINMENT_MAP:
+      ((EStructuralFeature.Setting)getStringToAddressContainmentMap()).set(newValue);
+      return;
+    case Model2Package.MAP_HOLDER__STRING_TO_ADDRESS_REFERENCE_MAP:
+      ((EStructuralFeature.Setting)getStringToAddressReferenceMap()).set(newValue);
+      return;
+    case Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_MAP:
+      ((EStructuralFeature.Setting)getEObjectToEObjectMap()).set(newValue);
+      return;
+    case Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP:
+      ((EStructuralFeature.Setting)getEObjectToEObjectKeyContainedMap()).set(newValue);
+      return;
+    case Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP:
+      ((EStructuralFeature.Setting)getEObjectToEObjectBothContainedMap()).set(newValue);
+      return;
+    case Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP:
+      ((EStructuralFeature.Setting)getEObjectToEObjectValueContainedMap()).set(newValue);
+      return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+    case Model2Package.MAP_HOLDER__INTEGER_TO_STRING_MAP:
+      getIntegerToStringMap().clear();
+      return;
+    case Model2Package.MAP_HOLDER__STRING_TO_STRING_MAP:
+      getStringToStringMap().clear();
+      return;
+    case Model2Package.MAP_HOLDER__STRING_TO_VAT_MAP:
+      getStringToVATMap().clear();
+      return;
+    case Model2Package.MAP_HOLDER__STRING_TO_ADDRESS_CONTAINMENT_MAP:
+      getStringToAddressContainmentMap().clear();
+      return;
+    case Model2Package.MAP_HOLDER__STRING_TO_ADDRESS_REFERENCE_MAP:
+      getStringToAddressReferenceMap().clear();
+      return;
+    case Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_MAP:
+      getEObjectToEObjectMap().clear();
+      return;
+    case Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP:
+      getEObjectToEObjectKeyContainedMap().clear();
+      return;
+    case Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP:
+      getEObjectToEObjectBothContainedMap().clear();
+      return;
+    case Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP:
+      getEObjectToEObjectValueContainedMap().clear();
+      return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+    case Model2Package.MAP_HOLDER__INTEGER_TO_STRING_MAP:
+      return integerToStringMap != null && !integerToStringMap.isEmpty();
+    case Model2Package.MAP_HOLDER__STRING_TO_STRING_MAP:
+      return stringToStringMap != null && !stringToStringMap.isEmpty();
+    case Model2Package.MAP_HOLDER__STRING_TO_VAT_MAP:
+      return stringToVATMap != null && !stringToVATMap.isEmpty();
+    case Model2Package.MAP_HOLDER__STRING_TO_ADDRESS_CONTAINMENT_MAP:
+      return stringToAddressContainmentMap != null && !stringToAddressContainmentMap.isEmpty();
+    case Model2Package.MAP_HOLDER__STRING_TO_ADDRESS_REFERENCE_MAP:
+      return stringToAddressReferenceMap != null && !stringToAddressReferenceMap.isEmpty();
+    case Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_MAP:
+      return eObjectToEObjectMap != null && !eObjectToEObjectMap.isEmpty();
+    case Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP:
+      return eObjectToEObjectKeyContainedMap != null && !eObjectToEObjectKeyContainedMap.isEmpty();
+    case Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP:
+      return eObjectToEObjectBothContainedMap != null && !eObjectToEObjectBothContainedMap.isEmpty();
+    case Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP:
+      return eObjectToEObjectValueContainedMap != null && !eObjectToEObjectValueContainedMap.isEmpty();
+    }
+    return super.eIsSet(featureID);
+  }
+
+} // MapHolderImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Model2FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Model2FactoryImpl.java
index 248f8a72b4..94fdc1aaa8 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Model2FactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Model2FactoryImpl.java
@@ -12,6 +12,9 @@ package org.eclipse.emf.cdo.tests.legacy.model2.impl;
 
 import org.eclipse.emf.cdo.tests.legacy.model2.Model2Factory;
 import org.eclipse.emf.cdo.tests.legacy.model2.Model2Package;
+import org.eclipse.emf.cdo.tests.model1.Address;
+import org.eclipse.emf.cdo.tests.model1.VAT;
+import org.eclipse.emf.cdo.tests.model2.MapHolder;
 import org.eclipse.emf.cdo.tests.model2.NotUnsettable;
 import org.eclipse.emf.cdo.tests.model2.NotUnsettableWithDefault;
 import org.eclipse.emf.cdo.tests.model2.PersistentContainment;
@@ -28,6 +31,8 @@ import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
+import java.util.Map;
+
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
  * 
@@ -96,6 +101,26 @@ public class Model2FactoryImpl extends EFactoryImpl implements Model2Factory
       return createNotUnsettable();
     case Model2Package.NOT_UNSETTABLE_WITH_DEFAULT:
       return createNotUnsettableWithDefault();
+    case Model2Package.MAP_HOLDER:
+      return createMapHolder();
+    case Model2Package.STRING_TO_STRING_MAP:
+      return (EObject)createStringToStringMap();
+    case Model2Package.INTEGER_TO_STRING_MAP:
+      return (EObject)createIntegerToStringMap();
+    case Model2Package.STRING_TO_VAT_MAP:
+      return (EObject)createStringToVATMap();
+    case Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP:
+      return (EObject)createStringToAddressContainmentMap();
+    case Model2Package.STRING_TO_ADDRESS_REFERENCE_MAP:
+      return (EObject)createStringToAddressReferenceMap();
+    case Model2Package.EOBJECT_TO_EOBJECT_MAP:
+      return (EObject)createEObjectToEObjectMap();
+    case Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP:
+      return (EObject)createEObjectToEObjectKeyContainedMap();
+    case Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP:
+      return (EObject)createEObjectToEObjectBothContainedMap();
+    case Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP:
+      return (EObject)createEObjectToEObjectValueContainedMap();
     default:
       throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
     }
@@ -205,6 +230,116 @@ public class Model2FactoryImpl extends EFactoryImpl implements Model2Factory
    * 
    * @generated
    */
+  public MapHolder createMapHolder()
+  {
+    MapHolderImpl mapHolder = new MapHolderImpl();
+    return mapHolder;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Map.Entry<String, String> createStringToStringMap()
+  {
+    StringToStringMapImpl stringToStringMap = new StringToStringMapImpl();
+    return stringToStringMap;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Map.Entry<Integer, String> createIntegerToStringMap()
+  {
+    IntegerToStringMapImpl integerToStringMap = new IntegerToStringMapImpl();
+    return integerToStringMap;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Map.Entry<String, VAT> createStringToVATMap()
+  {
+    StringToVATMapImpl stringToVATMap = new StringToVATMapImpl();
+    return stringToVATMap;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Map.Entry<String, Address> createStringToAddressContainmentMap()
+  {
+    StringToAddressContainmentMapImpl stringToAddressContainmentMap = new StringToAddressContainmentMapImpl();
+    return stringToAddressContainmentMap;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Map.Entry<String, Address> createStringToAddressReferenceMap()
+  {
+    StringToAddressReferenceMapImpl stringToAddressReferenceMap = new StringToAddressReferenceMapImpl();
+    return stringToAddressReferenceMap;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Map.Entry<EObject, EObject> createEObjectToEObjectMap()
+  {
+    EObjectToEObjectMapImpl eObjectToEObjectMap = new EObjectToEObjectMapImpl();
+    return eObjectToEObjectMap;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Map.Entry<EObject, EObject> createEObjectToEObjectKeyContainedMap()
+  {
+    EObjectToEObjectKeyContainedMapImpl eObjectToEObjectKeyContainedMap = new EObjectToEObjectKeyContainedMapImpl();
+    return eObjectToEObjectKeyContainedMap;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Map.Entry<EObject, EObject> createEObjectToEObjectBothContainedMap()
+  {
+    EObjectToEObjectBothContainedMapImpl eObjectToEObjectBothContainedMap = new EObjectToEObjectBothContainedMapImpl();
+    return eObjectToEObjectBothContainedMap;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Map.Entry<EObject, EObject> createEObjectToEObjectValueContainedMap()
+  {
+    EObjectToEObjectValueContainedMapImpl eObjectToEObjectValueContainedMap = new EObjectToEObjectValueContainedMapImpl();
+    return eObjectToEObjectValueContainedMap;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
   public Model2Package getModel2Package()
   {
     return (Model2Package)getEPackage();
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Model2PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Model2PackageImpl.java
index 41a47f86b3..f6082b77bf 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Model2PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Model2PackageImpl.java
@@ -13,6 +13,7 @@ package org.eclipse.emf.cdo.tests.legacy.model2.impl;
 import org.eclipse.emf.cdo.tests.legacy.model1.Model1Package;
 import org.eclipse.emf.cdo.tests.legacy.model2.Model2Factory;
 import org.eclipse.emf.cdo.tests.legacy.model2.Model2Package;
+import org.eclipse.emf.cdo.tests.model2.MapHolder;
 import org.eclipse.emf.cdo.tests.model2.NotUnsettable;
 import org.eclipse.emf.cdo.tests.model2.NotUnsettableWithDefault;
 import org.eclipse.emf.cdo.tests.model2.PersistentContainment;
@@ -29,6 +30,8 @@ import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 
+import java.util.Map;
+
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
  * 
@@ -100,6 +103,76 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
   private EClass notUnsettableWithDefaultEClass = null;
 
   /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass mapHolderEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass stringToStringMapEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass integerToStringMapEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass stringToVATMapEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass stringToAddressContainmentMapEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass stringToAddressReferenceMapEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass eObjectToEObjectMapEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass eObjectToEObjectKeyContainedMapEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass eObjectToEObjectBothContainedMapEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass eObjectToEObjectValueContainedMapEClass = 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>
@@ -139,9 +212,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
   public static Model2Package init()
   {
     if (isInited)
-    {
       return (Model2Package)EPackage.Registry.INSTANCE.getEPackage(Model2Package.eNS_URI);
-    }
 
     // Obtain or create and register package
     Model2PackageImpl theModel2Package = (Model2PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model2PackageImpl ? EPackage.Registry.INSTANCE
@@ -822,6 +893,376 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
    * 
    * @generated
    */
+  public EClass getMapHolder()
+  {
+    return mapHolderEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getMapHolder_IntegerToStringMap()
+  {
+    return (EReference)mapHolderEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getMapHolder_StringToStringMap()
+  {
+    return (EReference)mapHolderEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getMapHolder_StringToVATMap()
+  {
+    return (EReference)mapHolderEClass.getEStructuralFeatures().get(2);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getMapHolder_StringToAddressContainmentMap()
+  {
+    return (EReference)mapHolderEClass.getEStructuralFeatures().get(3);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getMapHolder_StringToAddressReferenceMap()
+  {
+    return (EReference)mapHolderEClass.getEStructuralFeatures().get(4);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getMapHolder_EObjectToEObjectMap()
+  {
+    return (EReference)mapHolderEClass.getEStructuralFeatures().get(5);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getMapHolder_EObjectToEObjectKeyContainedMap()
+  {
+    return (EReference)mapHolderEClass.getEStructuralFeatures().get(6);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getMapHolder_EObjectToEObjectBothContainedMap()
+  {
+    return (EReference)mapHolderEClass.getEStructuralFeatures().get(7);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getMapHolder_EObjectToEObjectValueContainedMap()
+  {
+    return (EReference)mapHolderEClass.getEStructuralFeatures().get(8);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getStringToStringMap()
+  {
+    return stringToStringMapEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EAttribute getStringToStringMap_Key()
+  {
+    return (EAttribute)stringToStringMapEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EAttribute getStringToStringMap_Value()
+  {
+    return (EAttribute)stringToStringMapEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getIntegerToStringMap()
+  {
+    return integerToStringMapEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EAttribute getIntegerToStringMap_Key()
+  {
+    return (EAttribute)integerToStringMapEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EAttribute getIntegerToStringMap_Value()
+  {
+    return (EAttribute)integerToStringMapEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getStringToVATMap()
+  {
+    return stringToVATMapEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EAttribute getStringToVATMap_Key()
+  {
+    return (EAttribute)stringToVATMapEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EAttribute getStringToVATMap_Value()
+  {
+    return (EAttribute)stringToVATMapEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getStringToAddressContainmentMap()
+  {
+    return stringToAddressContainmentMapEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EAttribute getStringToAddressContainmentMap_Key()
+  {
+    return (EAttribute)stringToAddressContainmentMapEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getStringToAddressContainmentMap_Value()
+  {
+    return (EReference)stringToAddressContainmentMapEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getStringToAddressReferenceMap()
+  {
+    return stringToAddressReferenceMapEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EAttribute getStringToAddressReferenceMap_Key()
+  {
+    return (EAttribute)stringToAddressReferenceMapEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getStringToAddressReferenceMap_Value()
+  {
+    return (EReference)stringToAddressReferenceMapEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getEObjectToEObjectMap()
+  {
+    return eObjectToEObjectMapEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getEObjectToEObjectMap_Key()
+  {
+    return (EReference)eObjectToEObjectMapEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getEObjectToEObjectMap_Value()
+  {
+    return (EReference)eObjectToEObjectMapEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getEObjectToEObjectKeyContainedMap()
+  {
+    return eObjectToEObjectKeyContainedMapEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getEObjectToEObjectKeyContainedMap_Key()
+  {
+    return (EReference)eObjectToEObjectKeyContainedMapEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getEObjectToEObjectKeyContainedMap_Value()
+  {
+    return (EReference)eObjectToEObjectKeyContainedMapEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getEObjectToEObjectBothContainedMap()
+  {
+    return eObjectToEObjectBothContainedMapEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getEObjectToEObjectBothContainedMap_Key()
+  {
+    return (EReference)eObjectToEObjectBothContainedMapEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getEObjectToEObjectBothContainedMap_Value()
+  {
+    return (EReference)eObjectToEObjectBothContainedMapEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getEObjectToEObjectValueContainedMap()
+  {
+    return eObjectToEObjectValueContainedMapEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getEObjectToEObjectValueContainedMap_Key()
+  {
+    return (EReference)eObjectToEObjectValueContainedMapEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getEObjectToEObjectValueContainedMap_Value()
+  {
+    return (EReference)eObjectToEObjectValueContainedMapEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
   public Model2Factory getModel2Factory()
   {
     return (Model2Factory)getEFactoryInstance();
@@ -843,9 +1284,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
   public void createPackageContents()
   {
     if (isCreated)
-    {
       return;
-    }
     isCreated = true;
 
     // Create classes and their features
@@ -922,6 +1361,53 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
     createEAttribute(notUnsettableWithDefaultEClass, NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_SHORT);
     createEAttribute(notUnsettableWithDefaultEClass, NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_STRING);
     createEAttribute(notUnsettableWithDefaultEClass, NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_VAT);
+
+    mapHolderEClass = createEClass(MAP_HOLDER);
+    createEReference(mapHolderEClass, MAP_HOLDER__INTEGER_TO_STRING_MAP);
+    createEReference(mapHolderEClass, MAP_HOLDER__STRING_TO_STRING_MAP);
+    createEReference(mapHolderEClass, MAP_HOLDER__STRING_TO_VAT_MAP);
+    createEReference(mapHolderEClass, MAP_HOLDER__STRING_TO_ADDRESS_CONTAINMENT_MAP);
+    createEReference(mapHolderEClass, MAP_HOLDER__STRING_TO_ADDRESS_REFERENCE_MAP);
+    createEReference(mapHolderEClass, MAP_HOLDER__EOBJECT_TO_EOBJECT_MAP);
+    createEReference(mapHolderEClass, MAP_HOLDER__EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP);
+    createEReference(mapHolderEClass, MAP_HOLDER__EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP);
+    createEReference(mapHolderEClass, MAP_HOLDER__EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP);
+
+    stringToStringMapEClass = createEClass(STRING_TO_STRING_MAP);
+    createEAttribute(stringToStringMapEClass, STRING_TO_STRING_MAP__KEY);
+    createEAttribute(stringToStringMapEClass, STRING_TO_STRING_MAP__VALUE);
+
+    integerToStringMapEClass = createEClass(INTEGER_TO_STRING_MAP);
+    createEAttribute(integerToStringMapEClass, INTEGER_TO_STRING_MAP__KEY);
+    createEAttribute(integerToStringMapEClass, INTEGER_TO_STRING_MAP__VALUE);
+
+    stringToVATMapEClass = createEClass(STRING_TO_VAT_MAP);
+    createEAttribute(stringToVATMapEClass, STRING_TO_VAT_MAP__KEY);
+    createEAttribute(stringToVATMapEClass, STRING_TO_VAT_MAP__VALUE);
+
+    stringToAddressContainmentMapEClass = createEClass(STRING_TO_ADDRESS_CONTAINMENT_MAP);
+    createEAttribute(stringToAddressContainmentMapEClass, STRING_TO_ADDRESS_CONTAINMENT_MAP__KEY);
+    createEReference(stringToAddressContainmentMapEClass, STRING_TO_ADDRESS_CONTAINMENT_MAP__VALUE);
+
+    stringToAddressReferenceMapEClass = createEClass(STRING_TO_ADDRESS_REFERENCE_MAP);
+    createEAttribute(stringToAddressReferenceMapEClass, STRING_TO_ADDRESS_REFERENCE_MAP__KEY);
+    createEReference(stringToAddressReferenceMapEClass, STRING_TO_ADDRESS_REFERENCE_MAP__VALUE);
+
+    eObjectToEObjectMapEClass = createEClass(EOBJECT_TO_EOBJECT_MAP);
+    createEReference(eObjectToEObjectMapEClass, EOBJECT_TO_EOBJECT_MAP__KEY);
+    createEReference(eObjectToEObjectMapEClass, EOBJECT_TO_EOBJECT_MAP__VALUE);
+
+    eObjectToEObjectKeyContainedMapEClass = createEClass(EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP);
+    createEReference(eObjectToEObjectKeyContainedMapEClass, EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__KEY);
+    createEReference(eObjectToEObjectKeyContainedMapEClass, EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__VALUE);
+
+    eObjectToEObjectBothContainedMapEClass = createEClass(EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP);
+    createEReference(eObjectToEObjectBothContainedMapEClass, EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__KEY);
+    createEReference(eObjectToEObjectBothContainedMapEClass, EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__VALUE);
+
+    eObjectToEObjectValueContainedMapEClass = createEClass(EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP);
+    createEReference(eObjectToEObjectValueContainedMapEClass, EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__KEY);
+    createEReference(eObjectToEObjectValueContainedMapEClass, EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE);
   }
 
   /**
@@ -940,9 +1426,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
   public void initializePackageContents()
   {
     if (isInitialized)
-    {
       return;
-    }
     isInitialized = true;
 
     // Initialize package
@@ -972,14 +1456,14 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
     initEClass(taskContainerEClass, TaskContainer.class, "TaskContainer", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getTaskContainer_Tasks(), getTask(), getTask_TaskContainer(), "tasks", null, 0, -1,
+    initEReference(getTaskContainer_Tasks(), this.getTask(), this.getTask_TaskContainer(), "tasks", null, 0, -1,
         TaskContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(taskEClass, Task.class, "Task", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getTask_TaskContainer(), getTaskContainer(), getTaskContainer_Tasks(), "taskContainer", null, 0, 1,
-        Task.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getTask_TaskContainer(), this.getTaskContainer(), this.getTaskContainer_Tasks(), "taskContainer",
+        null, 0, 1, Task.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getTask_Description(), ecorePackage.getEString(), "description", null, 0, 1, Task.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getTask_Done(), ecorePackage.getEBoolean(), "done", null, 0, 1, Task.class, !IS_TRANSIENT,
@@ -1062,9 +1546,10 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
     initEAttribute(getPersistentContainment_AttrBefore(), ecorePackage.getEString(), "attrBefore", null, 0, 1,
         PersistentContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getPersistentContainment_Children(), getTransientContainer(), getTransientContainer_Parent(),
-        "children", null, 0, -1, PersistentContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+    initEReference(getPersistentContainment_Children(), this.getTransientContainer(), this
+        .getTransientContainer_Parent(), "children", null, 0, -1, PersistentContainment.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        !IS_ORDERED);
     initEAttribute(getPersistentContainment_AttrAfter(), ecorePackage.getEString(), "attrAfter", null, 0, 1,
         PersistentContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
@@ -1074,9 +1559,10 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
     initEAttribute(getTransientContainer_AttrBefore(), ecorePackage.getEString(), "attrBefore", null, 0, 1,
         TransientContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getTransientContainer_Parent(), getPersistentContainment(), getPersistentContainment_Children(),
-        "parent", null, 0, 1, TransientContainer.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getTransientContainer_Parent(), this.getPersistentContainment(), this
+        .getPersistentContainment_Children(), "parent", null, 0, 1, TransientContainer.class, IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
     initEAttribute(getTransientContainer_AttrAfter(), ecorePackage.getEString(), "attrAfter", null, 0, 1,
         TransientContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
@@ -1153,6 +1639,109 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
         "vat15", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
         !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
+    initEClass(mapHolderEClass, MapHolder.class, "MapHolder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getMapHolder_IntegerToStringMap(), this.getIntegerToStringMap(), null, "integerToStringMap", null,
+        0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMapHolder_StringToStringMap(), this.getStringToStringMap(), null, "stringToStringMap", null, 0,
+        -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMapHolder_StringToVATMap(), this.getStringToVATMap(), null, "stringToVATMap", null, 0, -1,
+        MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMapHolder_StringToAddressContainmentMap(), this.getStringToAddressContainmentMap(), null,
+        "stringToAddressContainmentMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMapHolder_StringToAddressReferenceMap(), this.getStringToAddressReferenceMap(), null,
+        "stringToAddressReferenceMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMapHolder_EObjectToEObjectMap(), this.getEObjectToEObjectMap(), null, "eObjectToEObjectMap",
+        null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMapHolder_EObjectToEObjectKeyContainedMap(), this.getEObjectToEObjectKeyContainedMap(), null,
+        "eObjectToEObjectKeyContainedMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMapHolder_EObjectToEObjectBothContainedMap(), this.getEObjectToEObjectBothContainedMap(), null,
+        "eObjectToEObjectBothContainedMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMapHolder_EObjectToEObjectValueContainedMap(), this.getEObjectToEObjectValueContainedMap(), null,
+        "eObjectToEObjectValueContainedMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(stringToStringMapEClass, Map.Entry.class, "StringToStringMap", !IS_ABSTRACT, !IS_INTERFACE,
+        !IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getStringToStringMap_Key(), ecorePackage.getEString(), "key", null, 0, 1, Map.Entry.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getStringToStringMap_Value(), ecorePackage.getEString(), "value", null, 0, 1, Map.Entry.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(integerToStringMapEClass, Map.Entry.class, "IntegerToStringMap", !IS_ABSTRACT, !IS_INTERFACE,
+        !IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getIntegerToStringMap_Key(), ecorePackage.getEIntegerObject(), "key", null, 0, 1, Map.Entry.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getIntegerToStringMap_Value(), ecorePackage.getEString(), "value", null, 0, 1, Map.Entry.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(stringToVATMapEClass, Map.Entry.class, "StringToVATMap", !IS_ABSTRACT, !IS_INTERFACE,
+        !IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getStringToVATMap_Key(), ecorePackage.getEString(), "key", null, 0, 1, Map.Entry.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getStringToVATMap_Value(), theModel1Package.getVAT(), "value", null, 0, 1, Map.Entry.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(stringToAddressContainmentMapEClass, Map.Entry.class, "StringToAddressContainmentMap", !IS_ABSTRACT,
+        !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getStringToAddressContainmentMap_Key(), ecorePackage.getEString(), "key", null, 0, 1,
+        Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
+    initEReference(getStringToAddressContainmentMap_Value(), theModel1Package.getAddress(), null, "value", null, 0, 1,
+        Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(stringToAddressReferenceMapEClass, Map.Entry.class, "StringToAddressReferenceMap", !IS_ABSTRACT,
+        !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getStringToAddressReferenceMap_Key(), ecorePackage.getEString(), "key", null, 0, 1, Map.Entry.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getStringToAddressReferenceMap_Value(), theModel1Package.getAddress(), null, "value", null, 0, 1,
+        Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(eObjectToEObjectMapEClass, Map.Entry.class, "EObjectToEObjectMap", !IS_ABSTRACT, !IS_INTERFACE,
+        !IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getEObjectToEObjectMap_Key(), ecorePackage.getEObject(), null, "key", null, 0, 1, Map.Entry.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEReference(getEObjectToEObjectMap_Value(), ecorePackage.getEObject(), null, "value", null, 0, 1,
+        Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(eObjectToEObjectKeyContainedMapEClass, Map.Entry.class, "EObjectToEObjectKeyContainedMap", !IS_ABSTRACT,
+        !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getEObjectToEObjectKeyContainedMap_Key(), ecorePackage.getEObject(), null, "key", null, 0, 1,
+        Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getEObjectToEObjectKeyContainedMap_Value(), ecorePackage.getEObject(), null, "value", null, 0, 1,
+        Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(eObjectToEObjectBothContainedMapEClass, Map.Entry.class, "EObjectToEObjectBothContainedMap",
+        !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getEObjectToEObjectBothContainedMap_Key(), ecorePackage.getEObject(), null, "key", null, 0, 1,
+        Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getEObjectToEObjectBothContainedMap_Value(), ecorePackage.getEObject(), null, "value", null, 0, 1,
+        Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(eObjectToEObjectValueContainedMapEClass, Map.Entry.class, "EObjectToEObjectValueContainedMap",
+        !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getEObjectToEObjectValueContainedMap_Key(), ecorePackage.getEObject(), null, "key", null, 0, 1,
+        Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getEObjectToEObjectValueContainedMap_Value(), ecorePackage.getEObject(), null, "value", null, 0, 1,
+        Map.Entry.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);
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/NotUnsettableImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/NotUnsettableImpl.java
index 9dfd8b3fb5..7a7d16efbf 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/NotUnsettableImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/NotUnsettableImpl.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  *
- * $Id: NotUnsettableImpl.java,v 1.1 2010-02-26 09:06:21 mfluegge Exp $
+ * $Id: NotUnsettableImpl.java,v 1.2 2010-03-11 20:35:00 mfluegge Exp $
  */
 package org.eclipse.emf.cdo.tests.legacy.model2.impl;
 
@@ -318,10 +318,8 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
     boolean oldNotUnsettableBoolean = notUnsettableBoolean;
     notUnsettableBoolean = newNotUnsettableBoolean;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_BOOLEAN,
           oldNotUnsettableBoolean, notUnsettableBoolean));
-    }
   }
 
   /**
@@ -344,10 +342,8 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
     byte oldNotUnsettableByte = notUnsettableByte;
     notUnsettableByte = newNotUnsettableByte;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_BYTE,
           oldNotUnsettableByte, notUnsettableByte));
-    }
   }
 
   /**
@@ -370,10 +366,8 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
     char oldNotUnsettableChar = notUnsettableChar;
     notUnsettableChar = newNotUnsettableChar;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_CHAR,
           oldNotUnsettableChar, notUnsettableChar));
-    }
   }
 
   /**
@@ -396,10 +390,8 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
     Date oldNotUnsettableDate = notUnsettableDate;
     notUnsettableDate = newNotUnsettableDate;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_DATE,
           oldNotUnsettableDate, notUnsettableDate));
-    }
   }
 
   /**
@@ -422,10 +414,8 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
     double oldNotUnsettableDouble = notUnsettableDouble;
     notUnsettableDouble = newNotUnsettableDouble;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_DOUBLE,
           oldNotUnsettableDouble, notUnsettableDouble));
-    }
   }
 
   /**
@@ -448,10 +438,8 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
     float oldNotUnsettableFloat = notUnsettableFloat;
     notUnsettableFloat = newNotUnsettableFloat;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_FLOAT,
           oldNotUnsettableFloat, notUnsettableFloat));
-    }
   }
 
   /**
@@ -474,10 +462,8 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
     int oldNotUnsettableInt = notUnsettableInt;
     notUnsettableInt = newNotUnsettableInt;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_INT,
           oldNotUnsettableInt, notUnsettableInt));
-    }
   }
 
   /**
@@ -500,10 +486,8 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
     long oldNotUnsettableLong = notUnsettableLong;
     notUnsettableLong = newNotUnsettableLong;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_LONG,
           oldNotUnsettableLong, notUnsettableLong));
-    }
   }
 
   /**
@@ -526,10 +510,8 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
     short oldNotUnsettableShort = notUnsettableShort;
     notUnsettableShort = newNotUnsettableShort;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_SHORT,
           oldNotUnsettableShort, notUnsettableShort));
-    }
   }
 
   /**
@@ -552,10 +534,8 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
     String oldNotUnsettableString = notUnsettableString;
     notUnsettableString = newNotUnsettableString;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_STRING,
           oldNotUnsettableString, notUnsettableString));
-    }
   }
 
   /**
@@ -578,10 +558,8 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
     VAT oldNotUnsettableVAT = notUnsettableVAT;
     notUnsettableVAT = newNotUnsettableVAT == null ? NOT_UNSETTABLE_VAT_EDEFAULT : newNotUnsettableVAT;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_VAT,
           oldNotUnsettableVAT, notUnsettableVAT));
-    }
   }
 
   /**
@@ -761,9 +739,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable
   public String toString()
   {
     if (eIsProxy())
-    {
       return super.toString();
-    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (notUnsettableBoolean: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/NotUnsettableWithDefaultImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/NotUnsettableWithDefaultImpl.java
index 3cdee8d4b9..cf1ebfa5f2 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/NotUnsettableWithDefaultImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/NotUnsettableWithDefaultImpl.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  *
- * $Id: NotUnsettableWithDefaultImpl.java,v 1.1 2010-02-26 09:06:21 mfluegge Exp $
+ * $Id: NotUnsettableWithDefaultImpl.java,v 1.2 2010-03-11 20:34:59 mfluegge Exp $
  */
 package org.eclipse.emf.cdo.tests.legacy.model2.impl;
 
@@ -322,11 +322,9 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
     boolean oldNotUnsettableBoolean = notUnsettableBoolean;
     notUnsettableBoolean = newNotUnsettableBoolean;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET,
           Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_BOOLEAN, oldNotUnsettableBoolean,
           notUnsettableBoolean));
-    }
   }
 
   /**
@@ -349,10 +347,8 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
     byte oldNotUnsettableByte = notUnsettableByte;
     notUnsettableByte = newNotUnsettableByte;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET,
           Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_BYTE, oldNotUnsettableByte, notUnsettableByte));
-    }
   }
 
   /**
@@ -375,10 +371,8 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
     char oldNotUnsettableChar = notUnsettableChar;
     notUnsettableChar = newNotUnsettableChar;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET,
           Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_CHAR, oldNotUnsettableChar, notUnsettableChar));
-    }
   }
 
   /**
@@ -401,10 +395,8 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
     Date oldNotUnsettableDate = notUnsettableDate;
     notUnsettableDate = newNotUnsettableDate;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET,
           Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_DATE, oldNotUnsettableDate, notUnsettableDate));
-    }
   }
 
   /**
@@ -427,10 +419,8 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
     double oldNotUnsettableDouble = notUnsettableDouble;
     notUnsettableDouble = newNotUnsettableDouble;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET,
           Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_DOUBLE, oldNotUnsettableDouble, notUnsettableDouble));
-    }
   }
 
   /**
@@ -453,10 +443,8 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
     float oldNotUnsettableFloat = notUnsettableFloat;
     notUnsettableFloat = newNotUnsettableFloat;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET,
           Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_FLOAT, oldNotUnsettableFloat, notUnsettableFloat));
-    }
   }
 
   /**
@@ -479,10 +467,8 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
     int oldNotUnsettableInt = notUnsettableInt;
     notUnsettableInt = newNotUnsettableInt;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET,
           Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_INT, oldNotUnsettableInt, notUnsettableInt));
-    }
   }
 
   /**
@@ -505,10 +491,8 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
     long oldNotUnsettableLong = notUnsettableLong;
     notUnsettableLong = newNotUnsettableLong;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET,
           Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_LONG, oldNotUnsettableLong, notUnsettableLong));
-    }
   }
 
   /**
@@ -531,10 +515,8 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
     short oldNotUnsettableShort = notUnsettableShort;
     notUnsettableShort = newNotUnsettableShort;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET,
           Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_SHORT, oldNotUnsettableShort, notUnsettableShort));
-    }
   }
 
   /**
@@ -557,10 +539,8 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
     String oldNotUnsettableString = notUnsettableString;
     notUnsettableString = newNotUnsettableString;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET,
           Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_STRING, oldNotUnsettableString, notUnsettableString));
-    }
   }
 
   /**
@@ -583,10 +563,8 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
     VAT oldNotUnsettableVAT = notUnsettableVAT;
     notUnsettableVAT = newNotUnsettableVAT == null ? NOT_UNSETTABLE_VAT_EDEFAULT : newNotUnsettableVAT;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET,
           Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_VAT, oldNotUnsettableVAT, notUnsettableVAT));
-    }
   }
 
   /**
@@ -766,9 +744,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse
   public String toString()
   {
     if (eIsProxy())
-    {
       return super.toString();
-    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (notUnsettableBoolean: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/PersistentContainmentImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/PersistentContainmentImpl.java
index 287e04a9d6..0757f7f263 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/PersistentContainmentImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/PersistentContainmentImpl.java
@@ -134,10 +134,8 @@ public class PersistentContainmentImpl extends EObjectImpl implements Persistent
     String oldAttrBefore = attrBefore;
     attrBefore = newAttrBefore;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.PERSISTENT_CONTAINMENT__ATTR_BEFORE,
           oldAttrBefore, attrBefore));
-    }
   }
 
   /**
@@ -175,10 +173,8 @@ public class PersistentContainmentImpl extends EObjectImpl implements Persistent
     String oldAttrAfter = attrAfter;
     attrAfter = newAttrAfter;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.PERSISTENT_CONTAINMENT__ATTR_AFTER,
           oldAttrAfter, attrAfter));
-    }
   }
 
   /**
@@ -311,9 +307,7 @@ public class PersistentContainmentImpl extends EObjectImpl implements Persistent
   public String toString()
   {
     if (eIsProxy())
-    {
       return super.toString();
-    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (attrBefore: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/SpecialPurchaseOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/SpecialPurchaseOrderImpl.java
index dc465615f5..9d1b910200 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/SpecialPurchaseOrderImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/SpecialPurchaseOrderImpl.java
@@ -109,10 +109,8 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci
     String oldDiscountCode = discountCode;
     discountCode = newDiscountCode;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.SPECIAL_PURCHASE_ORDER__DISCOUNT_CODE,
           oldDiscountCode, discountCode));
-    }
   }
 
   /**
@@ -139,13 +137,9 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci
       ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
           Model2Package.SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS, oldShippingAddress, newShippingAddress);
       if (msgs == null)
-      {
         msgs = notification;
-      }
       else
-      {
         msgs.add(notification);
-      }
     }
     return msgs;
   }
@@ -161,26 +155,18 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci
     {
       NotificationChain msgs = null;
       if (shippingAddress != null)
-      {
         msgs = ((InternalEObject)shippingAddress).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
             - Model2Package.SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS, null, msgs);
-      }
       if (newShippingAddress != null)
-      {
         msgs = ((InternalEObject)newShippingAddress).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
             - Model2Package.SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS, null, msgs);
-      }
       msgs = basicSetShippingAddress(newShippingAddress, msgs);
       if (msgs != null)
-      {
         msgs.dispatch();
-      }
     }
     else if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS,
           newShippingAddress, newShippingAddress));
-    }
   }
 
   /**
@@ -284,9 +270,7 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci
   public String toString()
   {
     if (eIsProxy())
-    {
       return super.toString();
-    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (discountCode: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/StringToAddressContainmentMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/StringToAddressContainmentMapImpl.java
new file mode 100644
index 0000000000..8fea775c9a
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/StringToAddressContainmentMapImpl.java
@@ -0,0 +1,371 @@
+/**
+ * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ *
+ * $Id: StringToAddressContainmentMapImpl.java,v 1.1 2010-03-11 20:35:04 mfluegge Exp $
+ */
+package org.eclipse.emf.cdo.tests.legacy.model2.impl;
+
+import org.eclipse.emf.cdo.tests.legacy.model2.Model2Package;
+import org.eclipse.emf.cdo.tests.model1.Address;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.BasicEMap;
+import org.eclipse.emf.common.util.EMap;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>String To Address Containment Map</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.StringToAddressContainmentMapImpl#getTypedKey <em>Key</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.StringToAddressContainmentMapImpl#getTypedValue <em>Value
+ * </em>}</li>
+ * </ul>
+ * </p>
+ * 
+ * @generated
+ */
+public class StringToAddressContainmentMapImpl extends EObjectImpl implements BasicEMap.Entry<String, Address>
+{
+  /**
+   * The default value of the '{@link #getTypedKey() <em>Key</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+   * -->
+   * 
+   * @see #getTypedKey()
+   * @generated
+   * @ordered
+   */
+  protected static final String KEY_EDEFAULT = null;
+
+  /**
+   * The cached value of the '{@link #getTypedKey() <em>Key</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+   * -->
+   * 
+   * @see #getTypedKey()
+   * @generated
+   * @ordered
+   */
+  protected String key = KEY_EDEFAULT;
+
+  /**
+   * The cached value of the '{@link #getTypedValue() <em>Value</em>}' containment reference. <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * 
+   * @see #getTypedValue()
+   * @generated
+   * @ordered
+   */
+  protected Address value;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected StringToAddressContainmentMapImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Model2Package.Literals.STRING_TO_ADDRESS_CONTAINMENT_MAP;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String getTypedKey()
+  {
+    return key;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setTypedKey(String newKey)
+  {
+    String oldKey = key;
+    key = newKey;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP__KEY,
+          oldKey, key));
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Address getTypedValue()
+  {
+    return value;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public NotificationChain basicSetTypedValue(Address newValue, NotificationChain msgs)
+  {
+    Address oldValue = value;
+    value = newValue;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+          Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP__VALUE, oldValue, newValue);
+      if (msgs == null)
+        msgs = notification;
+      else
+        msgs.add(notification);
+    }
+    return msgs;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setTypedValue(Address newValue)
+  {
+    if (newValue != value)
+    {
+      NotificationChain msgs = null;
+      if (value != null)
+        msgs = ((InternalEObject)value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+            - Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP__VALUE, null, msgs);
+      if (newValue != null)
+        msgs = ((InternalEObject)newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+            - Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP__VALUE, null, msgs);
+      msgs = basicSetTypedValue(newValue, msgs);
+      if (msgs != null)
+        msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP__VALUE,
+          newValue, newValue));
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+    case Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP__VALUE:
+      return basicSetTypedValue(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 Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP__KEY:
+      return getTypedKey();
+    case Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP__VALUE:
+      return getTypedValue();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+    case Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP__KEY:
+      setTypedKey((String)newValue);
+      return;
+    case Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP__VALUE:
+      setTypedValue((Address)newValue);
+      return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+    case Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP__KEY:
+      setTypedKey(KEY_EDEFAULT);
+      return;
+    case Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP__VALUE:
+      setTypedValue((Address)null);
+      return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+    case Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP__KEY:
+      return KEY_EDEFAULT == null ? key != null : !KEY_EDEFAULT.equals(key);
+    case Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP__VALUE:
+      return value != null;
+    }
+    return super.eIsSet(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    if (eIsProxy())
+      return super.toString();
+
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (key: ");
+    result.append(key);
+    result.append(')');
+    return result.toString();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected int hash = -1;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public int getHash()
+  {
+    if (hash == -1)
+    {
+      Object theKey = getKey();
+      hash = (theKey == null ? 0 : theKey.hashCode());
+    }
+    return hash;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setHash(int hash)
+  {
+    this.hash = hash;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String getKey()
+  {
+    return getTypedKey();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setKey(String key)
+  {
+    setTypedKey(key);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Address getValue()
+  {
+    return getTypedValue();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Address setValue(Address value)
+  {
+    Address oldValue = getValue();
+    setTypedValue(value);
+    return oldValue;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  public EMap<String, Address> getEMap()
+  {
+    EObject container = eContainer();
+    return container == null ? null : (EMap<String, Address>)container.eGet(eContainmentFeature());
+  }
+
+} // StringToAddressContainmentMapImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/StringToAddressReferenceMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/StringToAddressReferenceMapImpl.java
new file mode 100644
index 0000000000..31ba5183e1
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/StringToAddressReferenceMapImpl.java
@@ -0,0 +1,345 @@
+/**
+ * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ *
+ * $Id: StringToAddressReferenceMapImpl.java,v 1.1 2010-03-11 20:35:02 mfluegge Exp $
+ */
+package org.eclipse.emf.cdo.tests.legacy.model2.impl;
+
+import org.eclipse.emf.cdo.tests.legacy.model2.Model2Package;
+import org.eclipse.emf.cdo.tests.model1.Address;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.BasicEMap;
+import org.eclipse.emf.common.util.EMap;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>String To Address Reference Map</b></em>'. <!--
+ * end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.StringToAddressReferenceMapImpl#getTypedKey <em>Key</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.StringToAddressReferenceMapImpl#getTypedValue <em>Value</em>}
+ * </li>
+ * </ul>
+ * </p>
+ * 
+ * @generated
+ */
+public class StringToAddressReferenceMapImpl extends EObjectImpl implements BasicEMap.Entry<String, Address>
+{
+  /**
+   * The default value of the '{@link #getTypedKey() <em>Key</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+   * -->
+   * 
+   * @see #getTypedKey()
+   * @generated
+   * @ordered
+   */
+  protected static final String KEY_EDEFAULT = null;
+
+  /**
+   * The cached value of the '{@link #getTypedKey() <em>Key</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+   * -->
+   * 
+   * @see #getTypedKey()
+   * @generated
+   * @ordered
+   */
+  protected String key = KEY_EDEFAULT;
+
+  /**
+   * The cached value of the '{@link #getTypedValue() <em>Value</em>}' reference. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @see #getTypedValue()
+   * @generated
+   * @ordered
+   */
+  protected Address value;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected StringToAddressReferenceMapImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Model2Package.Literals.STRING_TO_ADDRESS_REFERENCE_MAP;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String getTypedKey()
+  {
+    return key;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setTypedKey(String newKey)
+  {
+    String oldKey = key;
+    key = newKey;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.STRING_TO_ADDRESS_REFERENCE_MAP__KEY, oldKey,
+          key));
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Address getTypedValue()
+  {
+    if (value != null && value.eIsProxy())
+    {
+      InternalEObject oldValue = (InternalEObject)value;
+      value = (Address)eResolveProxy(oldValue);
+      if (value != oldValue)
+      {
+        if (eNotificationRequired())
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+              Model2Package.STRING_TO_ADDRESS_REFERENCE_MAP__VALUE, oldValue, value));
+      }
+    }
+    return value;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Address basicGetTypedValue()
+  {
+    return value;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setTypedValue(Address newValue)
+  {
+    Address oldValue = value;
+    value = newValue;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.STRING_TO_ADDRESS_REFERENCE_MAP__VALUE,
+          oldValue, value));
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+    case Model2Package.STRING_TO_ADDRESS_REFERENCE_MAP__KEY:
+      return getTypedKey();
+    case Model2Package.STRING_TO_ADDRESS_REFERENCE_MAP__VALUE:
+      if (resolve)
+        return getTypedValue();
+      return basicGetTypedValue();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+    case Model2Package.STRING_TO_ADDRESS_REFERENCE_MAP__KEY:
+      setTypedKey((String)newValue);
+      return;
+    case Model2Package.STRING_TO_ADDRESS_REFERENCE_MAP__VALUE:
+      setTypedValue((Address)newValue);
+      return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+    case Model2Package.STRING_TO_ADDRESS_REFERENCE_MAP__KEY:
+      setTypedKey(KEY_EDEFAULT);
+      return;
+    case Model2Package.STRING_TO_ADDRESS_REFERENCE_MAP__VALUE:
+      setTypedValue((Address)null);
+      return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+    case Model2Package.STRING_TO_ADDRESS_REFERENCE_MAP__KEY:
+      return KEY_EDEFAULT == null ? key != null : !KEY_EDEFAULT.equals(key);
+    case Model2Package.STRING_TO_ADDRESS_REFERENCE_MAP__VALUE:
+      return value != null;
+    }
+    return super.eIsSet(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    if (eIsProxy())
+      return super.toString();
+
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (key: ");
+    result.append(key);
+    result.append(')');
+    return result.toString();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected int hash = -1;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public int getHash()
+  {
+    if (hash == -1)
+    {
+      Object theKey = getKey();
+      hash = (theKey == null ? 0 : theKey.hashCode());
+    }
+    return hash;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setHash(int hash)
+  {
+    this.hash = hash;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String getKey()
+  {
+    return getTypedKey();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setKey(String key)
+  {
+    setTypedKey(key);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Address getValue()
+  {
+    return getTypedValue();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Address setValue(Address value)
+  {
+    Address oldValue = getValue();
+    setTypedValue(value);
+    return oldValue;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  public EMap<String, Address> getEMap()
+  {
+    EObject container = eContainer();
+    return container == null ? null : (EMap<String, Address>)container.eGet(eContainmentFeature());
+  }
+
+} // StringToAddressReferenceMapImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/StringToStringMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/StringToStringMapImpl.java
new file mode 100644
index 0000000000..1aee176a08
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/StringToStringMapImpl.java
@@ -0,0 +1,329 @@
+/**
+ * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ *
+ * $Id: StringToStringMapImpl.java,v 1.1 2010-03-11 20:34:58 mfluegge Exp $
+ */
+package org.eclipse.emf.cdo.tests.legacy.model2.impl;
+
+import org.eclipse.emf.cdo.tests.legacy.model2.Model2Package;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.BasicEMap;
+import org.eclipse.emf.common.util.EMap;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>String To String Map</b></em>'. <!--
+ * end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.StringToStringMapImpl#getTypedKey <em>Key</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.StringToStringMapImpl#getTypedValue <em>Value</em>}</li>
+ * </ul>
+ * </p>
+ * 
+ * @generated
+ */
+public class StringToStringMapImpl extends EObjectImpl implements BasicEMap.Entry<String, String>
+{
+  /**
+   * The default value of the '{@link #getTypedKey() <em>Key</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+   * -->
+   * 
+   * @see #getTypedKey()
+   * @generated
+   * @ordered
+   */
+  protected static final String KEY_EDEFAULT = null;
+
+  /**
+   * The cached value of the '{@link #getTypedKey() <em>Key</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+   * -->
+   * 
+   * @see #getTypedKey()
+   * @generated
+   * @ordered
+   */
+  protected String key = KEY_EDEFAULT;
+
+  /**
+   * The default value of the '{@link #getTypedValue() <em>Value</em>}' attribute. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @see #getTypedValue()
+   * @generated
+   * @ordered
+   */
+  protected static final String VALUE_EDEFAULT = null;
+
+  /**
+   * The cached value of the '{@link #getTypedValue() <em>Value</em>}' attribute. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @see #getTypedValue()
+   * @generated
+   * @ordered
+   */
+  protected String value = VALUE_EDEFAULT;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected StringToStringMapImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Model2Package.Literals.STRING_TO_STRING_MAP;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String getTypedKey()
+  {
+    return key;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setTypedKey(String newKey)
+  {
+    String oldKey = key;
+    key = newKey;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.STRING_TO_STRING_MAP__KEY, oldKey, key));
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String getTypedValue()
+  {
+    return value;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setTypedValue(String newValue)
+  {
+    String oldValue = value;
+    value = newValue;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.STRING_TO_STRING_MAP__VALUE, oldValue, value));
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+    case Model2Package.STRING_TO_STRING_MAP__KEY:
+      return getTypedKey();
+    case Model2Package.STRING_TO_STRING_MAP__VALUE:
+      return getTypedValue();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+    case Model2Package.STRING_TO_STRING_MAP__KEY:
+      setTypedKey((String)newValue);
+      return;
+    case Model2Package.STRING_TO_STRING_MAP__VALUE:
+      setTypedValue((String)newValue);
+      return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+    case Model2Package.STRING_TO_STRING_MAP__KEY:
+      setTypedKey(KEY_EDEFAULT);
+      return;
+    case Model2Package.STRING_TO_STRING_MAP__VALUE:
+      setTypedValue(VALUE_EDEFAULT);
+      return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+    case Model2Package.STRING_TO_STRING_MAP__KEY:
+      return KEY_EDEFAULT == null ? key != null : !KEY_EDEFAULT.equals(key);
+    case Model2Package.STRING_TO_STRING_MAP__VALUE:
+      return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
+    }
+    return super.eIsSet(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    if (eIsProxy())
+      return super.toString();
+
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (key: ");
+    result.append(key);
+    result.append(", value: ");
+    result.append(value);
+    result.append(')');
+    return result.toString();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected int hash = -1;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public int getHash()
+  {
+    if (hash == -1)
+    {
+      Object theKey = getKey();
+      hash = (theKey == null ? 0 : theKey.hashCode());
+    }
+    return hash;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setHash(int hash)
+  {
+    this.hash = hash;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String getKey()
+  {
+    return getTypedKey();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setKey(String key)
+  {
+    setTypedKey(key);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String getValue()
+  {
+    return getTypedValue();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String setValue(String value)
+  {
+    String oldValue = getValue();
+    setTypedValue(value);
+    return oldValue;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  public EMap<String, String> getEMap()
+  {
+    EObject container = eContainer();
+    return container == null ? null : (EMap<String, String>)container.eGet(eContainmentFeature());
+  }
+
+} // StringToStringMapImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/StringToVATMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/StringToVATMapImpl.java
new file mode 100644
index 0000000000..d613362671
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/StringToVATMapImpl.java
@@ -0,0 +1,330 @@
+/**
+ * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ *
+ * $Id: StringToVATMapImpl.java,v 1.1 2010-03-11 20:35:05 mfluegge Exp $
+ */
+package org.eclipse.emf.cdo.tests.legacy.model2.impl;
+
+import org.eclipse.emf.cdo.tests.legacy.model2.Model2Package;
+import org.eclipse.emf.cdo.tests.model1.VAT;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.BasicEMap;
+import org.eclipse.emf.common.util.EMap;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>String To VAT Map</b></em>'. <!-- end-user-doc
+ * -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.StringToVATMapImpl#getTypedKey <em>Key</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.StringToVATMapImpl#getTypedValue <em>Value</em>}</li>
+ * </ul>
+ * </p>
+ * 
+ * @generated
+ */
+public class StringToVATMapImpl extends EObjectImpl implements BasicEMap.Entry<String, VAT>
+{
+  /**
+   * The default value of the '{@link #getTypedKey() <em>Key</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+   * -->
+   * 
+   * @see #getTypedKey()
+   * @generated
+   * @ordered
+   */
+  protected static final String KEY_EDEFAULT = null;
+
+  /**
+   * The cached value of the '{@link #getTypedKey() <em>Key</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+   * -->
+   * 
+   * @see #getTypedKey()
+   * @generated
+   * @ordered
+   */
+  protected String key = KEY_EDEFAULT;
+
+  /**
+   * The default value of the '{@link #getTypedValue() <em>Value</em>}' attribute. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @see #getTypedValue()
+   * @generated
+   * @ordered
+   */
+  protected static final VAT VALUE_EDEFAULT = VAT.VAT0;
+
+  /**
+   * The cached value of the '{@link #getTypedValue() <em>Value</em>}' attribute. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @see #getTypedValue()
+   * @generated
+   * @ordered
+   */
+  protected VAT value = VALUE_EDEFAULT;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected StringToVATMapImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Model2Package.Literals.STRING_TO_VAT_MAP;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String getTypedKey()
+  {
+    return key;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setTypedKey(String newKey)
+  {
+    String oldKey = key;
+    key = newKey;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.STRING_TO_VAT_MAP__KEY, oldKey, key));
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public VAT getTypedValue()
+  {
+    return value;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setTypedValue(VAT newValue)
+  {
+    VAT oldValue = value;
+    value = newValue == null ? VALUE_EDEFAULT : newValue;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.STRING_TO_VAT_MAP__VALUE, oldValue, value));
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+    case Model2Package.STRING_TO_VAT_MAP__KEY:
+      return getTypedKey();
+    case Model2Package.STRING_TO_VAT_MAP__VALUE:
+      return getTypedValue();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+    case Model2Package.STRING_TO_VAT_MAP__KEY:
+      setTypedKey((String)newValue);
+      return;
+    case Model2Package.STRING_TO_VAT_MAP__VALUE:
+      setTypedValue((VAT)newValue);
+      return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+    case Model2Package.STRING_TO_VAT_MAP__KEY:
+      setTypedKey(KEY_EDEFAULT);
+      return;
+    case Model2Package.STRING_TO_VAT_MAP__VALUE:
+      setTypedValue(VALUE_EDEFAULT);
+      return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+    case Model2Package.STRING_TO_VAT_MAP__KEY:
+      return KEY_EDEFAULT == null ? key != null : !KEY_EDEFAULT.equals(key);
+    case Model2Package.STRING_TO_VAT_MAP__VALUE:
+      return value != VALUE_EDEFAULT;
+    }
+    return super.eIsSet(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    if (eIsProxy())
+      return super.toString();
+
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (key: ");
+    result.append(key);
+    result.append(", value: ");
+    result.append(value);
+    result.append(')');
+    return result.toString();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected int hash = -1;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public int getHash()
+  {
+    if (hash == -1)
+    {
+      Object theKey = getKey();
+      hash = (theKey == null ? 0 : theKey.hashCode());
+    }
+    return hash;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setHash(int hash)
+  {
+    this.hash = hash;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String getKey()
+  {
+    return getTypedKey();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setKey(String key)
+  {
+    setTypedKey(key);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public VAT getValue()
+  {
+    return getTypedValue();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public VAT setValue(VAT value)
+  {
+    VAT oldValue = getValue();
+    setTypedValue(value);
+    return oldValue;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  public EMap<String, VAT> getEMap()
+  {
+    EObject container = eContainer();
+    return container == null ? null : (EMap<String, VAT>)container.eGet(eContainmentFeature());
+  }
+
+} // StringToVATMapImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/TaskImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/TaskImpl.java
index a2d7942935..a1ce01f1c1 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/TaskImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/TaskImpl.java
@@ -104,9 +104,7 @@ public class TaskImpl extends EObjectImpl implements Task
   public TaskContainer getTaskContainer()
   {
     if (eContainerFeatureID() != Model2Package.TASK__TASK_CONTAINER)
-    {
       return null;
-    }
     return (TaskContainer)eContainer();
   }
 
@@ -128,34 +126,24 @@ public class TaskImpl extends EObjectImpl implements Task
    */
   public void setTaskContainer(TaskContainer newTaskContainer)
   {
-    if (newTaskContainer != eInternalContainer() || eContainerFeatureID() != Model2Package.TASK__TASK_CONTAINER
-        && newTaskContainer != null)
+    if (newTaskContainer != eInternalContainer()
+        || (eContainerFeatureID() != Model2Package.TASK__TASK_CONTAINER && newTaskContainer != null))
     {
       if (EcoreUtil.isAncestor(this, newTaskContainer))
-      {
         throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-      }
       NotificationChain msgs = null;
       if (eInternalContainer() != null)
-      {
         msgs = eBasicRemoveFromContainer(msgs);
-      }
       if (newTaskContainer != null)
-      {
         msgs = ((InternalEObject)newTaskContainer).eInverseAdd(this, Model2Package.TASK_CONTAINER__TASKS,
             TaskContainer.class, msgs);
-      }
       msgs = basicSetTaskContainer(newTaskContainer, msgs);
       if (msgs != null)
-      {
         msgs.dispatch();
-      }
     }
     else if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.TASK__TASK_CONTAINER, newTaskContainer,
           newTaskContainer));
-    }
   }
 
   /**
@@ -178,10 +166,8 @@ public class TaskImpl extends EObjectImpl implements Task
     String oldDescription = description;
     description = newDescription;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.TASK__DESCRIPTION, oldDescription,
           description));
-    }
   }
 
   /**
@@ -204,9 +190,7 @@ public class TaskImpl extends EObjectImpl implements Task
     boolean oldDone = done;
     done = newDone;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.TASK__DONE, oldDone, done));
-    }
   }
 
   /**
@@ -221,9 +205,7 @@ public class TaskImpl extends EObjectImpl implements Task
     {
     case Model2Package.TASK__TASK_CONTAINER:
       if (eInternalContainer() != null)
-      {
         msgs = eBasicRemoveFromContainer(msgs);
-      }
       return basicSetTaskContainer((TaskContainer)otherEnd, msgs);
     }
     return super.eInverseAdd(otherEnd, featureID, msgs);
@@ -356,9 +338,7 @@ public class TaskImpl extends EObjectImpl implements Task
   public String toString()
   {
     if (eIsProxy())
-    {
       return super.toString();
-    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (description: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/TransientContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/TransientContainerImpl.java
index 6c74a01b5a..2ad3c528fc 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/TransientContainerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/TransientContainerImpl.java
@@ -119,10 +119,8 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont
     String oldAttrBefore = attrBefore;
     attrBefore = newAttrBefore;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.TRANSIENT_CONTAINER__ATTR_BEFORE,
           oldAttrBefore, attrBefore));
-    }
   }
 
   /**
@@ -133,9 +131,7 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont
   public PersistentContainment getParent()
   {
     if (eContainerFeatureID() != Model2Package.TRANSIENT_CONTAINER__PARENT)
-    {
       return null;
-    }
     return (PersistentContainment)eContainer();
   }
 
@@ -157,34 +153,24 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont
    */
   public void setParent(PersistentContainment newParent)
   {
-    if (newParent != eInternalContainer() || eContainerFeatureID() != Model2Package.TRANSIENT_CONTAINER__PARENT
-        && newParent != null)
+    if (newParent != eInternalContainer()
+        || (eContainerFeatureID() != Model2Package.TRANSIENT_CONTAINER__PARENT && newParent != null))
     {
       if (EcoreUtil.isAncestor(this, newParent))
-      {
         throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-      }
       NotificationChain msgs = null;
       if (eInternalContainer() != null)
-      {
         msgs = eBasicRemoveFromContainer(msgs);
-      }
       if (newParent != null)
-      {
         msgs = ((InternalEObject)newParent).eInverseAdd(this, Model2Package.PERSISTENT_CONTAINMENT__CHILDREN,
             PersistentContainment.class, msgs);
-      }
       msgs = basicSetParent(newParent, msgs);
       if (msgs != null)
-      {
         msgs.dispatch();
-      }
     }
     else if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.TRANSIENT_CONTAINER__PARENT, newParent,
           newParent));
-    }
   }
 
   /**
@@ -207,10 +193,8 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont
     String oldAttrAfter = attrAfter;
     attrAfter = newAttrAfter;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.TRANSIENT_CONTAINER__ATTR_AFTER,
           oldAttrAfter, attrAfter));
-    }
   }
 
   /**
@@ -225,9 +209,7 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont
     {
     case Model2Package.TRANSIENT_CONTAINER__PARENT:
       if (eInternalContainer() != null)
-      {
         msgs = eBasicRemoveFromContainer(msgs);
-      }
       return basicSetParent((PersistentContainment)otherEnd, msgs);
     }
     return super.eInverseAdd(otherEnd, featureID, msgs);
@@ -361,9 +343,7 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont
   public String toString()
   {
     if (eIsProxy())
-    {
       return super.toString();
-    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (attrBefore: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Unsettable1Impl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Unsettable1Impl.java
index 6f6df83448..a8d0383ddc 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Unsettable1Impl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Unsettable1Impl.java
@@ -400,10 +400,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     boolean oldUnsettableBooleanESet = unsettableBooleanESet;
     unsettableBooleanESet = true;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_BOOLEAN,
           oldUnsettableBoolean, unsettableBoolean, !oldUnsettableBooleanESet));
-    }
   }
 
   /**
@@ -418,10 +416,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableBoolean = UNSETTABLE_BOOLEAN_EDEFAULT;
     unsettableBooleanESet = false;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_BOOLEAN,
           oldUnsettableBoolean, UNSETTABLE_BOOLEAN_EDEFAULT, oldUnsettableBooleanESet));
-    }
   }
 
   /**
@@ -456,10 +452,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     boolean oldUnsettableByteESet = unsettableByteESet;
     unsettableByteESet = true;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_BYTE,
           oldUnsettableByte, unsettableByte, !oldUnsettableByteESet));
-    }
   }
 
   /**
@@ -474,10 +468,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableByte = UNSETTABLE_BYTE_EDEFAULT;
     unsettableByteESet = false;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_BYTE,
           oldUnsettableByte, UNSETTABLE_BYTE_EDEFAULT, oldUnsettableByteESet));
-    }
   }
 
   /**
@@ -512,10 +504,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     boolean oldUnsettableCharESet = unsettableCharESet;
     unsettableCharESet = true;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_CHAR,
           oldUnsettableChar, unsettableChar, !oldUnsettableCharESet));
-    }
   }
 
   /**
@@ -530,10 +520,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableChar = UNSETTABLE_CHAR_EDEFAULT;
     unsettableCharESet = false;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_CHAR,
           oldUnsettableChar, UNSETTABLE_CHAR_EDEFAULT, oldUnsettableCharESet));
-    }
   }
 
   /**
@@ -568,10 +556,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     boolean oldUnsettableDateESet = unsettableDateESet;
     unsettableDateESet = true;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_DATE,
           oldUnsettableDate, unsettableDate, !oldUnsettableDateESet));
-    }
   }
 
   /**
@@ -586,10 +572,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableDate = UNSETTABLE_DATE_EDEFAULT;
     unsettableDateESet = false;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_DATE,
           oldUnsettableDate, UNSETTABLE_DATE_EDEFAULT, oldUnsettableDateESet));
-    }
   }
 
   /**
@@ -624,10 +608,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     boolean oldUnsettableDoubleESet = unsettableDoubleESet;
     unsettableDoubleESet = true;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_DOUBLE,
           oldUnsettableDouble, unsettableDouble, !oldUnsettableDoubleESet));
-    }
   }
 
   /**
@@ -642,10 +624,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableDouble = UNSETTABLE_DOUBLE_EDEFAULT;
     unsettableDoubleESet = false;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_DOUBLE,
           oldUnsettableDouble, UNSETTABLE_DOUBLE_EDEFAULT, oldUnsettableDoubleESet));
-    }
   }
 
   /**
@@ -680,10 +660,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     boolean oldUnsettableFloatESet = unsettableFloatESet;
     unsettableFloatESet = true;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_FLOAT,
           oldUnsettableFloat, unsettableFloat, !oldUnsettableFloatESet));
-    }
   }
 
   /**
@@ -698,10 +676,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableFloat = UNSETTABLE_FLOAT_EDEFAULT;
     unsettableFloatESet = false;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_FLOAT,
           oldUnsettableFloat, UNSETTABLE_FLOAT_EDEFAULT, oldUnsettableFloatESet));
-    }
   }
 
   /**
@@ -736,10 +712,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     boolean oldUnsettableIntESet = unsettableIntESet;
     unsettableIntESet = true;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_INT,
           oldUnsettableInt, unsettableInt, !oldUnsettableIntESet));
-    }
   }
 
   /**
@@ -754,10 +728,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableInt = UNSETTABLE_INT_EDEFAULT;
     unsettableIntESet = false;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_INT,
           oldUnsettableInt, UNSETTABLE_INT_EDEFAULT, oldUnsettableIntESet));
-    }
   }
 
   /**
@@ -792,10 +764,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     boolean oldUnsettableLongESet = unsettableLongESet;
     unsettableLongESet = true;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_LONG,
           oldUnsettableLong, unsettableLong, !oldUnsettableLongESet));
-    }
   }
 
   /**
@@ -810,10 +780,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableLong = UNSETTABLE_LONG_EDEFAULT;
     unsettableLongESet = false;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_LONG,
           oldUnsettableLong, UNSETTABLE_LONG_EDEFAULT, oldUnsettableLongESet));
-    }
   }
 
   /**
@@ -848,10 +816,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     boolean oldUnsettableShortESet = unsettableShortESet;
     unsettableShortESet = true;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_SHORT,
           oldUnsettableShort, unsettableShort, !oldUnsettableShortESet));
-    }
   }
 
   /**
@@ -866,10 +832,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableShort = UNSETTABLE_SHORT_EDEFAULT;
     unsettableShortESet = false;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_SHORT,
           oldUnsettableShort, UNSETTABLE_SHORT_EDEFAULT, oldUnsettableShortESet));
-    }
   }
 
   /**
@@ -904,10 +868,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     boolean oldUnsettableStringESet = unsettableStringESet;
     unsettableStringESet = true;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_STRING,
           oldUnsettableString, unsettableString, !oldUnsettableStringESet));
-    }
   }
 
   /**
@@ -922,10 +884,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableString = UNSETTABLE_STRING_EDEFAULT;
     unsettableStringESet = false;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_STRING,
           oldUnsettableString, UNSETTABLE_STRING_EDEFAULT, oldUnsettableStringESet));
-    }
   }
 
   /**
@@ -960,10 +920,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     boolean oldUnsettableVATESet = unsettableVATESet;
     unsettableVATESet = true;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_VAT,
           oldUnsettableVAT, unsettableVAT, !oldUnsettableVATESet));
-    }
   }
 
   /**
@@ -978,10 +936,8 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
     unsettableVAT = UNSETTABLE_VAT_EDEFAULT;
     unsettableVATESet = false;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_VAT,
           oldUnsettableVAT, UNSETTABLE_VAT_EDEFAULT, oldUnsettableVATESet));
-    }
   }
 
   /**
@@ -1169,110 +1125,64 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1
   public String toString()
   {
     if (eIsProxy())
-    {
       return super.toString();
-    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (unsettableBoolean: ");
     if (unsettableBooleanESet)
-    {
       result.append(unsettableBoolean);
-    }
     else
-    {
       result.append("<unset>");
-    }
     result.append(", unsettableByte: ");
     if (unsettableByteESet)
-    {
       result.append(unsettableByte);
-    }
     else
-    {
       result.append("<unset>");
-    }
     result.append(", unsettableChar: ");
     if (unsettableCharESet)
-    {
       result.append(unsettableChar);
-    }
     else
-    {
       result.append("<unset>");
-    }
     result.append(", unsettableDate: ");
     if (unsettableDateESet)
-    {
       result.append(unsettableDate);
-    }
     else
-    {
       result.append("<unset>");
-    }
     result.append(", unsettableDouble: ");
     if (unsettableDoubleESet)
-    {
       result.append(unsettableDouble);
-    }
     else
-    {
       result.append("<unset>");
-    }
     result.append(", unsettableFloat: ");
     if (unsettableFloatESet)
-    {
       result.append(unsettableFloat);
-    }
     else
-    {
       result.append("<unset>");
-    }
     result.append(", unsettableInt: ");
     if (unsettableIntESet)
-    {
       result.append(unsettableInt);
-    }
     else
-    {
       result.append("<unset>");
-    }
     result.append(", unsettableLong: ");
     if (unsettableLongESet)
-    {
       result.append(unsettableLong);
-    }
     else
-    {
       result.append("<unset>");
-    }
     result.append(", unsettableShort: ");
     if (unsettableShortESet)
-    {
       result.append(unsettableShort);
-    }
     else
-    {
       result.append("<unset>");
-    }
     result.append(", unsettableString: ");
     if (unsettableStringESet)
-    {
       result.append(unsettableString);
-    }
     else
-    {
       result.append("<unset>");
-    }
     result.append(", unsettableVAT: ");
     if (unsettableVATESet)
-    {
       result.append(unsettableVAT);
-    }
     else
-    {
       result.append("<unset>");
-    }
     result.append(')');
     return result.toString();
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Unsettable2WithDefaultImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Unsettable2WithDefaultImpl.java
index 85e52ba335..55951db5af 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Unsettable2WithDefaultImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Unsettable2WithDefaultImpl.java
@@ -410,10 +410,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     boolean oldUnsettableBooleanESet = unsettableBooleanESet;
     unsettableBooleanESet = true;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BOOLEAN,
           oldUnsettableBoolean, unsettableBoolean, !oldUnsettableBooleanESet));
-    }
   }
 
   /**
@@ -428,11 +426,9 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableBoolean = UNSETTABLE_BOOLEAN_EDEFAULT;
     unsettableBooleanESet = false;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.UNSET,
           Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BOOLEAN, oldUnsettableBoolean,
           UNSETTABLE_BOOLEAN_EDEFAULT, oldUnsettableBooleanESet));
-    }
   }
 
   /**
@@ -467,10 +463,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     boolean oldUnsettableByteESet = unsettableByteESet;
     unsettableByteESet = true;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BYTE,
           oldUnsettableByte, unsettableByte, !oldUnsettableByteESet));
-    }
   }
 
   /**
@@ -485,10 +479,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableByte = UNSETTABLE_BYTE_EDEFAULT;
     unsettableByteESet = false;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BYTE,
           oldUnsettableByte, UNSETTABLE_BYTE_EDEFAULT, oldUnsettableByteESet));
-    }
   }
 
   /**
@@ -523,10 +515,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     boolean oldUnsettableCharESet = unsettableCharESet;
     unsettableCharESet = true;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_CHAR,
           oldUnsettableChar, unsettableChar, !oldUnsettableCharESet));
-    }
   }
 
   /**
@@ -541,10 +531,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableChar = UNSETTABLE_CHAR_EDEFAULT;
     unsettableCharESet = false;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_CHAR,
           oldUnsettableChar, UNSETTABLE_CHAR_EDEFAULT, oldUnsettableCharESet));
-    }
   }
 
   /**
@@ -579,10 +567,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     boolean oldUnsettableDateESet = unsettableDateESet;
     unsettableDateESet = true;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DATE,
           oldUnsettableDate, unsettableDate, !oldUnsettableDateESet));
-    }
   }
 
   /**
@@ -597,10 +583,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableDate = UNSETTABLE_DATE_EDEFAULT;
     unsettableDateESet = false;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DATE,
           oldUnsettableDate, UNSETTABLE_DATE_EDEFAULT, oldUnsettableDateESet));
-    }
   }
 
   /**
@@ -635,10 +619,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     boolean oldUnsettableDoubleESet = unsettableDoubleESet;
     unsettableDoubleESet = true;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DOUBLE,
           oldUnsettableDouble, unsettableDouble, !oldUnsettableDoubleESet));
-    }
   }
 
   /**
@@ -653,11 +635,9 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableDouble = UNSETTABLE_DOUBLE_EDEFAULT;
     unsettableDoubleESet = false;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.UNSET,
           Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DOUBLE, oldUnsettableDouble, UNSETTABLE_DOUBLE_EDEFAULT,
           oldUnsettableDoubleESet));
-    }
   }
 
   /**
@@ -692,10 +672,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     boolean oldUnsettableFloatESet = unsettableFloatESet;
     unsettableFloatESet = true;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_FLOAT,
           oldUnsettableFloat, unsettableFloat, !oldUnsettableFloatESet));
-    }
   }
 
   /**
@@ -710,10 +688,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableFloat = UNSETTABLE_FLOAT_EDEFAULT;
     unsettableFloatESet = false;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_FLOAT,
           oldUnsettableFloat, UNSETTABLE_FLOAT_EDEFAULT, oldUnsettableFloatESet));
-    }
   }
 
   /**
@@ -748,10 +724,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     boolean oldUnsettableIntESet = unsettableIntESet;
     unsettableIntESet = true;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_INT,
           oldUnsettableInt, unsettableInt, !oldUnsettableIntESet));
-    }
   }
 
   /**
@@ -766,10 +740,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableInt = UNSETTABLE_INT_EDEFAULT;
     unsettableIntESet = false;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_INT,
           oldUnsettableInt, UNSETTABLE_INT_EDEFAULT, oldUnsettableIntESet));
-    }
   }
 
   /**
@@ -804,10 +776,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     boolean oldUnsettableLongESet = unsettableLongESet;
     unsettableLongESet = true;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_LONG,
           oldUnsettableLong, unsettableLong, !oldUnsettableLongESet));
-    }
   }
 
   /**
@@ -822,10 +792,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableLong = UNSETTABLE_LONG_EDEFAULT;
     unsettableLongESet = false;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_LONG,
           oldUnsettableLong, UNSETTABLE_LONG_EDEFAULT, oldUnsettableLongESet));
-    }
   }
 
   /**
@@ -860,10 +828,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     boolean oldUnsettableShortESet = unsettableShortESet;
     unsettableShortESet = true;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_SHORT,
           oldUnsettableShort, unsettableShort, !oldUnsettableShortESet));
-    }
   }
 
   /**
@@ -878,10 +844,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableShort = UNSETTABLE_SHORT_EDEFAULT;
     unsettableShortESet = false;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_SHORT,
           oldUnsettableShort, UNSETTABLE_SHORT_EDEFAULT, oldUnsettableShortESet));
-    }
   }
 
   /**
@@ -916,10 +880,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     boolean oldUnsettableStringESet = unsettableStringESet;
     unsettableStringESet = true;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_STRING,
           oldUnsettableString, unsettableString, !oldUnsettableStringESet));
-    }
   }
 
   /**
@@ -934,11 +896,9 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableString = UNSETTABLE_STRING_EDEFAULT;
     unsettableStringESet = false;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.UNSET,
           Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_STRING, oldUnsettableString, UNSETTABLE_STRING_EDEFAULT,
           oldUnsettableStringESet));
-    }
   }
 
   /**
@@ -973,10 +933,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     boolean oldUnsettableVATESet = unsettableVATESet;
     unsettableVATESet = true;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_VAT,
           oldUnsettableVAT, unsettableVAT, !oldUnsettableVATESet));
-    }
   }
 
   /**
@@ -991,10 +949,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
     unsettableVAT = UNSETTABLE_VAT_EDEFAULT;
     unsettableVATESet = false;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_VAT,
           oldUnsettableVAT, UNSETTABLE_VAT_EDEFAULT, oldUnsettableVATESet));
-    }
   }
 
   /**
@@ -1182,110 +1138,64 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl
   public String toString()
   {
     if (eIsProxy())
-    {
       return super.toString();
-    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (unsettableBoolean: ");
     if (unsettableBooleanESet)
-    {
       result.append(unsettableBoolean);
-    }
     else
-    {
       result.append("<unset>");
-    }
     result.append(", unsettableByte: ");
     if (unsettableByteESet)
-    {
       result.append(unsettableByte);
-    }
     else
-    {
       result.append("<unset>");
-    }
     result.append(", unsettableChar: ");
     if (unsettableCharESet)
-    {
       result.append(unsettableChar);
-    }
     else
-    {
       result.append("<unset>");
-    }
     result.append(", unsettableDate: ");
     if (unsettableDateESet)
-    {
       result.append(unsettableDate);
-    }
     else
-    {
       result.append("<unset>");
-    }
     result.append(", unsettableDouble: ");
     if (unsettableDoubleESet)
-    {
       result.append(unsettableDouble);
-    }
     else
-    {
       result.append("<unset>");
-    }
     result.append(", unsettableFloat: ");
     if (unsettableFloatESet)
-    {
       result.append(unsettableFloat);
-    }
     else
-    {
       result.append("<unset>");
-    }
     result.append(", unsettableInt: ");
     if (unsettableIntESet)
-    {
       result.append(unsettableInt);
-    }
     else
-    {
       result.append("<unset>");
-    }
     result.append(", unsettableLong: ");
     if (unsettableLongESet)
-    {
       result.append(unsettableLong);
-    }
     else
-    {
       result.append("<unset>");
-    }
     result.append(", unsettableShort: ");
     if (unsettableShortESet)
-    {
       result.append(unsettableShort);
-    }
     else
-    {
       result.append("<unset>");
-    }
     result.append(", unsettableString: ");
     if (unsettableStringESet)
-    {
       result.append(unsettableString);
-    }
     else
-    {
       result.append("<unset>");
-    }
     result.append(", unsettableVAT: ");
     if (unsettableVATESet)
-    {
       result.append(unsettableVAT);
-    }
     else
-    {
       result.append("<unset>");
-    }
     result.append(')');
     return result.toString();
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/util/Model2AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/util/Model2AdapterFactory.java
index 832963cebb..4af548a837 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/util/Model2AdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/util/Model2AdapterFactory.java
@@ -11,8 +11,11 @@
 package org.eclipse.emf.cdo.tests.legacy.model2.util;
 
 import org.eclipse.emf.cdo.tests.legacy.model2.Model2Package;
+import org.eclipse.emf.cdo.tests.model1.Address;
 import org.eclipse.emf.cdo.tests.model1.Order;
 import org.eclipse.emf.cdo.tests.model1.PurchaseOrder;
+import org.eclipse.emf.cdo.tests.model1.VAT;
+import org.eclipse.emf.cdo.tests.model2.MapHolder;
 import org.eclipse.emf.cdo.tests.model2.NotUnsettable;
 import org.eclipse.emf.cdo.tests.model2.NotUnsettableWithDefault;
 import org.eclipse.emf.cdo.tests.model2.PersistentContainment;
@@ -28,6 +31,8 @@ import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
 
+import java.util.Map;
+
 /**
  * <!-- 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 -->
@@ -141,6 +146,66 @@ public class Model2AdapterFactory extends AdapterFactoryImpl
     }
 
     @Override
+    public Adapter caseMapHolder(MapHolder object)
+    {
+      return createMapHolderAdapter();
+    }
+
+    @Override
+    public Adapter caseStringToStringMap(Map.Entry<String, String> object)
+    {
+      return createStringToStringMapAdapter();
+    }
+
+    @Override
+    public Adapter caseIntegerToStringMap(Map.Entry<Integer, String> object)
+    {
+      return createIntegerToStringMapAdapter();
+    }
+
+    @Override
+    public Adapter caseStringToVATMap(Map.Entry<String, VAT> object)
+    {
+      return createStringToVATMapAdapter();
+    }
+
+    @Override
+    public Adapter caseStringToAddressContainmentMap(Map.Entry<String, Address> object)
+    {
+      return createStringToAddressContainmentMapAdapter();
+    }
+
+    @Override
+    public Adapter caseStringToAddressReferenceMap(Map.Entry<String, Address> object)
+    {
+      return createStringToAddressReferenceMapAdapter();
+    }
+
+    @Override
+    public Adapter caseEObjectToEObjectMap(Map.Entry<EObject, EObject> object)
+    {
+      return createEObjectToEObjectMapAdapter();
+    }
+
+    @Override
+    public Adapter caseEObjectToEObjectKeyContainedMap(Map.Entry<EObject, EObject> object)
+    {
+      return createEObjectToEObjectKeyContainedMapAdapter();
+    }
+
+    @Override
+    public Adapter caseEObjectToEObjectBothContainedMap(Map.Entry<EObject, EObject> object)
+    {
+      return createEObjectToEObjectBothContainedMapAdapter();
+    }
+
+    @Override
+    public Adapter caseEObjectToEObjectValueContainedMap(Map.Entry<EObject, EObject> object)
+    {
+      return createEObjectToEObjectValueContainedMapAdapter();
+    }
+
+    @Override
     public Adapter caseOrder(Order object)
     {
       return createOrderAdapter();
@@ -305,6 +370,150 @@ public class Model2AdapterFactory extends AdapterFactoryImpl
   }
 
   /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model2.MapHolder
+   * <em>Map Holder</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.cdo.tests.legacy.model2.MapHolder
+   * @generated
+   */
+  public Adapter createMapHolderAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>String To String Map</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 java.util.Map.Entry
+   * @generated
+   */
+  public Adapter createStringToStringMapAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>Integer To String Map</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 java.util.Map.Entry
+   * @generated
+   */
+  public Adapter createIntegerToStringMapAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>String To VAT Map</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 java.util.Map.Entry
+   * @generated
+   */
+  public Adapter createStringToVATMapAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link java.util.Map.Entry
+   * <em>String To Address Containment Map</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 java.util.Map.Entry
+   * @generated
+   */
+  public Adapter createStringToAddressContainmentMapAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>String To Address Reference Map</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 java.util.Map.Entry
+   * @generated
+   */
+  public Adapter createStringToAddressReferenceMapAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>EObject To EObject Map</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 java.util.Map.Entry
+   * @generated
+   */
+  public Adapter createEObjectToEObjectMapAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link java.util.Map.Entry
+   * <em>EObject To EObject Key Contained Map</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 java.util.Map.Entry
+   * @generated
+   */
+  public Adapter createEObjectToEObjectKeyContainedMapAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link java.util.Map.Entry
+   * <em>EObject To EObject Both Contained Map</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 java.util.Map.Entry
+   * @generated
+   */
+  public Adapter createEObjectToEObjectBothContainedMapAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link java.util.Map.Entry
+   * <em>EObject To EObject Value Contained Map</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 java.util.Map.Entry
+   * @generated
+   */
+  public Adapter createEObjectToEObjectValueContainedMapAdapter()
+  {
+    return null;
+  }
+
+  /**
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model1.Order <em>Order</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 -->
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/util/Model2Switch.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/util/Model2Switch.java
index 4aa4aba6a6..55ebaa148f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/util/Model2Switch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/util/Model2Switch.java
@@ -11,8 +11,11 @@
 package org.eclipse.emf.cdo.tests.legacy.model2.util;
 
 import org.eclipse.emf.cdo.tests.legacy.model2.Model2Package;
+import org.eclipse.emf.cdo.tests.model1.Address;
 import org.eclipse.emf.cdo.tests.model1.Order;
 import org.eclipse.emf.cdo.tests.model1.PurchaseOrder;
+import org.eclipse.emf.cdo.tests.model1.VAT;
+import org.eclipse.emf.cdo.tests.model2.MapHolder;
 import org.eclipse.emf.cdo.tests.model2.NotUnsettable;
 import org.eclipse.emf.cdo.tests.model2.NotUnsettableWithDefault;
 import org.eclipse.emf.cdo.tests.model2.PersistentContainment;
@@ -27,6 +30,7 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance hierarchy. It supports the call
@@ -107,17 +111,11 @@ public class Model2Switch<T>
       SpecialPurchaseOrder specialPurchaseOrder = (SpecialPurchaseOrder)theEObject;
       T result = caseSpecialPurchaseOrder(specialPurchaseOrder);
       if (result == null)
-      {
         result = casePurchaseOrder(specialPurchaseOrder);
-      }
       if (result == null)
-      {
         result = caseOrder(specialPurchaseOrder);
-      }
       if (result == null)
-      {
         result = defaultCase(theEObject);
-      }
       return result;
     }
     case Model2Package.TASK_CONTAINER:
@@ -125,9 +123,7 @@ public class Model2Switch<T>
       TaskContainer taskContainer = (TaskContainer)theEObject;
       T result = caseTaskContainer(taskContainer);
       if (result == null)
-      {
         result = defaultCase(theEObject);
-      }
       return result;
     }
     case Model2Package.TASK:
@@ -135,9 +131,7 @@ public class Model2Switch<T>
       Task task = (Task)theEObject;
       T result = caseTask(task);
       if (result == null)
-      {
         result = defaultCase(theEObject);
-      }
       return result;
     }
     case Model2Package.UNSETTABLE1:
@@ -145,9 +139,7 @@ public class Model2Switch<T>
       Unsettable1 unsettable1 = (Unsettable1)theEObject;
       T result = caseUnsettable1(unsettable1);
       if (result == null)
-      {
         result = defaultCase(theEObject);
-      }
       return result;
     }
     case Model2Package.UNSETTABLE2_WITH_DEFAULT:
@@ -155,9 +147,7 @@ public class Model2Switch<T>
       Unsettable2WithDefault unsettable2WithDefault = (Unsettable2WithDefault)theEObject;
       T result = caseUnsettable2WithDefault(unsettable2WithDefault);
       if (result == null)
-      {
         result = defaultCase(theEObject);
-      }
       return result;
     }
     case Model2Package.PERSISTENT_CONTAINMENT:
@@ -165,9 +155,7 @@ public class Model2Switch<T>
       PersistentContainment persistentContainment = (PersistentContainment)theEObject;
       T result = casePersistentContainment(persistentContainment);
       if (result == null)
-      {
         result = defaultCase(theEObject);
-      }
       return result;
     }
     case Model2Package.TRANSIENT_CONTAINER:
@@ -175,9 +163,7 @@ public class Model2Switch<T>
       TransientContainer transientContainer = (TransientContainer)theEObject;
       T result = caseTransientContainer(transientContainer);
       if (result == null)
-      {
         result = defaultCase(theEObject);
-      }
       return result;
     }
     case Model2Package.NOT_UNSETTABLE:
@@ -185,9 +171,7 @@ public class Model2Switch<T>
       NotUnsettable notUnsettable = (NotUnsettable)theEObject;
       T result = caseNotUnsettable(notUnsettable);
       if (result == null)
-      {
         result = defaultCase(theEObject);
-      }
       return result;
     }
     case Model2Package.NOT_UNSETTABLE_WITH_DEFAULT:
@@ -195,9 +179,96 @@ public class Model2Switch<T>
       NotUnsettableWithDefault notUnsettableWithDefault = (NotUnsettableWithDefault)theEObject;
       T result = caseNotUnsettableWithDefault(notUnsettableWithDefault);
       if (result == null)
-      {
         result = defaultCase(theEObject);
-      }
+      return result;
+    }
+    case Model2Package.MAP_HOLDER:
+    {
+      MapHolder mapHolder = (MapHolder)theEObject;
+      T result = caseMapHolder(mapHolder);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model2Package.STRING_TO_STRING_MAP:
+    {
+      @SuppressWarnings("unchecked")
+      Map.Entry<String, String> stringToStringMap = (Map.Entry<String, String>)theEObject;
+      T result = caseStringToStringMap(stringToStringMap);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model2Package.INTEGER_TO_STRING_MAP:
+    {
+      @SuppressWarnings("unchecked")
+      Map.Entry<Integer, String> integerToStringMap = (Map.Entry<Integer, String>)theEObject;
+      T result = caseIntegerToStringMap(integerToStringMap);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model2Package.STRING_TO_VAT_MAP:
+    {
+      @SuppressWarnings("unchecked")
+      Map.Entry<String, VAT> stringToVATMap = (Map.Entry<String, VAT>)theEObject;
+      T result = caseStringToVATMap(stringToVATMap);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP:
+    {
+      @SuppressWarnings("unchecked")
+      Map.Entry<String, Address> stringToAddressContainmentMap = (Map.Entry<String, Address>)theEObject;
+      T result = caseStringToAddressContainmentMap(stringToAddressContainmentMap);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model2Package.STRING_TO_ADDRESS_REFERENCE_MAP:
+    {
+      @SuppressWarnings("unchecked")
+      Map.Entry<String, Address> stringToAddressReferenceMap = (Map.Entry<String, Address>)theEObject;
+      T result = caseStringToAddressReferenceMap(stringToAddressReferenceMap);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model2Package.EOBJECT_TO_EOBJECT_MAP:
+    {
+      @SuppressWarnings("unchecked")
+      Map.Entry<EObject, EObject> eObjectToEObjectMap = (Map.Entry<EObject, EObject>)theEObject;
+      T result = caseEObjectToEObjectMap(eObjectToEObjectMap);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP:
+    {
+      @SuppressWarnings("unchecked")
+      Map.Entry<EObject, EObject> eObjectToEObjectKeyContainedMap = (Map.Entry<EObject, EObject>)theEObject;
+      T result = caseEObjectToEObjectKeyContainedMap(eObjectToEObjectKeyContainedMap);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP:
+    {
+      @SuppressWarnings("unchecked")
+      Map.Entry<EObject, EObject> eObjectToEObjectBothContainedMap = (Map.Entry<EObject, EObject>)theEObject;
+      T result = caseEObjectToEObjectBothContainedMap(eObjectToEObjectBothContainedMap);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP:
+    {
+      @SuppressWarnings("unchecked")
+      Map.Entry<EObject, EObject> eObjectToEObjectValueContainedMap = (Map.Entry<EObject, EObject>)theEObject;
+      T result = caseEObjectToEObjectValueContainedMap(eObjectToEObjectValueContainedMap);
+      if (result == null)
+        result = defaultCase(theEObject);
       return result;
     }
     default:
@@ -345,6 +416,164 @@ public class Model2Switch<T>
   }
 
   /**
+   * Returns the result of interpreting the object as an instance of '<em>Map Holder</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 Holder</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseMapHolder(MapHolder object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>String To String Map</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>String To String Map</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseStringToStringMap(Map.Entry<String, String> object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Integer To String Map</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>Integer To String Map</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseIntegerToStringMap(Map.Entry<Integer, String> object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>String To VAT Map</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>String To VAT Map</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseStringToVATMap(Map.Entry<String, VAT> object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>String To Address Containment Map</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>String To Address Containment Map</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseStringToAddressContainmentMap(Map.Entry<String, Address> object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>String To Address Reference Map</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>String To Address Reference Map</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseStringToAddressReferenceMap(Map.Entry<String, Address> object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>EObject To EObject Map</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>EObject To EObject Map</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseEObjectToEObjectMap(Map.Entry<EObject, EObject> object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>EObject To EObject Key Contained Map</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>EObject To EObject Key Contained Map</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseEObjectToEObjectKeyContainedMap(Map.Entry<EObject, EObject> object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>EObject To EObject Both Contained Map</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>EObject To EObject Both Contained Map</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseEObjectToEObjectBothContainedMap(Map.Entry<EObject, EObject> object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>EObject To EObject Value Contained Map</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>EObject To EObject Value Contained Map</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseEObjectToEObjectValueContainedMap(Map.Entry<EObject, EObject> object)
+  {
+    return null;
+  }
+
+  /**
    * Returns the result of interpreting the object as an instance of '<em>Order</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
    * 
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/MapHolder.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/MapHolder.java
new file mode 100644
index 0000000000..de2e90890b
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/MapHolder.java
@@ -0,0 +1,202 @@
+/**
+ * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ *
+ * $Id: MapHolder.java,v 1.1 2010-03-11 20:34:56 mfluegge Exp $
+ */
+package org.eclipse.emf.cdo.tests.model2;
+
+import org.eclipse.emf.cdo.tests.model1.Address;
+import org.eclipse.emf.cdo.tests.model1.VAT;
+
+import org.eclipse.emf.common.util.EMap;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Map Holder</b></em>'. <!-- end-user-doc -->
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.tests.model2.MapHolder#getIntegerToStringMap <em>Integer To String Map</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model2.MapHolder#getStringToStringMap <em>String To String Map</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model2.MapHolder#getStringToVATMap <em>String To VAT Map</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model2.MapHolder#getStringToAddressContainmentMap <em>String To Address
+ * Containment Map</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model2.MapHolder#getStringToAddressReferenceMap <em>String To Address Reference
+ * Map</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model2.MapHolder#getEObjectToEObjectMap <em>EObject To EObject Map</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model2.MapHolder#getEObjectToEObjectKeyContainedMap <em>EObject To EObject Key
+ * Contained Map</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model2.MapHolder#getEObjectToEObjectBothContainedMap <em>EObject To EObject Both
+ * Contained Map</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model2.MapHolder#getEObjectToEObjectValueContainedMap <em>EObject To EObject
+ * Value Contained Map</em>}</li>
+ * </ul>
+ * </p>
+ * 
+ * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getMapHolder()
+ * @model
+ * @generated
+ */
+public interface MapHolder extends EObject
+{
+  /**
+   * Returns the value of the '<em><b>Integer To String Map</b></em>' map. The key is of type {@link java.lang.Integer},
+   * and the value is of type {@link java.lang.String}, <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Integer To String Map</em>' map isn't clear, there really should be more of a
+   * description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>Integer To String Map</em>' map.
+   * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getMapHolder_IntegerToStringMap()
+   * @model mapType="org.eclipse.emf.cdo.tests.model2.IntegerToStringMap<org.eclipse.emf.ecore.EIntegerObject, org.eclipse.emf.ecore.EString>"
+   * @generated
+   */
+  EMap<Integer, String> getIntegerToStringMap();
+
+  /**
+   * Returns the value of the '<em><b>String To String Map</b></em>' map. The key is of type {@link java.lang.String},
+   * and the value is of type {@link java.lang.String}, <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>String To String Map</em>' map isn't clear, there really should be more of a description
+   * here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>String To String Map</em>' map.
+   * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getMapHolder_StringToStringMap()
+   * @model mapType=
+   *        "org.eclipse.emf.cdo.tests.model2.StringToStringMap<org.eclipse.emf.ecore.EString, org.eclipse.emf.ecore.EString>"
+   * @generated
+   */
+  EMap<String, String> getStringToStringMap();
+
+  /**
+   * Returns the value of the '<em><b>String To VAT Map</b></em>' map. The key is of type {@link java.lang.String}, and
+   * the value is of type {@link org.eclipse.emf.cdo.tests.model1.VAT}, <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>String To VAT Map</em>' map isn't clear, there really should be more of a description
+   * here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>String To VAT Map</em>' map.
+   * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getMapHolder_StringToVATMap()
+   * @model mapType=
+   *        "org.eclipse.emf.cdo.tests.model2.StringToVATMap<org.eclipse.emf.ecore.EString, org.eclipse.emf.cdo.tests.model1.VAT>"
+   * @generated
+   */
+  EMap<String, VAT> getStringToVATMap();
+
+  /**
+   * Returns the value of the '<em><b>String To Address Containment Map</b></em>' map. The key is of type
+   * {@link java.lang.String}, and the value is of type {@link org.eclipse.emf.cdo.tests.model1.Address}, <!--
+   * begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>String To Address Containment Map</em>' map isn't clear, there really should be more of
+   * a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>String To Address Containment Map</em>' map.
+   * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getMapHolder_StringToAddressContainmentMap()
+   * @model mapType="org.eclipse.emf.cdo.tests.model2.StringToAddressContainmentMap<org.eclipse.emf.ecore.EString, org.eclipse.emf.cdo.tests.model1.Address>"
+   * @generated
+   */
+  EMap<String, Address> getStringToAddressContainmentMap();
+
+  /**
+   * Returns the value of the '<em><b>String To Address Reference Map</b></em>' map. The key is of type
+   * {@link java.lang.String}, and the value is of type {@link org.eclipse.emf.cdo.tests.model1.Address}, <!--
+   * begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>String To Address Reference Map</em>' map isn't clear, there really should be more of a
+   * description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>String To Address Reference Map</em>' map.
+   * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getMapHolder_StringToAddressReferenceMap()
+   * @model mapType="org.eclipse.emf.cdo.tests.model2.StringToAddressReferenceMap<org.eclipse.emf.ecore.EString, org.eclipse.emf.cdo.tests.model1.Address>"
+   * @generated
+   */
+  EMap<String, Address> getStringToAddressReferenceMap();
+
+  /**
+   * Returns the value of the '<em><b>EObject To EObject Map</b></em>' map. The key is of type
+   * {@link org.eclipse.emf.ecore.EObject}, and the value is of type {@link org.eclipse.emf.ecore.EObject}, <!--
+   * begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>EObject To EObject Map</em>' map isn't clear, there really should be more of a
+   * description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>EObject To EObject Map</em>' map.
+   * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getMapHolder_EObjectToEObjectMap()
+   * @model mapType=
+   *        "org.eclipse.emf.cdo.tests.model2.EObjectToEObjectMap<org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EObject>"
+   * @generated
+   */
+  EMap<EObject, EObject> getEObjectToEObjectMap();
+
+  /**
+   * Returns the value of the '<em><b>EObject To EObject Key Contained Map</b></em>' map. The key is of type
+   * {@link org.eclipse.emf.ecore.EObject}, and the value is of type {@link org.eclipse.emf.ecore.EObject}, <!--
+   * begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>EObject To EObject Key Contained Map</em>' map isn't clear, there really should be more
+   * of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>EObject To EObject Key Contained Map</em>' map.
+   * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getMapHolder_EObjectToEObjectKeyContainedMap()
+   * @model mapType="org.eclipse.emf.cdo.tests.model2.EObjectToEObjectKeyContainedMap<org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EObject>"
+   * @generated
+   */
+  EMap<EObject, EObject> getEObjectToEObjectKeyContainedMap();
+
+  /**
+   * Returns the value of the '<em><b>EObject To EObject Both Contained Map</b></em>' map. The key is of type
+   * {@link org.eclipse.emf.ecore.EObject}, and the value is of type {@link org.eclipse.emf.ecore.EObject}, <!--
+   * begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>EObject To EObject Both Contained Map</em>' map isn't clear, there really should be more
+   * of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>EObject To EObject Both Contained Map</em>' map.
+   * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getMapHolder_EObjectToEObjectBothContainedMap()
+   * @model mapType="org.eclipse.emf.cdo.tests.model2.EObjectToEObjectBothContainedMap<org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EObject>"
+   * @generated
+   */
+  EMap<EObject, EObject> getEObjectToEObjectBothContainedMap();
+
+  /**
+   * Returns the value of the '<em><b>EObject To EObject Value Contained Map</b></em>' map. The key is of type
+   * {@link org.eclipse.emf.ecore.EObject}, and the value is of type {@link org.eclipse.emf.ecore.EObject}, <!--
+   * begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>EObject To EObject Value Contained Map</em>' map isn't clear, there really should be
+   * more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * 
+   * @return the value of the '<em>EObject To EObject Value Contained Map</em>' map.
+   * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getMapHolder_EObjectToEObjectValueContainedMap()
+   * @model mapType="org.eclipse.emf.cdo.tests.model2.EObjectToEObjectValueContainedMap<org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EObject>"
+   * @generated
+   */
+  EMap<EObject, EObject> getEObjectToEObjectValueContainedMap();
+
+} // MapHolder
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Model2Factory.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Model2Factory.java
index f3504abddc..e126243379 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Model2Factory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Model2Factory.java
@@ -101,6 +101,14 @@ public interface Model2Factory extends EFactory
   NotUnsettableWithDefault createNotUnsettableWithDefault();
 
   /**
+   * Returns a new object of class '<em>Map Holder</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return a new object of class '<em>Map Holder</em>'.
+   * @generated
+   */
+  MapHolder createMapHolder();
+
+  /**
    * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
    * @return the package supported by this factory.
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Model2Package.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Model2Package.java
index 3254680cd9..4ef8f14354 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Model2Package.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Model2Package.java
@@ -733,6 +733,416 @@ public interface Model2Package extends EPackage
   int NOT_UNSETTABLE_WITH_DEFAULT_FEATURE_COUNT = 11;
 
   /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model2.impl.MapHolderImpl <em>Map Holder</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.emf.cdo.tests.model2.impl.MapHolderImpl
+   * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getMapHolder()
+   * @generated
+   */
+  int MAP_HOLDER = 9;
+
+  /**
+   * The feature id for the '<em><b>Integer To String Map</b></em>' map. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int MAP_HOLDER__INTEGER_TO_STRING_MAP = 0;
+
+  /**
+   * The feature id for the '<em><b>String To String Map</b></em>' map. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int MAP_HOLDER__STRING_TO_STRING_MAP = 1;
+
+  /**
+   * The feature id for the '<em><b>String To VAT Map</b></em>' map. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int MAP_HOLDER__STRING_TO_VAT_MAP = 2;
+
+  /**
+   * The feature id for the '<em><b>String To Address Containment Map</b></em>' map. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int MAP_HOLDER__STRING_TO_ADDRESS_CONTAINMENT_MAP = 3;
+
+  /**
+   * The feature id for the '<em><b>String To Address Reference Map</b></em>' map. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int MAP_HOLDER__STRING_TO_ADDRESS_REFERENCE_MAP = 4;
+
+  /**
+   * The feature id for the '<em><b>EObject To EObject Map</b></em>' map. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int MAP_HOLDER__EOBJECT_TO_EOBJECT_MAP = 5;
+
+  /**
+   * The feature id for the '<em><b>EObject To EObject Key Contained Map</b></em>' map. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int MAP_HOLDER__EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP = 6;
+
+  /**
+   * The feature id for the '<em><b>EObject To EObject Both Contained Map</b></em>' map. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int MAP_HOLDER__EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP = 7;
+
+  /**
+   * The feature id for the '<em><b>EObject To EObject Value Contained Map</b></em>' map. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int MAP_HOLDER__EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP = 8;
+
+  /**
+   * The number of structural features of the '<em>Map Holder</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int MAP_HOLDER_FEATURE_COUNT = 9;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model2.impl.StringToStringMapImpl
+   * <em>String To String Map</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.emf.cdo.tests.model2.impl.StringToStringMapImpl
+   * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getStringToStringMap()
+   * @generated
+   */
+  int STRING_TO_STRING_MAP = 10;
+
+  /**
+   * The feature id for the '<em><b>Key</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int STRING_TO_STRING_MAP__KEY = 0;
+
+  /**
+   * The feature id for the '<em><b>Value</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int STRING_TO_STRING_MAP__VALUE = 1;
+
+  /**
+   * The number of structural features of the '<em>String To String Map</em>' class. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int STRING_TO_STRING_MAP_FEATURE_COUNT = 2;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model2.impl.IntegerToStringMapImpl
+   * <em>Integer To String Map</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.emf.cdo.tests.model2.impl.IntegerToStringMapImpl
+   * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getIntegerToStringMap()
+   * @generated
+   */
+  int INTEGER_TO_STRING_MAP = 11;
+
+  /**
+   * The feature id for the '<em><b>Key</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int INTEGER_TO_STRING_MAP__KEY = 0;
+
+  /**
+   * The feature id for the '<em><b>Value</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int INTEGER_TO_STRING_MAP__VALUE = 1;
+
+  /**
+   * The number of structural features of the '<em>Integer To String Map</em>' class. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int INTEGER_TO_STRING_MAP_FEATURE_COUNT = 2;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model2.impl.StringToVATMapImpl
+   * <em>String To VAT Map</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.emf.cdo.tests.model2.impl.StringToVATMapImpl
+   * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getStringToVATMap()
+   * @generated
+   */
+  int STRING_TO_VAT_MAP = 12;
+
+  /**
+   * The feature id for the '<em><b>Key</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int STRING_TO_VAT_MAP__KEY = 0;
+
+  /**
+   * The feature id for the '<em><b>Value</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int STRING_TO_VAT_MAP__VALUE = 1;
+
+  /**
+   * The number of structural features of the '<em>String To VAT Map</em>' class. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int STRING_TO_VAT_MAP_FEATURE_COUNT = 2;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model2.impl.StringToAddressContainmentMapImpl
+   * <em>String To Address Containment Map</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.emf.cdo.tests.model2.impl.StringToAddressContainmentMapImpl
+   * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getStringToAddressContainmentMap()
+   * @generated
+   */
+  int STRING_TO_ADDRESS_CONTAINMENT_MAP = 13;
+
+  /**
+   * The feature id for the '<em><b>Key</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int STRING_TO_ADDRESS_CONTAINMENT_MAP__KEY = 0;
+
+  /**
+   * The feature id for the '<em><b>Value</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int STRING_TO_ADDRESS_CONTAINMENT_MAP__VALUE = 1;
+
+  /**
+   * The number of structural features of the '<em>String To Address Containment Map</em>' class. <!-- begin-user-doc
+   * --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int STRING_TO_ADDRESS_CONTAINMENT_MAP_FEATURE_COUNT = 2;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model2.impl.StringToAddressReferenceMapImpl
+   * <em>String To Address Reference Map</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.emf.cdo.tests.model2.impl.StringToAddressReferenceMapImpl
+   * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getStringToAddressReferenceMap()
+   * @generated
+   */
+  int STRING_TO_ADDRESS_REFERENCE_MAP = 14;
+
+  /**
+   * The feature id for the '<em><b>Key</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int STRING_TO_ADDRESS_REFERENCE_MAP__KEY = 0;
+
+  /**
+   * The feature id for the '<em><b>Value</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int STRING_TO_ADDRESS_REFERENCE_MAP__VALUE = 1;
+
+  /**
+   * The number of structural features of the '<em>String To Address Reference Map</em>' class. <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int STRING_TO_ADDRESS_REFERENCE_MAP_FEATURE_COUNT = 2;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model2.impl.EObjectToEObjectMapImpl
+   * <em>EObject To EObject Map</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.emf.cdo.tests.model2.impl.EObjectToEObjectMapImpl
+   * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getEObjectToEObjectMap()
+   * @generated
+   */
+  int EOBJECT_TO_EOBJECT_MAP = 15;
+
+  /**
+   * The feature id for the '<em><b>Key</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int EOBJECT_TO_EOBJECT_MAP__KEY = 0;
+
+  /**
+   * The feature id for the '<em><b>Value</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int EOBJECT_TO_EOBJECT_MAP__VALUE = 1;
+
+  /**
+   * The number of structural features of the '<em>EObject To EObject Map</em>' class. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int EOBJECT_TO_EOBJECT_MAP_FEATURE_COUNT = 2;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model2.impl.EObjectToEObjectKeyContainedMapImpl
+   * <em>EObject To EObject Key Contained Map</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.emf.cdo.tests.model2.impl.EObjectToEObjectKeyContainedMapImpl
+   * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getEObjectToEObjectKeyContainedMap()
+   * @generated
+   */
+  int EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP = 16;
+
+  /**
+   * The feature id for the '<em><b>Key</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__KEY = 0;
+
+  /**
+   * The feature id for the '<em><b>Value</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__VALUE = 1;
+
+  /**
+   * The number of structural features of the '<em>EObject To EObject Key Contained Map</em>' class. <!-- begin-user-doc
+   * --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP_FEATURE_COUNT = 2;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model2.impl.EObjectToEObjectBothContainedMapImpl
+   * <em>EObject To EObject Both Contained Map</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.emf.cdo.tests.model2.impl.EObjectToEObjectBothContainedMapImpl
+   * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getEObjectToEObjectBothContainedMap()
+   * @generated
+   */
+  int EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP = 17;
+
+  /**
+   * The feature id for the '<em><b>Key</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__KEY = 0;
+
+  /**
+   * The feature id for the '<em><b>Value</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__VALUE = 1;
+
+  /**
+   * The number of structural features of the '<em>EObject To EObject Both Contained Map</em>' class. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP_FEATURE_COUNT = 2;
+
+  /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model2.impl.EObjectToEObjectValueContainedMapImpl
+   * <em>EObject To EObject Value Contained Map</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.emf.cdo.tests.model2.impl.EObjectToEObjectValueContainedMapImpl
+   * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getEObjectToEObjectValueContainedMap()
+   * @generated
+   */
+  int EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP = 18;
+
+  /**
+   * The feature id for the '<em><b>Key</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__KEY = 0;
+
+  /**
+   * The feature id for the '<em><b>Value</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE = 1;
+
+  /**
+   * The number of structural features of the '<em>EObject To EObject Value Contained Map</em>' class. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP_FEATURE_COUNT = 2;
+
+  /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model2.SpecialPurchaseOrder
    * <em>Special Purchase Order</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
@@ -1480,6 +1890,419 @@ public interface Model2Package extends EPackage
   EAttribute getNotUnsettableWithDefault_NotUnsettableVAT();
 
   /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model2.MapHolder <em>Map Holder</em>}'. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>Map Holder</em>'.
+   * @see org.eclipse.emf.cdo.tests.model2.MapHolder
+   * @generated
+   */
+  EClass getMapHolder();
+
+  /**
+   * Returns the meta object for the map '{@link org.eclipse.emf.cdo.tests.model2.MapHolder#getIntegerToStringMap
+   * <em>Integer To String Map</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the map '<em>Integer To String Map</em>'.
+   * @see org.eclipse.emf.cdo.tests.model2.MapHolder#getIntegerToStringMap()
+   * @see #getMapHolder()
+   * @generated
+   */
+  EReference getMapHolder_IntegerToStringMap();
+
+  /**
+   * Returns the meta object for the map '{@link org.eclipse.emf.cdo.tests.model2.MapHolder#getStringToStringMap
+   * <em>String To String Map</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the map '<em>String To String Map</em>'.
+   * @see org.eclipse.emf.cdo.tests.model2.MapHolder#getStringToStringMap()
+   * @see #getMapHolder()
+   * @generated
+   */
+  EReference getMapHolder_StringToStringMap();
+
+  /**
+   * Returns the meta object for the map '{@link org.eclipse.emf.cdo.tests.model2.MapHolder#getStringToVATMap
+   * <em>String To VAT Map</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the map '<em>String To VAT Map</em>'.
+   * @see org.eclipse.emf.cdo.tests.model2.MapHolder#getStringToVATMap()
+   * @see #getMapHolder()
+   * @generated
+   */
+  EReference getMapHolder_StringToVATMap();
+
+  /**
+   * Returns the meta object for the map '
+   * {@link org.eclipse.emf.cdo.tests.model2.MapHolder#getStringToAddressContainmentMap
+   * <em>String To Address Containment Map</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the map '<em>String To Address Containment Map</em>'.
+   * @see org.eclipse.emf.cdo.tests.model2.MapHolder#getStringToAddressContainmentMap()
+   * @see #getMapHolder()
+   * @generated
+   */
+  EReference getMapHolder_StringToAddressContainmentMap();
+
+  /**
+   * Returns the meta object for the map '
+   * {@link org.eclipse.emf.cdo.tests.model2.MapHolder#getStringToAddressReferenceMap
+   * <em>String To Address Reference Map</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the map '<em>String To Address Reference Map</em>'.
+   * @see org.eclipse.emf.cdo.tests.model2.MapHolder#getStringToAddressReferenceMap()
+   * @see #getMapHolder()
+   * @generated
+   */
+  EReference getMapHolder_StringToAddressReferenceMap();
+
+  /**
+   * Returns the meta object for the map '{@link org.eclipse.emf.cdo.tests.model2.MapHolder#getEObjectToEObjectMap
+   * <em>EObject To EObject Map</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the map '<em>EObject To EObject Map</em>'.
+   * @see org.eclipse.emf.cdo.tests.model2.MapHolder#getEObjectToEObjectMap()
+   * @see #getMapHolder()
+   * @generated
+   */
+  EReference getMapHolder_EObjectToEObjectMap();
+
+  /**
+   * Returns the meta object for the map '
+   * {@link org.eclipse.emf.cdo.tests.model2.MapHolder#getEObjectToEObjectKeyContainedMap
+   * <em>EObject To EObject Key Contained Map</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the map '<em>EObject To EObject Key Contained Map</em>'.
+   * @see org.eclipse.emf.cdo.tests.model2.MapHolder#getEObjectToEObjectKeyContainedMap()
+   * @see #getMapHolder()
+   * @generated
+   */
+  EReference getMapHolder_EObjectToEObjectKeyContainedMap();
+
+  /**
+   * Returns the meta object for the map '
+   * {@link org.eclipse.emf.cdo.tests.model2.MapHolder#getEObjectToEObjectBothContainedMap
+   * <em>EObject To EObject Both Contained Map</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the map '<em>EObject To EObject Both Contained Map</em>'.
+   * @see org.eclipse.emf.cdo.tests.model2.MapHolder#getEObjectToEObjectBothContainedMap()
+   * @see #getMapHolder()
+   * @generated
+   */
+  EReference getMapHolder_EObjectToEObjectBothContainedMap();
+
+  /**
+   * Returns the meta object for the map '
+   * {@link org.eclipse.emf.cdo.tests.model2.MapHolder#getEObjectToEObjectValueContainedMap
+   * <em>EObject To EObject Value Contained Map</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the map '<em>EObject To EObject Value Contained Map</em>'.
+   * @see org.eclipse.emf.cdo.tests.model2.MapHolder#getEObjectToEObjectValueContainedMap()
+   * @see #getMapHolder()
+   * @generated
+   */
+  EReference getMapHolder_EObjectToEObjectValueContainedMap();
+
+  /**
+   * Returns the meta object for class '{@link java.util.Map.Entry <em>String To String Map</em>}'. <!-- begin-user-doc
+   * --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>String To String Map</em>'.
+   * @see java.util.Map.Entry
+   * @model keyDataType="org.eclipse.emf.ecore.EString" valueDataType="org.eclipse.emf.ecore.EString"
+   * @generated
+   */
+  EClass getStringToStringMap();
+
+  /**
+   * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Key</em>}'. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @return the meta object for the attribute '<em>Key</em>'.
+   * @see java.util.Map.Entry
+   * @see #getStringToStringMap()
+   * @generated
+   */
+  EAttribute getStringToStringMap_Key();
+
+  /**
+   * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Value</em>}'. <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * 
+   * @return the meta object for the attribute '<em>Value</em>'.
+   * @see java.util.Map.Entry
+   * @see #getStringToStringMap()
+   * @generated
+   */
+  EAttribute getStringToStringMap_Value();
+
+  /**
+   * Returns the meta object for class '{@link java.util.Map.Entry <em>Integer To String Map</em>}'. <!-- begin-user-doc
+   * --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>Integer To String Map</em>'.
+   * @see java.util.Map.Entry
+   * @model keyDataType="org.eclipse.emf.ecore.EIntegerObject" valueDataType="org.eclipse.emf.ecore.EString"
+   * @generated
+   */
+  EClass getIntegerToStringMap();
+
+  /**
+   * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Key</em>}'. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @return the meta object for the attribute '<em>Key</em>'.
+   * @see java.util.Map.Entry
+   * @see #getIntegerToStringMap()
+   * @generated
+   */
+  EAttribute getIntegerToStringMap_Key();
+
+  /**
+   * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Value</em>}'. <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * 
+   * @return the meta object for the attribute '<em>Value</em>'.
+   * @see java.util.Map.Entry
+   * @see #getIntegerToStringMap()
+   * @generated
+   */
+  EAttribute getIntegerToStringMap_Value();
+
+  /**
+   * Returns the meta object for class '{@link java.util.Map.Entry <em>String To VAT Map</em>}'. <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>String To VAT Map</em>'.
+   * @see java.util.Map.Entry
+   * @model keyDataType="org.eclipse.emf.ecore.EString" valueDataType="org.eclipse.emf.cdo.tests.model1.VAT"
+   * @generated
+   */
+  EClass getStringToVATMap();
+
+  /**
+   * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Key</em>}'. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @return the meta object for the attribute '<em>Key</em>'.
+   * @see java.util.Map.Entry
+   * @see #getStringToVATMap()
+   * @generated
+   */
+  EAttribute getStringToVATMap_Key();
+
+  /**
+   * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Value</em>}'. <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * 
+   * @return the meta object for the attribute '<em>Value</em>'.
+   * @see java.util.Map.Entry
+   * @see #getStringToVATMap()
+   * @generated
+   */
+  EAttribute getStringToVATMap_Value();
+
+  /**
+   * Returns the meta object for class '{@link java.util.Map.Entry <em>String To Address Containment Map</em>}'. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>String To Address Containment Map</em>'.
+   * @see java.util.Map.Entry
+   * @model keyDataType="org.eclipse.emf.ecore.EString" valueType="org.eclipse.emf.cdo.tests.model1.Address"
+   *        valueContainment="true"
+   * @generated
+   */
+  EClass getStringToAddressContainmentMap();
+
+  /**
+   * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Key</em>}'. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @return the meta object for the attribute '<em>Key</em>'.
+   * @see java.util.Map.Entry
+   * @see #getStringToAddressContainmentMap()
+   * @generated
+   */
+  EAttribute getStringToAddressContainmentMap_Key();
+
+  /**
+   * Returns the meta object for the containment reference '{@link java.util.Map.Entry <em>Value</em>}'. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the containment reference '<em>Value</em>'.
+   * @see java.util.Map.Entry
+   * @see #getStringToAddressContainmentMap()
+   * @generated
+   */
+  EReference getStringToAddressContainmentMap_Value();
+
+  /**
+   * Returns the meta object for class '{@link java.util.Map.Entry <em>String To Address Reference Map</em>}'. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>String To Address Reference Map</em>'.
+   * @see java.util.Map.Entry
+   * @model keyDataType="org.eclipse.emf.ecore.EString" valueType="org.eclipse.emf.cdo.tests.model1.Address"
+   * @generated
+   */
+  EClass getStringToAddressReferenceMap();
+
+  /**
+   * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Key</em>}'. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @return the meta object for the attribute '<em>Key</em>'.
+   * @see java.util.Map.Entry
+   * @see #getStringToAddressReferenceMap()
+   * @generated
+   */
+  EAttribute getStringToAddressReferenceMap_Key();
+
+  /**
+   * Returns the meta object for the reference '{@link java.util.Map.Entry <em>Value</em>}'. <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * 
+   * @return the meta object for the reference '<em>Value</em>'.
+   * @see java.util.Map.Entry
+   * @see #getStringToAddressReferenceMap()
+   * @generated
+   */
+  EReference getStringToAddressReferenceMap_Value();
+
+  /**
+   * Returns the meta object for class '{@link java.util.Map.Entry <em>EObject To EObject Map</em>}'. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>EObject To EObject Map</em>'.
+   * @see java.util.Map.Entry
+   * @model keyType="org.eclipse.emf.ecore.EObject" valueType="org.eclipse.emf.ecore.EObject"
+   * @generated
+   */
+  EClass getEObjectToEObjectMap();
+
+  /**
+   * Returns the meta object for the reference '{@link java.util.Map.Entry <em>Key</em>}'. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @return the meta object for the reference '<em>Key</em>'.
+   * @see java.util.Map.Entry
+   * @see #getEObjectToEObjectMap()
+   * @generated
+   */
+  EReference getEObjectToEObjectMap_Key();
+
+  /**
+   * Returns the meta object for the reference '{@link java.util.Map.Entry <em>Value</em>}'. <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * 
+   * @return the meta object for the reference '<em>Value</em>'.
+   * @see java.util.Map.Entry
+   * @see #getEObjectToEObjectMap()
+   * @generated
+   */
+  EReference getEObjectToEObjectMap_Value();
+
+  /**
+   * Returns the meta object for class '{@link java.util.Map.Entry <em>EObject To EObject Key Contained Map</em>}'. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>EObject To EObject Key Contained Map</em>'.
+   * @see java.util.Map.Entry
+   * @model keyType="org.eclipse.emf.ecore.EObject" keyContainment="true" valueType="org.eclipse.emf.ecore.EObject"
+   * @generated
+   */
+  EClass getEObjectToEObjectKeyContainedMap();
+
+  /**
+   * Returns the meta object for the containment reference '{@link java.util.Map.Entry <em>Key</em>}'. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the containment reference '<em>Key</em>'.
+   * @see java.util.Map.Entry
+   * @see #getEObjectToEObjectKeyContainedMap()
+   * @generated
+   */
+  EReference getEObjectToEObjectKeyContainedMap_Key();
+
+  /**
+   * Returns the meta object for the reference '{@link java.util.Map.Entry <em>Value</em>}'. <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * 
+   * @return the meta object for the reference '<em>Value</em>'.
+   * @see java.util.Map.Entry
+   * @see #getEObjectToEObjectKeyContainedMap()
+   * @generated
+   */
+  EReference getEObjectToEObjectKeyContainedMap_Value();
+
+  /**
+   * Returns the meta object for class '{@link java.util.Map.Entry <em>EObject To EObject Both Contained Map</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>EObject To EObject Both Contained Map</em>'.
+   * @see java.util.Map.Entry
+   * @model keyType="org.eclipse.emf.ecore.EObject" keyContainment="true" valueType="org.eclipse.emf.ecore.EObject"
+   *        valueContainment="true"
+   * @generated
+   */
+  EClass getEObjectToEObjectBothContainedMap();
+
+  /**
+   * Returns the meta object for the containment reference '{@link java.util.Map.Entry <em>Key</em>}'. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the containment reference '<em>Key</em>'.
+   * @see java.util.Map.Entry
+   * @see #getEObjectToEObjectBothContainedMap()
+   * @generated
+   */
+  EReference getEObjectToEObjectBothContainedMap_Key();
+
+  /**
+   * Returns the meta object for the containment reference '{@link java.util.Map.Entry <em>Value</em>}'. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the containment reference '<em>Value</em>'.
+   * @see java.util.Map.Entry
+   * @see #getEObjectToEObjectBothContainedMap()
+   * @generated
+   */
+  EReference getEObjectToEObjectBothContainedMap_Value();
+
+  /**
+   * Returns the meta object for class '{@link java.util.Map.Entry <em>EObject To EObject Value Contained Map</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>EObject To EObject Value Contained Map</em>'.
+   * @see java.util.Map.Entry
+   * @model keyType="org.eclipse.emf.ecore.EObject" valueType="org.eclipse.emf.ecore.EObject" valueContainment="true"
+   * @generated
+   */
+  EClass getEObjectToEObjectValueContainedMap();
+
+  /**
+   * Returns the meta object for the reference '{@link java.util.Map.Entry <em>Key</em>}'. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @return the meta object for the reference '<em>Key</em>'.
+   * @see java.util.Map.Entry
+   * @see #getEObjectToEObjectValueContainedMap()
+   * @generated
+   */
+  EReference getEObjectToEObjectValueContainedMap_Key();
+
+  /**
+   * Returns the meta object for the containment reference '{@link java.util.Map.Entry <em>Value</em>}'. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the containment reference '<em>Value</em>'.
+   * @see java.util.Map.Entry
+   * @see #getEObjectToEObjectValueContainedMap()
+   * @generated
+   */
+  EReference getEObjectToEObjectValueContainedMap_Value();
+
+  /**
    * 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.
@@ -2050,6 +2873,328 @@ public interface Model2Package extends EPackage
     EAttribute NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_VAT = eINSTANCE
         .getNotUnsettableWithDefault_NotUnsettableVAT();
 
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model2.impl.MapHolderImpl <em>Map Holder</em>}'
+     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.emf.cdo.tests.model2.impl.MapHolderImpl
+     * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getMapHolder()
+     * @generated
+     */
+    EClass MAP_HOLDER = eINSTANCE.getMapHolder();
+
+    /**
+     * The meta object literal for the '<em><b>Integer To String Map</b></em>' map feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference MAP_HOLDER__INTEGER_TO_STRING_MAP = eINSTANCE.getMapHolder_IntegerToStringMap();
+
+    /**
+     * The meta object literal for the '<em><b>String To String Map</b></em>' map feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference MAP_HOLDER__STRING_TO_STRING_MAP = eINSTANCE.getMapHolder_StringToStringMap();
+
+    /**
+     * The meta object literal for the '<em><b>String To VAT Map</b></em>' map feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference MAP_HOLDER__STRING_TO_VAT_MAP = eINSTANCE.getMapHolder_StringToVATMap();
+
+    /**
+     * The meta object literal for the '<em><b>String To Address Containment Map</b></em>' map feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference MAP_HOLDER__STRING_TO_ADDRESS_CONTAINMENT_MAP = eINSTANCE.getMapHolder_StringToAddressContainmentMap();
+
+    /**
+     * The meta object literal for the '<em><b>String To Address Reference Map</b></em>' map feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference MAP_HOLDER__STRING_TO_ADDRESS_REFERENCE_MAP = eINSTANCE.getMapHolder_StringToAddressReferenceMap();
+
+    /**
+     * The meta object literal for the '<em><b>EObject To EObject Map</b></em>' map feature. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference MAP_HOLDER__EOBJECT_TO_EOBJECT_MAP = eINSTANCE.getMapHolder_EObjectToEObjectMap();
+
+    /**
+     * The meta object literal for the '<em><b>EObject To EObject Key Contained Map</b></em>' map feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference MAP_HOLDER__EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP = eINSTANCE
+        .getMapHolder_EObjectToEObjectKeyContainedMap();
+
+    /**
+     * The meta object literal for the '<em><b>EObject To EObject Both Contained Map</b></em>' map feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference MAP_HOLDER__EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP = eINSTANCE
+        .getMapHolder_EObjectToEObjectBothContainedMap();
+
+    /**
+     * The meta object literal for the '<em><b>EObject To EObject Value Contained Map</b></em>' map feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference MAP_HOLDER__EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP = eINSTANCE
+        .getMapHolder_EObjectToEObjectValueContainedMap();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model2.impl.StringToStringMapImpl
+     * <em>String To String Map</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.emf.cdo.tests.model2.impl.StringToStringMapImpl
+     * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getStringToStringMap()
+     * @generated
+     */
+    EClass STRING_TO_STRING_MAP = eINSTANCE.getStringToStringMap();
+
+    /**
+     * The meta object literal for the '<em><b>Key</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EAttribute STRING_TO_STRING_MAP__KEY = eINSTANCE.getStringToStringMap_Key();
+
+    /**
+     * The meta object literal for the '<em><b>Value</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EAttribute STRING_TO_STRING_MAP__VALUE = eINSTANCE.getStringToStringMap_Value();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model2.impl.IntegerToStringMapImpl
+     * <em>Integer To String Map</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.emf.cdo.tests.model2.impl.IntegerToStringMapImpl
+     * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getIntegerToStringMap()
+     * @generated
+     */
+    EClass INTEGER_TO_STRING_MAP = eINSTANCE.getIntegerToStringMap();
+
+    /**
+     * The meta object literal for the '<em><b>Key</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EAttribute INTEGER_TO_STRING_MAP__KEY = eINSTANCE.getIntegerToStringMap_Key();
+
+    /**
+     * The meta object literal for the '<em><b>Value</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EAttribute INTEGER_TO_STRING_MAP__VALUE = eINSTANCE.getIntegerToStringMap_Value();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model2.impl.StringToVATMapImpl
+     * <em>String To VAT Map</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.emf.cdo.tests.model2.impl.StringToVATMapImpl
+     * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getStringToVATMap()
+     * @generated
+     */
+    EClass STRING_TO_VAT_MAP = eINSTANCE.getStringToVATMap();
+
+    /**
+     * The meta object literal for the '<em><b>Key</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EAttribute STRING_TO_VAT_MAP__KEY = eINSTANCE.getStringToVATMap_Key();
+
+    /**
+     * The meta object literal for the '<em><b>Value</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EAttribute STRING_TO_VAT_MAP__VALUE = eINSTANCE.getStringToVATMap_Value();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model2.impl.StringToAddressContainmentMapImpl
+     * <em>String To Address Containment Map</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.emf.cdo.tests.model2.impl.StringToAddressContainmentMapImpl
+     * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getStringToAddressContainmentMap()
+     * @generated
+     */
+    EClass STRING_TO_ADDRESS_CONTAINMENT_MAP = eINSTANCE.getStringToAddressContainmentMap();
+
+    /**
+     * The meta object literal for the '<em><b>Key</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EAttribute STRING_TO_ADDRESS_CONTAINMENT_MAP__KEY = eINSTANCE.getStringToAddressContainmentMap_Key();
+
+    /**
+     * The meta object literal for the '<em><b>Value</b></em>' containment reference feature. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference STRING_TO_ADDRESS_CONTAINMENT_MAP__VALUE = eINSTANCE.getStringToAddressContainmentMap_Value();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model2.impl.StringToAddressReferenceMapImpl
+     * <em>String To Address Reference Map</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.emf.cdo.tests.model2.impl.StringToAddressReferenceMapImpl
+     * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getStringToAddressReferenceMap()
+     * @generated
+     */
+    EClass STRING_TO_ADDRESS_REFERENCE_MAP = eINSTANCE.getStringToAddressReferenceMap();
+
+    /**
+     * The meta object literal for the '<em><b>Key</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EAttribute STRING_TO_ADDRESS_REFERENCE_MAP__KEY = eINSTANCE.getStringToAddressReferenceMap_Key();
+
+    /**
+     * The meta object literal for the '<em><b>Value</b></em>' reference feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference STRING_TO_ADDRESS_REFERENCE_MAP__VALUE = eINSTANCE.getStringToAddressReferenceMap_Value();
+
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model2.impl.EObjectToEObjectMapImpl
+     * <em>EObject To EObject Map</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.emf.cdo.tests.model2.impl.EObjectToEObjectMapImpl
+     * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getEObjectToEObjectMap()
+     * @generated
+     */
+    EClass EOBJECT_TO_EOBJECT_MAP = eINSTANCE.getEObjectToEObjectMap();
+
+    /**
+     * The meta object literal for the '<em><b>Key</b></em>' reference feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference EOBJECT_TO_EOBJECT_MAP__KEY = eINSTANCE.getEObjectToEObjectMap_Key();
+
+    /**
+     * The meta object literal for the '<em><b>Value</b></em>' reference feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference EOBJECT_TO_EOBJECT_MAP__VALUE = eINSTANCE.getEObjectToEObjectMap_Value();
+
+    /**
+     * The meta object literal for the '
+     * {@link org.eclipse.emf.cdo.tests.model2.impl.EObjectToEObjectKeyContainedMapImpl
+     * <em>EObject To EObject Key Contained Map</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.emf.cdo.tests.model2.impl.EObjectToEObjectKeyContainedMapImpl
+     * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getEObjectToEObjectKeyContainedMap()
+     * @generated
+     */
+    EClass EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP = eINSTANCE.getEObjectToEObjectKeyContainedMap();
+
+    /**
+     * The meta object literal for the '<em><b>Key</b></em>' containment reference feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__KEY = eINSTANCE.getEObjectToEObjectKeyContainedMap_Key();
+
+    /**
+     * The meta object literal for the '<em><b>Value</b></em>' reference feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__VALUE = eINSTANCE.getEObjectToEObjectKeyContainedMap_Value();
+
+    /**
+     * The meta object literal for the '
+     * {@link org.eclipse.emf.cdo.tests.model2.impl.EObjectToEObjectBothContainedMapImpl
+     * <em>EObject To EObject Both Contained Map</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.emf.cdo.tests.model2.impl.EObjectToEObjectBothContainedMapImpl
+     * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getEObjectToEObjectBothContainedMap()
+     * @generated
+     */
+    EClass EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP = eINSTANCE.getEObjectToEObjectBothContainedMap();
+
+    /**
+     * The meta object literal for the '<em><b>Key</b></em>' containment reference feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__KEY = eINSTANCE.getEObjectToEObjectBothContainedMap_Key();
+
+    /**
+     * The meta object literal for the '<em><b>Value</b></em>' containment reference feature. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__VALUE = eINSTANCE.getEObjectToEObjectBothContainedMap_Value();
+
+    /**
+     * The meta object literal for the '
+     * {@link org.eclipse.emf.cdo.tests.model2.impl.EObjectToEObjectValueContainedMapImpl
+     * <em>EObject To EObject Value Contained Map</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.emf.cdo.tests.model2.impl.EObjectToEObjectValueContainedMapImpl
+     * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getEObjectToEObjectValueContainedMap()
+     * @generated
+     */
+    EClass EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP = eINSTANCE.getEObjectToEObjectValueContainedMap();
+
+    /**
+     * The meta object literal for the '<em><b>Key</b></em>' reference feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__KEY = eINSTANCE.getEObjectToEObjectValueContainedMap_Key();
+
+    /**
+     * The meta object literal for the '<em><b>Value</b></em>' containment reference feature. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE = eINSTANCE.getEObjectToEObjectValueContainedMap_Value();
+
   }
 
 } // Model2Package
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectBothContainedMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectBothContainedMapImpl.java
new file mode 100644
index 0000000000..e429ea9cd8
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectBothContainedMapImpl.java
@@ -0,0 +1,197 @@
+/**
+ * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ *
+ * $Id: EObjectToEObjectBothContainedMapImpl.java,v 1.1 2010-03-11 20:34:50 mfluegge Exp $
+ */
+package org.eclipse.emf.cdo.tests.model2.impl;
+
+import org.eclipse.emf.cdo.tests.model2.Model2Package;
+
+import org.eclipse.emf.internal.cdo.CDOObjectImpl;
+
+import org.eclipse.emf.common.util.BasicEMap;
+import org.eclipse.emf.common.util.EMap;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>EObject To EObject Both Contained Map</b></em>
+ * '. <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.tests.model2.impl.EObjectToEObjectBothContainedMapImpl#getTypedKey <em>Key</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model2.impl.EObjectToEObjectBothContainedMapImpl#getTypedValue <em>Value</em>}</li>
+ * </ul>
+ * </p>
+ * 
+ * @generated
+ */
+public class EObjectToEObjectBothContainedMapImpl extends CDOObjectImpl implements BasicEMap.Entry<EObject, EObject>
+{
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected EObjectToEObjectBothContainedMapImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Model2Package.Literals.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected int eStaticFeatureCount()
+  {
+    return 0;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject getTypedKey()
+  {
+    return (EObject)eGet(Model2Package.Literals.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__KEY, true);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setTypedKey(EObject newKey)
+  {
+    eSet(Model2Package.Literals.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__KEY, newKey);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject getTypedValue()
+  {
+    return (EObject)eGet(Model2Package.Literals.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__VALUE, true);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setTypedValue(EObject newValue)
+  {
+    eSet(Model2Package.Literals.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__VALUE, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected int hash = -1;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public int getHash()
+  {
+    if (hash == -1)
+    {
+      Object theKey = getKey();
+      hash = (theKey == null ? 0 : theKey.hashCode());
+    }
+    return hash;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setHash(int hash)
+  {
+    this.hash = hash;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject getKey()
+  {
+    return getTypedKey();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setKey(EObject key)
+  {
+    setTypedKey(key);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject getValue()
+  {
+    return getTypedValue();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject setValue(EObject value)
+  {
+    EObject oldValue = getValue();
+    setTypedValue(value);
+    return oldValue;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  public EMap<EObject, EObject> getEMap()
+  {
+    EObject container = eContainer();
+    return container == null ? null : (EMap<EObject, EObject>)container.eGet(eContainmentFeature());
+  }
+
+} // EObjectToEObjectBothContainedMapImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectKeyContainedMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectKeyContainedMapImpl.java
new file mode 100644
index 0000000000..b9e6f59eeb
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectKeyContainedMapImpl.java
@@ -0,0 +1,197 @@
+/**
+ * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ *
+ * $Id: EObjectToEObjectKeyContainedMapImpl.java,v 1.1 2010-03-11 20:34:53 mfluegge Exp $
+ */
+package org.eclipse.emf.cdo.tests.model2.impl;
+
+import org.eclipse.emf.cdo.tests.model2.Model2Package;
+
+import org.eclipse.emf.internal.cdo.CDOObjectImpl;
+
+import org.eclipse.emf.common.util.BasicEMap;
+import org.eclipse.emf.common.util.EMap;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>EObject To EObject Key Contained Map</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.tests.model2.impl.EObjectToEObjectKeyContainedMapImpl#getTypedKey <em>Key</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model2.impl.EObjectToEObjectKeyContainedMapImpl#getTypedValue <em>Value</em>}</li>
+ * </ul>
+ * </p>
+ * 
+ * @generated
+ */
+public class EObjectToEObjectKeyContainedMapImpl extends CDOObjectImpl implements BasicEMap.Entry<EObject, EObject>
+{
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected EObjectToEObjectKeyContainedMapImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Model2Package.Literals.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected int eStaticFeatureCount()
+  {
+    return 0;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject getTypedKey()
+  {
+    return (EObject)eGet(Model2Package.Literals.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__KEY, true);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setTypedKey(EObject newKey)
+  {
+    eSet(Model2Package.Literals.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__KEY, newKey);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject getTypedValue()
+  {
+    return (EObject)eGet(Model2Package.Literals.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__VALUE, true);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setTypedValue(EObject newValue)
+  {
+    eSet(Model2Package.Literals.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__VALUE, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected int hash = -1;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public int getHash()
+  {
+    if (hash == -1)
+    {
+      Object theKey = getKey();
+      hash = (theKey == null ? 0 : theKey.hashCode());
+    }
+    return hash;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setHash(int hash)
+  {
+    this.hash = hash;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject getKey()
+  {
+    return getTypedKey();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setKey(EObject key)
+  {
+    setTypedKey(key);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject getValue()
+  {
+    return getTypedValue();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject setValue(EObject value)
+  {
+    EObject oldValue = getValue();
+    setTypedValue(value);
+    return oldValue;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  public EMap<EObject, EObject> getEMap()
+  {
+    EObject container = eContainer();
+    return container == null ? null : (EMap<EObject, EObject>)container.eGet(eContainmentFeature());
+  }
+
+} // EObjectToEObjectKeyContainedMapImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectMapImpl.java
new file mode 100644
index 0000000000..42dc358b5a
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectMapImpl.java
@@ -0,0 +1,197 @@
+/**
+ * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ *
+ * $Id: EObjectToEObjectMapImpl.java,v 1.1 2010-03-11 20:34:54 mfluegge Exp $
+ */
+package org.eclipse.emf.cdo.tests.model2.impl;
+
+import org.eclipse.emf.cdo.tests.model2.Model2Package;
+
+import org.eclipse.emf.internal.cdo.CDOObjectImpl;
+
+import org.eclipse.emf.common.util.BasicEMap;
+import org.eclipse.emf.common.util.EMap;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>EObject To EObject Map</b></em>'. <!--
+ * end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.tests.model2.impl.EObjectToEObjectMapImpl#getTypedKey <em>Key</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model2.impl.EObjectToEObjectMapImpl#getTypedValue <em>Value</em>}</li>
+ * </ul>
+ * </p>
+ * 
+ * @generated
+ */
+public class EObjectToEObjectMapImpl extends CDOObjectImpl implements BasicEMap.Entry<EObject, EObject>
+{
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected EObjectToEObjectMapImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Model2Package.Literals.EOBJECT_TO_EOBJECT_MAP;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected int eStaticFeatureCount()
+  {
+    return 0;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject getTypedKey()
+  {
+    return (EObject)eGet(Model2Package.Literals.EOBJECT_TO_EOBJECT_MAP__KEY, true);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setTypedKey(EObject newKey)
+  {
+    eSet(Model2Package.Literals.EOBJECT_TO_EOBJECT_MAP__KEY, newKey);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject getTypedValue()
+  {
+    return (EObject)eGet(Model2Package.Literals.EOBJECT_TO_EOBJECT_MAP__VALUE, true);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setTypedValue(EObject newValue)
+  {
+    eSet(Model2Package.Literals.EOBJECT_TO_EOBJECT_MAP__VALUE, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected int hash = -1;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public int getHash()
+  {
+    if (hash == -1)
+    {
+      Object theKey = getKey();
+      hash = (theKey == null ? 0 : theKey.hashCode());
+    }
+    return hash;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setHash(int hash)
+  {
+    this.hash = hash;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject getKey()
+  {
+    return getTypedKey();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setKey(EObject key)
+  {
+    setTypedKey(key);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject getValue()
+  {
+    return getTypedValue();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject setValue(EObject value)
+  {
+    EObject oldValue = getValue();
+    setTypedValue(value);
+    return oldValue;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  public EMap<EObject, EObject> getEMap()
+  {
+    EObject container = eContainer();
+    return container == null ? null : (EMap<EObject, EObject>)container.eGet(eContainmentFeature());
+  }
+
+} // EObjectToEObjectMapImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectValueContainedMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectValueContainedMapImpl.java
new file mode 100644
index 0000000000..15c186dac6
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectValueContainedMapImpl.java
@@ -0,0 +1,197 @@
+/**
+ * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ *
+ * $Id: EObjectToEObjectValueContainedMapImpl.java,v 1.1 2010-03-11 20:34:52 mfluegge Exp $
+ */
+package org.eclipse.emf.cdo.tests.model2.impl;
+
+import org.eclipse.emf.cdo.tests.model2.Model2Package;
+
+import org.eclipse.emf.internal.cdo.CDOObjectImpl;
+
+import org.eclipse.emf.common.util.BasicEMap;
+import org.eclipse.emf.common.util.EMap;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>EObject To EObject Value Contained Map</b></em>
+ * '. <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.tests.model2.impl.EObjectToEObjectValueContainedMapImpl#getTypedKey <em>Key</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model2.impl.EObjectToEObjectValueContainedMapImpl#getTypedValue <em>Value</em>}</li>
+ * </ul>
+ * </p>
+ * 
+ * @generated
+ */
+public class EObjectToEObjectValueContainedMapImpl extends CDOObjectImpl implements BasicEMap.Entry<EObject, EObject>
+{
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected EObjectToEObjectValueContainedMapImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Model2Package.Literals.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected int eStaticFeatureCount()
+  {
+    return 0;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject getTypedKey()
+  {
+    return (EObject)eGet(Model2Package.Literals.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__KEY, true);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setTypedKey(EObject newKey)
+  {
+    eSet(Model2Package.Literals.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__KEY, newKey);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject getTypedValue()
+  {
+    return (EObject)eGet(Model2Package.Literals.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE, true);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setTypedValue(EObject newValue)
+  {
+    eSet(Model2Package.Literals.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected int hash = -1;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public int getHash()
+  {
+    if (hash == -1)
+    {
+      Object theKey = getKey();
+      hash = (theKey == null ? 0 : theKey.hashCode());
+    }
+    return hash;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setHash(int hash)
+  {
+    this.hash = hash;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject getKey()
+  {
+    return getTypedKey();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setKey(EObject key)
+  {
+    setTypedKey(key);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject getValue()
+  {
+    return getTypedValue();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EObject setValue(EObject value)
+  {
+    EObject oldValue = getValue();
+    setTypedValue(value);
+    return oldValue;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  public EMap<EObject, EObject> getEMap()
+  {
+    EObject container = eContainer();
+    return container == null ? null : (EMap<EObject, EObject>)container.eGet(eContainmentFeature());
+  }
+
+} // EObjectToEObjectValueContainedMapImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/IntegerToStringMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/IntegerToStringMapImpl.java
new file mode 100644
index 0000000000..c9c8de1821
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/IntegerToStringMapImpl.java
@@ -0,0 +1,197 @@
+/**
+ * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ *
+ * $Id: IntegerToStringMapImpl.java,v 1.1 2010-03-11 20:34:51 mfluegge Exp $
+ */
+package org.eclipse.emf.cdo.tests.model2.impl;
+
+import org.eclipse.emf.cdo.tests.model2.Model2Package;
+
+import org.eclipse.emf.internal.cdo.CDOObjectImpl;
+
+import org.eclipse.emf.common.util.BasicEMap;
+import org.eclipse.emf.common.util.EMap;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Integer To String Map</b></em>'. <!--
+ * end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.tests.model2.impl.IntegerToStringMapImpl#getTypedKey <em>Key</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model2.impl.IntegerToStringMapImpl#getTypedValue <em>Value</em>}</li>
+ * </ul>
+ * </p>
+ * 
+ * @generated
+ */
+public class IntegerToStringMapImpl extends CDOObjectImpl implements BasicEMap.Entry<Integer, String>
+{
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected IntegerToStringMapImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Model2Package.Literals.INTEGER_TO_STRING_MAP;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected int eStaticFeatureCount()
+  {
+    return 0;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Integer getTypedKey()
+  {
+    return (Integer)eGet(Model2Package.Literals.INTEGER_TO_STRING_MAP__KEY, true);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setTypedKey(Integer newKey)
+  {
+    eSet(Model2Package.Literals.INTEGER_TO_STRING_MAP__KEY, newKey);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String getTypedValue()
+  {
+    return (String)eGet(Model2Package.Literals.INTEGER_TO_STRING_MAP__VALUE, true);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setTypedValue(String newValue)
+  {
+    eSet(Model2Package.Literals.INTEGER_TO_STRING_MAP__VALUE, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected int hash = -1;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public int getHash()
+  {
+    if (hash == -1)
+    {
+      Object theKey = getKey();
+      hash = (theKey == null ? 0 : theKey.hashCode());
+    }
+    return hash;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setHash(int hash)
+  {
+    this.hash = hash;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Integer getKey()
+  {
+    return getTypedKey();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setKey(Integer key)
+  {
+    setTypedKey(key);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String getValue()
+  {
+    return getTypedValue();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String setValue(String value)
+  {
+    String oldValue = getValue();
+    setTypedValue(value);
+    return oldValue;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  public EMap<Integer, String> getEMap()
+  {
+    EObject container = eContainer();
+    return container == null ? null : (EMap<Integer, String>)container.eGet(eContainmentFeature());
+  }
+
+} // IntegerToStringMapImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/MapHolderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/MapHolderImpl.java
new file mode 100644
index 0000000000..be5114f0b5
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/MapHolderImpl.java
@@ -0,0 +1,184 @@
+/**
+ * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ *
+ * $Id: MapHolderImpl.java,v 1.1 2010-03-11 20:34:52 mfluegge Exp $
+ */
+package org.eclipse.emf.cdo.tests.model2.impl;
+
+import org.eclipse.emf.cdo.tests.model1.Address;
+import org.eclipse.emf.cdo.tests.model1.VAT;
+import org.eclipse.emf.cdo.tests.model2.MapHolder;
+import org.eclipse.emf.cdo.tests.model2.Model2Package;
+
+import org.eclipse.emf.internal.cdo.CDOObjectImpl;
+
+import org.eclipse.emf.common.util.EMap;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Map Holder</b></em>'. <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.tests.model2.impl.MapHolderImpl#getIntegerToStringMap <em>Integer To String Map</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model2.impl.MapHolderImpl#getStringToStringMap <em>String To String Map</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model2.impl.MapHolderImpl#getStringToVATMap <em>String To VAT Map</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model2.impl.MapHolderImpl#getStringToAddressContainmentMap <em>String To Address
+ * Containment Map</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model2.impl.MapHolderImpl#getStringToAddressReferenceMap <em>String To Address
+ * Reference Map</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model2.impl.MapHolderImpl#getEObjectToEObjectMap <em>EObject To EObject Map
+ * </em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model2.impl.MapHolderImpl#getEObjectToEObjectKeyContainedMap <em>EObject To
+ * EObject Key Contained Map</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model2.impl.MapHolderImpl#getEObjectToEObjectBothContainedMap <em>EObject To
+ * EObject Both Contained Map</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model2.impl.MapHolderImpl#getEObjectToEObjectValueContainedMap <em>EObject To
+ * EObject Value Contained Map</em>}</li>
+ * </ul>
+ * </p>
+ * 
+ * @generated
+ */
+public class MapHolderImpl extends CDOObjectImpl implements MapHolder
+{
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected MapHolderImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Model2Package.Literals.MAP_HOLDER;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected int eStaticFeatureCount()
+  {
+    return 0;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  public EMap<Integer, String> getIntegerToStringMap()
+  {
+    return (EMap<Integer, String>)eGet(Model2Package.Literals.MAP_HOLDER__INTEGER_TO_STRING_MAP, true);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  public EMap<String, String> getStringToStringMap()
+  {
+    return (EMap<String, String>)eGet(Model2Package.Literals.MAP_HOLDER__STRING_TO_STRING_MAP, true);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  public EMap<String, VAT> getStringToVATMap()
+  {
+    return (EMap<String, VAT>)eGet(Model2Package.Literals.MAP_HOLDER__STRING_TO_VAT_MAP, true);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  public EMap<String, Address> getStringToAddressContainmentMap()
+  {
+    return (EMap<String, Address>)eGet(Model2Package.Literals.MAP_HOLDER__STRING_TO_ADDRESS_CONTAINMENT_MAP, true);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  public EMap<String, Address> getStringToAddressReferenceMap()
+  {
+    return (EMap<String, Address>)eGet(Model2Package.Literals.MAP_HOLDER__STRING_TO_ADDRESS_REFERENCE_MAP, true);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  public EMap<EObject, EObject> getEObjectToEObjectMap()
+  {
+    return (EMap<EObject, EObject>)eGet(Model2Package.Literals.MAP_HOLDER__EOBJECT_TO_EOBJECT_MAP, true);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  public EMap<EObject, EObject> getEObjectToEObjectKeyContainedMap()
+  {
+    return (EMap<EObject, EObject>)eGet(Model2Package.Literals.MAP_HOLDER__EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP, true);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  public EMap<EObject, EObject> getEObjectToEObjectBothContainedMap()
+  {
+    return (EMap<EObject, EObject>)eGet(Model2Package.Literals.MAP_HOLDER__EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP, true);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  public EMap<EObject, EObject> getEObjectToEObjectValueContainedMap()
+  {
+    return (EMap<EObject, EObject>)eGet(Model2Package.Literals.MAP_HOLDER__EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP, true);
+  }
+
+} // MapHolderImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Model2FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Model2FactoryImpl.java
index 11f69d3278..61121faf26 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Model2FactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Model2FactoryImpl.java
@@ -10,6 +10,9 @@
  */
 package org.eclipse.emf.cdo.tests.model2.impl;
 
+import org.eclipse.emf.cdo.tests.model1.Address;
+import org.eclipse.emf.cdo.tests.model1.VAT;
+import org.eclipse.emf.cdo.tests.model2.MapHolder;
 import org.eclipse.emf.cdo.tests.model2.Model2Factory;
 import org.eclipse.emf.cdo.tests.model2.Model2Package;
 import org.eclipse.emf.cdo.tests.model2.NotUnsettable;
@@ -28,6 +31,8 @@ import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
+import java.util.Map;
+
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
  * 
@@ -96,6 +101,26 @@ public class Model2FactoryImpl extends EFactoryImpl implements Model2Factory
       return createNotUnsettable();
     case Model2Package.NOT_UNSETTABLE_WITH_DEFAULT:
       return createNotUnsettableWithDefault();
+    case Model2Package.MAP_HOLDER:
+      return createMapHolder();
+    case Model2Package.STRING_TO_STRING_MAP:
+      return (EObject)createStringToStringMap();
+    case Model2Package.INTEGER_TO_STRING_MAP:
+      return (EObject)createIntegerToStringMap();
+    case Model2Package.STRING_TO_VAT_MAP:
+      return (EObject)createStringToVATMap();
+    case Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP:
+      return (EObject)createStringToAddressContainmentMap();
+    case Model2Package.STRING_TO_ADDRESS_REFERENCE_MAP:
+      return (EObject)createStringToAddressReferenceMap();
+    case Model2Package.EOBJECT_TO_EOBJECT_MAP:
+      return (EObject)createEObjectToEObjectMap();
+    case Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP:
+      return (EObject)createEObjectToEObjectKeyContainedMap();
+    case Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP:
+      return (EObject)createEObjectToEObjectBothContainedMap();
+    case Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP:
+      return (EObject)createEObjectToEObjectValueContainedMap();
     default:
       throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
     }
@@ -205,6 +230,116 @@ public class Model2FactoryImpl extends EFactoryImpl implements Model2Factory
    * 
    * @generated
    */
+  public MapHolder createMapHolder()
+  {
+    MapHolderImpl mapHolder = new MapHolderImpl();
+    return mapHolder;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Map.Entry<String, String> createStringToStringMap()
+  {
+    StringToStringMapImpl stringToStringMap = new StringToStringMapImpl();
+    return stringToStringMap;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Map.Entry<Integer, String> createIntegerToStringMap()
+  {
+    IntegerToStringMapImpl integerToStringMap = new IntegerToStringMapImpl();
+    return integerToStringMap;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Map.Entry<String, VAT> createStringToVATMap()
+  {
+    StringToVATMapImpl stringToVATMap = new StringToVATMapImpl();
+    return stringToVATMap;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Map.Entry<String, Address> createStringToAddressContainmentMap()
+  {
+    StringToAddressContainmentMapImpl stringToAddressContainmentMap = new StringToAddressContainmentMapImpl();
+    return stringToAddressContainmentMap;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Map.Entry<String, Address> createStringToAddressReferenceMap()
+  {
+    StringToAddressReferenceMapImpl stringToAddressReferenceMap = new StringToAddressReferenceMapImpl();
+    return stringToAddressReferenceMap;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Map.Entry<EObject, EObject> createEObjectToEObjectMap()
+  {
+    EObjectToEObjectMapImpl eObjectToEObjectMap = new EObjectToEObjectMapImpl();
+    return eObjectToEObjectMap;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Map.Entry<EObject, EObject> createEObjectToEObjectKeyContainedMap()
+  {
+    EObjectToEObjectKeyContainedMapImpl eObjectToEObjectKeyContainedMap = new EObjectToEObjectKeyContainedMapImpl();
+    return eObjectToEObjectKeyContainedMap;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Map.Entry<EObject, EObject> createEObjectToEObjectBothContainedMap()
+  {
+    EObjectToEObjectBothContainedMapImpl eObjectToEObjectBothContainedMap = new EObjectToEObjectBothContainedMapImpl();
+    return eObjectToEObjectBothContainedMap;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Map.Entry<EObject, EObject> createEObjectToEObjectValueContainedMap()
+  {
+    EObjectToEObjectValueContainedMapImpl eObjectToEObjectValueContainedMap = new EObjectToEObjectValueContainedMapImpl();
+    return eObjectToEObjectValueContainedMap;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
   public Model2Package getModel2Package()
   {
     return (Model2Package)getEPackage();
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Model2PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Model2PackageImpl.java
index c7649a47bb..63c99ca193 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Model2PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Model2PackageImpl.java
@@ -11,6 +11,7 @@
 package org.eclipse.emf.cdo.tests.model2.impl;
 
 import org.eclipse.emf.cdo.tests.model1.Model1Package;
+import org.eclipse.emf.cdo.tests.model2.MapHolder;
 import org.eclipse.emf.cdo.tests.model2.Model2Factory;
 import org.eclipse.emf.cdo.tests.model2.Model2Package;
 import org.eclipse.emf.cdo.tests.model2.NotUnsettable;
@@ -29,6 +30,8 @@ import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 
+import java.util.Map;
+
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
  * 
@@ -100,6 +103,76 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
   private EClass notUnsettableWithDefaultEClass = null;
 
   /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass mapHolderEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass stringToStringMapEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass integerToStringMapEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass stringToVATMapEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass stringToAddressContainmentMapEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass stringToAddressReferenceMapEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass eObjectToEObjectMapEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass eObjectToEObjectKeyContainedMapEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass eObjectToEObjectBothContainedMapEClass = null;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass eObjectToEObjectValueContainedMapEClass = 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>
@@ -139,9 +212,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
   public static Model2Package init()
   {
     if (isInited)
-    {
       return (Model2Package)EPackage.Registry.INSTANCE.getEPackage(Model2Package.eNS_URI);
-    }
 
     // Obtain or create and register package
     Model2PackageImpl theModel2Package = (Model2PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model2PackageImpl ? EPackage.Registry.INSTANCE
@@ -822,6 +893,376 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
    * 
    * @generated
    */
+  public EClass getMapHolder()
+  {
+    return mapHolderEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getMapHolder_IntegerToStringMap()
+  {
+    return (EReference)mapHolderEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getMapHolder_StringToStringMap()
+  {
+    return (EReference)mapHolderEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getMapHolder_StringToVATMap()
+  {
+    return (EReference)mapHolderEClass.getEStructuralFeatures().get(2);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getMapHolder_StringToAddressContainmentMap()
+  {
+    return (EReference)mapHolderEClass.getEStructuralFeatures().get(3);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getMapHolder_StringToAddressReferenceMap()
+  {
+    return (EReference)mapHolderEClass.getEStructuralFeatures().get(4);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getMapHolder_EObjectToEObjectMap()
+  {
+    return (EReference)mapHolderEClass.getEStructuralFeatures().get(5);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getMapHolder_EObjectToEObjectKeyContainedMap()
+  {
+    return (EReference)mapHolderEClass.getEStructuralFeatures().get(6);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getMapHolder_EObjectToEObjectBothContainedMap()
+  {
+    return (EReference)mapHolderEClass.getEStructuralFeatures().get(7);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getMapHolder_EObjectToEObjectValueContainedMap()
+  {
+    return (EReference)mapHolderEClass.getEStructuralFeatures().get(8);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getStringToStringMap()
+  {
+    return stringToStringMapEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EAttribute getStringToStringMap_Key()
+  {
+    return (EAttribute)stringToStringMapEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EAttribute getStringToStringMap_Value()
+  {
+    return (EAttribute)stringToStringMapEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getIntegerToStringMap()
+  {
+    return integerToStringMapEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EAttribute getIntegerToStringMap_Key()
+  {
+    return (EAttribute)integerToStringMapEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EAttribute getIntegerToStringMap_Value()
+  {
+    return (EAttribute)integerToStringMapEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getStringToVATMap()
+  {
+    return stringToVATMapEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EAttribute getStringToVATMap_Key()
+  {
+    return (EAttribute)stringToVATMapEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EAttribute getStringToVATMap_Value()
+  {
+    return (EAttribute)stringToVATMapEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getStringToAddressContainmentMap()
+  {
+    return stringToAddressContainmentMapEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EAttribute getStringToAddressContainmentMap_Key()
+  {
+    return (EAttribute)stringToAddressContainmentMapEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getStringToAddressContainmentMap_Value()
+  {
+    return (EReference)stringToAddressContainmentMapEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getStringToAddressReferenceMap()
+  {
+    return stringToAddressReferenceMapEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EAttribute getStringToAddressReferenceMap_Key()
+  {
+    return (EAttribute)stringToAddressReferenceMapEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getStringToAddressReferenceMap_Value()
+  {
+    return (EReference)stringToAddressReferenceMapEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getEObjectToEObjectMap()
+  {
+    return eObjectToEObjectMapEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getEObjectToEObjectMap_Key()
+  {
+    return (EReference)eObjectToEObjectMapEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getEObjectToEObjectMap_Value()
+  {
+    return (EReference)eObjectToEObjectMapEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getEObjectToEObjectKeyContainedMap()
+  {
+    return eObjectToEObjectKeyContainedMapEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getEObjectToEObjectKeyContainedMap_Key()
+  {
+    return (EReference)eObjectToEObjectKeyContainedMapEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getEObjectToEObjectKeyContainedMap_Value()
+  {
+    return (EReference)eObjectToEObjectKeyContainedMapEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getEObjectToEObjectBothContainedMap()
+  {
+    return eObjectToEObjectBothContainedMapEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getEObjectToEObjectBothContainedMap_Key()
+  {
+    return (EReference)eObjectToEObjectBothContainedMapEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getEObjectToEObjectBothContainedMap_Value()
+  {
+    return (EReference)eObjectToEObjectBothContainedMapEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getEObjectToEObjectValueContainedMap()
+  {
+    return eObjectToEObjectValueContainedMapEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getEObjectToEObjectValueContainedMap_Key()
+  {
+    return (EReference)eObjectToEObjectValueContainedMapEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getEObjectToEObjectValueContainedMap_Value()
+  {
+    return (EReference)eObjectToEObjectValueContainedMapEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
   public Model2Factory getModel2Factory()
   {
     return (Model2Factory)getEFactoryInstance();
@@ -843,9 +1284,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
   public void createPackageContents()
   {
     if (isCreated)
-    {
       return;
-    }
     isCreated = true;
 
     // Create classes and their features
@@ -922,6 +1361,53 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
     createEAttribute(notUnsettableWithDefaultEClass, NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_SHORT);
     createEAttribute(notUnsettableWithDefaultEClass, NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_STRING);
     createEAttribute(notUnsettableWithDefaultEClass, NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_VAT);
+
+    mapHolderEClass = createEClass(MAP_HOLDER);
+    createEReference(mapHolderEClass, MAP_HOLDER__INTEGER_TO_STRING_MAP);
+    createEReference(mapHolderEClass, MAP_HOLDER__STRING_TO_STRING_MAP);
+    createEReference(mapHolderEClass, MAP_HOLDER__STRING_TO_VAT_MAP);
+    createEReference(mapHolderEClass, MAP_HOLDER__STRING_TO_ADDRESS_CONTAINMENT_MAP);
+    createEReference(mapHolderEClass, MAP_HOLDER__STRING_TO_ADDRESS_REFERENCE_MAP);
+    createEReference(mapHolderEClass, MAP_HOLDER__EOBJECT_TO_EOBJECT_MAP);
+    createEReference(mapHolderEClass, MAP_HOLDER__EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP);
+    createEReference(mapHolderEClass, MAP_HOLDER__EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP);
+    createEReference(mapHolderEClass, MAP_HOLDER__EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP);
+
+    stringToStringMapEClass = createEClass(STRING_TO_STRING_MAP);
+    createEAttribute(stringToStringMapEClass, STRING_TO_STRING_MAP__KEY);
+    createEAttribute(stringToStringMapEClass, STRING_TO_STRING_MAP__VALUE);
+
+    integerToStringMapEClass = createEClass(INTEGER_TO_STRING_MAP);
+    createEAttribute(integerToStringMapEClass, INTEGER_TO_STRING_MAP__KEY);
+    createEAttribute(integerToStringMapEClass, INTEGER_TO_STRING_MAP__VALUE);
+
+    stringToVATMapEClass = createEClass(STRING_TO_VAT_MAP);
+    createEAttribute(stringToVATMapEClass, STRING_TO_VAT_MAP__KEY);
+    createEAttribute(stringToVATMapEClass, STRING_TO_VAT_MAP__VALUE);
+
+    stringToAddressContainmentMapEClass = createEClass(STRING_TO_ADDRESS_CONTAINMENT_MAP);
+    createEAttribute(stringToAddressContainmentMapEClass, STRING_TO_ADDRESS_CONTAINMENT_MAP__KEY);
+    createEReference(stringToAddressContainmentMapEClass, STRING_TO_ADDRESS_CONTAINMENT_MAP__VALUE);
+
+    stringToAddressReferenceMapEClass = createEClass(STRING_TO_ADDRESS_REFERENCE_MAP);
+    createEAttribute(stringToAddressReferenceMapEClass, STRING_TO_ADDRESS_REFERENCE_MAP__KEY);
+    createEReference(stringToAddressReferenceMapEClass, STRING_TO_ADDRESS_REFERENCE_MAP__VALUE);
+
+    eObjectToEObjectMapEClass = createEClass(EOBJECT_TO_EOBJECT_MAP);
+    createEReference(eObjectToEObjectMapEClass, EOBJECT_TO_EOBJECT_MAP__KEY);
+    createEReference(eObjectToEObjectMapEClass, EOBJECT_TO_EOBJECT_MAP__VALUE);
+
+    eObjectToEObjectKeyContainedMapEClass = createEClass(EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP);
+    createEReference(eObjectToEObjectKeyContainedMapEClass, EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__KEY);
+    createEReference(eObjectToEObjectKeyContainedMapEClass, EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__VALUE);
+
+    eObjectToEObjectBothContainedMapEClass = createEClass(EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP);
+    createEReference(eObjectToEObjectBothContainedMapEClass, EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__KEY);
+    createEReference(eObjectToEObjectBothContainedMapEClass, EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__VALUE);
+
+    eObjectToEObjectValueContainedMapEClass = createEClass(EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP);
+    createEReference(eObjectToEObjectValueContainedMapEClass, EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__KEY);
+    createEReference(eObjectToEObjectValueContainedMapEClass, EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE);
   }
 
   /**
@@ -940,9 +1426,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
   public void initializePackageContents()
   {
     if (isInitialized)
-    {
       return;
-    }
     isInitialized = true;
 
     // Initialize package
@@ -972,14 +1456,14 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
 
     initEClass(taskContainerEClass, TaskContainer.class, "TaskContainer", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getTaskContainer_Tasks(), getTask(), getTask_TaskContainer(), "tasks", null, 0, -1,
+    initEReference(getTaskContainer_Tasks(), this.getTask(), this.getTask_TaskContainer(), "tasks", null, 0, -1,
         TaskContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(taskEClass, Task.class, "Task", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getTask_TaskContainer(), getTaskContainer(), getTaskContainer_Tasks(), "taskContainer", null, 0, 1,
-        Task.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getTask_TaskContainer(), this.getTaskContainer(), this.getTaskContainer_Tasks(), "taskContainer",
+        null, 0, 1, Task.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getTask_Description(), ecorePackage.getEString(), "description", null, 0, 1, Task.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getTask_Done(), ecorePackage.getEBoolean(), "done", null, 0, 1, Task.class, !IS_TRANSIENT,
@@ -1062,9 +1546,10 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
     initEAttribute(getPersistentContainment_AttrBefore(), ecorePackage.getEString(), "attrBefore", null, 0, 1,
         PersistentContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getPersistentContainment_Children(), getTransientContainer(), getTransientContainer_Parent(),
-        "children", null, 0, -1, PersistentContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+    initEReference(getPersistentContainment_Children(), this.getTransientContainer(), this
+        .getTransientContainer_Parent(), "children", null, 0, -1, PersistentContainment.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        !IS_ORDERED);
     initEAttribute(getPersistentContainment_AttrAfter(), ecorePackage.getEString(), "attrAfter", null, 0, 1,
         PersistentContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
@@ -1074,9 +1559,10 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
     initEAttribute(getTransientContainer_AttrBefore(), ecorePackage.getEString(), "attrBefore", null, 0, 1,
         TransientContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getTransientContainer_Parent(), getPersistentContainment(), getPersistentContainment_Children(),
-        "parent", null, 0, 1, TransientContainer.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getTransientContainer_Parent(), this.getPersistentContainment(), this
+        .getPersistentContainment_Children(), "parent", null, 0, 1, TransientContainer.class, IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
     initEAttribute(getTransientContainer_AttrAfter(), ecorePackage.getEString(), "attrAfter", null, 0, 1,
         TransientContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
@@ -1153,6 +1639,109 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package
         "vat15", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
         !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
+    initEClass(mapHolderEClass, MapHolder.class, "MapHolder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getMapHolder_IntegerToStringMap(), this.getIntegerToStringMap(), null, "integerToStringMap", null,
+        0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMapHolder_StringToStringMap(), this.getStringToStringMap(), null, "stringToStringMap", null, 0,
+        -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMapHolder_StringToVATMap(), this.getStringToVATMap(), null, "stringToVATMap", null, 0, -1,
+        MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMapHolder_StringToAddressContainmentMap(), this.getStringToAddressContainmentMap(), null,
+        "stringToAddressContainmentMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMapHolder_StringToAddressReferenceMap(), this.getStringToAddressReferenceMap(), null,
+        "stringToAddressReferenceMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMapHolder_EObjectToEObjectMap(), this.getEObjectToEObjectMap(), null, "eObjectToEObjectMap",
+        null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMapHolder_EObjectToEObjectKeyContainedMap(), this.getEObjectToEObjectKeyContainedMap(), null,
+        "eObjectToEObjectKeyContainedMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMapHolder_EObjectToEObjectBothContainedMap(), this.getEObjectToEObjectBothContainedMap(), null,
+        "eObjectToEObjectBothContainedMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMapHolder_EObjectToEObjectValueContainedMap(), this.getEObjectToEObjectValueContainedMap(), null,
+        "eObjectToEObjectValueContainedMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(stringToStringMapEClass, Map.Entry.class, "StringToStringMap", !IS_ABSTRACT, !IS_INTERFACE,
+        !IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getStringToStringMap_Key(), ecorePackage.getEString(), "key", null, 0, 1, Map.Entry.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getStringToStringMap_Value(), ecorePackage.getEString(), "value", null, 0, 1, Map.Entry.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(integerToStringMapEClass, Map.Entry.class, "IntegerToStringMap", !IS_ABSTRACT, !IS_INTERFACE,
+        !IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getIntegerToStringMap_Key(), ecorePackage.getEIntegerObject(), "key", null, 0, 1, Map.Entry.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getIntegerToStringMap_Value(), ecorePackage.getEString(), "value", null, 0, 1, Map.Entry.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(stringToVATMapEClass, Map.Entry.class, "StringToVATMap", !IS_ABSTRACT, !IS_INTERFACE,
+        !IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getStringToVATMap_Key(), ecorePackage.getEString(), "key", null, 0, 1, Map.Entry.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getStringToVATMap_Value(), theModel1Package.getVAT(), "value", null, 0, 1, Map.Entry.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(stringToAddressContainmentMapEClass, Map.Entry.class, "StringToAddressContainmentMap", !IS_ABSTRACT,
+        !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getStringToAddressContainmentMap_Key(), ecorePackage.getEString(), "key", null, 0, 1,
+        Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
+    initEReference(getStringToAddressContainmentMap_Value(), theModel1Package.getAddress(), null, "value", null, 0, 1,
+        Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(stringToAddressReferenceMapEClass, Map.Entry.class, "StringToAddressReferenceMap", !IS_ABSTRACT,
+        !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getStringToAddressReferenceMap_Key(), ecorePackage.getEString(), "key", null, 0, 1, Map.Entry.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getStringToAddressReferenceMap_Value(), theModel1Package.getAddress(), null, "value", null, 0, 1,
+        Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(eObjectToEObjectMapEClass, Map.Entry.class, "EObjectToEObjectMap", !IS_ABSTRACT, !IS_INTERFACE,
+        !IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getEObjectToEObjectMap_Key(), ecorePackage.getEObject(), null, "key", null, 0, 1, Map.Entry.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEReference(getEObjectToEObjectMap_Value(), ecorePackage.getEObject(), null, "value", null, 0, 1,
+        Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(eObjectToEObjectKeyContainedMapEClass, Map.Entry.class, "EObjectToEObjectKeyContainedMap", !IS_ABSTRACT,
+        !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getEObjectToEObjectKeyContainedMap_Key(), ecorePackage.getEObject(), null, "key", null, 0, 1,
+        Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getEObjectToEObjectKeyContainedMap_Value(), ecorePackage.getEObject(), null, "value", null, 0, 1,
+        Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(eObjectToEObjectBothContainedMapEClass, Map.Entry.class, "EObjectToEObjectBothContainedMap",
+        !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getEObjectToEObjectBothContainedMap_Key(), ecorePackage.getEObject(), null, "key", null, 0, 1,
+        Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getEObjectToEObjectBothContainedMap_Value(), ecorePackage.getEObject(), null, "value", null, 0, 1,
+        Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(eObjectToEObjectValueContainedMapEClass, Map.Entry.class, "EObjectToEObjectValueContainedMap",
+        !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getEObjectToEObjectValueContainedMap_Key(), ecorePackage.getEObject(), null, "key", null, 0, 1,
+        Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getEObjectToEObjectValueContainedMap_Value(), ecorePackage.getEObject(), null, "value", null, 0, 1,
+        Map.Entry.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);
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToAddressContainmentMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToAddressContainmentMapImpl.java
new file mode 100644
index 0000000000..7afeded34e
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToAddressContainmentMapImpl.java
@@ -0,0 +1,198 @@
+/**
+ * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ *
+ * $Id: StringToAddressContainmentMapImpl.java,v 1.1 2010-03-11 20:34:55 mfluegge Exp $
+ */
+package org.eclipse.emf.cdo.tests.model2.impl;
+
+import org.eclipse.emf.cdo.tests.model1.Address;
+import org.eclipse.emf.cdo.tests.model2.Model2Package;
+
+import org.eclipse.emf.internal.cdo.CDOObjectImpl;
+
+import org.eclipse.emf.common.util.BasicEMap;
+import org.eclipse.emf.common.util.EMap;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>String To Address Containment Map</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.tests.model2.impl.StringToAddressContainmentMapImpl#getTypedKey <em>Key</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model2.impl.StringToAddressContainmentMapImpl#getTypedValue <em>Value</em>}</li>
+ * </ul>
+ * </p>
+ * 
+ * @generated
+ */
+public class StringToAddressContainmentMapImpl extends CDOObjectImpl implements BasicEMap.Entry<String, Address>
+{
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected StringToAddressContainmentMapImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Model2Package.Literals.STRING_TO_ADDRESS_CONTAINMENT_MAP;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected int eStaticFeatureCount()
+  {
+    return 0;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String getTypedKey()
+  {
+    return (String)eGet(Model2Package.Literals.STRING_TO_ADDRESS_CONTAINMENT_MAP__KEY, true);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setTypedKey(String newKey)
+  {
+    eSet(Model2Package.Literals.STRING_TO_ADDRESS_CONTAINMENT_MAP__KEY, newKey);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Address getTypedValue()
+  {
+    return (Address)eGet(Model2Package.Literals.STRING_TO_ADDRESS_CONTAINMENT_MAP__VALUE, true);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setTypedValue(Address newValue)
+  {
+    eSet(Model2Package.Literals.STRING_TO_ADDRESS_CONTAINMENT_MAP__VALUE, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected int hash = -1;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public int getHash()
+  {
+    if (hash == -1)
+    {
+      Object theKey = getKey();
+      hash = (theKey == null ? 0 : theKey.hashCode());
+    }
+    return hash;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setHash(int hash)
+  {
+    this.hash = hash;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String getKey()
+  {
+    return getTypedKey();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setKey(String key)
+  {
+    setTypedKey(key);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Address getValue()
+  {
+    return getTypedValue();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Address setValue(Address value)
+  {
+    Address oldValue = getValue();
+    setTypedValue(value);
+    return oldValue;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  public EMap<String, Address> getEMap()
+  {
+    EObject container = eContainer();
+    return container == null ? null : (EMap<String, Address>)container.eGet(eContainmentFeature());
+  }
+
+} // StringToAddressContainmentMapImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToAddressReferenceMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToAddressReferenceMapImpl.java
new file mode 100644
index 0000000000..905a24bc66
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToAddressReferenceMapImpl.java
@@ -0,0 +1,198 @@
+/**
+ * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ *
+ * $Id: StringToAddressReferenceMapImpl.java,v 1.1 2010-03-11 20:34:53 mfluegge Exp $
+ */
+package org.eclipse.emf.cdo.tests.model2.impl;
+
+import org.eclipse.emf.cdo.tests.model1.Address;
+import org.eclipse.emf.cdo.tests.model2.Model2Package;
+
+import org.eclipse.emf.internal.cdo.CDOObjectImpl;
+
+import org.eclipse.emf.common.util.BasicEMap;
+import org.eclipse.emf.common.util.EMap;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>String To Address Reference Map</b></em>'. <!--
+ * end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.tests.model2.impl.StringToAddressReferenceMapImpl#getTypedKey <em>Key</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model2.impl.StringToAddressReferenceMapImpl#getTypedValue <em>Value</em>}</li>
+ * </ul>
+ * </p>
+ * 
+ * @generated
+ */
+public class StringToAddressReferenceMapImpl extends CDOObjectImpl implements BasicEMap.Entry<String, Address>
+{
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected StringToAddressReferenceMapImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Model2Package.Literals.STRING_TO_ADDRESS_REFERENCE_MAP;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected int eStaticFeatureCount()
+  {
+    return 0;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String getTypedKey()
+  {
+    return (String)eGet(Model2Package.Literals.STRING_TO_ADDRESS_REFERENCE_MAP__KEY, true);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setTypedKey(String newKey)
+  {
+    eSet(Model2Package.Literals.STRING_TO_ADDRESS_REFERENCE_MAP__KEY, newKey);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Address getTypedValue()
+  {
+    return (Address)eGet(Model2Package.Literals.STRING_TO_ADDRESS_REFERENCE_MAP__VALUE, true);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setTypedValue(Address newValue)
+  {
+    eSet(Model2Package.Literals.STRING_TO_ADDRESS_REFERENCE_MAP__VALUE, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected int hash = -1;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public int getHash()
+  {
+    if (hash == -1)
+    {
+      Object theKey = getKey();
+      hash = (theKey == null ? 0 : theKey.hashCode());
+    }
+    return hash;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setHash(int hash)
+  {
+    this.hash = hash;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String getKey()
+  {
+    return getTypedKey();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setKey(String key)
+  {
+    setTypedKey(key);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Address getValue()
+  {
+    return getTypedValue();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public Address setValue(Address value)
+  {
+    Address oldValue = getValue();
+    setTypedValue(value);
+    return oldValue;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  public EMap<String, Address> getEMap()
+  {
+    EObject container = eContainer();
+    return container == null ? null : (EMap<String, Address>)container.eGet(eContainmentFeature());
+  }
+
+} // StringToAddressReferenceMapImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToStringMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToStringMapImpl.java
new file mode 100644
index 0000000000..bff094bae1
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToStringMapImpl.java
@@ -0,0 +1,197 @@
+/**
+ * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ *
+ * $Id: StringToStringMapImpl.java,v 1.1 2010-03-11 20:34:54 mfluegge Exp $
+ */
+package org.eclipse.emf.cdo.tests.model2.impl;
+
+import org.eclipse.emf.cdo.tests.model2.Model2Package;
+
+import org.eclipse.emf.internal.cdo.CDOObjectImpl;
+
+import org.eclipse.emf.common.util.BasicEMap;
+import org.eclipse.emf.common.util.EMap;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>String To String Map</b></em>'. <!--
+ * end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.tests.model2.impl.StringToStringMapImpl#getTypedKey <em>Key</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model2.impl.StringToStringMapImpl#getTypedValue <em>Value</em>}</li>
+ * </ul>
+ * </p>
+ * 
+ * @generated
+ */
+public class StringToStringMapImpl extends CDOObjectImpl implements BasicEMap.Entry<String, String>
+{
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected StringToStringMapImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Model2Package.Literals.STRING_TO_STRING_MAP;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected int eStaticFeatureCount()
+  {
+    return 0;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String getTypedKey()
+  {
+    return (String)eGet(Model2Package.Literals.STRING_TO_STRING_MAP__KEY, true);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setTypedKey(String newKey)
+  {
+    eSet(Model2Package.Literals.STRING_TO_STRING_MAP__KEY, newKey);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String getTypedValue()
+  {
+    return (String)eGet(Model2Package.Literals.STRING_TO_STRING_MAP__VALUE, true);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setTypedValue(String newValue)
+  {
+    eSet(Model2Package.Literals.STRING_TO_STRING_MAP__VALUE, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected int hash = -1;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public int getHash()
+  {
+    if (hash == -1)
+    {
+      Object theKey = getKey();
+      hash = (theKey == null ? 0 : theKey.hashCode());
+    }
+    return hash;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setHash(int hash)
+  {
+    this.hash = hash;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String getKey()
+  {
+    return getTypedKey();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setKey(String key)
+  {
+    setTypedKey(key);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String getValue()
+  {
+    return getTypedValue();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String setValue(String value)
+  {
+    String oldValue = getValue();
+    setTypedValue(value);
+    return oldValue;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  public EMap<String, String> getEMap()
+  {
+    EObject container = eContainer();
+    return container == null ? null : (EMap<String, String>)container.eGet(eContainmentFeature());
+  }
+
+} // StringToStringMapImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToVATMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToVATMapImpl.java
new file mode 100644
index 0000000000..67b310274f
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToVATMapImpl.java
@@ -0,0 +1,198 @@
+/**
+ * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ *
+ * $Id: StringToVATMapImpl.java,v 1.1 2010-03-11 20:34:54 mfluegge Exp $
+ */
+package org.eclipse.emf.cdo.tests.model2.impl;
+
+import org.eclipse.emf.cdo.tests.model1.VAT;
+import org.eclipse.emf.cdo.tests.model2.Model2Package;
+
+import org.eclipse.emf.internal.cdo.CDOObjectImpl;
+
+import org.eclipse.emf.common.util.BasicEMap;
+import org.eclipse.emf.common.util.EMap;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>String To VAT Map</b></em>'. <!-- end-user-doc
+ * -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.tests.model2.impl.StringToVATMapImpl#getTypedKey <em>Key</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model2.impl.StringToVATMapImpl#getTypedValue <em>Value</em>}</li>
+ * </ul>
+ * </p>
+ * 
+ * @generated
+ */
+public class StringToVATMapImpl extends CDOObjectImpl implements BasicEMap.Entry<String, VAT>
+{
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected StringToVATMapImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Model2Package.Literals.STRING_TO_VAT_MAP;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected int eStaticFeatureCount()
+  {
+    return 0;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String getTypedKey()
+  {
+    return (String)eGet(Model2Package.Literals.STRING_TO_VAT_MAP__KEY, true);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setTypedKey(String newKey)
+  {
+    eSet(Model2Package.Literals.STRING_TO_VAT_MAP__KEY, newKey);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public VAT getTypedValue()
+  {
+    return (VAT)eGet(Model2Package.Literals.STRING_TO_VAT_MAP__VALUE, true);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setTypedValue(VAT newValue)
+  {
+    eSet(Model2Package.Literals.STRING_TO_VAT_MAP__VALUE, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected int hash = -1;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public int getHash()
+  {
+    if (hash == -1)
+    {
+      Object theKey = getKey();
+      hash = (theKey == null ? 0 : theKey.hashCode());
+    }
+    return hash;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setHash(int hash)
+  {
+    this.hash = hash;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String getKey()
+  {
+    return getTypedKey();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setKey(String key)
+  {
+    setTypedKey(key);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public VAT getValue()
+  {
+    return getTypedValue();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public VAT setValue(VAT value)
+  {
+    VAT oldValue = getValue();
+    setTypedValue(value);
+    return oldValue;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  public EMap<String, VAT> getEMap()
+  {
+    EObject container = eContainer();
+    return container == null ? null : (EMap<String, VAT>)container.eGet(eContainmentFeature());
+  }
+
+} // StringToVATMapImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/util/Model2AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/util/Model2AdapterFactory.java
index 84ded140a0..9c6124bd92 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/util/Model2AdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/util/Model2AdapterFactory.java
@@ -10,8 +10,11 @@
  */
 package org.eclipse.emf.cdo.tests.model2.util;
 
+import org.eclipse.emf.cdo.tests.model1.Address;
 import org.eclipse.emf.cdo.tests.model1.Order;
 import org.eclipse.emf.cdo.tests.model1.PurchaseOrder;
+import org.eclipse.emf.cdo.tests.model1.VAT;
+import org.eclipse.emf.cdo.tests.model2.MapHolder;
 import org.eclipse.emf.cdo.tests.model2.Model2Package;
 import org.eclipse.emf.cdo.tests.model2.NotUnsettable;
 import org.eclipse.emf.cdo.tests.model2.NotUnsettableWithDefault;
@@ -28,6 +31,8 @@ import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
 
+import java.util.Map;
+
 /**
  * <!-- 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 -->
@@ -141,6 +146,66 @@ public class Model2AdapterFactory extends AdapterFactoryImpl
     }
 
     @Override
+    public Adapter caseMapHolder(MapHolder object)
+    {
+      return createMapHolderAdapter();
+    }
+
+    @Override
+    public Adapter caseStringToStringMap(Map.Entry<String, String> object)
+    {
+      return createStringToStringMapAdapter();
+    }
+
+    @Override
+    public Adapter caseIntegerToStringMap(Map.Entry<Integer, String> object)
+    {
+      return createIntegerToStringMapAdapter();
+    }
+
+    @Override
+    public Adapter caseStringToVATMap(Map.Entry<String, VAT> object)
+    {
+      return createStringToVATMapAdapter();
+    }
+
+    @Override
+    public Adapter caseStringToAddressContainmentMap(Map.Entry<String, Address> object)
+    {
+      return createStringToAddressContainmentMapAdapter();
+    }
+
+    @Override
+    public Adapter caseStringToAddressReferenceMap(Map.Entry<String, Address> object)
+    {
+      return createStringToAddressReferenceMapAdapter();
+    }
+
+    @Override
+    public Adapter caseEObjectToEObjectMap(Map.Entry<EObject, EObject> object)
+    {
+      return createEObjectToEObjectMapAdapter();
+    }
+
+    @Override
+    public Adapter caseEObjectToEObjectKeyContainedMap(Map.Entry<EObject, EObject> object)
+    {
+      return createEObjectToEObjectKeyContainedMapAdapter();
+    }
+
+    @Override
+    public Adapter caseEObjectToEObjectBothContainedMap(Map.Entry<EObject, EObject> object)
+    {
+      return createEObjectToEObjectBothContainedMapAdapter();
+    }
+
+    @Override
+    public Adapter caseEObjectToEObjectValueContainedMap(Map.Entry<EObject, EObject> object)
+    {
+      return createEObjectToEObjectValueContainedMapAdapter();
+    }
+
+    @Override
     public Adapter caseOrder(Order object)
     {
       return createOrderAdapter();
@@ -305,6 +370,150 @@ public class Model2AdapterFactory extends AdapterFactoryImpl
   }
 
   /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model2.MapHolder
+   * <em>Map Holder</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.cdo.tests.model2.MapHolder
+   * @generated
+   */
+  public Adapter createMapHolderAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>String To String Map</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 java.util.Map.Entry
+   * @generated
+   */
+  public Adapter createStringToStringMapAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>Integer To String Map</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 java.util.Map.Entry
+   * @generated
+   */
+  public Adapter createIntegerToStringMapAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>String To VAT Map</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 java.util.Map.Entry
+   * @generated
+   */
+  public Adapter createStringToVATMapAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link java.util.Map.Entry
+   * <em>String To Address Containment Map</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 java.util.Map.Entry
+   * @generated
+   */
+  public Adapter createStringToAddressContainmentMapAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>String To Address Reference Map</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 java.util.Map.Entry
+   * @generated
+   */
+  public Adapter createStringToAddressReferenceMapAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>EObject To EObject Map</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 java.util.Map.Entry
+   * @generated
+   */
+  public Adapter createEObjectToEObjectMapAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link java.util.Map.Entry
+   * <em>EObject To EObject Key Contained Map</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 java.util.Map.Entry
+   * @generated
+   */
+  public Adapter createEObjectToEObjectKeyContainedMapAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link java.util.Map.Entry
+   * <em>EObject To EObject Both Contained Map</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 java.util.Map.Entry
+   * @generated
+   */
+  public Adapter createEObjectToEObjectBothContainedMapAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link java.util.Map.Entry
+   * <em>EObject To EObject Value Contained Map</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 java.util.Map.Entry
+   * @generated
+   */
+  public Adapter createEObjectToEObjectValueContainedMapAdapter()
+  {
+    return null;
+  }
+
+  /**
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Order <em>Order</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 -->
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/util/Model2Switch.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/util/Model2Switch.java
index 3c8c165a84..efe1f97913 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/util/Model2Switch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/util/Model2Switch.java
@@ -10,8 +10,11 @@
  */
 package org.eclipse.emf.cdo.tests.model2.util;
 
+import org.eclipse.emf.cdo.tests.model1.Address;
 import org.eclipse.emf.cdo.tests.model1.Order;
 import org.eclipse.emf.cdo.tests.model1.PurchaseOrder;
+import org.eclipse.emf.cdo.tests.model1.VAT;
+import org.eclipse.emf.cdo.tests.model2.MapHolder;
 import org.eclipse.emf.cdo.tests.model2.Model2Package;
 import org.eclipse.emf.cdo.tests.model2.NotUnsettable;
 import org.eclipse.emf.cdo.tests.model2.NotUnsettableWithDefault;
@@ -27,6 +30,7 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance hierarchy. It supports the call
@@ -107,17 +111,11 @@ public class Model2Switch<T>
       SpecialPurchaseOrder specialPurchaseOrder = (SpecialPurchaseOrder)theEObject;
       T result = caseSpecialPurchaseOrder(specialPurchaseOrder);
       if (result == null)
-      {
         result = casePurchaseOrder(specialPurchaseOrder);
-      }
       if (result == null)
-      {
         result = caseOrder(specialPurchaseOrder);
-      }
       if (result == null)
-      {
         result = defaultCase(theEObject);
-      }
       return result;
     }
     case Model2Package.TASK_CONTAINER:
@@ -125,9 +123,7 @@ public class Model2Switch<T>
       TaskContainer taskContainer = (TaskContainer)theEObject;
       T result = caseTaskContainer(taskContainer);
       if (result == null)
-      {
         result = defaultCase(theEObject);
-      }
       return result;
     }
     case Model2Package.TASK:
@@ -135,9 +131,7 @@ public class Model2Switch<T>
       Task task = (Task)theEObject;
       T result = caseTask(task);
       if (result == null)
-      {
         result = defaultCase(theEObject);
-      }
       return result;
     }
     case Model2Package.UNSETTABLE1:
@@ -145,9 +139,7 @@ public class Model2Switch<T>
       Unsettable1 unsettable1 = (Unsettable1)theEObject;
       T result = caseUnsettable1(unsettable1);
       if (result == null)
-      {
         result = defaultCase(theEObject);
-      }
       return result;
     }
     case Model2Package.UNSETTABLE2_WITH_DEFAULT:
@@ -155,9 +147,7 @@ public class Model2Switch<T>
       Unsettable2WithDefault unsettable2WithDefault = (Unsettable2WithDefault)theEObject;
       T result = caseUnsettable2WithDefault(unsettable2WithDefault);
       if (result == null)
-      {
         result = defaultCase(theEObject);
-      }
       return result;
     }
     case Model2Package.PERSISTENT_CONTAINMENT:
@@ -165,9 +155,7 @@ public class Model2Switch<T>
       PersistentContainment persistentContainment = (PersistentContainment)theEObject;
       T result = casePersistentContainment(persistentContainment);
       if (result == null)
-      {
         result = defaultCase(theEObject);
-      }
       return result;
     }
     case Model2Package.TRANSIENT_CONTAINER:
@@ -175,9 +163,7 @@ public class Model2Switch<T>
       TransientContainer transientContainer = (TransientContainer)theEObject;
       T result = caseTransientContainer(transientContainer);
       if (result == null)
-      {
         result = defaultCase(theEObject);
-      }
       return result;
     }
     case Model2Package.NOT_UNSETTABLE:
@@ -185,9 +171,7 @@ public class Model2Switch<T>
       NotUnsettable notUnsettable = (NotUnsettable)theEObject;
       T result = caseNotUnsettable(notUnsettable);
       if (result == null)
-      {
         result = defaultCase(theEObject);
-      }
       return result;
     }
     case Model2Package.NOT_UNSETTABLE_WITH_DEFAULT:
@@ -195,9 +179,96 @@ public class Model2Switch<T>
       NotUnsettableWithDefault notUnsettableWithDefault = (NotUnsettableWithDefault)theEObject;
       T result = caseNotUnsettableWithDefault(notUnsettableWithDefault);
       if (result == null)
-      {
         result = defaultCase(theEObject);
-      }
+      return result;
+    }
+    case Model2Package.MAP_HOLDER:
+    {
+      MapHolder mapHolder = (MapHolder)theEObject;
+      T result = caseMapHolder(mapHolder);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model2Package.STRING_TO_STRING_MAP:
+    {
+      @SuppressWarnings("unchecked")
+      Map.Entry<String, String> stringToStringMap = (Map.Entry<String, String>)theEObject;
+      T result = caseStringToStringMap(stringToStringMap);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model2Package.INTEGER_TO_STRING_MAP:
+    {
+      @SuppressWarnings("unchecked")
+      Map.Entry<Integer, String> integerToStringMap = (Map.Entry<Integer, String>)theEObject;
+      T result = caseIntegerToStringMap(integerToStringMap);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model2Package.STRING_TO_VAT_MAP:
+    {
+      @SuppressWarnings("unchecked")
+      Map.Entry<String, VAT> stringToVATMap = (Map.Entry<String, VAT>)theEObject;
+      T result = caseStringToVATMap(stringToVATMap);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP:
+    {
+      @SuppressWarnings("unchecked")
+      Map.Entry<String, Address> stringToAddressContainmentMap = (Map.Entry<String, Address>)theEObject;
+      T result = caseStringToAddressContainmentMap(stringToAddressContainmentMap);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model2Package.STRING_TO_ADDRESS_REFERENCE_MAP:
+    {
+      @SuppressWarnings("unchecked")
+      Map.Entry<String, Address> stringToAddressReferenceMap = (Map.Entry<String, Address>)theEObject;
+      T result = caseStringToAddressReferenceMap(stringToAddressReferenceMap);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model2Package.EOBJECT_TO_EOBJECT_MAP:
+    {
+      @SuppressWarnings("unchecked")
+      Map.Entry<EObject, EObject> eObjectToEObjectMap = (Map.Entry<EObject, EObject>)theEObject;
+      T result = caseEObjectToEObjectMap(eObjectToEObjectMap);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP:
+    {
+      @SuppressWarnings("unchecked")
+      Map.Entry<EObject, EObject> eObjectToEObjectKeyContainedMap = (Map.Entry<EObject, EObject>)theEObject;
+      T result = caseEObjectToEObjectKeyContainedMap(eObjectToEObjectKeyContainedMap);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP:
+    {
+      @SuppressWarnings("unchecked")
+      Map.Entry<EObject, EObject> eObjectToEObjectBothContainedMap = (Map.Entry<EObject, EObject>)theEObject;
+      T result = caseEObjectToEObjectBothContainedMap(eObjectToEObjectBothContainedMap);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP:
+    {
+      @SuppressWarnings("unchecked")
+      Map.Entry<EObject, EObject> eObjectToEObjectValueContainedMap = (Map.Entry<EObject, EObject>)theEObject;
+      T result = caseEObjectToEObjectValueContainedMap(eObjectToEObjectValueContainedMap);
+      if (result == null)
+        result = defaultCase(theEObject);
       return result;
     }
     default:
@@ -345,6 +416,164 @@ public class Model2Switch<T>
   }
 
   /**
+   * Returns the result of interpreting the object as an instance of '<em>Map Holder</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 Holder</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseMapHolder(MapHolder object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>String To String Map</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>String To String Map</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseStringToStringMap(Map.Entry<String, String> object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Integer To String Map</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>Integer To String Map</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseIntegerToStringMap(Map.Entry<Integer, String> object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>String To VAT Map</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>String To VAT Map</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseStringToVATMap(Map.Entry<String, VAT> object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>String To Address Containment Map</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>String To Address Containment Map</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseStringToAddressContainmentMap(Map.Entry<String, Address> object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>String To Address Reference Map</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>String To Address Reference Map</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseStringToAddressReferenceMap(Map.Entry<String, Address> object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>EObject To EObject Map</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>EObject To EObject Map</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseEObjectToEObjectMap(Map.Entry<EObject, EObject> object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>EObject To EObject Key Contained Map</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>EObject To EObject Key Contained Map</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseEObjectToEObjectKeyContainedMap(Map.Entry<EObject, EObject> object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>EObject To EObject Both Contained Map</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>EObject To EObject Both Contained Map</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseEObjectToEObjectBothContainedMap(Map.Entry<EObject, EObject> object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>EObject To EObject Value Contained Map</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>EObject To EObject Value Contained Map</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseEObjectToEObjectValueContainedMap(Map.Entry<EObject, EObject> object)
+  {
+    return null;
+  }
+
+  /**
    * Returns the result of interpreting the object as an instance of '<em>Order</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
    *