Bug 568853: [Toolsmiths - ElementTypes] Add "MatchAndApply" Stereotype Matcher

Refactoring of the core Element Types Configurations model to unify the configurations owned by an element type in one containment reference with subsets to distinguish the different configuration roles: - owned advice of any element type configuration - matcher of a specialization type configuration - edit-helper of a specialization type configuration - container constraint of a specialization type configuration - fix drag-and-drop for owned advices - create wrappers to identify the multiple roles of StereotypeMatcherAdviceConfiguration - ensure that deletion of owned configurations should deletes from the superset - Fix the diagram to use GMF Text instead of UML Comments to show subsets constraints. - Fix the ordering of children features in the ElementTypeSetConfiguration to be as previously. - ensure preferred ordering of advice children in the editor tree - use mask label style for subsets instead of GMF Text shapes This additionally simplifies the EMF.Edit providers for the AbstractAdviceBindingConfiguration::owningTarget reference that now is a subset of the inherited owningType reference. https://bugs.eclipse.org/bugs/show_bug.cgi?id=568853 Change-Id: Ic9007c9029bf2859774b7f82b521afbdfd94a511 Signed-off-by: Christian W. Damus <give.a.damus@gmail.com>
author: Christian W. Damus 2020-11-17 16:01:55 +0000
committer: Vincent Lorenzo 2021-03-24 14:06:46 +0000
commit: b9f6a34918a93b93cf427278ee569ac65222dc1b (patch)
tree: f6761abafd412ce98755aadaa3dc39d1ef9c9ca6
parent: 92056ec5378f72436acc100a3f6f016a396e0908 (diff)
download: org.eclipse.papyrus-b9f6a34918a93b93cf427278ee569ac65222dc1b.tar.gz
org.eclipse.papyrus-b9f6a34918a93b93cf427278ee569ac65222dc1b.tar.xz
org.eclipse.papyrus-b9f6a34918a93b93cf427278ee569ac65222dc1b.zip
41 files changed, 4042 insertions, 2223 deletions
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/plugin.properties b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/plugin.properties
index 8a66f1c3955..3c1b30df3e9 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/plugin.properties
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/plugin.properties
@@ -9,7 +9,7 @@
 # 
 # Contributors:
 #  CEA LIST - Initial API and implementation
-#  Christian W. Damus - bug 568782
+#  Christian W. Damus - bugs 568782, 568853
 #  
 
 pluginName = Papyrus TypesConfigurations Edit Support
@@ -100,3 +100,7 @@ _UI_ElementTypeConfiguration_owningSet_feature = Owning Set
 _UI_AbstractAdviceBindingConfiguration_owningSet_feature = Owning Set
 _UI_AbstractAdviceBindingConfiguration_elementTypeSet_feature = Element Type Set
 _UI_ElementTypeSetConfiguration_allAdviceBindings_feature = All Advice Bindings
+_UI_ConfigurationElement_owningType_feature = Owning Type
+_UI_ElementTypeConfiguration_ownedConfigurations_feature = Owned Configurations
+_UI_ContainerConfiguration_containedType_feature = Contained Type
+_UI_AbstractMatcherConfiguration_matchedType_feature = Matched Type
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/AbstractAdviceBindingConfigurationItemProvider.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/AbstractAdviceBindingConfigurationItemProvider.java
index 44e10635d89..3d7447f892e 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/AbstractAdviceBindingConfigurationItemProvider.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/AbstractAdviceBindingConfigurationItemProvider.java
@@ -11,7 +11,7 @@
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
- *  Christian W. Damus - bug 568782
+ *  Christian W. Damus - bugs 568782, 568853
  */
 package org.eclipse.papyrus.infra.types.provider;
 
@@ -23,10 +23,10 @@ import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.command.AddCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
@@ -36,7 +36,6 @@ import org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration;
 import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;
 import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsFactory;
 import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
-import org.eclipse.uml2.common.edit.command.SubsetSupersetSetCommand;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration} object.
@@ -302,58 +301,6 @@ public class AbstractAdviceBindingConfigurationItemProvider extends AdviceConfig
 				 ElementTypesConfigurationsFactory.eINSTANCE.createMatcherConfiguration()));
 	}
 
-	/**
-	 * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#createSetCommand(org.eclipse.emf.edit.domain.EditingDomain, org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EStructuralFeature, java.lang.Object)
-	 *      <!-- begin-user-doc -->
-	 *      <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Command createSetCommandGen(EditingDomain domain, EObject owner, EStructuralFeature feature, Object value) {
-		if (feature == ElementTypesConfigurationsPackage.Literals.ABSTRACT_ADVICE_BINDING_CONFIGURATION__OWNING_TARGET) {
-			return new SubsetSupersetSetCommand(domain, owner, feature, new EStructuralFeature[] {ElementTypesConfigurationsPackage.Literals.ABSTRACT_ADVICE_BINDING_CONFIGURATION__TARGET}, null, value);
-		}
-		if (feature == ElementTypesConfigurationsPackage.Literals.ABSTRACT_ADVICE_BINDING_CONFIGURATION__TARGET) {
-			return new SubsetSupersetSetCommand(domain, owner, feature, null, new EStructuralFeature[] {ElementTypesConfigurationsPackage.Literals.ABSTRACT_ADVICE_BINDING_CONFIGURATION__OWNING_TARGET}, value);
-		}
-		return super.createSetCommand(domain, owner, feature, value);
-	}
-
-	@Override
-	protected Command createSetCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, Object value) {
-		boolean isInverseAdd = InverseAddWrapper.isInverseAdd(value);
-		value = InverseAddWrapper.unwrap(value);
-		
-		Command result = createSetCommandGen(domain, owner, feature, value);
-
-		if (result != null && feature == ElementTypesConfigurationsPackage.Literals.ABSTRACT_ADVICE_BINDING_CONFIGURATION__TARGET) {
-			AbstractAdviceBindingConfiguration advice = (AbstractAdviceBindingConfiguration) owner;
-			if (value != advice.getOwningTarget()) {
-				// This command will unset the container. Follow up with placement of the advice binding configuration into the element types set
-				ElementTypeSetConfiguration typeSet = advice.getElementTypeSet();
-				if (typeSet != null) {
-					Command add = AddCommand.create(domain, typeSet, ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS, advice);
-					result = result.chain(add);
-				}
-			} // Otherwise, this command will not change the target, so don't worry about it
-		} else if (result != null && feature == ElementTypesConfigurationsPackage.Literals.ABSTRACT_ADVICE_BINDING_CONFIGURATION__OWNING_TARGET) {
-			AbstractAdviceBindingConfiguration advice = (AbstractAdviceBindingConfiguration) owner;
-			ElementTypeSetConfiguration typeSet = advice.getElementTypeSet();
-			if (!isInverseAdd && typeSet != null && value != advice.getOwningTarget()) {
-				// User is changing the container. Remove from current container, first so that it's undoable
-				result = RemoveCommand.create(domain, owner).chain(result);
-
-				// If clearing the container, re-home the advice in the set. Note that if the user wants to
-				// delete the advice from the model, then that is done by a RemoveCommand, not by this means
-				if (value == null) {
-					Command add = AddCommand.create(domain, typeSet, ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS, advice);
-					result = result.chain(add);
-				}
-			}
-		}
-
-		return result;
-	}
-
 	@Override
 	protected ItemPropertyDescriptor createItemPropertyDescriptor(AdapterFactory adapterFactory, ResourceLocator resourceLocator, String displayName, String description, EStructuralFeature feature, boolean isSettable, boolean multiLine, boolean sortChoices,
 			Object staticImage, String category, String[] filterFlags, Object propertyEditorFactory) {
@@ -364,11 +311,42 @@ public class AbstractAdviceBindingConfigurationItemProvider extends AdviceConfig
 			result = new ItemPropertyDescriptor(adapterFactory, resourceLocator, displayName, description, feature, isSettable, multiLine, sortChoices, staticImage, category, filterFlags, propertyEditorFactory) {
 				@Override
 				public void setPropertyValue(Object object, Object value) {
-					EObject eObject = (EObject) object;
+					AbstractAdviceBindingConfiguration advice = (AbstractAdviceBindingConfiguration) object;
+					EditingDomain editingDomain = getEditingDomain(object);
+
+					if (value == null) {
+						// Remove from current container and add to the configuration set
+						ElementTypeSetConfiguration set = advice.getElementTypeSet();
+						
+						Command remove = RemoveCommand.create(editingDomain, advice);
+						Command add = AddCommand.create(editingDomain, set, ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS, object);
+						editingDomain.getCommandStack().execute(remove.chain(add));
+					} else {
+						// Default behaviour is to add it to new type's owned advice, which is what we want
+						super.setPropertyValue(advice, value);
+					}
+				}
+			};
+		} else if (feature == ElementTypesConfigurationsPackage.Literals.ABSTRACT_ADVICE_BINDING_CONFIGURATION__TARGET) {
+			result = new ItemPropertyDescriptor(adapterFactory, resourceLocator, displayName, description, feature, isSettable, multiLine, sortChoices, staticImage, category, filterFlags, propertyEditorFactory) {
+				@Override
+				public void setPropertyValue(Object object, Object value) {
+					AbstractAdviceBindingConfiguration advice = (AbstractAdviceBindingConfiguration) object;
 					EditingDomain editingDomain = getEditingDomain(object);
 
-					// Create our set command; don't add on the other side
-					editingDomain.getCommandStack().execute(createSetCommand(editingDomain, (EObject) getCommandOwner(eObject), feature, value));
+					
+					if (advice.getOwningTarget() != null && value != advice.getOwningTarget()) {
+						// Remove from current container and add to the configuration set before setting the target
+						ElementTypeSetConfiguration set = advice.getElementTypeSet();
+						
+						Command remove = RemoveCommand.create(editingDomain, advice);
+						Command add = AddCommand.create(editingDomain, set, ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS, object);
+						Command setTarget = SetCommand.create(editingDomain, getCommandOwner(advice), feature, value);
+						editingDomain.getCommandStack().execute(remove.chain(add).chain(setTarget));
+					} else {
+						// Default behaviour is to just set the target, which is what we want
+						super.setPropertyValue(advice, value);
+					}
 				}
 			};
 		} else {
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/AbstractEditHelperAdviceConfigurationItemProvider.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/AbstractEditHelperAdviceConfigurationItemProvider.java
index 500db6167e6..53fdad00e0b 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/AbstractEditHelperAdviceConfigurationItemProvider.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/AbstractEditHelperAdviceConfigurationItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 CEA LIST.
+ * Copyright (c) 2014, 2020 CEA LIST, Christian W. Damus, and others.
  * 
  * 
  * All rights reserved. This program and the accompanying materials
@@ -11,6 +11,7 @@
  * 
  * Contributors:
  *  CEA LIST - Initial API and implementation
+ *  Christian W. Damus - bug 568853
  */
 package org.eclipse.papyrus.infra.types.provider;
 
@@ -18,12 +19,18 @@ package org.eclipse.papyrus.infra.types.provider;
 import java.util.Collection;
 import java.util.List;
 
+import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 
 import org.eclipse.papyrus.infra.types.AbstractEditHelperAdviceConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+import org.eclipse.uml2.common.edit.command.SubsetSupersetSetCommand;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.types.AbstractEditHelperAdviceConfiguration} object.
@@ -97,4 +104,21 @@ public class AbstractEditHelperAdviceConfigurationItemProvider extends AdviceCon
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 	}
 
+	/**
+	 * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#createSetCommand(org.eclipse.emf.edit.domain.EditingDomain, org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EStructuralFeature, java.lang.Object)
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected Command createSetCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, Object value) {
+		if (feature == ElementTypesConfigurationsPackage.Literals.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET) {
+			return new SubsetSupersetSetCommand(domain, owner, feature, new EStructuralFeature[] {ElementTypesConfigurationsPackage.Literals.CONFIGURATION_ELEMENT__OWNING_TYPE}, null, value);
+		}
+		if (feature == ElementTypesConfigurationsPackage.Literals.CONFIGURATION_ELEMENT__OWNING_TYPE) {
+			return new SubsetSupersetSetCommand(domain, owner, feature, null, new EStructuralFeature[] {ElementTypesConfigurationsPackage.Literals.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET}, value);
+		}
+		return super.createSetCommand(domain, owner, feature, value);
+	}
+
 }
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/AbstractMatcherConfigurationItemProvider.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/AbstractMatcherConfigurationItemProvider.java
index 321ff01c6ab..211d208506d 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/AbstractMatcherConfigurationItemProvider.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/AbstractMatcherConfigurationItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014, 2017 CEA LIST.
+ * Copyright (c) 2014, 2020 CEA LIST, Christian W. Damus, and others.
  * 
  * 
  * All rights reserved. This program and the accompanying materials
@@ -11,6 +11,7 @@
  * 
  * Contributors:
  *  CEA LIST - Initial API and implementation
+ *  Christian W. Damus - bug 568853
  */
 package org.eclipse.papyrus.infra.types.provider;
 
@@ -18,17 +19,17 @@ package org.eclipse.papyrus.infra.types.provider;
 import java.util.Collection;
 import java.util.List;
 
+import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+import org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+import org.eclipse.uml2.common.edit.command.SubsetSupersetSetCommand;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration} object.
@@ -37,13 +38,7 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter;
  * @generated
  */
 public class AbstractMatcherConfigurationItemProvider 
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+	extends ConfigurationElementItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
@@ -77,11 +72,34 @@ public class AbstractMatcherConfigurationItemProvider
 		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
+			addMatchedTypePropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
 
 	/**
+	 * This adds a property descriptor for the Matched Type feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addMatchedTypePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_AbstractMatcherConfiguration_matchedType_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_AbstractMatcherConfiguration_matchedType_feature", "_UI_AbstractMatcherConfiguration_type"),
+				 ElementTypesConfigurationsPackage.Literals.ABSTRACT_MATCHER_CONFIGURATION__MATCHED_TYPE,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -89,7 +107,10 @@ public class AbstractMatcherConfigurationItemProvider
 	 */
 	@Override
 	public String getText(Object object) {
-		return getString("_UI_AbstractMatcherConfiguration_type");
+		String label = ((AbstractMatcherConfiguration)object).getDescription();
+		return label == null || label.length() == 0 ?
+			getString("_UI_AbstractMatcherConfiguration_type") :
+			getString("_UI_AbstractMatcherConfiguration_type") + " " + label;
 	}
 	
 
@@ -119,14 +140,20 @@ public class AbstractMatcherConfigurationItemProvider
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
+	 * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#createSetCommand(org.eclipse.emf.edit.domain.EditingDomain, org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EStructuralFeature, java.lang.Object)
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
+	protected Command createSetCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, Object value) {
+		if (feature == ElementTypesConfigurationsPackage.Literals.ABSTRACT_MATCHER_CONFIGURATION__MATCHED_TYPE) {
+			return new SubsetSupersetSetCommand(domain, owner, feature, new EStructuralFeature[] {ElementTypesConfigurationsPackage.Literals.CONFIGURATION_ELEMENT__OWNING_TYPE}, null, value);
+		}
+		if (feature == ElementTypesConfigurationsPackage.Literals.CONFIGURATION_ELEMENT__OWNING_TYPE) {
+			return new SubsetSupersetSetCommand(domain, owner, feature, null, new EStructuralFeature[] {ElementTypesConfigurationsPackage.Literals.ABSTRACT_MATCHER_CONFIGURATION__MATCHED_TYPE}, value);
+		}
+		return super.createSetCommand(domain, owner, feature, value);
 	}
 
 }
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ContainerConfigurationItemProvider.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ContainerConfigurationItemProvider.java
index 828199e19c7..845e458400a 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ContainerConfigurationItemProvider.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ContainerConfigurationItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014, 2017 CEA LIST.
+ * Copyright (c) 2014, 2020 CEA LIST, Christian W. Damus, and others.
  * 
  * 
  * All rights reserved. This program and the accompanying materials
@@ -11,6 +11,7 @@
  * 
  * Contributors:
  *  CEA LIST - Initial API and implementation
+ *  Christian W. Damus - bug 568853
  */
 package org.eclipse.papyrus.infra.types.provider;
 
@@ -18,23 +19,19 @@ package org.eclipse.papyrus.infra.types.provider;
 import java.util.Collection;
 import java.util.List;
 
+import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.papyrus.infra.types.ContainerConfiguration;
 import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsFactory;
 import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+import org.eclipse.uml2.common.edit.command.SubsetSupersetSetCommand;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.types.ContainerConfiguration} object.
@@ -43,13 +40,7 @@ import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
  * @generated
  */
 public class ContainerConfigurationItemProvider 
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+	extends ConfigurationElementItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
@@ -83,12 +74,35 @@ public class ContainerConfigurationItemProvider
 		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
+			addContainedTypePropertyDescriptor(object);
 			addEContainmentFeaturesPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
 
 	/**
+	 * This adds a property descriptor for the Contained Type feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addContainedTypePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ContainerConfiguration_containedType_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_ContainerConfiguration_containedType_feature", "_UI_ContainerConfiguration_type"),
+				 ElementTypesConfigurationsPackage.Literals.CONTAINER_CONFIGURATION__CONTAINED_TYPE,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
 	 * This adds a property descriptor for the EContainment Features feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -159,7 +173,10 @@ public class ContainerConfigurationItemProvider
 	 */
 	@Override
 	public String getText(Object object) {
-		return getString("_UI_ContainerConfiguration_type");
+		String label = ((ContainerConfiguration)object).getDescription();
+		return label == null || label.length() == 0 ?
+			getString("_UI_ContainerConfiguration_type") :
+			getString("_UI_ContainerConfiguration_type") + " " + label;
 	}
 	
 
@@ -200,14 +217,20 @@ public class ContainerConfigurationItemProvider
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
+	 * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#createSetCommand(org.eclipse.emf.edit.domain.EditingDomain, org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EStructuralFeature, java.lang.Object)
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
+	protected Command createSetCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, Object value) {
+		if (feature == ElementTypesConfigurationsPackage.Literals.CONTAINER_CONFIGURATION__CONTAINED_TYPE) {
+			return new SubsetSupersetSetCommand(domain, owner, feature, new EStructuralFeature[] {ElementTypesConfigurationsPackage.Literals.CONFIGURATION_ELEMENT__OWNING_TYPE}, null, value);
+		}
+		if (feature == ElementTypesConfigurationsPackage.Literals.CONFIGURATION_ELEMENT__OWNING_TYPE) {
+			return new SubsetSupersetSetCommand(domain, owner, feature, null, new EStructuralFeature[] {ElementTypesConfigurationsPackage.Literals.CONTAINER_CONFIGURATION__CONTAINED_TYPE}, value);
+		}
+		return super.createSetCommand(domain, owner, feature, value);
 	}
 
 }
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ElementTypeConfigurationItemProvider.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ElementTypeConfigurationItemProvider.java
index 9bae5b3d267..1f31626f0b1 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ElementTypeConfigurationItemProvider.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ElementTypeConfigurationItemProvider.java
@@ -11,31 +11,31 @@
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
- *  Christian W. Damus - bug 568782
+ *  Christian W. Damus - bugs 568782, 568853
  */
 package org.eclipse.papyrus.infra.types.provider;
 
 
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
-import org.eclipse.emf.common.command.AbortExecutionException;
 import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CommandWrapper;
-import org.eclipse.emf.common.command.CompoundCommand;
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EAnnotation;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.command.CommandParameter;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.ecore.util.EContentsEList.FeatureIterator;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.DelegatingWrapperItemProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
 import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsFactory;
 import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
@@ -72,6 +72,7 @@ public class ElementTypeConfigurationItemProvider extends ConfigurationElementIt
 			addNamePropertyDescriptor(object);
 			addHintPropertyDescriptor(object);
 			addKindPropertyDescriptor(object);
+			addOwnedConfigurationsPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
@@ -165,6 +166,28 @@ public class ElementTypeConfigurationItemProvider extends ConfigurationElementIt
 	}
 
 	/**
+	 * This adds a property descriptor for the Owned Configurations feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addOwnedConfigurationsPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ElementTypeConfiguration_ownedConfigurations_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_ElementTypeConfiguration_ownedConfigurations_feature", "_UI_ElementTypeConfiguration_type"),
+				 ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS,
+				 false,
+				 false,
+				 false,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
@@ -185,16 +208,129 @@ public class ElementTypeConfigurationItemProvider extends ConfigurationElementIt
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
+		EStructuralFeature result = null;
+
+		// Sort the children features to get the most specific subset reference and, if applicable,
+		// a single subset, in which to (e.g.) drop a dragged object
+		for (EStructuralFeature feature : sortChildrenFeatures(getChildrenFeatures(object))) {
+			if (isValidValue(object, child, feature)) {
+				result = feature;
+				break;
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	 * Sort children features by:
+	 * <ul>
+	 * <li>single features before many features</li>
+	 * <li>subset features before their supersets</li>
+	 * </ul>
+	 * 
+	 * @param features
+	 * @return
+	 */
+	protected List<? extends EStructuralFeature> sortChildrenFeatures(Collection<? extends EStructuralFeature> features) {
+		List<EStructuralFeature> result = new ArrayList<>(features);
+
+		Collections.sort(result, this::compareFeatures);
+
+		return result;
+	}
+
+	protected int compareFeatures(EStructuralFeature a, EStructuralFeature b) {
+		if (a.isMany() && !b.isMany()) {
+			return +1;
+		}
+		if (b.isMany() && !a.isMany()) {
+			return -1;
+		}
+		if (isSubset(a, b)) {
+			return +1;
+		}
+		if (isSubset(b, a)) {
+			return -1;
+		}
+		return 0;
+	}
+
+	protected boolean isSubset(EStructuralFeature possibleSubset, EStructuralFeature possibleSuperset) {
+		EAnnotation subsetAnnotation = possibleSubset.getEAnnotation("subsets"); //$NON-NLS-1$
+		return subsetAnnotation != null && subsetAnnotation.getReferences().contains(possibleSuperset);
+	}
+	
+	@Override
+	protected boolean isWrappingNeeded(Object object) {
+		return true; // the 'ownedConfigurations' has subsets that can repeat the same element
+	}
+	
+	@Override
+	protected Object createWrapper(EObject object, EStructuralFeature feature, Object value, int index) {
+		Object result = value;
 
-		return super.getChildFeature(object, child);
+		if (feature instanceof EReference) {
+			// Wrapping is needed if the value appears in multiple subsets of the 'ownedConfigurations'
+			EStructuralFeature previousSubset = null;
+
+			for (FeatureIterator<EObject> iter = (FeatureIterator<EObject>) object.eCrossReferences().iterator(); iter.hasNext();) {
+				EObject next = iter.next();
+
+				if (next == value
+						&& next.eContainmentFeature() == ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS
+						&& isSubset(iter.feature(), ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS)) {
+
+					if (previousSubset != null && previousSubset != iter.feature()) {
+						result = new DelegatingWrapperItemProvider(value, object, feature, index, adapterFactory) {
+							@Override
+							public String getText(Object object) {
+								return NLS.bind("{0} as {1}", super.getText(object), getFeatureText(feature));
+							}
+						};
+						break;
+					}
+
+					previousSubset = iter.feature();
+				}
+			}
+		} else {
+			result = super.createWrapper(object, feature, value, index);
+		}
+
+		return result;
 	}
 
+	@Override
+	protected Command createAddCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, Collection<?> collection, int index) {
+		if (feature.isDerived() && isSubset(feature, ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS)) {
+			// Add to the superset because the subset is derived
+			feature = ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS;
+		}
+		
+		return super.createAddCommand(domain, owner, feature, collection, index);
+	}
+	
+	@Override
+	protected Command createRemoveCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, Collection<?> collection) {
+		Command result;
+
+		if (isSubset(feature, ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS)) {
+			// Remove from the containment superset to entirely remove the object
+			result = createRemoveCommand(domain, owner, (EStructuralFeature) ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS, collection);
+		} else {
+			result = super.createRemoveCommand(domain, owner, feature, collection);
+		}
+
+		return result;
+	}
+	
 	/**
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
@@ -217,8 +353,7 @@ public class ElementTypeConfigurationItemProvider extends ConfigurationElementIt
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
-	public void notifyChanged(Notification notification) {
+	public void notifyChangedGen(Notification notification) {
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(ElementTypeConfiguration.class)) {
@@ -226,6 +361,7 @@ public class ElementTypeConfigurationItemProvider extends ConfigurationElementIt
 			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__NAME:
 			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__HINT:
 			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__KIND:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY:
@@ -235,6 +371,28 @@ public class ElementTypeConfigurationItemProvider extends ConfigurationElementIt
 		}
 		super.notifyChanged(notification);
 	}
+	
+	@Override
+	public void notifyChanged(Notification notification) {
+		notifyChangedGen(notification);
+
+		switch (notification.getEventType()) {
+		case Notification.ADD:
+		case Notification.ADD_MANY:
+		case Notification.REMOVE:
+		case Notification.REMOVE_MANY:
+			switch (notification.getFeatureID(ElementTypeConfiguration.class)) {
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS:
+				// Refresh derived subsets
+				if (childrenStoreMap != null) {
+					childrenStoreMap.remove(notification.getNotifier());
+				}
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, true));
+				return;
+			}
+			break;
+		}
+	}
 
 	/**
 	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
@@ -263,54 +421,4 @@ public class ElementTypeConfigurationItemProvider extends ConfigurationElementIt
 				 ElementTypesConfigurationsFactory.eINSTANCE.createExternallyRegisteredAdvice()));
 	}
 
-	@Override
-	protected Command createAddCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, Collection<?> collection, int index) {
-		Command result = super.createAddCommand(domain, owner, feature, collection, index);
-
-		if (feature == ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_CONFIGURATION__OWNED_ADVICE) {
-			// The opposite is a subset, so we need to take care of its superset feature(s)
-			CompoundCommand compound = new CompoundCommand(CompoundCommand.LAST_COMMAND_ALL, result.getLabel(), result.getDescription());
-
-			int i = 0;
-			for (Object next : collection) {
-				IEditingDomainItemProvider provider = (IEditingDomainItemProvider) getRootAdapterFactory().adapt(next, IEditingDomainItemProvider.class);
-				if (provider != null) {
-					// Wrap the owner of the add to let the provider know that it's an inverse-add, which should not implicitly
-					// remove from the existing container. That ensures that a drag-and-drop operation doesn't fail on attempt
-					// to remove twice, and avoids an unnecessary removal step in the case of creating a new contained object
-					Command inverse = provider.createCommand(next, domain, SetCommand.class, new CommandParameter(next, ElementTypesConfigurationsPackage.Literals.ABSTRACT_ADVICE_BINDING_CONFIGURATION__OWNING_TARGET,
-							new InverseAddWrapper(owner)));
-					if (inverse.canExecute()) {
-						compound.append(inverse);
-
-						if (index != CommandParameter.NO_INDEX) {
-							// We cannot compute an executable move now because the object is not yet in the list.
-							// So, defer the calculation to the future
-							compound.append(new CommandWrapper(MoveCommand.create(domain, owner, feature, next, index + i)) {
-								@Override
-								protected boolean prepare() {
-									return true;
-								}
-
-								@Override
-								public void execute() {
-									if (!super.prepare()) {
-										throw new AbortExecutionException();
-									}
-									super.execute();
-								}
-							});
-						}
-					}
-				}
-
-				i++;
-			}
-
-			result = compound.unwrap();
-		}
-
-		return result;
-	}
-
 }
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ElementTypeSetConfigurationItemProvider.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ElementTypeSetConfigurationItemProvider.java
index 2fbe32f4995..454ebb504d0 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ElementTypeSetConfigurationItemProvider.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ElementTypeSetConfigurationItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 CEA LIST.
+ * Copyright (c) 2014, 2020 CEA LIST, Christian W. Damus, and others.
  * 
  * 
  * All rights reserved. This program and the accompanying materials
@@ -11,11 +11,13 @@
  * 
  * Contributors:
  *  CEA LIST - Initial API and implementation
+ *  Christian W. Damus - bug 568853
  */
 package org.eclipse.papyrus.infra.types.provider;
 
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -141,13 +143,28 @@ public class ElementTypeSetConfigurationItemProvider extends ConfigurationElemen
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+	public Collection<? extends EStructuralFeature> getChildrenFeaturesGen(Object object) {
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
-			childrenFeatures.add(ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS);
 			childrenFeatures.add(ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS);
+			childrenFeatures.add(ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS);
+		}
+		return childrenFeatures;
+	}
+	
+	@Override
+	protected Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
+			getChildrenFeaturesGen(object);
+
+			// Ensure that types come before advice
+			int typesIndex = childrenFeatures.indexOf(ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS);
+			int adviceIndex = childrenFeatures.indexOf(ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS);
+			if (typesIndex > adviceIndex) {
+				Collections.swap(childrenFeatures, typesIndex, adviceIndex);
+			}
 		}
+
 		return childrenFeatures;
 	}
 
@@ -207,8 +224,8 @@ public class ElementTypeSetConfigurationItemProvider extends ConfigurationElemen
 			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__METAMODEL_NS_URI:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
-			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS:
 			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 				return;
 		}
@@ -228,28 +245,28 @@ public class ElementTypeSetConfigurationItemProvider extends ConfigurationElemen
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS,
-				 ElementTypesConfigurationsFactory.eINSTANCE.createSpecializationTypeConfiguration()));
+				(ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS,
+				 ElementTypesConfigurationsFactory.eINSTANCE.createAdviceBindingConfiguration()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS,
-				 ElementTypesConfigurationsFactory.eINSTANCE.createMetamodelTypeConfiguration()));
+				(ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS,
+				 ElementTypesConfigurationsFactory.eINSTANCE.createExternallyRegisteredAdvice()));
 
 		newChildDescriptors.add
 			(createChildParameter
 				(ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS,
-				 ElementTypesConfigurationsFactory.eINSTANCE.createExternallyRegisteredType()));
+				 ElementTypesConfigurationsFactory.eINSTANCE.createSpecializationTypeConfiguration()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS,
-				 ElementTypesConfigurationsFactory.eINSTANCE.createAdviceBindingConfiguration()));
+				(ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS,
+				 ElementTypesConfigurationsFactory.eINSTANCE.createMetamodelTypeConfiguration()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS,
-				 ElementTypesConfigurationsFactory.eINSTANCE.createExternallyRegisteredAdvice()));
+				(ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS,
+				 ElementTypesConfigurationsFactory.eINSTANCE.createExternallyRegisteredType()));
 	}
 
 }
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ExternallyRegisteredTypeItemProvider.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ExternallyRegisteredTypeItemProvider.java
index 99a3c0c2c80..07877fdc443 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ExternallyRegisteredTypeItemProvider.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ExternallyRegisteredTypeItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 CEA LIST.
+ * Copyright (c) 2014, 2020 CEA LIST, Christian W. Damus, and others.
  * 
  * 
  * All rights reserved. This program and the accompanying materials
@@ -11,6 +11,7 @@
  * 
  * Contributors:
  *  CEA LIST - Initial API and implementation
+ *  Christian W. Damus - bug 568853
  */
 package org.eclipse.papyrus.infra.types.provider;
 
@@ -22,7 +23,6 @@ import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-
 import org.eclipse.papyrus.infra.types.ExternallyRegisteredType;
 
 /**
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/InverseAddWrapper.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/InverseAddWrapper.java
deleted file mode 100644
index 8192582ca06..00000000000
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/InverseAddWrapper.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2020 Christian W. Damus, CEA LIST, and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *   Christian W. Damus - Initial API and implementation
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.types.provider;
-
-/**
- * A wrapper around an object being set into a container reference to indicate that
- * it is being set to invert an add on the containment end.
- */
-final class InverseAddWrapper {
-
-	private final Object value;
-
-	InverseAddWrapper(Object value) {
-		super();
-
-		this.value = value;
-	}
-
-	static boolean isInverseAdd(Object value) {
-		return value instanceof InverseAddWrapper;
-	}
-
-	static Object unwrap(Object value) {
-		return isInverseAdd(value) ? ((InverseAddWrapper) value).value : value;
-	}
-
-}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/SpecializationTypeConfigurationItemProvider.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/SpecializationTypeConfigurationItemProvider.java
index 8ca5d1c0885..ba6c8b8cc95 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/SpecializationTypeConfigurationItemProvider.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/SpecializationTypeConfigurationItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014, 2017 CEA LIST.
+ * Copyright (c) 2014, 2020 CEA LIST, Christian W. Damus, and others.
  * 
  * 
  * All rights reserved. This program and the accompanying materials
@@ -12,6 +12,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  *  Ansgar Radermacher - Bug 526162 (use different label for references)
+ *  Christian W. Damus - bug 568853
  */
 package org.eclipse.papyrus.infra.types.provider;
 
@@ -19,15 +20,21 @@ package org.eclipse.papyrus.infra.types.provider;
 import java.util.Collection;
 import java.util.List;
 
+import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsFactory;
 import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
 import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration;
+import org.eclipse.uml2.common.edit.command.SubsetSupersetReplaceCommand;
+import org.eclipse.uml2.common.edit.command.SubsetSupersetSetCommand;
+import org.eclipse.uml2.common.edit.command.SupersetRemoveCommand;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration} object.
@@ -92,8 +99,7 @@ public class SpecializationTypeConfigurationItemProvider extends ElementTypeConf
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+	public Collection<? extends EStructuralFeature> getChildrenFeaturesGen(Object object) {
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(ElementTypesConfigurationsPackage.Literals.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION);
@@ -102,6 +108,22 @@ public class SpecializationTypeConfigurationItemProvider extends ElementTypeConf
 		}
 		return childrenFeatures;
 	}
+	
+	@Override
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
+			getChildrenFeaturesGen(object);
+
+			// Ensure that owned advice comes after the matcher
+			int matcherIndex = childrenFeatures.indexOf(ElementTypesConfigurationsPackage.Literals.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION);
+			int adviceIndex = childrenFeatures.indexOf(ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_CONFIGURATION__OWNED_ADVICE);
+			if (matcherIndex > adviceIndex) {
+				childrenFeatures.add(matcherIndex, childrenFeatures.remove(adviceIndex));
+			}
+		}
+
+		return childrenFeatures;
+	}
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -190,4 +212,55 @@ public class SpecializationTypeConfigurationItemProvider extends ElementTypeConf
 				 ElementTypesConfigurationsFactory.eINSTANCE.createMatcherConfiguration()));
 	}
 
+	/**
+	 * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#createRemoveCommand(org.eclipse.emf.edit.domain.EditingDomain, org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EStructuralFeature, java.util.Collection)
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected Command createRemoveCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, Collection<?> collection) {
+		if (feature == ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS) {
+			return new SupersetRemoveCommand(domain, owner, feature, new EStructuralFeature[] {ElementTypesConfigurationsPackage.Literals.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION, ElementTypesConfigurationsPackage.Literals.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION, ElementTypesConfigurationsPackage.Literals.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION}, collection);
+		}
+		return super.createRemoveCommand(domain, owner, feature, collection);
+	}
+
+	/**
+	 * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#createReplaceCommand(org.eclipse.emf.edit.domain.EditingDomain, org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EStructuralFeature, java.lang.Object, java.util.Collection)
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected Command createReplaceCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, Object value, Collection<?> collection) {
+		if (feature == ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS) {
+			return new SubsetSupersetReplaceCommand(domain, owner, feature, null, new EStructuralFeature[] {ElementTypesConfigurationsPackage.Literals.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION, ElementTypesConfigurationsPackage.Literals.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION, ElementTypesConfigurationsPackage.Literals.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION}, value, collection);
+		}
+		return super.createReplaceCommand(domain, owner, feature, value, collection);
+	}
+
+	/**
+	 * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#createSetCommand(org.eclipse.emf.edit.domain.EditingDomain, org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EStructuralFeature, java.lang.Object)
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected Command createSetCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, Object value) {
+		if (feature == ElementTypesConfigurationsPackage.Literals.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION) {
+			return new SubsetSupersetSetCommand(domain, owner, feature, new EStructuralFeature[] {ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS}, null, value);
+		}
+		if (feature == ElementTypesConfigurationsPackage.Literals.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION) {
+			return new SubsetSupersetSetCommand(domain, owner, feature, new EStructuralFeature[] {ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS}, null, value);
+		}
+		if (feature == ElementTypesConfigurationsPackage.Literals.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION) {
+			return new SubsetSupersetSetCommand(domain, owner, feature, new EStructuralFeature[] {ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS}, null, value);
+		}
+		if (feature == ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS) {
+			return new SubsetSupersetSetCommand(domain, owner, feature, null, new EStructuralFeature[] {ElementTypesConfigurationsPackage.Literals.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION, ElementTypesConfigurationsPackage.Literals.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION, ElementTypesConfigurationsPackage.Literals.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION}, value);
+		}
+		return super.createSetCommand(domain, owner, feature, value);
+	}
+
 }
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/META-INF/MANIFEST.MF b/plugins/infra/types/org.eclipse.papyrus.infra.types/META-INF/MANIFEST.MF
index 1f1d55a29dd..43e792d1eb1 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/META-INF/MANIFEST.MF
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/META-INF/MANIFEST.MF
@@ -18,7 +18,8 @@ Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="[2.16.0,3.0.0)",
  org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.22.0,3.0.0)",
- org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)"
+ org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.uml2.common;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.papyrus.infra.types
 Bundle-Activator: org.eclipse.papyrus.infra.types.Activator$Implementation
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.ecore b/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.ecore
index 1ab3d7464d1..7c0af4a533b 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.ecore
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.ecore
@@ -15,19 +15,21 @@
         <details key="originalName" value="allAdviceBindings"/>
       </eAnnotations>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="elementTypeConfigurations"
-        upperBound="-1" eType="#//ElementTypeConfiguration" containment="true" eOpposite="#//ElementTypeConfiguration/owningSet"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="adviceBindingsConfigurations"
         upperBound="-1" eType="#//AbstractAdviceBindingConfiguration" containment="true"
         eOpposite="#//AbstractAdviceBindingConfiguration/owningSet"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="allAdviceBindings" ordered="false"
         upperBound="-1" eType="#//AbstractAdviceBindingConfiguration" changeable="false"
         volatile="true" transient="true" derived="true" eOpposite="#//AbstractAdviceBindingConfiguration/elementTypeSet"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="elementTypeConfigurations"
+        upperBound="-1" eType="#//ElementTypeConfiguration" containment="true" eOpposite="#//ElementTypeConfiguration/owningSet"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="metamodelNsURI" lowerBound="1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ConfigurationElement" abstract="true">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="owningType" ordered="false"
+        eType="#//ElementTypeConfiguration" eOpposite="#//ElementTypeConfiguration/ownedConfigurations"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ElementTypeConfiguration" abstract="true"
       eSuperTypes="#//ConfigurationElement #//IdentifiedConfiguration #//NamedConfiguration">
@@ -38,10 +40,14 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="iconEntry" eType="#//IconEntry"
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="ownedAdvice" ordered="false"
-        upperBound="-1" eType="#//AbstractAdviceBindingConfiguration" containment="true"
-        eOpposite="#//AbstractAdviceBindingConfiguration/owningTarget"/>
+        upperBound="-1" eType="#//AbstractAdviceBindingConfiguration" volatile="true"
+        transient="true" derived="true" eOpposite="#//AbstractAdviceBindingConfiguration/owningTarget">
+      <eAnnotations source="subsets" references="#//ElementTypeConfiguration/ownedConfigurations"/>
+    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="owningSet" ordered="false"
         lowerBound="1" eType="#//ElementTypeSetConfiguration" eOpposite="#//ElementTypeSetConfiguration/elementTypeConfigurations"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedConfigurations" ordered="false"
+        upperBound="-1" eType="#//ConfigurationElement" containment="true" eOpposite="#//ConfigurationElement/owningType"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="IconEntry">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="iconPath" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -82,8 +88,9 @@
         lowerBound="1" eType="#//ElementTypeSetConfiguration" changeable="false" volatile="true"
         transient="true" derived="true" eOpposite="#//ElementTypeSetConfiguration/allAdviceBindings"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="owningTarget" ordered="false"
-        eType="#//ElementTypeConfiguration" eOpposite="#//ElementTypeConfiguration/ownedAdvice">
-      <eAnnotations source="subsets" references="#//AbstractAdviceBindingConfiguration/target"/>
+        eType="#//ElementTypeConfiguration" volatile="true" transient="true" derived="true"
+        eOpposite="#//ElementTypeConfiguration/ownedAdvice">
+      <eAnnotations source="subsets" references="#//AbstractAdviceBindingConfiguration/target #//ConfigurationElement/owningType"/>
     </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="AdviceConfiguration" abstract="true"
@@ -93,13 +100,46 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="after" upperBound="-1"
         eType="#//AdviceConfiguration"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ContainerConfiguration">
+  <eClassifiers xsi:type="ecore:EClass" name="ContainerConfiguration" eSuperTypes="#//ConfigurationElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="containerMatcherConfiguration"
         eType="#//AbstractMatcherConfiguration" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="containedType" ordered="false"
+        eType="#//SpecializationTypeConfiguration" eOpposite="#//SpecializationTypeConfiguration/containerConfiguration">
+      <eAnnotations source="subsets" references="#//ConfigurationElement/owningType"/>
+    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="eContainmentFeatures" upperBound="-1"
         eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EReference"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AbstractMatcherConfiguration" abstract="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="AbstractMatcherConfiguration" abstract="true"
+      eSuperTypes="#//ConfigurationElement">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="matchedType" ordered="false"
+        eType="#//SpecializationTypeConfiguration" eOpposite="#//SpecializationTypeConfiguration/matcherConfiguration">
+      <eAnnotations source="subsets" references="#//ConfigurationElement/owningType"/>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="SpecializationTypeConfiguration" eSuperTypes="#//ElementTypeConfiguration">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="editHelperAdviceConfiguration"
+        eType="#//AbstractEditHelperAdviceConfiguration" eOpposite="#//AbstractEditHelperAdviceConfiguration/target">
+      <eAnnotations source="subsets" references="#//ElementTypeConfiguration/ownedConfigurations"/>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="containerConfiguration"
+        eType="#//ContainerConfiguration" eOpposite="#//ContainerConfiguration/containedType">
+      <eAnnotations source="subsets" references="#//ElementTypeConfiguration/ownedConfigurations"/>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="specializedTypes" upperBound="-1"
+        eType="#//ElementTypeConfiguration"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="matcherConfiguration" eType="#//AbstractMatcherConfiguration"
+        eOpposite="#//AbstractMatcherConfiguration/matchedType">
+      <eAnnotations source="subsets" references="#//ElementTypeConfiguration/ownedConfigurations"/>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="AbstractEditHelperAdviceConfiguration"
+      abstract="true" eSuperTypes="#//AdviceConfiguration">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1"
+        eType="#//SpecializationTypeConfiguration" eOpposite="#//SpecializationTypeConfiguration/editHelperAdviceConfiguration">
+      <eAnnotations source="subsets" references="#//ConfigurationElement/owningType"/>
+    </eStructuralFeatures>
+  </eClassifiers>
   <eClassifiers xsi:type="ecore:EEnum" name="InheritanceKind">
     <eLiterals name="none" literal="none"/>
     <eLiterals name="all" value="1" literal="all"/>
@@ -113,21 +153,6 @@
       interface="true">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SpecializationTypeConfiguration" eSuperTypes="#//ElementTypeConfiguration">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="editHelperAdviceConfiguration"
-        eType="#//AbstractEditHelperAdviceConfiguration" containment="true" eOpposite="#//AbstractEditHelperAdviceConfiguration/target"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="containerConfiguration"
-        eType="#//ContainerConfiguration" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="matcherConfiguration" eType="#//AbstractMatcherConfiguration"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="specializedTypes" upperBound="-1"
-        eType="#//ElementTypeConfiguration"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AbstractEditHelperAdviceConfiguration"
-      abstract="true" eSuperTypes="#//AdviceConfiguration">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1"
-        eType="#//SpecializationTypeConfiguration" eOpposite="#//SpecializationTypeConfiguration/editHelperAdviceConfiguration"/>
-  </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="MetamodelTypeConfiguration" eSuperTypes="#//ElementTypeConfiguration">
     <eStructuralFeatures xsi:type="ecore:EReference" name="eClass" eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EClass"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="editHelperClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel b/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel
index be61874e716..aa0dbe96afb 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel
@@ -23,9 +23,9 @@
     <details key="DERIVED_FEATURES" value="PROCESS"/>
     <details key="SUPER_CLASS_ORDER" value="PROCESS"/>
     <details key="DUPLICATE_OPERATION_INHERITANCE" value="DISCARD"/>
-    <details key="REDEFINING_OPERATIONS" value="REPORT"/>
+    <details key="REDEFINING_OPERATIONS" value="PROCESS"/>
     <details key="INVARIANT_CONSTRAINTS" value="PROCESS"/>
-    <details key="UNION_PROPERTIES" value="REPORT"/>
+    <details key="UNION_PROPERTIES" value="PROCESS"/>
     <details key="DUPLICATE_OPERATIONS" value="DISCARD"/>
     <details key="NON_API_INVARIANTS" value="PROCESS"/>
     <details key="CAMEL_CASE_NAMES" value="IGNORE"/>
@@ -33,7 +33,7 @@
     <details key="OPERATION_BODIES" value="IGNORE"/>
     <details key="ECORE_TAGGED_VALUES" value="PROCESS"/>
     <details key="UNTYPED_PROPERTIES" value="REPORT"/>
-    <details key="REDEFINING_PROPERTIES" value="REPORT"/>
+    <details key="REDEFINING_PROPERTIES" value="PROCESS"/>
     <details key="INVOCATION_DELEGATES" value="PROCESS"/>
     <details key="VALIDATION_DELEGATES" value="PROCESS"/>
   </genAnnotations>
@@ -43,22 +43,27 @@
       extensibleProviderFactory="true" contentTypeIdentifier="org.eclipse.papyrus.infra.types"
       fileExtensions="elementtypesconfigurations" ecorePackage="ElementTypesConfigurations.ecore#/"
       operationsPackage="org.eclipse.papyrus.infra.types.operations">
+    <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/exporter/org.eclipse.uml2.uml.ecore.exporter">
+      <genAnnotations source="ElementTypesConfigurations.uml"/>
+    </genAnnotations>
     <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="ElementTypesConfigurations.ecore#//InheritanceKind">
       <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="ElementTypesConfigurations.ecore#//InheritanceKind/none"/>
       <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="ElementTypesConfigurations.ecore#//InheritanceKind/all"/>
     </genEnums>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="ElementTypesConfigurations.ecore#//ElementTypeSetConfiguration">
       <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
-          createChild="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//ElementTypeSetConfiguration/elementTypeConfigurations"/>
-      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
           createChild="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//ElementTypeSetConfiguration/adviceBindingsConfigurations"/>
       <genFeatures xsi:type="genmodel:GenFeature" property="None" notify="false" createChild="false"
           ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//ElementTypeSetConfiguration/allAdviceBindings"/>
+      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
+          createChild="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//ElementTypeSetConfiguration/elementTypeConfigurations"/>
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//ElementTypeSetConfiguration/metamodelNsURI"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="ElementTypesConfigurations.ecore#//ElementTypeSetConfiguration/getAllAdviceBindings"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="ElementTypesConfigurations.ecore#//ConfigurationElement">
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//ConfigurationElement/description"/>
+      <genFeatures xsi:type="genmodel:GenFeature" property="None" notify="false" createChild="false"
+          ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//ConfigurationElement/owningType"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="ElementTypesConfigurations.ecore#//ElementTypeConfiguration">
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//ElementTypeConfiguration/hint"/>
@@ -69,6 +74,8 @@
           createChild="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//ElementTypeConfiguration/ownedAdvice"/>
       <genFeatures xsi:type="genmodel:GenFeature" property="None" notify="false" createChild="false"
           ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//ElementTypeConfiguration/owningSet"/>
+      <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" createChild="false"
+          ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//ElementTypeConfiguration/ownedConfigurations"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="ElementTypesConfigurations.ecore#//IconEntry">
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//IconEntry/iconPath"/>
@@ -99,29 +106,34 @@
       <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
           createChild="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//ContainerConfiguration/containerMatcherConfiguration"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+          propertySortChoices="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//ContainerConfiguration/containedType"/>
+      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
           propertySortChoices="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//ContainerConfiguration/eContainmentFeatures"/>
     </genClasses>
-    <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="ElementTypesConfigurations.ecore#//AbstractMatcherConfiguration"/>
-    <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="ElementTypesConfigurations.ecore#//IdentifiedConfiguration">
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//IdentifiedConfiguration/identifier"/>
-    </genClasses>
-    <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="ElementTypesConfigurations.ecore#//NamedConfiguration">
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//NamedConfiguration/name"/>
+    <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="ElementTypesConfigurations.ecore#//AbstractMatcherConfiguration">
+      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+          propertySortChoices="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//AbstractMatcherConfiguration/matchedType"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration">
       <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
           createChild="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/editHelperAdviceConfiguration"/>
       <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
           createChild="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/containerConfiguration"/>
-      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
-          createChild="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/matcherConfiguration"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
           propertySortChoices="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/specializedTypes"/>
+      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
+          createChild="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/matcherConfiguration"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="ElementTypesConfigurations.ecore#//AbstractEditHelperAdviceConfiguration">
       <genFeatures xsi:type="genmodel:GenFeature" property="None" notify="false" createChild="false"
           ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//AbstractEditHelperAdviceConfiguration/target"/>
     </genClasses>
+    <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="ElementTypesConfigurations.ecore#//IdentifiedConfiguration">
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//IdentifiedConfiguration/identifier"/>
+    </genClasses>
+    <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="ElementTypesConfigurations.ecore#//NamedConfiguration">
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//NamedConfiguration/name"/>
+    </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="ElementTypesConfigurations.ecore#//MetamodelTypeConfiguration">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
           propertySortChoices="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//MetamodelTypeConfiguration/eClass"/>
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.notation b/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.notation
index d25e0e72e70..d39cd05371b 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.notation
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.notation
@@ -1,1592 +1,1663 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.3/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_ebrAsBOQEeeTo_35pSTPiA" type="PapyrusUMLClassDiagram" name="Overview ElementTypes" measurementUnit="Pixel">
-  <children xmi:type="notation:Shape" xmi:id="_fr880BOQEeeTo_35pSTPiA" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_fr_ZEBOQEeeTo_35pSTPiA" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_fr_ZEROQEeeTo_35pSTPiA" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_fr_ZEhOQEeeTo_35pSTPiA" y="15"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_fsAAIBOQEeeTo_35pSTPiA" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_hsi7kBOQEeeTo_35pSTPiA" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="ElementTypesConfigurations.uml#_VkhwPBLoEeeDV7UHoBIkeA"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_hsjioBOQEeeTo_35pSTPiA"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_fsAAIROQEeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_fsAAIhOQEeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_fsAAIxOQEeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fsAAJBOQEeeTo_35pSTPiA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_fsAAJROQEeeTo_35pSTPiA" visible="false" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_fsAAJhOQEeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_fsAAJxOQEeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_fsAAKBOQEeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fsAAKROQEeeTo_35pSTPiA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_fsAAKhOQEeeTo_35pSTPiA" visible="false" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_fsAAKxOQEeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_fsAALBOQEeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_fsAALROQEeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fsAALhOQEeeTo_35pSTPiA"/>
-    </children>
-    <element xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwOxLoEeeDV7UHoBIkeA"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fr880ROQEeeTo_35pSTPiA" x="573" y="71"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_mqbK0BOQEeeTo_35pSTPiA" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_mqdnEBOQEeeTo_35pSTPiA" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_mqdnEROQEeeTo_35pSTPiA" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_mqdnEhOQEeeTo_35pSTPiA" y="15"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_mqdnExOQEeeTo_35pSTPiA" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mqdnFBOQEeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_mqdnFROQEeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_mqdnFhOQEeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mqdnFxOQEeeTo_35pSTPiA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_mqdnGBOQEeeTo_35pSTPiA" visible="false" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mqdnGROQEeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_mqdnGhOQEeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_mqdnGxOQEeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mqdnHBOQEeeTo_35pSTPiA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_mqdnHROQEeeTo_35pSTPiA" visible="false" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mqdnHhOQEeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_mqdnHxOQEeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_mqdnIBOQEeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mqdnIROQEeeTo_35pSTPiA"/>
-    </children>
-    <element xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwYRLoEeeDV7UHoBIkeA"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mqbK0ROQEeeTo_35pSTPiA" x="1120" y="260"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_s12yUBOQEeeTo_35pSTPiA" type="Interface_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_s13ZYBOQEeeTo_35pSTPiA" type="Interface_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_s13ZYROQEeeTo_35pSTPiA" type="Interface_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_s13ZYhOQEeeTo_35pSTPiA" y="15"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_s13ZYxOQEeeTo_35pSTPiA" type="Interface_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_c9gHoBOSEeeTo_35pSTPiA" type="Property_InterfaceAttributeLabel">
-        <element xmi:type="uml:Property" href="ElementTypesConfigurations.uml#_VkhwQRLoEeeDV7UHoBIkeA"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_c9gHoROSEeeTo_35pSTPiA"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_s13ZZBOQEeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_s13ZZROQEeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_s13ZZhOQEeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s13ZZxOQEeeTo_35pSTPiA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_s14AcBOQEeeTo_35pSTPiA" visible="false" type="Interface_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_s14AcROQEeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_s14AchOQEeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_s14AcxOQEeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s14AdBOQEeeTo_35pSTPiA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_s14AdROQEeeTo_35pSTPiA" visible="false" type="Interface_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_s14AdhOQEeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_s14AdxOQEeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_s14AeBOQEeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s14AeROQEeeTo_35pSTPiA"/>
-    </children>
-    <element xmi:type="uml:Interface" href="ElementTypesConfigurations.uml#_VkhwQBLoEeeDV7UHoBIkeA"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s12yUROQEeeTo_35pSTPiA" x="700" y="320"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_JMepoBOREeeTo_35pSTPiA" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_JMfQsBOREeeTo_35pSTPiA" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_JMfQsROREeeTo_35pSTPiA" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_JMfQshOREeeTo_35pSTPiA" y="15"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_JMfQsxOREeeTo_35pSTPiA" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_c9gusBOSEeeTo_35pSTPiA" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="ElementTypesConfigurations.uml#_VkhwOBLoEeeDV7UHoBIkeA"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_c9gusROSEeeTo_35pSTPiA"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_JMfQtBOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_JMfQtROREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_JMfQthOREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JMfQtxOREeeTo_35pSTPiA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_JMfQuBOREeeTo_35pSTPiA" visible="false" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_JMfQuROREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_JMfQuhOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_JMfQuxOREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JMfQvBOREeeTo_35pSTPiA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_JMf3wBOREeeTo_35pSTPiA" visible="false" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_JMf3wROREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_JMf3whOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_JMf3wxOREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JMf3xBOREeeTo_35pSTPiA"/>
-    </children>
-    <element xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwMBLoEeeDV7UHoBIkeA"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JMepoROREeeTo_35pSTPiA" x="880" y="500"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_L_e8wBOREeeTo_35pSTPiA" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_L_gx8BOREeeTo_35pSTPiA" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_L_gx8ROREeeTo_35pSTPiA" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_L_gx8hOREeeTo_35pSTPiA" y="15"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_L_hZABOREeeTo_35pSTPiA" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_c9ij4BOSEeeTo_35pSTPiA" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="ElementTypesConfigurations.uml#_VkhwRBLoEeeDV7UHoBIkeA"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_c9ij4ROSEeeTo_35pSTPiA"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_c9jyABOSEeeTo_35pSTPiA" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="ElementTypesConfigurations.uml#_VkhwRxLoEeeDV7UHoBIkeA"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_c9jyAROSEeeTo_35pSTPiA"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_L_hZAROREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_L_hZAhOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_L_hZAxOREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L_hZBBOREeeTo_35pSTPiA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_L_hZBROREeeTo_35pSTPiA" visible="false" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_L_hZBhOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_L_hZBxOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_L_hZCBOREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L_hZCROREeeTo_35pSTPiA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_L_hZChOREeeTo_35pSTPiA" visible="false" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_L_hZCxOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_L_hZDBOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_L_hZDROREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L_hZDhOREeeTo_35pSTPiA"/>
-    </children>
-    <element xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwQhLoEeeDV7UHoBIkeA"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L_e8wROREeeTo_35pSTPiA" x="300" y="500"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_NBPUsBOREeeTo_35pSTPiA" type="Interface_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_NBPUshOREeeTo_35pSTPiA" type="Interface_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_NBPUsxOREeeTo_35pSTPiA" type="Interface_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_NBPUtBOREeeTo_35pSTPiA" y="15"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_NBPUtROREeeTo_35pSTPiA" type="Interface_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_c9kZEBOSEeeTo_35pSTPiA" type="Property_InterfaceAttributeLabel">
-        <element xmi:type="uml:Property" href="ElementTypesConfigurations.uml#_VkhwPxLoEeeDV7UHoBIkeA"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_c9kZEROSEeeTo_35pSTPiA"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_NBPUthOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_NBPUtxOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_NBPUuBOREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NBPUuROREeeTo_35pSTPiA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_NBPUuhOREeeTo_35pSTPiA" visible="false" type="Interface_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_NBPUuxOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_NBPUvBOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_NBPUvROREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NBPUvhOREeeTo_35pSTPiA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_NBP7wBOREeeTo_35pSTPiA" visible="false" type="Interface_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_NBP7wROREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_NBP7whOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_NBP7wxOREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NBP7xBOREeeTo_35pSTPiA"/>
-    </children>
-    <element xmi:type="uml:Interface" href="ElementTypesConfigurations.uml#_VkhwPhLoEeeDV7UHoBIkeA"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NBPUsROREeeTo_35pSTPiA" x="640" y="672"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_QLaKoBOREeeTo_35pSTPiA" type="Enumeration_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QLaxsBOREeeTo_35pSTPiA" type="Enumeration_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QLaxsROREeeTo_35pSTPiA" type="Enumeration_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QLaxshOREeeTo_35pSTPiA" y="15"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_QLbYwBOREeeTo_35pSTPiA" type="Enumeration_LiteralCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_TprL0BOSEeeTo_35pSTPiA" type="EnumerationLiteral_LiteralLabel">
-        <element xmi:type="uml:EnumerationLiteral" href="ElementTypesConfigurations.uml#_VkhwfxLoEeeDV7UHoBIkeA"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_TprL0ROSEeeTo_35pSTPiA"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_Tpry4BOSEeeTo_35pSTPiA" type="EnumerationLiteral_LiteralLabel">
-        <element xmi:type="uml:EnumerationLiteral" href="ElementTypesConfigurations.uml#_VkhwgBLoEeeDV7UHoBIkeA"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Tpry4ROSEeeTo_35pSTPiA"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_QLbYwROREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_QLbYwhOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_QLbYwxOREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QLbYxBOREeeTo_35pSTPiA"/>
-    </children>
-    <element xmi:type="uml:Enumeration" href="ElementTypesConfigurations.uml#_VkhwfhLoEeeDV7UHoBIkeA"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QLaKoROREeeTo_35pSTPiA" x="1480" y="40"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_Rv6DQBOREeeTo_35pSTPiA" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_Rv6DQhOREeeTo_35pSTPiA" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_Rv6DQxOREeeTo_35pSTPiA" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Rv6DRBOREeeTo_35pSTPiA" y="15"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_Rv6DRROREeeTo_35pSTPiA" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_Rv6DRhOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_Rv6DRxOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Rv6DSBOREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Rv6DSROREeeTo_35pSTPiA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_Rv6DShOREeeTo_35pSTPiA" visible="false" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_Rv6DSxOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_Rv6DTBOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Rv6DTROREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Rv6DThOREeeTo_35pSTPiA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_Rv6qUBOREeeTo_35pSTPiA" visible="false" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_Rv6qUROREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_Rv6qUhOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Rv6qUxOREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Rv6qVBOREeeTo_35pSTPiA"/>
-    </children>
-    <element xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwjhLoEeeDV7UHoBIkeA"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Rv6DQROREeeTo_35pSTPiA" x="1520" y="640"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_S0fFsBOREeeTo_35pSTPiA" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_S0fFshOREeeTo_35pSTPiA" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_S0fFsxOREeeTo_35pSTPiA" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_S0fFtBOREeeTo_35pSTPiA" y="15"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_S0fFtROREeeTo_35pSTPiA" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_c9lnMBOSEeeTo_35pSTPiA" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="ElementTypesConfigurations.uml#_VkhwohLoEeeDV7UHoBIkeA"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_c9lnMROSEeeTo_35pSTPiA"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_S0fFthOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_S0fFtxOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_S0fFuBOREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_S0fFuROREeeTo_35pSTPiA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_S0fFuhOREeeTo_35pSTPiA" visible="false" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_S0fFuxOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_S0fFvBOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_S0fFvROREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_S0fFvhOREeeTo_35pSTPiA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_S0fswBOREeeTo_35pSTPiA" visible="false" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_S0fswROREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_S0fswhOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_S0fswxOREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_S0fsxBOREeeTo_35pSTPiA"/>
-    </children>
-    <element xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwoBLoEeeDV7UHoBIkeA"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_S0fFsROREeeTo_35pSTPiA" x="1500" y="960"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_UrV5oBOREeeTo_35pSTPiA" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_UrV5ohOREeeTo_35pSTPiA" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_UrWgsBOREeeTo_35pSTPiA" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_UrWgsROREeeTo_35pSTPiA" y="15"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_UrWgshOREeeTo_35pSTPiA" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_c9mOQBOSEeeTo_35pSTPiA" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="ElementTypesConfigurations.uml#_VkhwpRLoEeeDV7UHoBIkeA"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_c9mOQROSEeeTo_35pSTPiA"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_UrWgsxOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_UrWgtBOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_UrWgtROREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UrWgthOREeeTo_35pSTPiA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_UrWgtxOREeeTo_35pSTPiA" visible="false" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_UrWguBOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_UrWguROREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_UrWguhOREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UrWguxOREeeTo_35pSTPiA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_UrWgvBOREeeTo_35pSTPiA" visible="false" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_UrWgvROREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_UrWgvhOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_UrWgvxOREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UrWgwBOREeeTo_35pSTPiA"/>
-    </children>
-    <element xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwoxLoEeeDV7UHoBIkeA"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UrV5oROREeeTo_35pSTPiA" x="520" y="980"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_VnxFoBOREeeTo_35pSTPiA" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_VnxssBOREeeTo_35pSTPiA" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_VnxssROREeeTo_35pSTPiA" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_VnxsshOREeeTo_35pSTPiA" y="15"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_Vny60BOREeeTo_35pSTPiA" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_Vny60ROREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_Vny60hOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Vny60xOREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Vny61BOREeeTo_35pSTPiA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_Vny61ROREeeTo_35pSTPiA" visible="false" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_Vny61hOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_Vny61xOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Vny62BOREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Vny62ROREeeTo_35pSTPiA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_Vny62hOREeeTo_35pSTPiA" visible="false" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_Vny62xOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_Vny63BOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Vny63ROREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Vny63hOREeeTo_35pSTPiA"/>
-    </children>
-    <element xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwqxLoEeeDV7UHoBIkeA"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VnxFoROREeeTo_35pSTPiA" x="536" y="1176"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_Wr-7sBOREeeTo_35pSTPiA" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_Wr-7shOREeeTo_35pSTPiA" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_Wr-7sxOREeeTo_35pSTPiA" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Wr-7tBOREeeTo_35pSTPiA" y="15"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_Wr-7tROREeeTo_35pSTPiA" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_Wr_iwBOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_Wr_iwROREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Wr_iwhOREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Wr_iwxOREeeTo_35pSTPiA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_Wr_ixBOREeeTo_35pSTPiA" visible="false" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_Wr_ixROREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_Wr_ixhOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Wr_ixxOREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Wr_iyBOREeeTo_35pSTPiA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_Wr_iyROREeeTo_35pSTPiA" visible="false" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_Wr_iyhOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_Wr_iyxOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Wr_izBOREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Wr_izROREeeTo_35pSTPiA"/>
-    </children>
-    <element xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwbxLoEeeDV7UHoBIkeA"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Wr-7sROREeeTo_35pSTPiA" x="1100" y="1340"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_X2b8oBOREeeTo_35pSTPiA" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_X2cjsBOREeeTo_35pSTPiA" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_X2cjsROREeeTo_35pSTPiA" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_X2cjshOREeeTo_35pSTPiA" y="15"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_X2cjsxOREeeTo_35pSTPiA" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_X2cjtBOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_X2cjtROREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_X2cjthOREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X2cjtxOREeeTo_35pSTPiA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_X2cjuBOREeeTo_35pSTPiA" visible="false" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_X2cjuROREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_X2cjuhOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_X2cjuxOREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X2cjvBOREeeTo_35pSTPiA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_X2cjvROREeeTo_35pSTPiA" visible="false" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_X2cjvhOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_X2cjvxOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_X2cjwBOREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X2cjwROREeeTo_35pSTPiA"/>
-    </children>
-    <element xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwdRLoEeeDV7UHoBIkeA"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X2b8oROREeeTo_35pSTPiA" x="1400" y="1340"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_kigmoBOREeeTo_35pSTPiA" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_kigmohOREeeTo_35pSTPiA" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_kigmoxOREeeTo_35pSTPiA" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_kigmpBOREeeTo_35pSTPiA" y="15"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_kigmpROREeeTo_35pSTPiA" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_kigmphOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_kigmpxOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_kigmqBOREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kigmqROREeeTo_35pSTPiA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_kigmqhOREeeTo_35pSTPiA" visible="false" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_kigmqxOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_kigmrBOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_kigmrROREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kigmrhOREeeTo_35pSTPiA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_kigmrxOREeeTo_35pSTPiA" visible="false" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_kigmsBOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_kigmsROREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_kigmshOREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kigmsxOREeeTo_35pSTPiA"/>
-    </children>
-    <element xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwgxLoEeeDV7UHoBIkeA"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kigmoROREeeTo_35pSTPiA" x="280" y="1440" height="141"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_mQmgIBOREeeTo_35pSTPiA" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_mQmgIhOREeeTo_35pSTPiA" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_mQmgIxOREeeTo_35pSTPiA" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_mQmgJBOREeeTo_35pSTPiA" y="15"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_mQmgJROREeeTo_35pSTPiA" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_c9oDchOSEeeTo_35pSTPiA" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="ElementTypesConfigurations.uml#_VkhwqBLoEeeDV7UHoBIkeA"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_c9oDcxOSEeeTo_35pSTPiA"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mQmgJhOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_mQmgJxOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_mQmgKBOREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mQmgKROREeeTo_35pSTPiA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_mQnHMBOREeeTo_35pSTPiA" visible="false" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mQnHMROREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_mQnHMhOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_mQnHMxOREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mQnHNBOREeeTo_35pSTPiA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_mQnHNROREeeTo_35pSTPiA" visible="false" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_mQnHNhOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_mQnHNxOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_mQnHOBOREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mQnHOROREeeTo_35pSTPiA"/>
-    </children>
-    <element xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwphLoEeeDV7UHoBIkeA"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mQmgIROREeeTo_35pSTPiA" x="1560" y="1460"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_n9jKIBOREeeTo_35pSTPiA" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_n9jKIhOREeeTo_35pSTPiA" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_n9jKIxOREeeTo_35pSTPiA" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_n9jKJBOREeeTo_35pSTPiA" y="15"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_n9jxMBOREeeTo_35pSTPiA" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_c9oqgBOSEeeTo_35pSTPiA" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="ElementTypesConfigurations.uml#_VkhwnBLoEeeDV7UHoBIkeA"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_c9oqgROSEeeTo_35pSTPiA"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_n9jxMROREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_n9jxMhOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_n9jxMxOREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n9jxNBOREeeTo_35pSTPiA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_n9jxNROREeeTo_35pSTPiA" visible="false" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_n9jxNhOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_n9jxNxOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_n9jxOBOREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n9jxOROREeeTo_35pSTPiA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_n9jxOhOREeeTo_35pSTPiA" visible="false" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_n9jxOxOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_n9jxPBOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_n9jxPROREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n9jxPhOREeeTo_35pSTPiA"/>
-    </children>
-    <element xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwmBLoEeeDV7UHoBIkeA"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n9jKIROREeeTo_35pSTPiA" x="-60" y="1140"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_qGWpsBOREeeTo_35pSTPiA" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_qGWpshOREeeTo_35pSTPiA" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_qGXQwBOREeeTo_35pSTPiA" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_qGXQwROREeeTo_35pSTPiA" y="15"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_qGXQwhOREeeTo_35pSTPiA" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_c9pRkhOSEeeTo_35pSTPiA" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="ElementTypesConfigurations.uml#_VkhwTxLoEeeDV7UHoBIkeA"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_c9pRkxOSEeeTo_35pSTPiA"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_c9p4oBOSEeeTo_35pSTPiA" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="ElementTypesConfigurations.uml#_VkhwURLoEeeDV7UHoBIkeA"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_c9p4oROSEeeTo_35pSTPiA"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_qGXQwxOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_qGXQxBOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_qGXQxROREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qGXQxhOREeeTo_35pSTPiA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_qGXQxxOREeeTo_35pSTPiA" visible="false" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_qGXQyBOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_qGXQyROREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_qGXQyhOREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qGXQyxOREeeTo_35pSTPiA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_qGXQzBOREeeTo_35pSTPiA" visible="false" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_qGXQzROREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_qGXQzhOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_qGXQzxOREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qGXQ0BOREeeTo_35pSTPiA"/>
-    </children>
-    <element xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwThLoEeeDV7UHoBIkeA"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qGWpsROREeeTo_35pSTPiA" x="-100" y="500"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_qwUMsBOREeeTo_35pSTPiA" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_qwUMshOREeeTo_35pSTPiA" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_qwUMsxOREeeTo_35pSTPiA" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_qwUMtBOREeeTo_35pSTPiA" y="15"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_qwUMtROREeeTo_35pSTPiA" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_qwUMthOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_qwUMtxOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_qwUMuBOREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qwUMuROREeeTo_35pSTPiA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_qwUMuhOREeeTo_35pSTPiA" visible="false" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_qwUMuxOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_qwUMvBOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_qwUMvROREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qwUMvhOREeeTo_35pSTPiA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_qwUMvxOREeeTo_35pSTPiA" visible="false" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_qwUMwBOREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_qwUMwROREeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_qwUMwhOREeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qwUMwxOREeeTo_35pSTPiA"/>
-    </children>
-    <element xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwqRLoEeeDV7UHoBIkeA"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qwUMsROREeeTo_35pSTPiA" x="-60" y="980"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_zrrvwBOSEeeTo_35pSTPiA" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_zrsW0BOSEeeTo_35pSTPiA" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_zrsW0ROSEeeTo_35pSTPiA" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_zrsW0hOSEeeTo_35pSTPiA" y="15"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_zrsW0xOSEeeTo_35pSTPiA" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_Mg1ycCXBEeueH428b_S_BA" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="ElementTypesConfigurations.uml#_VkhwXxLoEeeDV7UHoBIkeA"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Mg1ycSXBEeueH428b_S_BA"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_K4acECXBEeueH428b_S_BA" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="ElementTypesConfigurations.uml#_KRblkCKVEeu4pfq0yS8BRA"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_K4acESXBEeueH428b_S_BA"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_zrsW1BOSEeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zrsW1ROSEeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zrsW1hOSEeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zrsW1xOSEeeTo_35pSTPiA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_zrsW2BOSEeeTo_35pSTPiA" visible="false" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_zrsW2ROSEeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zrsW2hOSEeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zrsW2xOSEeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zrsW3BOSEeeTo_35pSTPiA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_zrsW3ROSEeeTo_35pSTPiA" visible="false" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_zrsW3hOSEeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zrsW3xOSEeeTo_35pSTPiA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zrsW4BOSEeeTo_35pSTPiA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zrsW4ROSEeeTo_35pSTPiA"/>
-    </children>
-    <element xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwVxLoEeeDV7UHoBIkeA"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zrrvwROSEeeTo_35pSTPiA" x="980" y="740"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_DILIACXDEeueH428b_S_BA" type="Comment_Shape" fontName="Arial">
-    <children xmi:type="notation:DecorationNode" xmi:id="_DILvECXDEeueH428b_S_BA" type="Comment_BodyLabel"/>
-    <element xmi:type="uml:Comment" href="ElementTypesConfigurations.uml#_DIG2kCXDEeueH428b_S_BA"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DILIASXDEeueH428b_S_BA" x="493" y="626" height="40"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_xIey0CXDEeueH428b_S_BA" type="Constraint_PackagedElementShape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_xIfZ4CXDEeueH428b_S_BA" type="Constraint_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_xIfZ4SXDEeueH428b_S_BA" type="Constraint_BodyLabel"/>
-    <element xmi:type="uml:Constraint" href="ElementTypesConfigurations.uml#_xIXeECXDEeueH428b_S_BA"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xIey0SXDEeueH428b_S_BA" x="1193" y="672"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_o1fr8CgTEeuIUIZUxl0ivA" type="StereotypeComment">
-    <styles xmi:type="notation:TitleStyle" xmi:id="_o1fr8SgTEeuIUIZUxl0ivA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o1fr8ygTEeuIUIZUxl0ivA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwOxLoEeeDV7UHoBIkeA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o1fr8igTEeuIUIZUxl0ivA" x="773" y="71"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_o1rSICgTEeuIUIZUxl0ivA" type="StereotypeComment">
-    <styles xmi:type="notation:TitleStyle" xmi:id="_o1rSISgTEeuIUIZUxl0ivA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o1rSIygTEeuIUIZUxl0ivA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwYRLoEeeDV7UHoBIkeA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o1rSIigTEeuIUIZUxl0ivA" x="1320" y="260"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_o17w0CgTEeuIUIZUxl0ivA" type="StereotypeComment">
-    <styles xmi:type="notation:TitleStyle" xmi:id="_o17w0SgTEeuIUIZUxl0ivA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o17w0ygTEeuIUIZUxl0ivA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Interface" href="ElementTypesConfigurations.uml#_VkhwQBLoEeeDV7UHoBIkeA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o17w0igTEeuIUIZUxl0ivA" x="900" y="320"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_o2Fh0CgTEeuIUIZUxl0ivA" type="StereotypeComment">
-    <styles xmi:type="notation:TitleStyle" xmi:id="_o2Fh0SgTEeuIUIZUxl0ivA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o2Fh0ygTEeuIUIZUxl0ivA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwMBLoEeeDV7UHoBIkeA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o2Fh0igTEeuIUIZUxl0ivA" x="1080" y="500"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_o2SWICgTEeuIUIZUxl0ivA" type="StereotypeComment">
-    <styles xmi:type="notation:TitleStyle" xmi:id="_o2SWISgTEeuIUIZUxl0ivA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o2SWIygTEeuIUIZUxl0ivA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwQhLoEeeDV7UHoBIkeA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o2SWIigTEeuIUIZUxl0ivA" x="500" y="500"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_o2r-wygTEeuIUIZUxl0ivA" type="StereotypeComment">
-    <styles xmi:type="notation:TitleStyle" xmi:id="_o2r-xCgTEeuIUIZUxl0ivA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o2sl0SgTEeuIUIZUxl0ivA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Interface" href="ElementTypesConfigurations.uml#_VkhwPhLoEeeDV7UHoBIkeA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o2sl0CgTEeuIUIZUxl0ivA" x="840" y="672"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_o21vwCgTEeuIUIZUxl0ivA" type="StereotypeComment">
-    <styles xmi:type="notation:TitleStyle" xmi:id="_o21vwSgTEeuIUIZUxl0ivA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o21vwygTEeuIUIZUxl0ivA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Enumeration" href="ElementTypesConfigurations.uml#_VkhwfhLoEeeDV7UHoBIkeA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o21vwigTEeuIUIZUxl0ivA" x="1680" y="40"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_o3U38CgTEeuIUIZUxl0ivA" type="StereotypeComment">
-    <styles xmi:type="notation:TitleStyle" xmi:id="_o3U38SgTEeuIUIZUxl0ivA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o3U38ygTEeuIUIZUxl0ivA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwjhLoEeeDV7UHoBIkeA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o3U38igTEeuIUIZUxl0ivA" x="1720" y="640"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_o3hsQCgTEeuIUIZUxl0ivA" type="StereotypeComment">
-    <styles xmi:type="notation:TitleStyle" xmi:id="_o3hsQSgTEeuIUIZUxl0ivA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o3hsQygTEeuIUIZUxl0ivA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwoBLoEeeDV7UHoBIkeA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o3hsQigTEeuIUIZUxl0ivA" x="1700" y="960"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_o3poEygTEeuIUIZUxl0ivA" type="StereotypeComment">
-    <styles xmi:type="notation:TitleStyle" xmi:id="_o3poFCgTEeuIUIZUxl0ivA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o3qPICgTEeuIUIZUxl0ivA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwoxLoEeeDV7UHoBIkeA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o3poFSgTEeuIUIZUxl0ivA" x="720" y="980"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_o3yK8CgTEeuIUIZUxl0ivA" type="StereotypeComment">
-    <styles xmi:type="notation:TitleStyle" xmi:id="_o3yK8SgTEeuIUIZUxl0ivA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o3yK8ygTEeuIUIZUxl0ivA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwqxLoEeeDV7UHoBIkeA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o3yK8igTEeuIUIZUxl0ivA" x="736" y="1176"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_o36GwCgTEeuIUIZUxl0ivA" type="StereotypeComment">
-    <styles xmi:type="notation:TitleStyle" xmi:id="_o36GwSgTEeuIUIZUxl0ivA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o36GwygTEeuIUIZUxl0ivA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwbxLoEeeDV7UHoBIkeA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o36GwigTEeuIUIZUxl0ivA" x="1300" y="1340"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_o4JXUCgTEeuIUIZUxl0ivA" type="StereotypeComment">
-    <styles xmi:type="notation:TitleStyle" xmi:id="_o4JXUSgTEeuIUIZUxl0ivA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o4JXUygTEeuIUIZUxl0ivA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwdRLoEeeDV7UHoBIkeA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o4JXUigTEeuIUIZUxl0ivA" x="1600" y="1340"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_o4c5UCgTEeuIUIZUxl0ivA" type="StereotypeComment">
-    <styles xmi:type="notation:TitleStyle" xmi:id="_o4c5USgTEeuIUIZUxl0ivA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o4c5UygTEeuIUIZUxl0ivA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwgxLoEeeDV7UHoBIkeA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o4c5UigTEeuIUIZUxl0ivA" x="480" y="1440"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_o4mDQCgTEeuIUIZUxl0ivA" type="StereotypeComment">
-    <styles xmi:type="notation:TitleStyle" xmi:id="_o4mDQSgTEeuIUIZUxl0ivA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o4mDQygTEeuIUIZUxl0ivA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwphLoEeeDV7UHoBIkeA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o4mDQigTEeuIUIZUxl0ivA" x="1760" y="1460"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_o4v0QCgTEeuIUIZUxl0ivA" type="StereotypeComment">
-    <styles xmi:type="notation:TitleStyle" xmi:id="_o4v0QSgTEeuIUIZUxl0ivA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o4v0QygTEeuIUIZUxl0ivA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwmBLoEeeDV7UHoBIkeA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o4v0QigTEeuIUIZUxl0ivA" x="140" y="1140"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_o44XICgTEeuIUIZUxl0ivA" type="StereotypeComment">
-    <styles xmi:type="notation:TitleStyle" xmi:id="_o44XISgTEeuIUIZUxl0ivA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o44XIygTEeuIUIZUxl0ivA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwThLoEeeDV7UHoBIkeA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o44XIigTEeuIUIZUxl0ivA" x="100" y="500"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_o5EkYygTEeuIUIZUxl0ivA" type="StereotypeComment">
-    <styles xmi:type="notation:TitleStyle" xmi:id="_o5EkZCgTEeuIUIZUxl0ivA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o5EkZigTEeuIUIZUxl0ivA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwqRLoEeeDV7UHoBIkeA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o5EkZSgTEeuIUIZUxl0ivA" x="140" y="980"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_o5MgMygTEeuIUIZUxl0ivA" type="StereotypeComment">
-    <styles xmi:type="notation:TitleStyle" xmi:id="_o5MgNCgTEeuIUIZUxl0ivA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o5MgNigTEeuIUIZUxl0ivA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwVxLoEeeDV7UHoBIkeA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o5MgNSgTEeuIUIZUxl0ivA" x="1180" y="740"/>
-  </children>
-  <styles xmi:type="notation:StringValueStyle" xmi:id="_ebrAsROQEeeTo_35pSTPiA" name="diagram_compatibility_version" stringValue="1.4.0"/>
-  <styles xmi:type="notation:DiagramStyle" xmi:id="_ebrAshOQEeeTo_35pSTPiA"/>
-  <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_ebrAsxOQEeeTo_35pSTPiA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
-    <owner xmi:type="uml:Model" href="ElementTypesConfigurations.uml#_VkhJIBLoEeeDV7UHoBIkeA"/>
-  </styles>
-  <element xmi:type="uml:Model" href="ElementTypesConfigurations.uml#_VkhJIBLoEeeDV7UHoBIkeA"/>
-  <edges xmi:type="notation:Connector" xmi:id="_q7ewUBOQEeeTo_35pSTPiA" type="Association_Edge" source="_mqbK0BOQEeeTo_35pSTPiA" target="_mqbK0BOQEeeTo_35pSTPiA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_q7fXYBOQEeeTo_35pSTPiA" type="Association_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FdpK8BOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_q7fXYROQEeeTo_35pSTPiA" y="-20"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_q7fXYhOQEeeTo_35pSTPiA" type="Association_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FeFP0BOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_q7fXYxOQEeeTo_35pSTPiA" y="20"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_q7f-cBOQEeeTo_35pSTPiA" type="Association_TargetRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FejJ4BOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_q7f-cROQEeeTo_35pSTPiA" x="45" y="-18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_q7f-chOQEeeTo_35pSTPiA" type="Association_SourceRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FfC5IBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_q7f-cxOQEeeTo_35pSTPiA" x="-13" y="-27"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_q7f-dBOQEeeTo_35pSTPiA" type="Association_SourceMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FfiBUBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_q7f-dROQEeeTo_35pSTPiA" x="47" y="19"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_q7f-dhOQEeeTo_35pSTPiA" type="Association_TargetMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FgRoMBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_q7f-dxOQEeeTo_35pSTPiA" x="-47" y="-18"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_q7ewUROQEeeTo_35pSTPiA"/>
-    <element xmi:type="uml:Association" href="ElementTypesConfigurations.uml#_VkhwaRLoEeeDV7UHoBIkeA"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_q7ewUhOQEeeTo_35pSTPiA" points="[1200, 260, -643984, -643984]$[1200, 200, -643984, -643984]$[1300, 200, -643984, -643984]$[1300, 300, -643984, -643984]$[1268, 300, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IxGfwBOSEeeTo_35pSTPiA" id="(0.5405405405405406,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IxGfwROSEeeTo_35pSTPiA" id="(1.0,0.4)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_q7n6QBOQEeeTo_35pSTPiA" type="Association_Edge" source="_mqbK0BOQEeeTo_35pSTPiA" target="_mqbK0BOQEeeTo_35pSTPiA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_q7ohUBOQEeeTo_35pSTPiA" type="Association_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FgzMoBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_q7ohUROQEeeTo_35pSTPiA" y="-20"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_q7ohUhOQEeeTo_35pSTPiA" type="Association_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FhbewBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_q7ohUxOQEeeTo_35pSTPiA" y="20"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_q7ohVBOQEeeTo_35pSTPiA" type="Association_TargetRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FiAGgBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_q7ohVROQEeeTo_35pSTPiA" x="23" y="-19"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_q7ohVhOQEeeTo_35pSTPiA" type="Association_SourceRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FivtYBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_q7ohVxOQEeeTo_35pSTPiA" x="-57" y="-60"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_q7ohWBOQEeeTo_35pSTPiA" type="Association_SourceMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FjetMBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_q7ohWROQEeeTo_35pSTPiA" x="25" y="17"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_q7ohWhOQEeeTo_35pSTPiA" type="Association_TargetMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Fl_1sBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_q7ohWxOQEeeTo_35pSTPiA" x="-23" y="-17"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_q7n6QROQEeeTo_35pSTPiA"/>
-    <element xmi:type="uml:Association" href="ElementTypesConfigurations.uml#_VkhwaxLoEeeDV7UHoBIkeA"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_q7n6QhOQEeeTo_35pSTPiA" points="[1120, 320, -643984, -643984]$[1080, 320, -643984, -643984]$[1080, 400, -643984, -643984]$[1140, 400, -643984, -643984]$[1140, 360, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GYg3wBOSEeeTo_35pSTPiA" id="(0.0,0.6)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GYhe0BOSEeeTo_35pSTPiA" id="(0.13513513513513514,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_q7pvcBOQEeeTo_35pSTPiA" type="Generalization_Edge" source="_mqbK0BOQEeeTo_35pSTPiA" target="_fr880BOQEeeTo_35pSTPiA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_q7qWgBOQEeeTo_35pSTPiA" type="Generalization_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FmtAUBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_q7qWgROQEeeTo_35pSTPiA" x="1" y="38"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_q7pvcROQEeeTo_35pSTPiA"/>
-    <element xmi:type="uml:Generalization" href="ElementTypesConfigurations.uml#_VkhwYhLoEeeDV7UHoBIkeA"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_q7pvchOQEeeTo_35pSTPiA" points="[1120, 300, -643984, -643984]$[680, 300, -643984, -643984]$[680, 181, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FpiR4BOSEeeTo_35pSTPiA" id="(0.0,0.36363636363636365)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Fpi48BOSEeeTo_35pSTPiA" id="(0.5144230769230769,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_uo8rIBOREeeTo_35pSTPiA" type="Association_Edge" source="_X2b8oBOREeeTo_35pSTPiA" target="_Wr-7sBOREeeTo_35pSTPiA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_uo8rIxOREeeTo_35pSTPiA" type="Association_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lkA1ABOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_uo8rJBOREeeTo_35pSTPiA" x="-1" y="-18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_uo8rJROREeeTo_35pSTPiA" type="Association_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lkogEBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_uo8rJhOREeeTo_35pSTPiA" x="-1" y="18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_uo8rJxOREeeTo_35pSTPiA" type="Association_TargetRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_llVqsBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_uo8rKBOREeeTo_35pSTPiA" x="57" y="-18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_uo8rKROREeeTo_35pSTPiA" type="Association_SourceRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lmBnMBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_uo9SMBOREeeTo_35pSTPiA" x="46" y="73"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_uo9SMROREeeTo_35pSTPiA" type="Association_SourceMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lmoEIBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_uo9SMhOREeeTo_35pSTPiA" x="59" y="19"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_uo9SMxOREeeTo_35pSTPiA" type="Association_TargetMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lnUAoBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_uo9SNBOREeeTo_35pSTPiA" x="-59" y="-20"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_uo8rIROREeeTo_35pSTPiA"/>
-    <element xmi:type="uml:Association" href="ElementTypesConfigurations.uml#_VkhwdhLoEeeDV7UHoBIkeA"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uo8rIhOREeeTo_35pSTPiA" points="[1400, 1380, -643984, -643984]$[1400, 1380, -643984, -643984]$[1266, 1380, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DPTZMBOUEeeTo_35pSTPiA" id="(0.0,0.4)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DPTZMROUEeeTo_35pSTPiA" id="(1.0,0.4)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_uo95QBOREeeTo_35pSTPiA" type="InterfaceRealization_Edge" source="_L_e8wBOREeeTo_35pSTPiA" target="_NBPUsBOREeeTo_35pSTPiA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_uo-gUBOREeeTo_35pSTPiA" type="InterfaceRealization_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9RfB0BOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_uo-gUROREeeTo_35pSTPiA" y="39"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_uo-gUhOREeeTo_35pSTPiA" type="InterfaceRealization_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9SBNUBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_uo-gUxOREeeTo_35pSTPiA" x="1" y="59"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_uo95QROREeeTo_35pSTPiA"/>
-    <element xmi:type="uml:InterfaceRealization" href="ElementTypesConfigurations.uml#_VkhwTBLoEeeDV7UHoBIkeA"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uo95QhOREeeTo_35pSTPiA" points="[488, 600, -643984, -643984]$[700, 620, -643984, -643984]$[700, 700, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9qVmsBOREeeTo_35pSTPiA" id="(1.0,0.8899082568807339)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9qVmsROREeeTo_35pSTPiA" id="(0.44776119402985076,0.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_uo_HYBOREeeTo_35pSTPiA" type="Generalization_Edge" source="_L_e8wBOREeeTo_35pSTPiA" target="_fr880BOQEeeTo_35pSTPiA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_uo_HYxOREeeTo_35pSTPiA" type="Generalization_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9SjY0BOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_uo_HZBOREeeTo_35pSTPiA" x="1" y="39"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_uo_HYROREeeTo_35pSTPiA"/>
-    <element xmi:type="uml:Generalization" href="ElementTypesConfigurations.uml#_VkhwQxLoEeeDV7UHoBIkeA"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uo_HYhOREeeTo_35pSTPiA" points="[508, 520, -643984, -643984]$[680, 520, -643984, -643984]$[680, 181, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9qU_oBOREeeTo_35pSTPiA" id="(1.0,0.14084507042253522)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9qU_oROREeeTo_35pSTPiA" id="(0.5144230769230769,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_uo_ucBOREeeTo_35pSTPiA" type="Generalization_Edge" source="_S0fFsBOREeeTo_35pSTPiA" target="_Rv6DQBOREeeTo_35pSTPiA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_uo_ucxOREeeTo_35pSTPiA" type="Generalization_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_g-mlkBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upAVgBOREeeTo_35pSTPiA" y="39"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_uo_ucROREeeTo_35pSTPiA"/>
-    <element xmi:type="uml:Generalization" href="ElementTypesConfigurations.uml#_VkhwoRLoEeeDV7UHoBIkeA"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uo_uchOREeeTo_35pSTPiA" points="[1642, 840, -643984, -643984]$[1725, 725, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g_ZPwROSEeeTo_35pSTPiA" id="(0.5405405405405406,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g_Z20BOSEeeTo_35pSTPiA" id="(0.5283018867924528,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_upAVgROREeeTo_35pSTPiA" type="Association_Edge" source="_L_e8wBOREeeTo_35pSTPiA" target="_JMepoBOREeeTo_35pSTPiA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_upA8khOREeeTo_35pSTPiA" type="Association_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9THZgBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upA8kxOREeeTo_35pSTPiA" x="1" y="-18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_upA8lBOREeeTo_35pSTPiA" type="Association_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9TyH4BOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upA8lROREeeTo_35pSTPiA" y="19"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_upA8lhOREeeTo_35pSTPiA" type="Association_TargetRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9UujEBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upA8lxOREeeTo_35pSTPiA" x="62" y="-11"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_upA8mBOREeeTo_35pSTPiA" type="Association_SourceRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9VeJ8BOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upA8mROREeeTo_35pSTPiA" x="-95" y="21"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_upA8mhOREeeTo_35pSTPiA" type="Association_SourceMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9WKGcBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upA8mxOREeeTo_35pSTPiA" x="32" y="19"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_upA8nBOREeeTo_35pSTPiA" type="Association_TargetMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9W6UYBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upA8nROREeeTo_35pSTPiA" x="-33" y="-18"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_upA8kBOREeeTo_35pSTPiA"/>
-    <element xmi:type="uml:Association" href="ElementTypesConfigurations.uml#_VkhwVRLoEeeDV7UHoBIkeA"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_upA8kROREeeTo_35pSTPiA" points="[488, 540, -643984, -643984]$[700, 540, -643984, -643984]$[880, 540, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9qWNwhOREeeTo_35pSTPiA" id="(1.0,0.35714285714285715)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9qWNwxOREeeTo_35pSTPiA" id="(0.0,0.4)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_upCKsBOREeeTo_35pSTPiA" type="Association_Edge" source="_Wr-7sBOREeeTo_35pSTPiA" target="_kigmoBOREeeTo_35pSTPiA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_upCKsxOREeeTo_35pSTPiA" type="Association_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_39b40BOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upCKtBOREeeTo_35pSTPiA" y="-18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_upCKtROREeeTo_35pSTPiA" type="Association_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3-EyABOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upCKthOREeeTo_35pSTPiA" x="2" y="16"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_upCKtxOREeeTo_35pSTPiA" type="Association_TargetRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3-3cMBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upCKuBOREeeTo_35pSTPiA" x="15" y="-18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_upCKuROREeeTo_35pSTPiA" type="Association_SourceRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3_fuUBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upCKuhOREeeTo_35pSTPiA" x="-43" y="13"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_upCKuxOREeeTo_35pSTPiA" type="Association_SourceMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_4AOHEBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upCKvBOREeeTo_35pSTPiA" x="15" y="16"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_upCKvROREeeTo_35pSTPiA" type="Association_TargetMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_4BEboBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upCKvhOREeeTo_35pSTPiA" x="-3" y="13"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_upCKsROREeeTo_35pSTPiA"/>
-    <element xmi:type="uml:Association" href="ElementTypesConfigurations.uml#_VkhwkhLoEeeDV7UHoBIkeA"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_upCKshOREeeTo_35pSTPiA" points="[1100, 1420, -643984, -643984]$[1180, 1480, -643984, -643984]$[497, 1480, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4JMc4ROSEeeTo_35pSTPiA" id="(0.4819277108433735,1.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4JMc4hOSEeeTo_35pSTPiA" id="(1.0,0.28169014084507044)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_upDY0BOREeeTo_35pSTPiA" type="Association_Edge" source="_Rv6DQBOREeeTo_35pSTPiA" target="_kigmoBOREeeTo_35pSTPiA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_upDY0xOREeeTo_35pSTPiA" type="Association_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_g6wAUBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upDY1BOREeeTo_35pSTPiA" x="67" y="-140"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_upDY1ROREeeTo_35pSTPiA" type="Association_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_g7XrYBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upDY1hOREeeTo_35pSTPiA" x="69" y="-107"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_upDY1xOREeeTo_35pSTPiA" type="Association_TargetRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_g8AkkBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upDY2BOREeeTo_35pSTPiA" x="15" y="-33"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_upDY2ROREeeTo_35pSTPiA" type="Association_SourceRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_g8macBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upDY2hOREeeTo_35pSTPiA" x="-63" y="13"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_upDY2xOREeeTo_35pSTPiA" type="Association_SourceMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_g9NecBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upDY3BOREeeTo_35pSTPiA" x="55" y="-13"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_upDY3ROREeeTo_35pSTPiA" type="Association_TargetMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_g92XoBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upDY3hOREeeTo_35pSTPiA" x="-110" y="-141"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_upDY0ROREeeTo_35pSTPiA"/>
-    <element xmi:type="uml:Association" href="ElementTypesConfigurations.uml#_VkhwkRLoEeeDV7UHoBIkeA"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_upDY0hOREeeTo_35pSTPiA" points="[1785, 700, -643984, -643984]$[1820, 700, -643984, -643984]$[1820, 1580, -643984, -643984]$[497, 1580, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g_ZPwBOSEeeTo_35pSTPiA" id="(1.0,0.6)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4JL10BOSEeeTo_35pSTPiA" id="(1.0,0.9929078014184397)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_upD_4BOREeeTo_35pSTPiA" type="Association_Edge" source="_qGWpsBOREeeTo_35pSTPiA" target="_L_e8wBOREeeTo_35pSTPiA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_upD_4xOREeeTo_35pSTPiA" type="Association_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9juBUBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upEm8BOREeeTo_35pSTPiA" x="1" y="-18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_upEm8ROREeeTo_35pSTPiA" type="Association_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9kTQIBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upEm8hOREeeTo_35pSTPiA" y="19"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_upEm8xOREeeTo_35pSTPiA" type="Association_TargetRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9mUCUBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upEm9BOREeeTo_35pSTPiA" x="50" y="-17"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_upEm9ROREeeTo_35pSTPiA" type="Association_SourceRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9m0YoBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upEm9hOREeeTo_35pSTPiA" x="-100" y="27"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_upEm9xOREeeTo_35pSTPiA" type="Association_SourceMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9nef8BOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upEm-BOREeeTo_35pSTPiA" x="50" y="20"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_upEm-ROREeeTo_35pSTPiA" type="Association_TargetMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9n-2QBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upEm-hOREeeTo_35pSTPiA" x="-50" y="-19"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_upD_4ROREeeTo_35pSTPiA"/>
-    <element xmi:type="uml:Association" href="ElementTypesConfigurations.uml#_VkhwUxLoEeeDV7UHoBIkeA"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_upD_4hOREeeTo_35pSTPiA" points="[147, 713, -643984, -643984]$[478, 677, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9qVmshOREeeTo_35pSTPiA" id="(1.0,0.15873015873015872)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9qVmsxOREeeTo_35pSTPiA" id="(0.0,0.14084507042253522)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_upFOABOREeeTo_35pSTPiA" type="Generalization_Edge" source="_Rv6DQBOREeeTo_35pSTPiA" target="_mqbK0BOQEeeTo_35pSTPiA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_upFOAxOREeeTo_35pSTPiA" type="Generalization_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FowOwBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upFOBBOREeeTo_35pSTPiA" x="-1" y="38"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_upFOAROREeeTo_35pSTPiA"/>
-    <element xmi:type="uml:Generalization" href="ElementTypesConfigurations.uml#_VkhwjxLoEeeDV7UHoBIkeA"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_upFOAhOREeeTo_35pSTPiA" points="[1520, 660, -643984, -643984]$[1200, 658, -643984, -643984]$[1200, 360, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Fpi48ROSEeeTo_35pSTPiA" id="(0.0,0.2)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Fpi48hOSEeeTo_35pSTPiA" id="(0.5405405405405406,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_upF1EBOREeeTo_35pSTPiA" type="Generalization_Edge" source="_qwUMsBOREeeTo_35pSTPiA" target="_L_e8wBOREeeTo_35pSTPiA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_upGcIBOREeeTo_35pSTPiA" type="Generalization_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9oqywBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upGcIROREeeTo_35pSTPiA" x="-140" y="39"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_upF1EROREeeTo_35pSTPiA"/>
-    <element xmi:type="uml:Generalization" href="ElementTypesConfigurations.uml#_VkhwqhLoEeeDV7UHoBIkeA"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_upF1EhOREeeTo_35pSTPiA" points="[115, 1040, -643984, -643984]$[380, 1036, -643984, -643984]$[380, 612, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9qWNwBOREeeTo_35pSTPiA" id="(1.0,0.6)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9qWNwROREeeTo_35pSTPiA" id="(0.425531914893617,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_upHqQBOREeeTo_35pSTPiA" type="Association_Edge" source="_L_e8wBOREeeTo_35pSTPiA" target="_kigmoBOREeeTo_35pSTPiA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_upHqQxOREeeTo_35pSTPiA" type="Association_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9Xe8IBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upHqRBOREeeTo_35pSTPiA" x="140" y="-19"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_upHqRROREeeTo_35pSTPiA" type="Association_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9ZaOwBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upHqRhOREeeTo_35pSTPiA" x="141" y="18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_upHqRxOREeeTo_35pSTPiA" type="Association_TargetRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9aKcsBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upIRUBOREeeTo_35pSTPiA" x="93" y="-18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_upIRUROREeeTo_35pSTPiA" type="Association_SourceRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9a4OYBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upIRUhOREeeTo_35pSTPiA" x="-53" y="-20"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_upIRUxOREeeTo_35pSTPiA" type="Association_SourceMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9c6OsBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upIRVBOREeeTo_35pSTPiA" x="93" y="18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_upIRVROREeeTo_35pSTPiA" type="Association_TargetMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9dwjQBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upIRVhOREeeTo_35pSTPiA" x="47" y="-20"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_upHqQROREeeTo_35pSTPiA"/>
-    <element xmi:type="uml:Association" href="ElementTypesConfigurations.uml#_VkhwlhLoEeeDV7UHoBIkeA"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_upHqQhOREeeTo_35pSTPiA" points="[568, 719, -643984, -643984]$[531, 1340, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9qVmtBOREeeTo_35pSTPiA" id="(0.5769230769230769,1.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9qVmtROREeeTo_35pSTPiA" id="(0.5529953917050692,0.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_upI4YBOREeeTo_35pSTPiA" type="Generalization_Edge" source="_kigmoBOREeeTo_35pSTPiA" target="_L_e8wBOREeeTo_35pSTPiA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_upJfcBOREeeTo_35pSTPiA" type="Generalization_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9pOMYBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upJfcROREeeTo_35pSTPiA" x="-140" y="39"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_upI4YROREeeTo_35pSTPiA"/>
-    <element xmi:type="uml:Generalization" href="ElementTypesConfigurations.uml#_VkhwhBLoEeeDV7UHoBIkeA"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_upI4YhOREeeTo_35pSTPiA" points="[531, 1340, -643984, -643984]$[568, 719, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9qVmthOREeeTo_35pSTPiA" id="(0.4608294930875576,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9qVmtxOREeeTo_35pSTPiA" id="(0.38461538461538464,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_upKtkBOREeeTo_35pSTPiA" type="Association_Edge" source="_X2b8oBOREeeTo_35pSTPiA" target="_kigmoBOREeeTo_35pSTPiA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_upKtkxOREeeTo_35pSTPiA" type="Association_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_4B1QoBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upKtlBOREeeTo_35pSTPiA" x="1" y="-19"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_upKtlROREeeTo_35pSTPiA" type="Association_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_4CibQBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upKtlhOREeeTo_35pSTPiA" x="-2" y="17"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_upLUoBOREeeTo_35pSTPiA" type="Association_TargetRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_4DNJoBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upLUoROREeeTo_35pSTPiA" x="97" y="-18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_upLUohOREeeTo_35pSTPiA" type="Association_SourceRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_4FXFwBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upLUoxOREeeTo_35pSTPiA" x="-63" y="13"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_upLUpBOREeeTo_35pSTPiA" type="Association_SourceMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_4F-w0BOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upLUpROREeeTo_35pSTPiA" x="95" y="19"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_upLUphOREeeTo_35pSTPiA" type="Association_TargetMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_4Gwz8BOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upLUpxOREeeTo_35pSTPiA" x="-23" y="-27"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_upKtkROREeeTo_35pSTPiA"/>
-    <element xmi:type="uml:Association" href="ElementTypesConfigurations.uml#_VkhwlBLoEeeDV7UHoBIkeA"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_upKtkhOREeeTo_35pSTPiA" points="[1500, 1443, -643984, -643984]$[1500, 1500, -643984, -643984]$[1500, 1520, -643984, -643984]$[497, 1520, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4JL10ROSEeeTo_35pSTPiA" id="(0.47393364928909953,1.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4JMc4BOSEeeTo_35pSTPiA" id="(1.0,0.5633802816901409)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_upL7sBOREeeTo_35pSTPiA" type="InterfaceRealization_Edge" source="_L_e8wBOREeeTo_35pSTPiA" target="_s12yUBOQEeeTo_35pSTPiA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_upL7sxOREeeTo_35pSTPiA" type="InterfaceRealization_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9f0YwBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upL7tBOREeeTo_35pSTPiA" y="39"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_upL7tROREeeTo_35pSTPiA" type="InterfaceRealization_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9i6wEBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upL7thOREeeTo_35pSTPiA" y="59"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_upL7sROREeeTo_35pSTPiA"/>
-    <element xmi:type="uml:InterfaceRealization" href="ElementTypesConfigurations.uml#_VkhwTRLoEeeDV7UHoBIkeA"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_upL7shOREeeTo_35pSTPiA" points="[400, 500, -643984, -643984]$[400, 400, -643984, -643984]$[500, 400, -643984, -643984]$[700, 400, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9qU_ohOREeeTo_35pSTPiA" id="(0.4807692307692308,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9qU_oxOREeeTo_35pSTPiA" id="(0.0,0.6451612903225806)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_upMiwBOREeeTo_35pSTPiA" type="Generalization_Edge" source="_JMepoBOREeeTo_35pSTPiA" target="_fr880BOQEeeTo_35pSTPiA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_upMiwxOREeeTo_35pSTPiA" type="Generalization_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_KdFD8BOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upMixBOREeeTo_35pSTPiA" y="40"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_upMiwROREeeTo_35pSTPiA"/>
-    <element xmi:type="uml:Generalization" href="ElementTypesConfigurations.uml#_VkhwMRLoEeeDV7UHoBIkeA"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_upMiwhOREeeTo_35pSTPiA" points="[876, 520, -643984, -643984]$[680, 520, -643984, -643984]$[680, 181, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JeRSUBOTEeeTo_35pSTPiA" id="(0.0,0.15873015873015872)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Kccx0BOTEeeTo_35pSTPiA" id="(0.5144230769230769,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_upNJ0BOREeeTo_35pSTPiA" type="InterfaceRealization_Edge" source="_JMepoBOREeeTo_35pSTPiA" target="_NBPUsBOREeeTo_35pSTPiA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_upNJ0xOREeeTo_35pSTPiA" type="InterfaceRealization_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_xXEBwBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upNJ1BOREeeTo_35pSTPiA" x="1" y="38"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_upNJ1ROREeeTo_35pSTPiA" type="InterfaceRealization_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_xXrs0BOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upNJ1hOREeeTo_35pSTPiA" x="1" y="58"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_upNJ0ROREeeTo_35pSTPiA"/>
-    <element xmi:type="uml:InterfaceRealization" href="ElementTypesConfigurations.uml#_VkhwORLoEeeDV7UHoBIkeA"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_upNJ0hOREeeTo_35pSTPiA" points="[940, 613, -643984, -643984]$[700, 620, -643984, -643984]$[760, 700, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xYuOoBOSEeeTo_35pSTPiA" id="(0.25882352941176473,1.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xYu1sBOSEeeTo_35pSTPiA" id="(0.44776119402985076,0.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_upNw4BOREeeTo_35pSTPiA" type="Generalization_Edge" source="_n9jKIBOREeeTo_35pSTPiA" target="_L_e8wBOREeeTo_35pSTPiA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_upNw4xOREeeTo_35pSTPiA" type="Generalization_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9pstgBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upNw5BOREeeTo_35pSTPiA" x="-139" y="38"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_upNw4ROREeeTo_35pSTPiA"/>
-    <element xmi:type="uml:Generalization" href="ElementTypesConfigurations.uml#_VkhwmRLoEeeDV7UHoBIkeA"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_upNw4hOREeeTo_35pSTPiA" points="[212, 1200, -643984, -643984]$[380, 1200, -643984, -643984]$[380, 612, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9qWNxBOREeeTo_35pSTPiA" id="(1.0,0.6)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9qWNxROREeeTo_35pSTPiA" id="(0.425531914893617,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_upOX8BOREeeTo_35pSTPiA" type="Generalization_Edge" source="_VnxFoBOREeeTo_35pSTPiA" target="_UrV5oBOREeeTo_35pSTPiA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_upOX8xOREeeTo_35pSTPiA" type="Generalization_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jNYKQBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upOX9BOREeeTo_35pSTPiA" x="1" y="39"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_upOX8ROREeeTo_35pSTPiA"/>
-    <element xmi:type="uml:Generalization" href="ElementTypesConfigurations.uml#_VkhwrBLoEeeDV7UHoBIkeA"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_upOX8hOREeeTo_35pSTPiA" points="[651, 1176, -643984, -643984]$[686, 1092, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jOBqgBOSEeeTo_35pSTPiA" id="(0.4797297297297297,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jOCRkBOSEeeTo_35pSTPiA" id="(0.33783783783783783,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_upPmEBOREeeTo_35pSTPiA" type="Generalization_Edge" source="_mQmgIBOREeeTo_35pSTPiA" target="_X2b8oBOREeeTo_35pSTPiA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_upPmExOREeeTo_35pSTPiA" type="Generalization_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lh2R0BOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upPmFBOREeeTo_35pSTPiA" y="39"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_upPmEROREeeTo_35pSTPiA"/>
-    <element xmi:type="uml:Generalization" href="ElementTypesConfigurations.uml#_VkhwpxLoEeeDV7UHoBIkeA"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_upPmEhOREeeTo_35pSTPiA" points="[1560, 1500, -643984, -643984]$[1520, 1500, -643984, -643984]$[1520, 1440, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4sI8cBOTEeeTo_35pSTPiA" id="(0.0,0.4)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4sJjgBOTEeeTo_35pSTPiA" id="(0.5687203791469194,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_upQNIBOREeeTo_35pSTPiA" type="InterfaceRealization_Edge" source="_JMepoBOREeeTo_35pSTPiA" target="_s12yUBOQEeeTo_35pSTPiA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_upQ0MBOREeeTo_35pSTPiA" type="InterfaceRealization_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_EiG6UBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upQ0MROREeeTo_35pSTPiA" x="-1" y="38"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_upQ0MhOREeeTo_35pSTPiA" type="InterfaceRealization_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Ei3vUBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_upQ0MxOREeeTo_35pSTPiA" x="-1" y="57"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_upQNIROREeeTo_35pSTPiA"/>
-    <element xmi:type="uml:InterfaceRealization" href="ElementTypesConfigurations.uml#_VkhwOhLoEeeDV7UHoBIkeA"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_upQNIhOREeeTo_35pSTPiA" points="[980, 487, -643984, -643984]$[980, 400, -643984, -643984]$[857, 400, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjrnoBOTEeeTo_35pSTPiA" id="(0.43859649122807015,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjrnoROTEeeTo_35pSTPiA" id="(1.0,0.6451612903225806)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_1r9lcBOSEeeTo_35pSTPiA" type="Association_Edge" source="_X2b8oBOREeeTo_35pSTPiA" target="_zrrvwBOSEeeTo_35pSTPiA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_1r-MghOSEeeTo_35pSTPiA" type="Association_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ln_WEBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1r-MgxOSEeeTo_35pSTPiA" x="1" y="-18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_1r-MhBOSEeeTo_35pSTPiA" type="Association_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lqDLkBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1r-MhROSEeeTo_35pSTPiA" y="18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_1r-MhhOSEeeTo_35pSTPiA" type="Association_TargetRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lq7VUBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1r-MhxOSEeeTo_35pSTPiA" x="56" y="-18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_1r-MiBOSEeeTo_35pSTPiA" type="Association_SourceRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ltBnEBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1r-MiROSEeeTo_35pSTPiA" x="-56" y="18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_1r-MihOSEeeTo_35pSTPiA" type="Association_SourceMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ltoEABOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1r-MixOSEeeTo_35pSTPiA" x="55" y="18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_1r-MjBOSEeeTo_35pSTPiA" type="Association_TargetMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_luPIABOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1r-MjROSEeeTo_35pSTPiA" x="-55" y="-18"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_1r-MgBOSEeeTo_35pSTPiA"/>
-    <element xmi:type="uml:Association" href="ElementTypesConfigurations.uml#_VkhwfBLoEeeDV7UHoBIkeA"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1r-MgROSEeeTo_35pSTPiA" points="[1420, 1340, -643984, -643984]$[1420, 780, -643984, -643984]$[1226, 780, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lwnGkBOTEeeTo_35pSTPiA" id="(0.0947867298578199,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lwnGkROTEeeTo_35pSTPiA" id="(1.0,0.3883495145631068)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_1r-zkBOSEeeTo_35pSTPiA" type="InterfaceRealization_Edge" source="_zrrvwBOSEeeTo_35pSTPiA" target="_NBPUsBOREeeTo_35pSTPiA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_1r-zkxOSEeeTo_35pSTPiA" type="InterfaceRealization_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_j_H60BOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1r-zlBOSEeeTo_35pSTPiA" x="1" y="38"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_1r-zlROSEeeTo_35pSTPiA" type="InterfaceRealization_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_j_1sgBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1r_aoBOSEeeTo_35pSTPiA" x="-1" y="58"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_1r-zkROSEeeTo_35pSTPiA"/>
-    <element xmi:type="uml:InterfaceRealization" href="ElementTypesConfigurations.uml#_VkhwYBLoEeeDV7UHoBIkeA"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1r-zkhOSEeeTo_35pSTPiA" points="[1101, 767, -643984, -643984]$[957, 739, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kAxgoBOTEeeTo_35pSTPiA" id="(0.0,0.3853211009174312)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kAxgoROTEeeTo_35pSTPiA" id="(1.0,0.6442307692307693)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_1r_aoROSEeeTo_35pSTPiA" type="Association_Edge" source="_L_e8wBOREeeTo_35pSTPiA" target="_zrrvwBOSEeeTo_35pSTPiA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_1r_apBOSEeeTo_35pSTPiA" type="Association_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_omIiMBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1r_apROSEeeTo_35pSTPiA" x="1" y="-18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_1r_aphOSEeeTo_35pSTPiA" type="Association_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_omtxABOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1r_apxOSEeeTo_35pSTPiA" y="19"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_1r_aqBOSEeeTo_35pSTPiA" type="Association_TargetRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_onTm4BOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1r_aqROSEeeTo_35pSTPiA" x="91" y="-18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_1r_aqhOSEeeTo_35pSTPiA" type="Association_SourceRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_on6D0BOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1r_aqxOSEeeTo_35pSTPiA" x="-53" y="9"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_1sABsBOSEeeTo_35pSTPiA" type="Association_SourceMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_oof5sBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1sABsROSEeeTo_35pSTPiA" x="92" y="19"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_1sABshOSEeeTo_35pSTPiA" type="Association_TargetMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_opIL0BOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1sABsxOSEeeTo_35pSTPiA" x="-36" y="-6"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_1r_aohOSEeeTo_35pSTPiA"/>
-    <element xmi:type="uml:Association" href="ElementTypesConfigurations.uml#_VkhwbRLoEeeDV7UHoBIkeA"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1r_aoxOSEeeTo_35pSTPiA" points="[460, 642, -643984, -643984]$[460, 840, -643984, -643984]$[1101, 840, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_olisUBOTEeeTo_35pSTPiA" id="(0.7692307692307693,1.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_olisUROTEeeTo_35pSTPiA" id="(0.0,0.970873786407767)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_1sABtBOSEeeTo_35pSTPiA" type="Generalization_Edge" source="_zrrvwBOSEeeTo_35pSTPiA" target="_mqbK0BOQEeeTo_35pSTPiA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_1sAowBOSEeeTo_35pSTPiA" type="Generalization_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_LcKiYBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1sAowROSEeeTo_35pSTPiA" x="1" y="39"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_1sABtROSEeeTo_35pSTPiA"/>
-    <element xmi:type="uml:Generalization" href="ElementTypesConfigurations.uml#_VkhwWBLoEeeDV7UHoBIkeA"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1sABthOSEeeTo_35pSTPiA" points="[1244, 740, -643984, -643984]$[1302, 590, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Lc6JQBOTEeeTo_35pSTPiA" id="(0.8943089430894309,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Lc6wUBOTEeeTo_35pSTPiA" id="(0.4807692307692308,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_1sAowhOSEeeTo_35pSTPiA" type="Association_Edge" source="_zrrvwBOSEeeTo_35pSTPiA" target="_JMepoBOREeeTo_35pSTPiA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_1sAoxROSEeeTo_35pSTPiA" type="Association_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_uKrv4BOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1sAoxhOSEeeTo_35pSTPiA" x="1" y="-18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_1sAoxxOSEeeTo_35pSTPiA" type="Association_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_uLbWwBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1sAoyBOSEeeTo_35pSTPiA" x="-1" y="18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_1sAoyROSEeeTo_35pSTPiA" type="Association_TargetRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_uMCawBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1sBP0BOSEeeTo_35pSTPiA" x="27" y="-18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_1sBP0ROSEeeTo_35pSTPiA" type="Association_SourceRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_uMrT8BOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1sBP0hOSEeeTo_35pSTPiA" x="-47" y="-80"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_1sBP0xOSEeeTo_35pSTPiA" type="Association_SourceMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_uNQiwBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1sBP1BOSEeeTo_35pSTPiA" x="26" y="18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_1sBP1ROSEeeTo_35pSTPiA" type="Association_TargetMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_uN2_sBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1sBP1hOSEeeTo_35pSTPiA" x="-26" y="-18"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_1sAowxOSEeeTo_35pSTPiA"/>
-    <element xmi:type="uml:Association" href="ElementTypesConfigurations.uml#_VkhwgRLoEeeDV7UHoBIkeA"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1sAoxBOSEeeTo_35pSTPiA" points="[1174, 740, -643984, -643984]$[1051, 613, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uOt7UBOTEeeTo_35pSTPiA" id="(0.3252032520325203,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uOt7UROTEeeTo_35pSTPiA" id="(0.7894736842105263,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_1sB24BOSEeeTo_35pSTPiA" type="Association_Edge" source="_Wr-7sBOREeeTo_35pSTPiA" target="_zrrvwBOSEeeTo_35pSTPiA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_1sB24xOSEeeTo_35pSTPiA" type="Association_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_l0Uh4BOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1sB25BOSEeeTo_35pSTPiA" x="-1" y="-17"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_1sB25ROSEeeTo_35pSTPiA" type="Association_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_l2mZ0BOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1sB25hOSEeeTo_35pSTPiA" y="19"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_1sB25xOSEeeTo_35pSTPiA" type="Association_TargetRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_l3MPsBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1sB26BOSEeeTo_35pSTPiA" x="70" y="-19"/>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.3/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
+  <notation:Diagram xmi:id="_ebrAsBOQEeeTo_35pSTPiA" type="PapyrusUMLClassDiagram" name="Overview ElementTypes" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_fr880BOQEeeTo_35pSTPiA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_fr_ZEBOQEeeTo_35pSTPiA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_fr_ZEROQEeeTo_35pSTPiA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_fr_ZEhOQEeeTo_35pSTPiA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_fsAAIBOQEeeTo_35pSTPiA" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_hsi7kBOQEeeTo_35pSTPiA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="ElementTypesConfigurations.uml#_VkhwPBLoEeeDV7UHoBIkeA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_hsjioBOQEeeTo_35pSTPiA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_fsAAIROQEeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_fsAAIhOQEeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_fsAAIxOQEeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fsAAJBOQEeeTo_35pSTPiA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_fsAAJROQEeeTo_35pSTPiA" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_fsAAJhOQEeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_fsAAJxOQEeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_fsAAKBOQEeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fsAAKROQEeeTo_35pSTPiA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_fsAAKhOQEeeTo_35pSTPiA" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_fsAAKxOQEeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_fsAALBOQEeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_fsAALROQEeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fsAALhOQEeeTo_35pSTPiA"/>
+      </children>
+      <element xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwOxLoEeeDV7UHoBIkeA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fr880ROQEeeTo_35pSTPiA" x="573" y="71"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_1sB26ROSEeeTo_35pSTPiA" type="Association_SourceRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_l3yFkBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1sB26hOSEeeTo_35pSTPiA" x="-44" y="-120"/>
+    <children xmi:type="notation:Shape" xmi:id="_mqbK0BOQEeeTo_35pSTPiA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_mqdnEBOQEeeTo_35pSTPiA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_mqdnEROQEeeTo_35pSTPiA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_mqdnEhOQEeeTo_35pSTPiA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mqdnExOQEeeTo_35pSTPiA" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mqdnFBOQEeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_mqdnFROQEeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_mqdnFhOQEeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mqdnFxOQEeeTo_35pSTPiA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mqdnGBOQEeeTo_35pSTPiA" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mqdnGROQEeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_mqdnGhOQEeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_mqdnGxOQEeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mqdnHBOQEeeTo_35pSTPiA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mqdnHROQEeeTo_35pSTPiA" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mqdnHhOQEeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_mqdnHxOQEeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_mqdnIBOQEeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mqdnIROQEeeTo_35pSTPiA"/>
+      </children>
+      <element xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwYRLoEeeDV7UHoBIkeA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mqbK0ROQEeeTo_35pSTPiA" x="1120" y="260"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_1sB26xOSEeeTo_35pSTPiA" type="Association_SourceMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_l4a-wBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1sB27BOSEeeTo_35pSTPiA" x="70" y="18"/>
+    <children xmi:type="notation:Shape" xmi:id="_s12yUBOQEeeTo_35pSTPiA" type="Interface_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_s13ZYBOQEeeTo_35pSTPiA" type="Interface_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_s13ZYROQEeeTo_35pSTPiA" type="Interface_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_s13ZYhOQEeeTo_35pSTPiA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_s13ZYxOQEeeTo_35pSTPiA" type="Interface_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_c9gHoBOSEeeTo_35pSTPiA" type="Property_InterfaceAttributeLabel">
+          <element xmi:type="uml:Property" href="ElementTypesConfigurations.uml#_VkhwQRLoEeeDV7UHoBIkeA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_c9gHoROSEeeTo_35pSTPiA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_s13ZZBOQEeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_s13ZZROQEeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_s13ZZhOQEeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s13ZZxOQEeeTo_35pSTPiA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_s14AcBOQEeeTo_35pSTPiA" visible="false" type="Interface_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_s14AcROQEeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_s14AchOQEeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_s14AcxOQEeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s14AdBOQEeeTo_35pSTPiA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_s14AdROQEeeTo_35pSTPiA" visible="false" type="Interface_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_s14AdhOQEeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_s14AdxOQEeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_s14AeBOQEeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s14AeROQEeeTo_35pSTPiA"/>
+      </children>
+      <element xmi:type="uml:Interface" href="ElementTypesConfigurations.uml#_VkhwQBLoEeeDV7UHoBIkeA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s12yUROQEeeTo_35pSTPiA" x="700" y="320"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_1sCd8BOSEeeTo_35pSTPiA" type="Association_TargetMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_l5Cp0BOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1sCd8ROSEeeTo_35pSTPiA" x="-70" y="-16"/>
+    <children xmi:type="notation:Shape" xmi:id="_JMepoBOREeeTo_35pSTPiA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_JMfQsBOREeeTo_35pSTPiA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_JMfQsROREeeTo_35pSTPiA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_JMfQshOREeeTo_35pSTPiA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_JMfQsxOREeeTo_35pSTPiA" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_c9gusBOSEeeTo_35pSTPiA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="ElementTypesConfigurations.uml#_VkhwOBLoEeeDV7UHoBIkeA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_c9gusROSEeeTo_35pSTPiA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_JMfQtBOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_JMfQtROREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_JMfQthOREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JMfQtxOREeeTo_35pSTPiA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_JMfQuBOREeeTo_35pSTPiA" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_JMfQuROREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_JMfQuhOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_JMfQuxOREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JMfQvBOREeeTo_35pSTPiA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_JMf3wBOREeeTo_35pSTPiA" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_JMf3wROREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_JMf3whOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_JMf3wxOREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JMf3xBOREeeTo_35pSTPiA"/>
+      </children>
+      <element xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwMBLoEeeDV7UHoBIkeA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JMepoROREeeTo_35pSTPiA" x="880" y="500"/>
     </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_1sB24ROSEeeTo_35pSTPiA"/>
-    <element xmi:type="uml:Association" href="ElementTypesConfigurations.uml#_VkhwehLoEeeDV7UHoBIkeA"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1sB24hOSEeeTo_35pSTPiA" points="[1220, 1340, -643984, -643984]$[1200, 843, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l5t_QBOTEeeTo_35pSTPiA" id="(0.6024096385542169,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l5t_QROTEeeTo_35pSTPiA" id="(0.8943089430894309,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_1sCd8hOSEeeTo_35pSTPiA" type="Generalization_Edge" source="_UrV5oBOREeeTo_35pSTPiA" target="_zrrvwBOSEeeTo_35pSTPiA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_1sDFABOSEeeTo_35pSTPiA" type="Generalization_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lifLABOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1sDFAROSEeeTo_35pSTPiA" y="39"/>
+    <children xmi:type="notation:Shape" xmi:id="_L_e8wBOREeeTo_35pSTPiA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_L_gx8BOREeeTo_35pSTPiA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_L_gx8ROREeeTo_35pSTPiA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_L_gx8hOREeeTo_35pSTPiA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_L_hZABOREeeTo_35pSTPiA" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_c9ij4BOSEeeTo_35pSTPiA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="ElementTypesConfigurations.uml#_VkhwRBLoEeeDV7UHoBIkeA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_c9ij4ROSEeeTo_35pSTPiA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_c9jyABOSEeeTo_35pSTPiA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="ElementTypesConfigurations.uml#_VkhwRxLoEeeDV7UHoBIkeA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_c9jyAROSEeeTo_35pSTPiA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_L_hZAROREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_L_hZAhOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_L_hZAxOREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L_hZBBOREeeTo_35pSTPiA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_L_hZBROREeeTo_35pSTPiA" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_L_hZBhOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_L_hZBxOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_L_hZCBOREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L_hZCROREeeTo_35pSTPiA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_L_hZChOREeeTo_35pSTPiA" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_L_hZCxOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_L_hZDBOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_L_hZDROREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L_hZDhOREeeTo_35pSTPiA"/>
+      </children>
+      <element xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwQhLoEeeDV7UHoBIkeA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L_e8wROREeeTo_35pSTPiA" x="300" y="500"/>
     </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_1sCd8xOSEeeTo_35pSTPiA"/>
-    <element xmi:type="uml:Generalization" href="ElementTypesConfigurations.uml#_VkhwpBLoEeeDV7UHoBIkeA"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1sCd9BOSEeeTo_35pSTPiA" points="[816, 879, -643984, -643984]$[1101, 817, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ljPY8BOTEeeTo_35pSTPiA" id="(1.0,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ljQAABOTEeeTo_35pSTPiA" id="(0.08130081300813008,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_NLIQICXCEeueH428b_S_BA" type="Association_Edge" source="_L_e8wBOREeeTo_35pSTPiA" target="_zrrvwBOSEeeTo_35pSTPiA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_NLI3MCXCEeueH428b_S_BA" type="Association_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_NwwFsCXCEeueH428b_S_BA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_NLI3MSXCEeueH428b_S_BA" x="-1" y="-18"/>
+    <children xmi:type="notation:Shape" xmi:id="_NBPUsBOREeeTo_35pSTPiA" type="Interface_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_NBPUshOREeeTo_35pSTPiA" type="Interface_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_NBPUsxOREeeTo_35pSTPiA" type="Interface_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_NBPUtBOREeeTo_35pSTPiA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_NBPUtROREeeTo_35pSTPiA" type="Interface_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_c9kZEBOSEeeTo_35pSTPiA" type="Property_InterfaceAttributeLabel">
+          <element xmi:type="uml:Property" href="ElementTypesConfigurations.uml#_VkhwPxLoEeeDV7UHoBIkeA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_c9kZEROSEeeTo_35pSTPiA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_NBPUthOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_NBPUtxOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_NBPUuBOREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NBPUuROREeeTo_35pSTPiA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_NBPUuhOREeeTo_35pSTPiA" visible="false" type="Interface_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_NBPUuxOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_NBPUvBOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_NBPUvROREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NBPUvhOREeeTo_35pSTPiA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_NBP7wBOREeeTo_35pSTPiA" visible="false" type="Interface_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_NBP7wROREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_NBP7whOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_NBP7wxOREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NBP7xBOREeeTo_35pSTPiA"/>
+      </children>
+      <element xmi:type="uml:Interface" href="ElementTypesConfigurations.uml#_VkhwPhLoEeeDV7UHoBIkeA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NBPUsROREeeTo_35pSTPiA" x="640" y="672"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_NLI3MiXCEeueH428b_S_BA" type="Association_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Nx0csCXCEeueH428b_S_BA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_NLI3MyXCEeueH428b_S_BA" x="1" y="19"/>
+    <children xmi:type="notation:Shape" xmi:id="_QLaKoBOREeeTo_35pSTPiA" type="Enumeration_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_QLaxsBOREeeTo_35pSTPiA" type="Enumeration_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_QLaxsROREeeTo_35pSTPiA" type="Enumeration_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QLaxshOREeeTo_35pSTPiA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_QLbYwBOREeeTo_35pSTPiA" type="Enumeration_LiteralCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_TprL0BOSEeeTo_35pSTPiA" type="EnumerationLiteral_LiteralLabel">
+          <element xmi:type="uml:EnumerationLiteral" href="ElementTypesConfigurations.uml#_VkhwfxLoEeeDV7UHoBIkeA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_TprL0ROSEeeTo_35pSTPiA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_Tpry4BOSEeeTo_35pSTPiA" type="EnumerationLiteral_LiteralLabel">
+          <element xmi:type="uml:EnumerationLiteral" href="ElementTypesConfigurations.uml#_VkhwgBLoEeeDV7UHoBIkeA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Tpry4ROSEeeTo_35pSTPiA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_QLbYwROREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_QLbYwhOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_QLbYwxOREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QLbYxBOREeeTo_35pSTPiA"/>
+      </children>
+      <element xmi:type="uml:Enumeration" href="ElementTypesConfigurations.uml#_VkhwfhLoEeeDV7UHoBIkeA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QLaKoROREeeTo_35pSTPiA" x="1484" y="193"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_NLI3NCXCEeueH428b_S_BA" type="Association_TargetRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Ny3lkCXCEeueH428b_S_BA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_NLI3NSXCEeueH428b_S_BA" x="99" y="-18"/>
+    <children xmi:type="notation:Shape" xmi:id="_Rv6DQBOREeeTo_35pSTPiA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Rv6DQhOREeeTo_35pSTPiA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Rv6DQxOREeeTo_35pSTPiA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Rv6DRBOREeeTo_35pSTPiA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Rv6DRROREeeTo_35pSTPiA" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Rv6DRhOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Rv6DRxOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Rv6DSBOREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Rv6DSROREeeTo_35pSTPiA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Rv6DShOREeeTo_35pSTPiA" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Rv6DSxOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Rv6DTBOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Rv6DTROREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Rv6DThOREeeTo_35pSTPiA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Rv6qUBOREeeTo_35pSTPiA" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Rv6qUROREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Rv6qUhOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Rv6qUxOREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Rv6qVBOREeeTo_35pSTPiA"/>
+      </children>
+      <element xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwjhLoEeeDV7UHoBIkeA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Rv6DQROREeeTo_35pSTPiA" x="1520" y="640"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_NLI3NiXCEeueH428b_S_BA" type="Association_SourceRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Nz8joCXCEeueH428b_S_BA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_NLI3NyXCEeueH428b_S_BA" x="-61" y="11"/>
+    <children xmi:type="notation:Shape" xmi:id="_S0fFsBOREeeTo_35pSTPiA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_S0fFshOREeeTo_35pSTPiA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_S0fFsxOREeeTo_35pSTPiA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_S0fFtBOREeeTo_35pSTPiA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_S0fFtROREeeTo_35pSTPiA" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_c9lnMBOSEeeTo_35pSTPiA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="ElementTypesConfigurations.uml#_VkhwohLoEeeDV7UHoBIkeA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_c9lnMROSEeeTo_35pSTPiA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_S0fFthOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_S0fFtxOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_S0fFuBOREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_S0fFuROREeeTo_35pSTPiA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_S0fFuhOREeeTo_35pSTPiA" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_S0fFuxOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_S0fFvBOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_S0fFvROREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_S0fFvhOREeeTo_35pSTPiA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_S0fswBOREeeTo_35pSTPiA" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_S0fswROREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_S0fswhOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_S0fswxOREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_S0fsxBOREeeTo_35pSTPiA"/>
+      </children>
+      <element xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwoBLoEeeDV7UHoBIkeA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_S0fFsROREeeTo_35pSTPiA" x="1500" y="960"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_NLI3OCXCEeueH428b_S_BA" type="Association_SourceMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_N0_sgCXCEeueH428b_S_BA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_NLI3OSXCEeueH428b_S_BA" x="98" y="17"/>
+    <children xmi:type="notation:Shape" xmi:id="_UrV5oBOREeeTo_35pSTPiA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UrV5ohOREeeTo_35pSTPiA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UrWgsBOREeeTo_35pSTPiA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UrWgsROREeeTo_35pSTPiA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UrWgshOREeeTo_35pSTPiA" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_c9mOQBOSEeeTo_35pSTPiA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="ElementTypesConfigurations.uml#_VkhwpRLoEeeDV7UHoBIkeA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_c9mOQROSEeeTo_35pSTPiA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UrWgsxOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UrWgtBOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UrWgtROREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UrWgthOREeeTo_35pSTPiA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UrWgtxOREeeTo_35pSTPiA" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UrWguBOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UrWguROREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UrWguhOREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UrWguxOREeeTo_35pSTPiA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UrWgvBOREeeTo_35pSTPiA" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UrWgvROREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UrWgvhOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UrWgvxOREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UrWgwBOREeeTo_35pSTPiA"/>
+      </children>
+      <element xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwoxLoEeeDV7UHoBIkeA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UrV5oROREeeTo_35pSTPiA" x="520" y="980"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_NLI3OiXCEeueH428b_S_BA" type="Association_TargetMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_N2C1YCXCEeueH428b_S_BA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_NLI3OyXCEeueH428b_S_BA" x="-33" y="-8"/>
+    <children xmi:type="notation:Shape" xmi:id="_VnxFoBOREeeTo_35pSTPiA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_VnxssBOREeeTo_35pSTPiA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_VnxssROREeeTo_35pSTPiA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_VnxsshOREeeTo_35pSTPiA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Vny60BOREeeTo_35pSTPiA" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Vny60ROREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Vny60hOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Vny60xOREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Vny61BOREeeTo_35pSTPiA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Vny61ROREeeTo_35pSTPiA" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Vny61hOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Vny61xOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Vny62BOREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Vny62ROREeeTo_35pSTPiA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Vny62hOREeeTo_35pSTPiA" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Vny62xOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Vny63BOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Vny63ROREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Vny63hOREeeTo_35pSTPiA"/>
+      </children>
+      <element xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwqxLoEeeDV7UHoBIkeA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VnxFoROREeeTo_35pSTPiA" x="536" y="1176"/>
     </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_NLIQISXCEeueH428b_S_BA"/>
-    <element xmi:type="uml:Association" href="ElementTypesConfigurations.uml#_NJtT0CXCEeueH428b_S_BA"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NLIQIiXCEeueH428b_S_BA" points="[450, 597, -643984, -643984]$[518, 795, -643984, -643984]$[980, 814, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NNm8YCXCEeueH428b_S_BA" id="(1.0,0.8899082568807339)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NNnjcCXCEeueH428b_S_BA" id="(0.0,0.6788990825688074)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_PONswCXDEeueH428b_S_BA" type="Comment_AnnotatedElementEdge" source="_DILIACXDEeueH428b_S_BA" target="_NLIQICXCEeueH428b_S_BA">
-    <styles xmi:type="notation:FontStyle" xmi:id="_PONswSXDEeueH428b_S_BA"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PONswiXDEeueH428b_S_BA" points="[243, 370, -643984, -643984]$[220, 429, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PQbTQCXDEeueH428b_S_BA" id="(0.53,1.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PQb6UCXDEeueH428b_S_BA" id="(0.09498207885304659,0.48846153846153845)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_xhAAgCXDEeueH428b_S_BA" type="Constraint_ContextEdge" source="_xIey0CXDEeueH428b_S_BA" target="_zrrvwBOSEeeTo_35pSTPiA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_xhAAgyXDEeueH428b_S_BA" visible="false" type="Constraint_KeywordLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_NAI2MCXEEeueH428b_S_BA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_xhAAhCXDEeueH428b_S_BA" x="-1" y="13"/>
+    <children xmi:type="notation:Shape" xmi:id="_Wr-7sBOREeeTo_35pSTPiA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Wr-7shOREeeTo_35pSTPiA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Wr-7sxOREeeTo_35pSTPiA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Wr-7tBOREeeTo_35pSTPiA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Wr-7tROREeeTo_35pSTPiA" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Wr_iwBOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Wr_iwROREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Wr_iwhOREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Wr_iwxOREeeTo_35pSTPiA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Wr_ixBOREeeTo_35pSTPiA" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Wr_ixROREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Wr_ixhOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Wr_ixxOREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Wr_iyBOREeeTo_35pSTPiA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Wr_iyROREeeTo_35pSTPiA" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Wr_iyhOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Wr_iyxOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Wr_izBOREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Wr_izROREeeTo_35pSTPiA"/>
+      </children>
+      <element xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwbxLoEeeDV7UHoBIkeA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Wr-7sROREeeTo_35pSTPiA" x="1100" y="1340"/>
     </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_xhAAgSXDEeueH428b_S_BA"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xhAAgiXDEeueH428b_S_BA" points="[1224, 865, -643984, -643984]$[1174, 835, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xjXYACXDEeueH428b_S_BA" id="(0.0,0.7166666666666667)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xjXYASXDEeueH428b_S_BA" id="(0.9536082474226805,0.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_xofWUCXIEeueH428b_S_BA" type="Association_Edge" source="_zrrvwBOSEeeTo_35pSTPiA" target="_JMepoBOREeeTo_35pSTPiA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_xofWUyXIEeueH428b_S_BA" type="Association_StereotypeLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_xofWVCXIEeueH428b_S_BA" y="-20"/>
+    <children xmi:type="notation:Shape" xmi:id="_X2b8oBOREeeTo_35pSTPiA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_X2cjsBOREeeTo_35pSTPiA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_X2cjsROREeeTo_35pSTPiA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_X2cjshOREeeTo_35pSTPiA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_X2cjsxOREeeTo_35pSTPiA" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_X2cjtBOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_X2cjtROREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_X2cjthOREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X2cjtxOREeeTo_35pSTPiA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_X2cjuBOREeeTo_35pSTPiA" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_X2cjuROREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_X2cjuhOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_X2cjuxOREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X2cjvBOREeeTo_35pSTPiA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_X2cjvROREeeTo_35pSTPiA" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_X2cjvhOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_X2cjvxOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_X2cjwBOREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X2cjwROREeeTo_35pSTPiA"/>
+      </children>
+      <element xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwdRLoEeeDV7UHoBIkeA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X2b8oROREeeTo_35pSTPiA" x="1400" y="1340"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_xofWVSXIEeueH428b_S_BA" type="Association_NameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_xofWViXIEeueH428b_S_BA" y="20"/>
+    <children xmi:type="notation:Shape" xmi:id="_kigmoBOREeeTo_35pSTPiA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_kigmohOREeeTo_35pSTPiA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_kigmoxOREeeTo_35pSTPiA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_kigmpBOREeeTo_35pSTPiA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kigmpROREeeTo_35pSTPiA" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kigmphOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_kigmpxOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_kigmqBOREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kigmqROREeeTo_35pSTPiA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kigmqhOREeeTo_35pSTPiA" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kigmqxOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_kigmrBOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_kigmrROREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kigmrhOREeeTo_35pSTPiA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kigmrxOREeeTo_35pSTPiA" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kigmsBOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_kigmsROREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_kigmshOREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kigmsxOREeeTo_35pSTPiA"/>
+      </children>
+      <element xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwgxLoEeeDV7UHoBIkeA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kigmoROREeeTo_35pSTPiA" x="280" y="1440" height="141"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_xofWVyXIEeueH428b_S_BA" type="Association_TargetRoleLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_xofWWCXIEeueH428b_S_BA" y="-20"/>
+    <children xmi:type="notation:Shape" xmi:id="_mQmgIBOREeeTo_35pSTPiA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_mQmgIhOREeeTo_35pSTPiA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_mQmgIxOREeeTo_35pSTPiA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_mQmgJBOREeeTo_35pSTPiA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mQmgJROREeeTo_35pSTPiA" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_c9oDchOSEeeTo_35pSTPiA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="ElementTypesConfigurations.uml#_VkhwqBLoEeeDV7UHoBIkeA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_c9oDcxOSEeeTo_35pSTPiA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mQmgJhOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_mQmgJxOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_mQmgKBOREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mQmgKROREeeTo_35pSTPiA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mQnHMBOREeeTo_35pSTPiA" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mQnHMROREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_mQnHMhOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_mQnHMxOREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mQnHNBOREeeTo_35pSTPiA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mQnHNROREeeTo_35pSTPiA" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mQnHNhOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_mQnHNxOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_mQnHOBOREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mQnHOROREeeTo_35pSTPiA"/>
+      </children>
+      <element xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwphLoEeeDV7UHoBIkeA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mQmgIROREeeTo_35pSTPiA" x="1560" y="1460"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_xofWWSXIEeueH428b_S_BA" type="Association_SourceRoleLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_xof9YCXIEeueH428b_S_BA" y="20"/>
+    <children xmi:type="notation:Shape" xmi:id="_n9jKIBOREeeTo_35pSTPiA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_n9jKIhOREeeTo_35pSTPiA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_n9jKIxOREeeTo_35pSTPiA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_n9jKJBOREeeTo_35pSTPiA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_n9jxMBOREeeTo_35pSTPiA" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_c9oqgBOSEeeTo_35pSTPiA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="ElementTypesConfigurations.uml#_VkhwnBLoEeeDV7UHoBIkeA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_c9oqgROSEeeTo_35pSTPiA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_n9jxMROREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_n9jxMhOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_n9jxMxOREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n9jxNBOREeeTo_35pSTPiA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_n9jxNROREeeTo_35pSTPiA" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_n9jxNhOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_n9jxNxOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_n9jxOBOREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n9jxOROREeeTo_35pSTPiA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_n9jxOhOREeeTo_35pSTPiA" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_n9jxOxOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_n9jxPBOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_n9jxPROREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n9jxPhOREeeTo_35pSTPiA"/>
+      </children>
+      <element xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwmBLoEeeDV7UHoBIkeA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n9jKIROREeeTo_35pSTPiA" x="-60" y="1140"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_xof9YSXIEeueH428b_S_BA" type="Association_SourceMultiplicityLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_xof9YiXIEeueH428b_S_BA" y="20"/>
+    <children xmi:type="notation:Shape" xmi:id="_qGWpsBOREeeTo_35pSTPiA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_qGWpshOREeeTo_35pSTPiA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_qGXQwBOREeeTo_35pSTPiA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qGXQwROREeeTo_35pSTPiA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_qGXQwhOREeeTo_35pSTPiA" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_c9pRkhOSEeeTo_35pSTPiA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="ElementTypesConfigurations.uml#_VkhwTxLoEeeDV7UHoBIkeA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_c9pRkxOSEeeTo_35pSTPiA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_c9p4oBOSEeeTo_35pSTPiA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="ElementTypesConfigurations.uml#_VkhwURLoEeeDV7UHoBIkeA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_c9p4oROSEeeTo_35pSTPiA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qGXQwxOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_qGXQxBOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_qGXQxROREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qGXQxhOREeeTo_35pSTPiA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_qGXQxxOREeeTo_35pSTPiA" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qGXQyBOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_qGXQyROREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_qGXQyhOREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qGXQyxOREeeTo_35pSTPiA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_qGXQzBOREeeTo_35pSTPiA" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qGXQzROREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_qGXQzhOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_qGXQzxOREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qGXQ0BOREeeTo_35pSTPiA"/>
+      </children>
+      <element xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwThLoEeeDV7UHoBIkeA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qGWpsROREeeTo_35pSTPiA" x="-100" y="500"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_xof9YyXIEeueH428b_S_BA" type="Association_TargetMultiplicityLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_xof9ZCXIEeueH428b_S_BA" y="-20"/>
+    <children xmi:type="notation:Shape" xmi:id="_qwUMsBOREeeTo_35pSTPiA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_qwUMshOREeeTo_35pSTPiA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_qwUMsxOREeeTo_35pSTPiA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qwUMtBOREeeTo_35pSTPiA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_qwUMtROREeeTo_35pSTPiA" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qwUMthOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_qwUMtxOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_qwUMuBOREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qwUMuROREeeTo_35pSTPiA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_qwUMuhOREeeTo_35pSTPiA" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qwUMuxOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_qwUMvBOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_qwUMvROREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qwUMvhOREeeTo_35pSTPiA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_qwUMvxOREeeTo_35pSTPiA" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qwUMwBOREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_qwUMwROREeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_qwUMwhOREeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qwUMwxOREeeTo_35pSTPiA"/>
+      </children>
+      <element xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwqRLoEeeDV7UHoBIkeA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qwUMsROREeeTo_35pSTPiA" x="-60" y="980"/>
     </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_xofWUSXIEeueH428b_S_BA"/>
-    <element xmi:type="uml:Association" href="ElementTypesConfigurations.uml#_xnU4sCXIEeueH428b_S_BA"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xofWUiXIEeueH428b_S_BA" points="[1109, 740, -643984, -643984]$[1045, 600, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xq1fsCXIEeueH428b_S_BA" id="(0.6649484536082474,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xq1fsSXIEeueH428b_S_BA" id="(0.9705882352941176,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_o1gTACgTEeuIUIZUxl0ivA" type="StereotypeCommentLink" source="_fr880BOQEeeTo_35pSTPiA" target="_o1fr8CgTEeuIUIZUxl0ivA">
-    <styles xmi:type="notation:FontStyle" xmi:id="_o1gTASgTEeuIUIZUxl0ivA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o1gTBSgTEeuIUIZUxl0ivA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwOxLoEeeDV7UHoBIkeA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o1gTAigTEeuIUIZUxl0ivA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o1gTAygTEeuIUIZUxl0ivA"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o1gTBCgTEeuIUIZUxl0ivA"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_o1rSJCgTEeuIUIZUxl0ivA" type="StereotypeCommentLink" source="_mqbK0BOQEeeTo_35pSTPiA" target="_o1rSICgTEeuIUIZUxl0ivA">
-    <styles xmi:type="notation:FontStyle" xmi:id="_o1rSJSgTEeuIUIZUxl0ivA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o1rSKSgTEeuIUIZUxl0ivA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwYRLoEeeDV7UHoBIkeA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o1rSJigTEeuIUIZUxl0ivA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o1rSJygTEeuIUIZUxl0ivA"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o1rSKCgTEeuIUIZUxl0ivA"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_o17w1CgTEeuIUIZUxl0ivA" type="StereotypeCommentLink" source="_s12yUBOQEeeTo_35pSTPiA" target="_o17w0CgTEeuIUIZUxl0ivA">
-    <styles xmi:type="notation:FontStyle" xmi:id="_o17w1SgTEeuIUIZUxl0ivA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o18X4igTEeuIUIZUxl0ivA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Interface" href="ElementTypesConfigurations.uml#_VkhwQBLoEeeDV7UHoBIkeA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o17w1igTEeuIUIZUxl0ivA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o18X4CgTEeuIUIZUxl0ivA"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o18X4SgTEeuIUIZUxl0ivA"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_o2Fh1CgTEeuIUIZUxl0ivA" type="StereotypeCommentLink" source="_JMepoBOREeeTo_35pSTPiA" target="_o2Fh0CgTEeuIUIZUxl0ivA">
-    <styles xmi:type="notation:FontStyle" xmi:id="_o2Fh1SgTEeuIUIZUxl0ivA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o2Fh2SgTEeuIUIZUxl0ivA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwMBLoEeeDV7UHoBIkeA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o2Fh1igTEeuIUIZUxl0ivA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o2Fh1ygTEeuIUIZUxl0ivA"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o2Fh2CgTEeuIUIZUxl0ivA"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_o2SWJCgTEeuIUIZUxl0ivA" type="StereotypeCommentLink" source="_L_e8wBOREeeTo_35pSTPiA" target="_o2SWICgTEeuIUIZUxl0ivA">
-    <styles xmi:type="notation:FontStyle" xmi:id="_o2SWJSgTEeuIUIZUxl0ivA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o2S9MigTEeuIUIZUxl0ivA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwQhLoEeeDV7UHoBIkeA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o2SWJigTEeuIUIZUxl0ivA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o2S9MCgTEeuIUIZUxl0ivA"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o2S9MSgTEeuIUIZUxl0ivA"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_o2sl0igTEeuIUIZUxl0ivA" type="StereotypeCommentLink" source="_NBPUsBOREeeTo_35pSTPiA" target="_o2r-wygTEeuIUIZUxl0ivA">
-    <styles xmi:type="notation:FontStyle" xmi:id="_o2sl0ygTEeuIUIZUxl0ivA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o2sl1ygTEeuIUIZUxl0ivA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Interface" href="ElementTypesConfigurations.uml#_VkhwPhLoEeeDV7UHoBIkeA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o2sl1CgTEeuIUIZUxl0ivA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o2sl1SgTEeuIUIZUxl0ivA"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o2sl1igTEeuIUIZUxl0ivA"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_o21vxCgTEeuIUIZUxl0ivA" type="StereotypeCommentLink" source="_QLaKoBOREeeTo_35pSTPiA" target="_o21vwCgTEeuIUIZUxl0ivA">
-    <styles xmi:type="notation:FontStyle" xmi:id="_o21vxSgTEeuIUIZUxl0ivA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o21vySgTEeuIUIZUxl0ivA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Enumeration" href="ElementTypesConfigurations.uml#_VkhwfhLoEeeDV7UHoBIkeA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o21vxigTEeuIUIZUxl0ivA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o21vxygTEeuIUIZUxl0ivA"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o21vyCgTEeuIUIZUxl0ivA"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_o3U39CgTEeuIUIZUxl0ivA" type="StereotypeCommentLink" source="_Rv6DQBOREeeTo_35pSTPiA" target="_o3U38CgTEeuIUIZUxl0ivA">
-    <styles xmi:type="notation:FontStyle" xmi:id="_o3U39SgTEeuIUIZUxl0ivA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o3VfACgTEeuIUIZUxl0ivA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwjhLoEeeDV7UHoBIkeA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o3U39igTEeuIUIZUxl0ivA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o3U39ygTEeuIUIZUxl0ivA"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o3U3-CgTEeuIUIZUxl0ivA"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_o3hsRCgTEeuIUIZUxl0ivA" type="StereotypeCommentLink" source="_S0fFsBOREeeTo_35pSTPiA" target="_o3hsQCgTEeuIUIZUxl0ivA">
-    <styles xmi:type="notation:FontStyle" xmi:id="_o3hsRSgTEeuIUIZUxl0ivA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o3hsSSgTEeuIUIZUxl0ivA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwoBLoEeeDV7UHoBIkeA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o3hsRigTEeuIUIZUxl0ivA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o3hsRygTEeuIUIZUxl0ivA"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o3hsSCgTEeuIUIZUxl0ivA"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_o3qPISgTEeuIUIZUxl0ivA" type="StereotypeCommentLink" source="_UrV5oBOREeeTo_35pSTPiA" target="_o3poEygTEeuIUIZUxl0ivA">
-    <styles xmi:type="notation:FontStyle" xmi:id="_o3qPIigTEeuIUIZUxl0ivA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o3qPJigTEeuIUIZUxl0ivA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwoxLoEeeDV7UHoBIkeA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o3qPIygTEeuIUIZUxl0ivA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o3qPJCgTEeuIUIZUxl0ivA"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o3qPJSgTEeuIUIZUxl0ivA"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_o3yK9CgTEeuIUIZUxl0ivA" type="StereotypeCommentLink" source="_VnxFoBOREeeTo_35pSTPiA" target="_o3yK8CgTEeuIUIZUxl0ivA">
-    <styles xmi:type="notation:FontStyle" xmi:id="_o3yK9SgTEeuIUIZUxl0ivA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o3yK-SgTEeuIUIZUxl0ivA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwqxLoEeeDV7UHoBIkeA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o3yK9igTEeuIUIZUxl0ivA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o3yK9ygTEeuIUIZUxl0ivA"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o3yK-CgTEeuIUIZUxl0ivA"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_o36GxCgTEeuIUIZUxl0ivA" type="StereotypeCommentLink" source="_Wr-7sBOREeeTo_35pSTPiA" target="_o36GwCgTEeuIUIZUxl0ivA">
-    <styles xmi:type="notation:FontStyle" xmi:id="_o36GxSgTEeuIUIZUxl0ivA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o36t0igTEeuIUIZUxl0ivA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwbxLoEeeDV7UHoBIkeA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o36GxigTEeuIUIZUxl0ivA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o36t0CgTEeuIUIZUxl0ivA"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o36t0SgTEeuIUIZUxl0ivA"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_o4JXVCgTEeuIUIZUxl0ivA" type="StereotypeCommentLink" source="_X2b8oBOREeeTo_35pSTPiA" target="_o4JXUCgTEeuIUIZUxl0ivA">
-    <styles xmi:type="notation:FontStyle" xmi:id="_o4JXVSgTEeuIUIZUxl0ivA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o4JXWSgTEeuIUIZUxl0ivA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwdRLoEeeDV7UHoBIkeA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o4JXVigTEeuIUIZUxl0ivA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o4JXVygTEeuIUIZUxl0ivA"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o4JXWCgTEeuIUIZUxl0ivA"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_o4c5VCgTEeuIUIZUxl0ivA" type="StereotypeCommentLink" source="_kigmoBOREeeTo_35pSTPiA" target="_o4c5UCgTEeuIUIZUxl0ivA">
-    <styles xmi:type="notation:FontStyle" xmi:id="_o4c5VSgTEeuIUIZUxl0ivA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o4c5WSgTEeuIUIZUxl0ivA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwgxLoEeeDV7UHoBIkeA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o4c5VigTEeuIUIZUxl0ivA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o4c5VygTEeuIUIZUxl0ivA"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o4c5WCgTEeuIUIZUxl0ivA"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_o4mDRCgTEeuIUIZUxl0ivA" type="StereotypeCommentLink" source="_mQmgIBOREeeTo_35pSTPiA" target="_o4mDQCgTEeuIUIZUxl0ivA">
-    <styles xmi:type="notation:FontStyle" xmi:id="_o4mDRSgTEeuIUIZUxl0ivA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o4mDSSgTEeuIUIZUxl0ivA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwphLoEeeDV7UHoBIkeA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o4mDRigTEeuIUIZUxl0ivA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o4mDRygTEeuIUIZUxl0ivA"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o4mDSCgTEeuIUIZUxl0ivA"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_o4v0RCgTEeuIUIZUxl0ivA" type="StereotypeCommentLink" source="_n9jKIBOREeeTo_35pSTPiA" target="_o4v0QCgTEeuIUIZUxl0ivA">
-    <styles xmi:type="notation:FontStyle" xmi:id="_o4v0RSgTEeuIUIZUxl0ivA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o4v0SSgTEeuIUIZUxl0ivA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwmBLoEeeDV7UHoBIkeA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o4v0RigTEeuIUIZUxl0ivA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o4v0RygTEeuIUIZUxl0ivA"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o4v0SCgTEeuIUIZUxl0ivA"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_o44XJCgTEeuIUIZUxl0ivA" type="StereotypeCommentLink" source="_qGWpsBOREeeTo_35pSTPiA" target="_o44XICgTEeuIUIZUxl0ivA">
-    <styles xmi:type="notation:FontStyle" xmi:id="_o44XJSgTEeuIUIZUxl0ivA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o44XKSgTEeuIUIZUxl0ivA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwThLoEeeDV7UHoBIkeA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o44XJigTEeuIUIZUxl0ivA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o44XJygTEeuIUIZUxl0ivA"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o44XKCgTEeuIUIZUxl0ivA"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_o5EkZygTEeuIUIZUxl0ivA" type="StereotypeCommentLink" source="_qwUMsBOREeeTo_35pSTPiA" target="_o5EkYygTEeuIUIZUxl0ivA">
-    <styles xmi:type="notation:FontStyle" xmi:id="_o5EkaCgTEeuIUIZUxl0ivA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o5EkbCgTEeuIUIZUxl0ivA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwqRLoEeeDV7UHoBIkeA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o5EkaSgTEeuIUIZUxl0ivA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o5EkaigTEeuIUIZUxl0ivA"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o5EkaygTEeuIUIZUxl0ivA"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_o5MgNygTEeuIUIZUxl0ivA" type="StereotypeCommentLink" source="_zrrvwBOSEeeTo_35pSTPiA" target="_o5MgMygTEeuIUIZUxl0ivA">
-    <styles xmi:type="notation:FontStyle" xmi:id="_o5MgOCgTEeuIUIZUxl0ivA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_o5MgPCgTEeuIUIZUxl0ivA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwVxLoEeeDV7UHoBIkeA"/>
+    <children xmi:type="notation:Shape" xmi:id="_zrrvwBOSEeeTo_35pSTPiA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_zrsW0BOSEeeTo_35pSTPiA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_zrsW0ROSEeeTo_35pSTPiA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_zrsW0hOSEeeTo_35pSTPiA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_zrsW0xOSEeeTo_35pSTPiA" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_Mg1ycCXBEeueH428b_S_BA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="ElementTypesConfigurations.uml#_VkhwXxLoEeeDV7UHoBIkeA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Mg1ycSXBEeueH428b_S_BA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_K4acECXBEeueH428b_S_BA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="ElementTypesConfigurations.uml#_KRblkCKVEeu4pfq0yS8BRA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_K4acESXBEeueH428b_S_BA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_zrsW1BOSEeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_zrsW1ROSEeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_zrsW1hOSEeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zrsW1xOSEeeTo_35pSTPiA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_zrsW2BOSEeeTo_35pSTPiA" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_zrsW2ROSEeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_zrsW2hOSEeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_zrsW2xOSEeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zrsW3BOSEeeTo_35pSTPiA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_zrsW3ROSEeeTo_35pSTPiA" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_zrsW3hOSEeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_zrsW3xOSEeeTo_35pSTPiA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_zrsW4BOSEeeTo_35pSTPiA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zrsW4ROSEeeTo_35pSTPiA"/>
+      </children>
+      <element xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwVxLoEeeDV7UHoBIkeA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zrrvwROSEeeTo_35pSTPiA" x="980" y="740"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_xIey0CXDEeueH428b_S_BA" type="Constraint_PackagedElementShape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_xIfZ4CXDEeueH428b_S_BA" type="Constraint_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_xIfZ4SXDEeueH428b_S_BA" type="Constraint_BodyLabel"/>
+      <element xmi:type="uml:Constraint" href="ElementTypesConfigurations.uml#_xIXeECXDEeueH428b_S_BA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xIey0SXDEeueH428b_S_BA" x="1193" y="672"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_J7f7EDA5EeujiLBW1HgzCA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_J7f7ETA5EeujiLBW1HgzCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_J7f7EzA5EeujiLBW1HgzCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwOxLoEeeDV7UHoBIkeA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J7f7EjA5EeujiLBW1HgzCA" x="773" y="71"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_J7laqTA5EeujiLBW1HgzCA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_J7laqjA5EeujiLBW1HgzCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_J7larDA5EeujiLBW1HgzCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwYRLoEeeDV7UHoBIkeA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J7laqzA5EeujiLBW1HgzCA" x="1320" y="260"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_J7svbTA5EeujiLBW1HgzCA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_J7svbjA5EeujiLBW1HgzCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_J7tWcDA5EeujiLBW1HgzCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Interface" href="ElementTypesConfigurations.uml#_VkhwQBLoEeeDV7UHoBIkeA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J7svbzA5EeujiLBW1HgzCA" x="900" y="320"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_J7y2CzA5EeujiLBW1HgzCA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_J7y2DDA5EeujiLBW1HgzCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_J7y2DjA5EeujiLBW1HgzCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwMBLoEeeDV7UHoBIkeA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J7y2DTA5EeujiLBW1HgzCA" x="1080" y="500"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_J75jsDA5EeujiLBW1HgzCA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_J75jsTA5EeujiLBW1HgzCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_J75jszA5EeujiLBW1HgzCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwQhLoEeeDV7UHoBIkeA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J75jsjA5EeujiLBW1HgzCA" x="500" y="500"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_J8D7wDA5EeujiLBW1HgzCA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_J8D7wTA5EeujiLBW1HgzCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_J8D7wzA5EeujiLBW1HgzCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Interface" href="ElementTypesConfigurations.uml#_VkhwPhLoEeeDV7UHoBIkeA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J8D7wjA5EeujiLBW1HgzCA" x="840" y="672"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_J8JbUDA5EeujiLBW1HgzCA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_J8JbUTA5EeujiLBW1HgzCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_J8JbUzA5EeujiLBW1HgzCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Enumeration" href="ElementTypesConfigurations.uml#_VkhwfhLoEeeDV7UHoBIkeA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J8JbUjA5EeujiLBW1HgzCA" x="1684" y="193"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_J8QJAzA5EeujiLBW1HgzCA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_J8QJBDA5EeujiLBW1HgzCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_J8QJBjA5EeujiLBW1HgzCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwjhLoEeeDV7UHoBIkeA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J8QJBTA5EeujiLBW1HgzCA" x="1720" y="640"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_J8W2sDA5EeujiLBW1HgzCA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_J8W2sTA5EeujiLBW1HgzCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_J8W2szA5EeujiLBW1HgzCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwoBLoEeeDV7UHoBIkeA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J8W2sjA5EeujiLBW1HgzCA" x="1700" y="960"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_J8dkazA5EeujiLBW1HgzCA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_J8dkbDA5EeujiLBW1HgzCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_J8dkbjA5EeujiLBW1HgzCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwoxLoEeeDV7UHoBIkeA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J8dkbTA5EeujiLBW1HgzCA" x="720" y="980"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_J8jrBzA5EeujiLBW1HgzCA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_J8jrCDA5EeujiLBW1HgzCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_J8jrCjA5EeujiLBW1HgzCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwqxLoEeeDV7UHoBIkeA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J8jrCTA5EeujiLBW1HgzCA" x="736" y="1176"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_J8pKmzA5EeujiLBW1HgzCA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_J8pKnDA5EeujiLBW1HgzCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_J8pKnjA5EeujiLBW1HgzCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwbxLoEeeDV7UHoBIkeA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J8pKnTA5EeujiLBW1HgzCA" x="1300" y="1340"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_J8v4TTA5EeujiLBW1HgzCA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_J8v4TjA5EeujiLBW1HgzCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_J8v4UDA5EeujiLBW1HgzCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwdRLoEeeDV7UHoBIkeA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J8v4TzA5EeujiLBW1HgzCA" x="1600" y="1340"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_J85CMDA5EeujiLBW1HgzCA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_J85CMTA5EeujiLBW1HgzCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_J85CMzA5EeujiLBW1HgzCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwgxLoEeeDV7UHoBIkeA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J85CMjA5EeujiLBW1HgzCA" x="480" y="1440"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_J896wTA5EeujiLBW1HgzCA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_J896wjA5EeujiLBW1HgzCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_J896xDA5EeujiLBW1HgzCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwphLoEeeDV7UHoBIkeA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J896wzA5EeujiLBW1HgzCA" x="1760" y="1460"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_J9DaTTA5EeujiLBW1HgzCA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_J9DaTjA5EeujiLBW1HgzCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_J9DaUDA5EeujiLBW1HgzCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwmBLoEeeDV7UHoBIkeA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J9DaTzA5EeujiLBW1HgzCA" x="140" y="1140"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_J9I53TA5EeujiLBW1HgzCA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_J9I53jA5EeujiLBW1HgzCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_J9I54DA5EeujiLBW1HgzCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwThLoEeeDV7UHoBIkeA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J9I53zA5EeujiLBW1HgzCA" x="100" y="500"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_J9PngzA5EeujiLBW1HgzCA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_J9PnhDA5EeujiLBW1HgzCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_J9PnhjA5EeujiLBW1HgzCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwqRLoEeeDV7UHoBIkeA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J9PnhTA5EeujiLBW1HgzCA" x="140" y="980"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_J9VHEDA5EeujiLBW1HgzCA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_J9VHETA5EeujiLBW1HgzCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_J9VHEzA5EeujiLBW1HgzCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwVxLoEeeDV7UHoBIkeA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J9VHEjA5EeujiLBW1HgzCA" x="1180" y="740"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_ebrAsROQEeeTo_35pSTPiA" name="diagram_compatibility_version" stringValue="1.4.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_ebrAshOQEeeTo_35pSTPiA"/>
+    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_ebrAsxOQEeeTo_35pSTPiA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+      <owner xmi:type="uml:Model" href="ElementTypesConfigurations.uml#_VkhJIBLoEeeDV7UHoBIkeA"/>
     </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o5MgOSgTEeuIUIZUxl0ivA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o5MgOigTEeuIUIZUxl0ivA"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_o5MgOygTEeuIUIZUxl0ivA"/>
-  </edges>
-</notation:Diagram>
+    <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_3HKZsDA1EeujiLBW1HgzCA" name="css_stylesheets"/>
+    <element xmi:type="uml:Model" href="ElementTypesConfigurations.uml#_VkhJIBLoEeeDV7UHoBIkeA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_q7ewUBOQEeeTo_35pSTPiA" type="Association_Edge" source="_mqbK0BOQEeeTo_35pSTPiA" target="_mqbK0BOQEeeTo_35pSTPiA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_q7fXYBOQEeeTo_35pSTPiA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FdpK8BOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_q7fXYROQEeeTo_35pSTPiA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_q7fXYhOQEeeTo_35pSTPiA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FeFP0BOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_q7fXYxOQEeeTo_35pSTPiA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_q7f-cBOQEeeTo_35pSTPiA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FejJ4BOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_q7f-cROQEeeTo_35pSTPiA" x="45" y="-18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_q7f-chOQEeeTo_35pSTPiA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FfC5IBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_q7f-cxOQEeeTo_35pSTPiA" x="-13" y="-27"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_q7f-dBOQEeeTo_35pSTPiA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FfiBUBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_q7f-dROQEeeTo_35pSTPiA" x="47" y="19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_q7f-dhOQEeeTo_35pSTPiA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FgRoMBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_q7f-dxOQEeeTo_35pSTPiA" x="-47" y="-18"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_q7ewUROQEeeTo_35pSTPiA"/>
+      <element xmi:type="uml:Association" href="ElementTypesConfigurations.uml#_VkhwaRLoEeeDV7UHoBIkeA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_q7ewUhOQEeeTo_35pSTPiA" points="[1200, 260, -643984, -643984]$[1200, 200, -643984, -643984]$[1300, 200, -643984, -643984]$[1300, 300, -643984, -643984]$[1268, 300, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IxGfwBOSEeeTo_35pSTPiA" id="(0.5405405405405406,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IxGfwROSEeeTo_35pSTPiA" id="(1.0,0.4)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_q7n6QBOQEeeTo_35pSTPiA" type="Association_Edge" source="_mqbK0BOQEeeTo_35pSTPiA" target="_mqbK0BOQEeeTo_35pSTPiA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_q7ohUBOQEeeTo_35pSTPiA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FgzMoBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_q7ohUROQEeeTo_35pSTPiA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_q7ohUhOQEeeTo_35pSTPiA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FhbewBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_q7ohUxOQEeeTo_35pSTPiA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_q7ohVBOQEeeTo_35pSTPiA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FiAGgBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_q7ohVROQEeeTo_35pSTPiA" x="23" y="-19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_q7ohVhOQEeeTo_35pSTPiA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FivtYBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_q7ohVxOQEeeTo_35pSTPiA" x="-57" y="-60"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_q7ohWBOQEeeTo_35pSTPiA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FjetMBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_q7ohWROQEeeTo_35pSTPiA" x="25" y="17"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_q7ohWhOQEeeTo_35pSTPiA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Fl_1sBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_q7ohWxOQEeeTo_35pSTPiA" x="-23" y="-17"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_q7n6QROQEeeTo_35pSTPiA"/>
+      <element xmi:type="uml:Association" href="ElementTypesConfigurations.uml#_VkhwaxLoEeeDV7UHoBIkeA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_q7n6QhOQEeeTo_35pSTPiA" points="[1120, 320, -643984, -643984]$[1080, 320, -643984, -643984]$[1080, 400, -643984, -643984]$[1140, 400, -643984, -643984]$[1140, 360, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GYg3wBOSEeeTo_35pSTPiA" id="(0.0,0.6)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GYhe0BOSEeeTo_35pSTPiA" id="(0.13513513513513514,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_q7pvcBOQEeeTo_35pSTPiA" type="Generalization_Edge" source="_mqbK0BOQEeeTo_35pSTPiA" target="_fr880BOQEeeTo_35pSTPiA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_q7qWgBOQEeeTo_35pSTPiA" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FmtAUBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_q7qWgROQEeeTo_35pSTPiA" x="1" y="38"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_q7pvcROQEeeTo_35pSTPiA"/>
+      <element xmi:type="uml:Generalization" href="ElementTypesConfigurations.uml#_VkhwYhLoEeeDV7UHoBIkeA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_q7pvchOQEeeTo_35pSTPiA" points="[1120, 300, -643984, -643984]$[680, 300, -643984, -643984]$[680, 181, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FpiR4BOSEeeTo_35pSTPiA" id="(0.0,0.36363636363636365)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Fpi48BOSEeeTo_35pSTPiA" id="(0.5144230769230769,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_uo8rIBOREeeTo_35pSTPiA" type="Association_Edge" source="_X2b8oBOREeeTo_35pSTPiA" target="_Wr-7sBOREeeTo_35pSTPiA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_uo8rIxOREeeTo_35pSTPiA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lkA1ABOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_uo8rJBOREeeTo_35pSTPiA" x="-1" y="-18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_uo8rJROREeeTo_35pSTPiA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lkogEBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_uo8rJhOREeeTo_35pSTPiA" x="-1" y="18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_uo8rJxOREeeTo_35pSTPiA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_llVqsBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_uo8rKBOREeeTo_35pSTPiA" x="57" y="-18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_uo8rKROREeeTo_35pSTPiA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lmBnMBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_uo9SMBOREeeTo_35pSTPiA" x="-76" y="24"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_uo9SMROREeeTo_35pSTPiA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lmoEIBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_uo9SMhOREeeTo_35pSTPiA" x="-14" y="18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_uo9SMxOREeeTo_35pSTPiA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lnUAoBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_uo9SNBOREeeTo_35pSTPiA" x="-59" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_uo8rIROREeeTo_35pSTPiA"/>
+      <element xmi:type="uml:Association" href="ElementTypesConfigurations.uml#_VkhwdhLoEeeDV7UHoBIkeA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uo8rIhOREeeTo_35pSTPiA" points="[1400, 1380, -643984, -643984]$[1400, 1380, -643984, -643984]$[1266, 1380, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DPTZMBOUEeeTo_35pSTPiA" id="(0.0,0.4)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DPTZMROUEeeTo_35pSTPiA" id="(1.0,0.4)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_uo95QBOREeeTo_35pSTPiA" type="InterfaceRealization_Edge" source="_L_e8wBOREeeTo_35pSTPiA" target="_NBPUsBOREeeTo_35pSTPiA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_uo-gUBOREeeTo_35pSTPiA" type="InterfaceRealization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9RfB0BOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_uo-gUROREeeTo_35pSTPiA" y="39"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_uo-gUhOREeeTo_35pSTPiA" type="InterfaceRealization_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9SBNUBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_uo-gUxOREeeTo_35pSTPiA" x="1" y="59"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_uo95QROREeeTo_35pSTPiA"/>
+      <element xmi:type="uml:InterfaceRealization" href="ElementTypesConfigurations.uml#_VkhwTBLoEeeDV7UHoBIkeA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uo95QhOREeeTo_35pSTPiA" points="[488, 600, -643984, -643984]$[700, 620, -643984, -643984]$[700, 700, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9qVmsBOREeeTo_35pSTPiA" id="(1.0,0.8899082568807339)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9qVmsROREeeTo_35pSTPiA" id="(0.44776119402985076,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_uo_HYBOREeeTo_35pSTPiA" type="Generalization_Edge" source="_L_e8wBOREeeTo_35pSTPiA" target="_fr880BOQEeeTo_35pSTPiA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_uo_HYxOREeeTo_35pSTPiA" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9SjY0BOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_uo_HZBOREeeTo_35pSTPiA" x="1" y="39"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_uo_HYROREeeTo_35pSTPiA"/>
+      <element xmi:type="uml:Generalization" href="ElementTypesConfigurations.uml#_VkhwQxLoEeeDV7UHoBIkeA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uo_HYhOREeeTo_35pSTPiA" points="[508, 520, -643984, -643984]$[680, 520, -643984, -643984]$[680, 181, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9qU_oBOREeeTo_35pSTPiA" id="(1.0,0.14084507042253522)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9qU_oROREeeTo_35pSTPiA" id="(0.5144230769230769,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_uo_ucBOREeeTo_35pSTPiA" type="Generalization_Edge" source="_S0fFsBOREeeTo_35pSTPiA" target="_Rv6DQBOREeeTo_35pSTPiA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_uo_ucxOREeeTo_35pSTPiA" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_g-mlkBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upAVgBOREeeTo_35pSTPiA" y="39"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_uo_ucROREeeTo_35pSTPiA"/>
+      <element xmi:type="uml:Generalization" href="ElementTypesConfigurations.uml#_VkhwoRLoEeeDV7UHoBIkeA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uo_uchOREeeTo_35pSTPiA" points="[1642, 840, -643984, -643984]$[1725, 725, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g_ZPwROSEeeTo_35pSTPiA" id="(0.5405405405405406,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g_Z20BOSEeeTo_35pSTPiA" id="(0.44660194174757284,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_upAVgROREeeTo_35pSTPiA" type="Association_Edge" source="_L_e8wBOREeeTo_35pSTPiA" target="_JMepoBOREeeTo_35pSTPiA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_upA8khOREeeTo_35pSTPiA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9THZgBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upA8kxOREeeTo_35pSTPiA" x="1" y="-18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_upA8lBOREeeTo_35pSTPiA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9TyH4BOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upA8lROREeeTo_35pSTPiA" y="19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_upA8lhOREeeTo_35pSTPiA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9UujEBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upA8lxOREeeTo_35pSTPiA" x="62" y="-11"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_upA8mBOREeeTo_35pSTPiA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9VeJ8BOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upA8mROREeeTo_35pSTPiA" x="-95" y="21"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_upA8mhOREeeTo_35pSTPiA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9WKGcBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upA8mxOREeeTo_35pSTPiA" x="32" y="19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_upA8nBOREeeTo_35pSTPiA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9W6UYBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upA8nROREeeTo_35pSTPiA" x="-33" y="-18"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_upA8kBOREeeTo_35pSTPiA"/>
+      <element xmi:type="uml:Association" href="ElementTypesConfigurations.uml#_VkhwVRLoEeeDV7UHoBIkeA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_upA8kROREeeTo_35pSTPiA" points="[488, 540, -643984, -643984]$[700, 540, -643984, -643984]$[880, 540, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9qWNwhOREeeTo_35pSTPiA" id="(1.0,0.35714285714285715)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9qWNwxOREeeTo_35pSTPiA" id="(0.0,0.4)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_upCKsBOREeeTo_35pSTPiA" type="Association_Edge" source="_Wr-7sBOREeeTo_35pSTPiA" target="_kigmoBOREeeTo_35pSTPiA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_upCKsxOREeeTo_35pSTPiA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_39b40BOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upCKtBOREeeTo_35pSTPiA" y="-18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_upCKtROREeeTo_35pSTPiA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3-EyABOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upCKthOREeeTo_35pSTPiA" x="2" y="16"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_upCKtxOREeeTo_35pSTPiA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3-3cMBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_cyR-YDA6EeujiLBW1HgzCA" name="cssClass">
+          <stringListValue>hasSubsets</stringListValue>
+        </styles>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upCKuBOREeeTo_35pSTPiA" x="50" y="-22"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_upCKuROREeeTo_35pSTPiA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3_fuUBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_PeWqMDA6EeujiLBW1HgzCA" name="cssClass">
+          <stringListValue>hasSubsets</stringListValue>
+        </styles>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upCKuhOREeeTo_35pSTPiA" x="-205" y="-13"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_upCKuxOREeeTo_35pSTPiA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_4AOHEBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upCKvBOREeeTo_35pSTPiA" x="14" y="24"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_upCKvROREeeTo_35pSTPiA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_4BEboBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upCKvhOREeeTo_35pSTPiA" x="-23" y="20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_upCKsROREeeTo_35pSTPiA"/>
+      <element xmi:type="uml:Association" href="ElementTypesConfigurations.uml#_VkhwkhLoEeeDV7UHoBIkeA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_upCKshOREeeTo_35pSTPiA" points="[1164, 1440, -643984, -643984]$[1164, 1479, -643984, -643984]$[453, 1479, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4JMc4ROSEeeTo_35pSTPiA" id="(0.47761194029850745,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4JMc4hOSEeeTo_35pSTPiA" id="(1.0,0.2765957446808511)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_upDY0BOREeeTo_35pSTPiA" type="Association_Edge" source="_Rv6DQBOREeeTo_35pSTPiA" target="_kigmoBOREeeTo_35pSTPiA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_upDY0xOREeeTo_35pSTPiA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_g6wAUBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upDY1BOREeeTo_35pSTPiA" x="67" y="-140"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_upDY1ROREeeTo_35pSTPiA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_g7XrYBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upDY1hOREeeTo_35pSTPiA" x="69" y="-107"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_upDY1xOREeeTo_35pSTPiA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_g8AkkBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_eDgVsDA6EeujiLBW1HgzCA" name="cssClass">
+          <stringListValue>hasSubsets</stringListValue>
+        </styles>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upDY2BOREeeTo_35pSTPiA" x="115" y="16"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_upDY2ROREeeTo_35pSTPiA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_g8macBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_T7XBADA6EeujiLBW1HgzCA" name="cssClass">
+          <stringListValue>hasSubsets</stringListValue>
+        </styles>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upDY2hOREeeTo_35pSTPiA" x="-221" y="-16"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_upDY2xOREeeTo_35pSTPiA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_g9NecBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upDY3BOREeeTo_35pSTPiA" x="18" y="-17"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_upDY3ROREeeTo_35pSTPiA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_g92XoBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upDY3hOREeeTo_35pSTPiA" x="-21" y="16"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_upDY0ROREeeTo_35pSTPiA"/>
+      <element xmi:type="uml:Association" href="ElementTypesConfigurations.uml#_VkhwkRLoEeeDV7UHoBIkeA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_upDY0hOREeeTo_35pSTPiA" points="[1785, 700, -643984, -643984]$[1820, 700, -643984, -643984]$[1820, 1580, -643984, -643984]$[497, 1580, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g_ZPwBOSEeeTo_35pSTPiA" id="(1.0,0.6)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4JL10BOSEeeTo_35pSTPiA" id="(1.0,0.9929078014184397)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_upD_4BOREeeTo_35pSTPiA" type="Association_Edge" source="_qGWpsBOREeeTo_35pSTPiA" target="_L_e8wBOREeeTo_35pSTPiA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_upD_4xOREeeTo_35pSTPiA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9juBUBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upEm8BOREeeTo_35pSTPiA" x="1" y="-18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_upEm8ROREeeTo_35pSTPiA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9kTQIBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upEm8hOREeeTo_35pSTPiA" y="19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_upEm8xOREeeTo_35pSTPiA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9mUCUBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upEm9BOREeeTo_35pSTPiA" x="50" y="-17"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_upEm9ROREeeTo_35pSTPiA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9m0YoBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upEm9hOREeeTo_35pSTPiA" x="-100" y="27"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_upEm9xOREeeTo_35pSTPiA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9nef8BOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upEm-BOREeeTo_35pSTPiA" x="50" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_upEm-ROREeeTo_35pSTPiA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9n-2QBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upEm-hOREeeTo_35pSTPiA" x="-50" y="-19"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_upD_4ROREeeTo_35pSTPiA"/>
+      <element xmi:type="uml:Association" href="ElementTypesConfigurations.uml#_VkhwUxLoEeeDV7UHoBIkeA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_upD_4hOREeeTo_35pSTPiA" points="[147, 713, -643984, -643984]$[478, 677, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9qVmshOREeeTo_35pSTPiA" id="(1.0,0.15873015873015872)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9qVmsxOREeeTo_35pSTPiA" id="(0.0,0.14084507042253522)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_upFOABOREeeTo_35pSTPiA" type="Generalization_Edge" source="_Rv6DQBOREeeTo_35pSTPiA" target="_mqbK0BOQEeeTo_35pSTPiA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_upFOAxOREeeTo_35pSTPiA" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FowOwBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upFOBBOREeeTo_35pSTPiA" x="-1" y="38"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_upFOAROREeeTo_35pSTPiA"/>
+      <element xmi:type="uml:Generalization" href="ElementTypesConfigurations.uml#_VkhwjxLoEeeDV7UHoBIkeA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_upFOAhOREeeTo_35pSTPiA" points="[1520, 660, -643984, -643984]$[1200, 658, -643984, -643984]$[1200, 360, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Fpi48ROSEeeTo_35pSTPiA" id="(0.0,0.2)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Fpi48hOSEeeTo_35pSTPiA" id="(0.5405405405405406,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_upF1EBOREeeTo_35pSTPiA" type="Generalization_Edge" source="_qwUMsBOREeeTo_35pSTPiA" target="_L_e8wBOREeeTo_35pSTPiA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_upGcIBOREeeTo_35pSTPiA" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9oqywBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upGcIROREeeTo_35pSTPiA" x="-140" y="39"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_upF1EROREeeTo_35pSTPiA"/>
+      <element xmi:type="uml:Generalization" href="ElementTypesConfigurations.uml#_VkhwqhLoEeeDV7UHoBIkeA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_upF1EhOREeeTo_35pSTPiA" points="[115, 1040, -643984, -643984]$[380, 1036, -643984, -643984]$[380, 612, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9qWNwBOREeeTo_35pSTPiA" id="(1.0,0.6)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9qWNwROREeeTo_35pSTPiA" id="(0.425531914893617,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_upHqQBOREeeTo_35pSTPiA" type="Association_Edge" source="_L_e8wBOREeeTo_35pSTPiA" target="_kigmoBOREeeTo_35pSTPiA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_upHqQxOREeeTo_35pSTPiA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9Xe8IBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upHqRBOREeeTo_35pSTPiA" x="140" y="-19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_upHqRROREeeTo_35pSTPiA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9ZaOwBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upHqRhOREeeTo_35pSTPiA" x="141" y="18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_upHqRxOREeeTo_35pSTPiA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9aKcsBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upIRUBOREeeTo_35pSTPiA" x="93" y="-18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_upIRUROREeeTo_35pSTPiA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9a4OYBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upIRUhOREeeTo_35pSTPiA" x="-53" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_upIRUxOREeeTo_35pSTPiA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9c6OsBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upIRVBOREeeTo_35pSTPiA" x="93" y="18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_upIRVROREeeTo_35pSTPiA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9dwjQBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upIRVhOREeeTo_35pSTPiA" x="-17" y="-25"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_upHqQROREeeTo_35pSTPiA"/>
+      <element xmi:type="uml:Association" href="ElementTypesConfigurations.uml#_VkhwlhLoEeeDV7UHoBIkeA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_upHqQhOREeeTo_35pSTPiA" points="[568, 719, -643984, -643984]$[531, 1340, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9qVmtBOREeeTo_35pSTPiA" id="(0.5769230769230769,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9qVmtROREeeTo_35pSTPiA" id="(0.5529953917050692,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_upI4YBOREeeTo_35pSTPiA" type="Generalization_Edge" source="_kigmoBOREeeTo_35pSTPiA" target="_L_e8wBOREeeTo_35pSTPiA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_upJfcBOREeeTo_35pSTPiA" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9pOMYBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upJfcROREeeTo_35pSTPiA" x="-140" y="39"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_upI4YROREeeTo_35pSTPiA"/>
+      <element xmi:type="uml:Generalization" href="ElementTypesConfigurations.uml#_VkhwhBLoEeeDV7UHoBIkeA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_upI4YhOREeeTo_35pSTPiA" points="[531, 1340, -643984, -643984]$[568, 719, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9qVmthOREeeTo_35pSTPiA" id="(0.4608294930875576,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9qVmtxOREeeTo_35pSTPiA" id="(0.38461538461538464,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_upKtkBOREeeTo_35pSTPiA" type="Association_Edge" source="_X2b8oBOREeeTo_35pSTPiA" target="_kigmoBOREeeTo_35pSTPiA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_upKtkxOREeeTo_35pSTPiA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_4B1QoBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upKtlBOREeeTo_35pSTPiA" x="1" y="-19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_upKtlROREeeTo_35pSTPiA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_4CibQBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upKtlhOREeeTo_35pSTPiA" x="-2" y="17"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_upLUoBOREeeTo_35pSTPiA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_4DNJoBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_a09WEDA6EeujiLBW1HgzCA" name="cssClass">
+          <stringListValue>hasSubsets</stringListValue>
+        </styles>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upLUoROREeeTo_35pSTPiA" x="94" y="61"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_upLUohOREeeTo_35pSTPiA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_4FXFwBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_SurLcDA6EeujiLBW1HgzCA" name="cssClass">
+          <stringListValue>hasSubsets</stringListValue>
+        </styles>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upLUoxOREeeTo_35pSTPiA" x="-194" y="-17"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_upLUpBOREeeTo_35pSTPiA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_4F-w0BOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upLUpROREeeTo_35pSTPiA" x="63" y="15"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_upLUphOREeeTo_35pSTPiA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_4Gwz8BOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upLUpxOREeeTo_35pSTPiA" x="-24" y="18"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_upKtkROREeeTo_35pSTPiA"/>
+      <element xmi:type="uml:Association" href="ElementTypesConfigurations.uml#_VkhwlBLoEeeDV7UHoBIkeA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_upKtkhOREeeTo_35pSTPiA" points="[1479, 1440, -643984, -643984]$[1479, 1519, -643984, -643984]$[453, 1519, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4JL10ROSEeeTo_35pSTPiA" id="(0.47305389221556887,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4JMc4BOSEeeTo_35pSTPiA" id="(1.0,0.5602836879432624)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_upL7sBOREeeTo_35pSTPiA" type="InterfaceRealization_Edge" source="_L_e8wBOREeeTo_35pSTPiA" target="_s12yUBOQEeeTo_35pSTPiA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_upL7sxOREeeTo_35pSTPiA" type="InterfaceRealization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9f0YwBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upL7tBOREeeTo_35pSTPiA" y="39"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_upL7tROREeeTo_35pSTPiA" type="InterfaceRealization_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9i6wEBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upL7thOREeeTo_35pSTPiA" y="59"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_upL7sROREeeTo_35pSTPiA"/>
+      <element xmi:type="uml:InterfaceRealization" href="ElementTypesConfigurations.uml#_VkhwTRLoEeeDV7UHoBIkeA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_upL7shOREeeTo_35pSTPiA" points="[372, 500, -643984, -643984]$[400, 400, -643984, -643984]$[700, 387, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9qU_ohOREeeTo_35pSTPiA" id="(0.48,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9qU_oxOREeeTo_35pSTPiA" id="(0.0,0.6442307692307693)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_upMiwBOREeeTo_35pSTPiA" type="Generalization_Edge" source="_JMepoBOREeeTo_35pSTPiA" target="_fr880BOQEeeTo_35pSTPiA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_upMiwxOREeeTo_35pSTPiA" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_KdFD8BOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upMixBOREeeTo_35pSTPiA" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_upMiwROREeeTo_35pSTPiA"/>
+      <element xmi:type="uml:Generalization" href="ElementTypesConfigurations.uml#_VkhwMRLoEeeDV7UHoBIkeA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_upMiwhOREeeTo_35pSTPiA" points="[876, 520, -643984, -643984]$[680, 520, -643984, -643984]$[680, 181, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JeRSUBOTEeeTo_35pSTPiA" id="(0.0,0.15873015873015872)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Kccx0BOTEeeTo_35pSTPiA" id="(0.5144230769230769,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_upNJ0BOREeeTo_35pSTPiA" type="InterfaceRealization_Edge" source="_JMepoBOREeeTo_35pSTPiA" target="_NBPUsBOREeeTo_35pSTPiA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_upNJ0xOREeeTo_35pSTPiA" type="InterfaceRealization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_xXEBwBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upNJ1BOREeeTo_35pSTPiA" x="1" y="38"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_upNJ1ROREeeTo_35pSTPiA" type="InterfaceRealization_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_xXrs0BOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upNJ1hOREeeTo_35pSTPiA" x="1" y="58"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_upNJ0ROREeeTo_35pSTPiA"/>
+      <element xmi:type="uml:InterfaceRealization" href="ElementTypesConfigurations.uml#_VkhwORLoEeeDV7UHoBIkeA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_upNJ0hOREeeTo_35pSTPiA" points="[940, 613, -643984, -643984]$[700, 620, -643984, -643984]$[760, 700, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xYuOoBOSEeeTo_35pSTPiA" id="(0.25882352941176473,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xYu1sBOSEeeTo_35pSTPiA" id="(0.44776119402985076,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_upNw4BOREeeTo_35pSTPiA" type="Generalization_Edge" source="_n9jKIBOREeeTo_35pSTPiA" target="_L_e8wBOREeeTo_35pSTPiA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_upNw4xOREeeTo_35pSTPiA" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9pstgBOREeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upNw5BOREeeTo_35pSTPiA" x="-139" y="38"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_upNw4ROREeeTo_35pSTPiA"/>
+      <element xmi:type="uml:Generalization" href="ElementTypesConfigurations.uml#_VkhwmRLoEeeDV7UHoBIkeA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_upNw4hOREeeTo_35pSTPiA" points="[212, 1200, -643984, -643984]$[380, 1200, -643984, -643984]$[380, 612, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9qWNxBOREeeTo_35pSTPiA" id="(1.0,0.6)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9qWNxROREeeTo_35pSTPiA" id="(0.425531914893617,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_upOX8BOREeeTo_35pSTPiA" type="Generalization_Edge" source="_VnxFoBOREeeTo_35pSTPiA" target="_UrV5oBOREeeTo_35pSTPiA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_upOX8xOREeeTo_35pSTPiA" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jNYKQBOSEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upOX9BOREeeTo_35pSTPiA" x="1" y="39"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_upOX8ROREeeTo_35pSTPiA"/>
+      <element xmi:type="uml:Generalization" href="ElementTypesConfigurations.uml#_VkhwrBLoEeeDV7UHoBIkeA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_upOX8hOREeeTo_35pSTPiA" points="[651, 1176, -643984, -643984]$[686, 1092, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jOBqgBOSEeeTo_35pSTPiA" id="(0.4797297297297297,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jOCRkBOSEeeTo_35pSTPiA" id="(0.33783783783783783,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_upPmEBOREeeTo_35pSTPiA" type="Generalization_Edge" source="_mQmgIBOREeeTo_35pSTPiA" target="_X2b8oBOREeeTo_35pSTPiA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_upPmExOREeeTo_35pSTPiA" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lh2R0BOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upPmFBOREeeTo_35pSTPiA" y="39"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_upPmEROREeeTo_35pSTPiA"/>
+      <element xmi:type="uml:Generalization" href="ElementTypesConfigurations.uml#_VkhwpxLoEeeDV7UHoBIkeA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_upPmEhOREeeTo_35pSTPiA" points="[1560, 1500, -643984, -643984]$[1520, 1500, -643984, -643984]$[1520, 1440, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4sI8cBOTEeeTo_35pSTPiA" id="(0.0,0.4)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4sJjgBOTEeeTo_35pSTPiA" id="(0.718562874251497,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_upQNIBOREeeTo_35pSTPiA" type="InterfaceRealization_Edge" source="_JMepoBOREeeTo_35pSTPiA" target="_s12yUBOQEeeTo_35pSTPiA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_upQ0MBOREeeTo_35pSTPiA" type="InterfaceRealization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_EiG6UBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upQ0MROREeeTo_35pSTPiA" x="-1" y="38"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_upQ0MhOREeeTo_35pSTPiA" type="InterfaceRealization_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Ei3vUBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_upQ0MxOREeeTo_35pSTPiA" x="-1" y="57"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_upQNIROREeeTo_35pSTPiA"/>
+      <element xmi:type="uml:InterfaceRealization" href="ElementTypesConfigurations.uml#_VkhwOhLoEeeDV7UHoBIkeA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_upQNIhOREeeTo_35pSTPiA" points="[954, 500, -643984, -643984]$[954, 387, -643984, -643984]$[822, 387, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjrnoBOTEeeTo_35pSTPiA" id="(0.43529411764705883,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjrnoROTEeeTo_35pSTPiA" id="(1.0,0.6442307692307693)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_1r9lcBOSEeeTo_35pSTPiA" type="Association_Edge" source="_X2b8oBOREeeTo_35pSTPiA" target="_zrrvwBOSEeeTo_35pSTPiA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_1r-MghOSEeeTo_35pSTPiA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ln_WEBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1r-MgxOSEeeTo_35pSTPiA" x="1" y="-18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_1r-MhBOSEeeTo_35pSTPiA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lqDLkBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1r-MhROSEeeTo_35pSTPiA" y="18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_1r-MhhOSEeeTo_35pSTPiA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lq7VUBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1r-MhxOSEeeTo_35pSTPiA" x="56" y="-18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_1r-MiBOSEeeTo_35pSTPiA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ltBnEBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1r-MiROSEeeTo_35pSTPiA" x="-56" y="18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_1r-MihOSEeeTo_35pSTPiA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ltoEABOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1r-MixOSEeeTo_35pSTPiA" x="55" y="18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_1r-MjBOSEeeTo_35pSTPiA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_luPIABOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1r-MjROSEeeTo_35pSTPiA" x="-55" y="-18"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_1r-MgBOSEeeTo_35pSTPiA"/>
+      <element xmi:type="uml:Association" href="ElementTypesConfigurations.uml#_VkhwfBLoEeeDV7UHoBIkeA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1r-MgROSEeeTo_35pSTPiA" points="[1415, 1340, -643984, -643984]$[1408, 782, -643984, -643984]$[1174, 782, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lwnGkBOTEeeTo_35pSTPiA" id="(0.08982035928143713,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lwnGkROTEeeTo_35pSTPiA" id="(1.0,0.3853211009174312)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_1r-zkBOSEeeTo_35pSTPiA" type="InterfaceRealization_Edge" source="_zrrvwBOSEeeTo_35pSTPiA" target="_NBPUsBOREeeTo_35pSTPiA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_1r-zkxOSEeeTo_35pSTPiA" type="InterfaceRealization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_j_H60BOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1r-zlBOSEeeTo_35pSTPiA" x="1" y="38"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_1r-zlROSEeeTo_35pSTPiA" type="InterfaceRealization_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_j_1sgBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1r_aoBOSEeeTo_35pSTPiA" x="-1" y="58"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_1r-zkROSEeeTo_35pSTPiA"/>
+      <element xmi:type="uml:InterfaceRealization" href="ElementTypesConfigurations.uml#_VkhwYBLoEeeDV7UHoBIkeA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1r-zkhOSEeeTo_35pSTPiA" points="[1101, 767, -643984, -643984]$[957, 739, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kAxgoBOTEeeTo_35pSTPiA" id="(0.0,0.12844036697247707)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kAxgoROTEeeTo_35pSTPiA" id="(1.0,0.5192307692307693)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_1r_aoROSEeeTo_35pSTPiA" type="Association_Edge" source="_L_e8wBOREeeTo_35pSTPiA" target="_zrrvwBOSEeeTo_35pSTPiA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_1r_apBOSEeeTo_35pSTPiA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_omIiMBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1r_apROSEeeTo_35pSTPiA" x="1" y="-18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_1r_aphOSEeeTo_35pSTPiA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_omtxABOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1r_apxOSEeeTo_35pSTPiA" y="19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_1r_aqBOSEeeTo_35pSTPiA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_onTm4BOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1r_aqROSEeeTo_35pSTPiA" x="91" y="-18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_1r_aqhOSEeeTo_35pSTPiA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_on6D0BOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1r_aqxOSEeeTo_35pSTPiA" x="-53" y="9"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_1sABsBOSEeeTo_35pSTPiA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_oof5sBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1sABsROSEeeTo_35pSTPiA" x="92" y="19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_1sABshOSEeeTo_35pSTPiA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_opIL0BOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1sABsxOSEeeTo_35pSTPiA" x="-36" y="-6"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_1r_aohOSEeeTo_35pSTPiA"/>
+      <element xmi:type="uml:Association" href="ElementTypesConfigurations.uml#_VkhwbRLoEeeDV7UHoBIkeA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1r_aoxOSEeeTo_35pSTPiA" points="[460, 642, -643984, -643984]$[460, 840, -643984, -643984]$[1101, 840, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_olisUBOTEeeTo_35pSTPiA" id="(0.7692307692307693,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_olisUROTEeeTo_35pSTPiA" id="(0.0,0.970873786407767)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_1sABtBOSEeeTo_35pSTPiA" type="Generalization_Edge" source="_zrrvwBOSEeeTo_35pSTPiA" target="_mqbK0BOQEeeTo_35pSTPiA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_1sAowBOSEeeTo_35pSTPiA" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_LcKiYBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1sAowROSEeeTo_35pSTPiA" x="1" y="39"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_1sABtROSEeeTo_35pSTPiA"/>
+      <element xmi:type="uml:Generalization" href="ElementTypesConfigurations.uml#_VkhwWBLoEeeDV7UHoBIkeA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1sABthOSEeeTo_35pSTPiA" points="[1244, 740, -643984, -643984]$[1302, 590, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Lc6JQBOTEeeTo_35pSTPiA" id="(0.8943089430894309,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Lc6wUBOTEeeTo_35pSTPiA" id="(0.4807692307692308,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_1sAowhOSEeeTo_35pSTPiA" type="Association_Edge" source="_zrrvwBOSEeeTo_35pSTPiA" target="_JMepoBOREeeTo_35pSTPiA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_1sAoxROSEeeTo_35pSTPiA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_uKrv4BOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1sAoxhOSEeeTo_35pSTPiA" x="1" y="-18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_1sAoxxOSEeeTo_35pSTPiA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_uLbWwBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1sAoyBOSEeeTo_35pSTPiA" x="-1" y="18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_1sAoyROSEeeTo_35pSTPiA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_uMCawBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1sBP0BOSEeeTo_35pSTPiA" x="40" y="-68"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_1sBP0ROSEeeTo_35pSTPiA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_uMrT8BOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1sBP0hOSEeeTo_35pSTPiA" x="-47" y="-80"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_1sBP0xOSEeeTo_35pSTPiA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_uNQiwBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1sBP1BOSEeeTo_35pSTPiA" x="26" y="18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_1sBP1ROSEeeTo_35pSTPiA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_uN2_sBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1sBP1hOSEeeTo_35pSTPiA" x="-26" y="-18"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_1sAowxOSEeeTo_35pSTPiA"/>
+      <element xmi:type="uml:Association" href="ElementTypesConfigurations.uml#_VkhwgRLoEeeDV7UHoBIkeA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1sAoxBOSEeeTo_35pSTPiA" points="[1174, 740, -643984, -643984]$[1051, 613, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uOt7UBOTEeeTo_35pSTPiA" id="(0.09278350515463918,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uOt7UROTEeeTo_35pSTPiA" id="(0.6823529411764706,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_1sB24BOSEeeTo_35pSTPiA" type="Association_Edge" source="_Wr-7sBOREeeTo_35pSTPiA" target="_zrrvwBOSEeeTo_35pSTPiA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_1sB24xOSEeeTo_35pSTPiA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_l0Uh4BOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1sB25BOSEeeTo_35pSTPiA" x="-1" y="-17"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_1sB25ROSEeeTo_35pSTPiA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_l2mZ0BOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1sB25hOSEeeTo_35pSTPiA" y="19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_1sB25xOSEeeTo_35pSTPiA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_l3MPsBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1sB26BOSEeeTo_35pSTPiA" x="70" y="-19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_1sB26ROSEeeTo_35pSTPiA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_l3yFkBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1sB26hOSEeeTo_35pSTPiA" x="-32" y="64"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_1sB26xOSEeeTo_35pSTPiA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_l4a-wBOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1sB27BOSEeeTo_35pSTPiA" x="70" y="18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_1sCd8BOSEeeTo_35pSTPiA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_l5Cp0BOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1sCd8ROSEeeTo_35pSTPiA" x="33" y="-12"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_1sB24ROSEeeTo_35pSTPiA"/>
+      <element xmi:type="uml:Association" href="ElementTypesConfigurations.uml#_VkhwehLoEeeDV7UHoBIkeA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1sB24hOSEeeTo_35pSTPiA" points="[1180, 1340, -643984, -643984]$[1153, 849, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l5t_QBOTEeeTo_35pSTPiA" id="(0.27611940298507465,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l5t_QROTEeeTo_35pSTPiA" id="(0.7835051546391752,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_1sCd8hOSEeeTo_35pSTPiA" type="Generalization_Edge" source="_UrV5oBOREeeTo_35pSTPiA" target="_zrrvwBOSEeeTo_35pSTPiA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_1sDFABOSEeeTo_35pSTPiA" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lifLABOTEeeTo_35pSTPiA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1sDFAROSEeeTo_35pSTPiA" y="39"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_1sCd8xOSEeeTo_35pSTPiA"/>
+      <element xmi:type="uml:Generalization" href="ElementTypesConfigurations.uml#_VkhwpBLoEeeDV7UHoBIkeA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1sCd9BOSEeeTo_35pSTPiA" points="[816, 879, -643984, -643984]$[1101, 817, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ljPY8BOTEeeTo_35pSTPiA" id="(1.0,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ljQAABOTEeeTo_35pSTPiA" id="(0.08130081300813008,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_NLIQICXCEeueH428b_S_BA" type="Association_Edge" source="_L_e8wBOREeeTo_35pSTPiA" target="_zrrvwBOSEeeTo_35pSTPiA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_NLI3MCXCEeueH428b_S_BA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_NwwFsCXCEeueH428b_S_BA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_NLI3MSXCEeueH428b_S_BA" x="-1" y="-18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_NLI3MiXCEeueH428b_S_BA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Nx0csCXCEeueH428b_S_BA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_NLI3MyXCEeueH428b_S_BA" x="1" y="19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_NLI3NCXCEeueH428b_S_BA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Ny3lkCXCEeueH428b_S_BA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_FauwgDA3EeujiLBW1HgzCA" name="cssClass">
+          <stringListValue>hasSubsets</stringListValue>
+        </styles>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_NLI3NSXCEeueH428b_S_BA" x="75" y="-82"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_NLI3NiXCEeueH428b_S_BA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Nz8joCXCEeueH428b_S_BA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_-0vCADA4EeujiLBW1HgzCA" name="cssClass">
+          <stringListValue>hasSubsets</stringListValue>
+        </styles>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_NLI3NyXCEeueH428b_S_BA" x="-142" y="-11"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_NLI3OCXCEeueH428b_S_BA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_N0_sgCXCEeueH428b_S_BA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_NLI3OSXCEeueH428b_S_BA" x="60" y="14"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_NLI3OiXCEeueH428b_S_BA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_N2C1YCXCEeueH428b_S_BA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_NLI3OyXCEeueH428b_S_BA" x="-27" y="11"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_NLIQISXCEeueH428b_S_BA"/>
+      <element xmi:type="uml:Association" href="ElementTypesConfigurations.uml#_NJtT0CXCEeueH428b_S_BA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NLIQIiXCEeueH428b_S_BA" points="[450, 597, -643984, -643984]$[518, 795, -643984, -643984]$[980, 814, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NNm8YCXCEeueH428b_S_BA" id="(1.0,0.8899082568807339)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NNnjcCXCEeueH428b_S_BA" id="(0.0,0.6788990825688074)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_xhAAgCXDEeueH428b_S_BA" type="Constraint_ContextEdge" source="_xIey0CXDEeueH428b_S_BA" target="_zrrvwBOSEeeTo_35pSTPiA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_xhAAgyXDEeueH428b_S_BA" visible="false" type="Constraint_KeywordLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_NAI2MCXEEeueH428b_S_BA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xhAAhCXDEeueH428b_S_BA" x="-1" y="13"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_xhAAgSXDEeueH428b_S_BA"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xhAAgiXDEeueH428b_S_BA" points="[1224, 865, -643984, -643984]$[1174, 835, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xjXYACXDEeueH428b_S_BA" id="(0.0,0.7166666666666667)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xjXYASXDEeueH428b_S_BA" id="(0.9536082474226805,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_xofWUCXIEeueH428b_S_BA" type="Association_Edge" source="_zrrvwBOSEeeTo_35pSTPiA" target="_JMepoBOREeeTo_35pSTPiA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_xofWUyXIEeueH428b_S_BA" type="Association_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xofWVCXIEeueH428b_S_BA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_xofWVSXIEeueH428b_S_BA" type="Association_NameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xofWViXIEeueH428b_S_BA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_xofWVyXIEeueH428b_S_BA" type="Association_TargetRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xofWWCXIEeueH428b_S_BA" x="16" y="51"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_xofWWSXIEeueH428b_S_BA" type="Association_SourceRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xof9YCXIEeueH428b_S_BA" x="-7" y="52"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_xof9YSXIEeueH428b_S_BA" type="Association_SourceMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xof9YiXIEeueH428b_S_BA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_xof9YyXIEeueH428b_S_BA" type="Association_TargetMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xof9ZCXIEeueH428b_S_BA" x="-23" y="15"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_xofWUSXIEeueH428b_S_BA"/>
+      <element xmi:type="uml:Association" href="ElementTypesConfigurations.uml#_xnU4sCXIEeueH428b_S_BA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xofWUiXIEeueH428b_S_BA" points="[1109, 740, -643984, -643984]$[1045, 600, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xq1fsCXIEeueH428b_S_BA" id="(0.33505154639175255,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xq1fsSXIEeueH428b_S_BA" id="(0.9647058823529412,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_Ua1JECjYEeuEo8scjf0hcw" type="Association_Edge" source="_L_e8wBOREeeTo_35pSTPiA" target="_fr880BOQEeeTo_35pSTPiA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Ua1JEyjYEeuEo8scjf0hcw" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_WQtsoCjYEeuEo8scjf0hcw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ua1JFCjYEeuEo8scjf0hcw" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Ua1wICjYEeuEo8scjf0hcw" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_WSxiICjYEeuEo8scjf0hcw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ua1wISjYEeuEo8scjf0hcw" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Ua1wIijYEeuEo8scjf0hcw" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_WUy7YCjYEeuEo8scjf0hcw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ua1wIyjYEeuEo8scjf0hcw" x="76" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Ua1wJCjYEeuEo8scjf0hcw" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_WWxRUCjYEeuEo8scjf0hcw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ua1wJSjYEeuEo8scjf0hcw" x="-77" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Ua1wJijYEeuEo8scjf0hcw" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_WYtyECjYEeuEo8scjf0hcw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ua1wJyjYEeuEo8scjf0hcw" x="76" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Ua1wKCjYEeuEo8scjf0hcw" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_WasvECjYEeuEo8scjf0hcw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ua1wKSjYEeuEo8scjf0hcw" x="-77" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_Ua1JESjYEeuEo8scjf0hcw"/>
+      <element xmi:type="uml:Association" href="ElementTypesConfigurations.uml#_UYp-0CjYEeuEo8scjf0hcw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ua1JEijYEeuEo8scjf0hcw" points="[350, 500, -643984, -643984]$[356, 142, -643984, -643984]$[573, 142, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UfN50CjYEeuEo8scjf0hcw" id="(0.3333333333333333,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UfOg4CjYEeuEo8scjf0hcw" id="(0.0,0.71)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_94l48CjcEeuEo8scjf0hcw" type="Generalization_Edge" source="_Wr-7sBOREeeTo_35pSTPiA" target="_fr880BOQEeeTo_35pSTPiA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_94mgACjcEeuEo8scjf0hcw" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_CUIY0CndEeuly4Z9kvrz9A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_94mgASjcEeuEo8scjf0hcw" x="-1" y="38"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_94l48SjcEeuEo8scjf0hcw"/>
+      <element xmi:type="uml:Generalization" href="ElementTypesConfigurations.uml#_903PgCjcEeuEo8scjf0hcw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_94l48ijcEeuEo8scjf0hcw" points="[1134, 1340, -643984, -643984]$[1213, 995, -643984, -643984]$[1457, 995, -643984, -643984]$[1439, 144, -643984, -643984]$[728, 144, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9-YX4CjcEeuEo8scjf0hcw" id="(0.835820895522388,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9-YX4SjcEeuEo8scjf0hcw" id="(1.0,0.73)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_AsPsUCjdEeuEo8scjf0hcw" type="Generalization_Edge" source="_X2b8oBOREeeTo_35pSTPiA" target="_fr880BOQEeeTo_35pSTPiA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_AsQTYCjdEeuEo8scjf0hcw" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_CHrvkCjdEeuEo8scjf0hcw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_AsQTYSjdEeuEo8scjf0hcw" x="-1" y="38"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_AsPsUSjdEeuEo8scjf0hcw"/>
+      <element xmi:type="uml:Generalization" href="ElementTypesConfigurations.uml#_ApiWkCjdEeuEo8scjf0hcw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_AsPsUijdEeuEo8scjf0hcw" points="[1567, 1356, -643984, -643984]$[1794, 1356, -643984, -643984]$[1770, 101, -643984, -643984]$[728, 170, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AxfYsCjdEeuEo8scjf0hcw" id="(1.0,0.16)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Axf_wCjdEeuEo8scjf0hcw" id="(1.0,0.3)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_J7f7FDA5EeujiLBW1HgzCA" type="StereotypeCommentLink" source="_fr880BOQEeeTo_35pSTPiA" target="_J7f7EDA5EeujiLBW1HgzCA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_J7f7FTA5EeujiLBW1HgzCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_J7f7GTA5EeujiLBW1HgzCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwOxLoEeeDV7UHoBIkeA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J7f7FjA5EeujiLBW1HgzCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J7f7FzA5EeujiLBW1HgzCA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J7f7GDA5EeujiLBW1HgzCA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_J7larTA5EeujiLBW1HgzCA" type="StereotypeCommentLink" source="_mqbK0BOQEeeTo_35pSTPiA" target="_J7laqTA5EeujiLBW1HgzCA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_J7larjA5EeujiLBW1HgzCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_J7lasjA5EeujiLBW1HgzCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwYRLoEeeDV7UHoBIkeA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J7larzA5EeujiLBW1HgzCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J7lasDA5EeujiLBW1HgzCA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J7lasTA5EeujiLBW1HgzCA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_J7tWcTA5EeujiLBW1HgzCA" type="StereotypeCommentLink" source="_s12yUBOQEeeTo_35pSTPiA" target="_J7svbTA5EeujiLBW1HgzCA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_J7tWcjA5EeujiLBW1HgzCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_J7tWdjA5EeujiLBW1HgzCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Interface" href="ElementTypesConfigurations.uml#_VkhwQBLoEeeDV7UHoBIkeA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J7tWczA5EeujiLBW1HgzCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J7tWdDA5EeujiLBW1HgzCA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J7tWdTA5EeujiLBW1HgzCA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_J7y2DzA5EeujiLBW1HgzCA" type="StereotypeCommentLink" source="_JMepoBOREeeTo_35pSTPiA" target="_J7y2CzA5EeujiLBW1HgzCA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_J7y2EDA5EeujiLBW1HgzCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_J7y2FDA5EeujiLBW1HgzCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwMBLoEeeDV7UHoBIkeA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J7y2ETA5EeujiLBW1HgzCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J7y2EjA5EeujiLBW1HgzCA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J7y2EzA5EeujiLBW1HgzCA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_J75jtDA5EeujiLBW1HgzCA" type="StereotypeCommentLink" source="_L_e8wBOREeeTo_35pSTPiA" target="_J75jsDA5EeujiLBW1HgzCA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_J75jtTA5EeujiLBW1HgzCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_J75juTA5EeujiLBW1HgzCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwQhLoEeeDV7UHoBIkeA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J75jtjA5EeujiLBW1HgzCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J75jtzA5EeujiLBW1HgzCA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J75juDA5EeujiLBW1HgzCA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_J8D7xDA5EeujiLBW1HgzCA" type="StereotypeCommentLink" source="_NBPUsBOREeeTo_35pSTPiA" target="_J8D7wDA5EeujiLBW1HgzCA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_J8D7xTA5EeujiLBW1HgzCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_J8D7yTA5EeujiLBW1HgzCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Interface" href="ElementTypesConfigurations.uml#_VkhwPhLoEeeDV7UHoBIkeA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J8D7xjA5EeujiLBW1HgzCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J8D7xzA5EeujiLBW1HgzCA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J8D7yDA5EeujiLBW1HgzCA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_J8JbVDA5EeujiLBW1HgzCA" type="StereotypeCommentLink" source="_QLaKoBOREeeTo_35pSTPiA" target="_J8JbUDA5EeujiLBW1HgzCA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_J8JbVTA5EeujiLBW1HgzCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_J8JbWTA5EeujiLBW1HgzCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Enumeration" href="ElementTypesConfigurations.uml#_VkhwfhLoEeeDV7UHoBIkeA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J8JbVjA5EeujiLBW1HgzCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J8JbVzA5EeujiLBW1HgzCA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J8JbWDA5EeujiLBW1HgzCA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_J8QJBzA5EeujiLBW1HgzCA" type="StereotypeCommentLink" source="_Rv6DQBOREeeTo_35pSTPiA" target="_J8QJAzA5EeujiLBW1HgzCA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_J8QJCDA5EeujiLBW1HgzCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_J8QJDDA5EeujiLBW1HgzCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwjhLoEeeDV7UHoBIkeA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J8QJCTA5EeujiLBW1HgzCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J8QJCjA5EeujiLBW1HgzCA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J8QJCzA5EeujiLBW1HgzCA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_J8W2tDA5EeujiLBW1HgzCA" type="StereotypeCommentLink" source="_S0fFsBOREeeTo_35pSTPiA" target="_J8W2sDA5EeujiLBW1HgzCA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_J8W2tTA5EeujiLBW1HgzCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_J8W2uTA5EeujiLBW1HgzCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwoBLoEeeDV7UHoBIkeA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J8W2tjA5EeujiLBW1HgzCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J8W2tzA5EeujiLBW1HgzCA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J8W2uDA5EeujiLBW1HgzCA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_J8dkbzA5EeujiLBW1HgzCA" type="StereotypeCommentLink" source="_UrV5oBOREeeTo_35pSTPiA" target="_J8dkazA5EeujiLBW1HgzCA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_J8dkcDA5EeujiLBW1HgzCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_J8dkdDA5EeujiLBW1HgzCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwoxLoEeeDV7UHoBIkeA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J8dkcTA5EeujiLBW1HgzCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J8dkcjA5EeujiLBW1HgzCA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J8dkczA5EeujiLBW1HgzCA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_J8jrCzA5EeujiLBW1HgzCA" type="StereotypeCommentLink" source="_VnxFoBOREeeTo_35pSTPiA" target="_J8jrBzA5EeujiLBW1HgzCA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_J8jrDDA5EeujiLBW1HgzCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_J8jrEDA5EeujiLBW1HgzCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwqxLoEeeDV7UHoBIkeA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J8jrDTA5EeujiLBW1HgzCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J8jrDjA5EeujiLBW1HgzCA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J8jrDzA5EeujiLBW1HgzCA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_J8pKnzA5EeujiLBW1HgzCA" type="StereotypeCommentLink" source="_Wr-7sBOREeeTo_35pSTPiA" target="_J8pKmzA5EeujiLBW1HgzCA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_J8pKoDA5EeujiLBW1HgzCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_J8pKpDA5EeujiLBW1HgzCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwbxLoEeeDV7UHoBIkeA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J8pKoTA5EeujiLBW1HgzCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J8pKojA5EeujiLBW1HgzCA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J8pKozA5EeujiLBW1HgzCA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_J8wfUDA5EeujiLBW1HgzCA" type="StereotypeCommentLink" source="_X2b8oBOREeeTo_35pSTPiA" target="_J8v4TTA5EeujiLBW1HgzCA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_J8wfUTA5EeujiLBW1HgzCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_J8wfVTA5EeujiLBW1HgzCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwdRLoEeeDV7UHoBIkeA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J8wfUjA5EeujiLBW1HgzCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J8wfUzA5EeujiLBW1HgzCA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J8wfVDA5EeujiLBW1HgzCA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_J85CNDA5EeujiLBW1HgzCA" type="StereotypeCommentLink" source="_kigmoBOREeeTo_35pSTPiA" target="_J85CMDA5EeujiLBW1HgzCA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_J85CNTA5EeujiLBW1HgzCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_J85COTA5EeujiLBW1HgzCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwgxLoEeeDV7UHoBIkeA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J85CNjA5EeujiLBW1HgzCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J85CNzA5EeujiLBW1HgzCA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J85CODA5EeujiLBW1HgzCA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_J8-hwDA5EeujiLBW1HgzCA" type="StereotypeCommentLink" source="_mQmgIBOREeeTo_35pSTPiA" target="_J896wTA5EeujiLBW1HgzCA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_J8-hwTA5EeujiLBW1HgzCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_J8-hxTA5EeujiLBW1HgzCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwphLoEeeDV7UHoBIkeA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J8-hwjA5EeujiLBW1HgzCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J8-hwzA5EeujiLBW1HgzCA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J8-hxDA5EeujiLBW1HgzCA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_J9DaUTA5EeujiLBW1HgzCA" type="StereotypeCommentLink" source="_n9jKIBOREeeTo_35pSTPiA" target="_J9DaTTA5EeujiLBW1HgzCA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_J9DaUjA5EeujiLBW1HgzCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_J9DaVjA5EeujiLBW1HgzCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwmBLoEeeDV7UHoBIkeA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J9DaUzA5EeujiLBW1HgzCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J9DaVDA5EeujiLBW1HgzCA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J9DaVTA5EeujiLBW1HgzCA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_J9I54TA5EeujiLBW1HgzCA" type="StereotypeCommentLink" source="_qGWpsBOREeeTo_35pSTPiA" target="_J9I53TA5EeujiLBW1HgzCA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_J9I54jA5EeujiLBW1HgzCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_J9Jg4DA5EeujiLBW1HgzCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwThLoEeeDV7UHoBIkeA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J9I54zA5EeujiLBW1HgzCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J9I55DA5EeujiLBW1HgzCA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J9I55TA5EeujiLBW1HgzCA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_J9PnhzA5EeujiLBW1HgzCA" type="StereotypeCommentLink" source="_qwUMsBOREeeTo_35pSTPiA" target="_J9PngzA5EeujiLBW1HgzCA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_J9PniDA5EeujiLBW1HgzCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_J9PnjDA5EeujiLBW1HgzCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwqRLoEeeDV7UHoBIkeA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J9PniTA5EeujiLBW1HgzCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J9PnijA5EeujiLBW1HgzCA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J9PnizA5EeujiLBW1HgzCA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_J9VHFDA5EeujiLBW1HgzCA" type="StereotypeCommentLink" source="_zrrvwBOSEeeTo_35pSTPiA" target="_J9VHEDA5EeujiLBW1HgzCA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_J9VHFTA5EeujiLBW1HgzCA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_J9VHGTA5EeujiLBW1HgzCA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_VkhwVxLoEeeDV7UHoBIkeA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J9VHFjA5EeujiLBW1HgzCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J9VHFzA5EeujiLBW1HgzCA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J9VHGDA5EeujiLBW1HgzCA"/>
+    </edges>
+  </notation:Diagram>
+  <css:ModelStyleSheets xmi:id="_4Ms-EDA4EeujiLBW1HgzCA">
+    <stylesheets xmi:type="css:EmbeddedStyleSheet" xmi:id="_4MtlIDA4EeujiLBW1HgzCA" label="Association Roles" content=".hasSubsets {&#xA;&#x9;maskLabel: visibility derived name modifiers;&#xA;}&#xA;"/>
+  </css:ModelStyleSheets>
+</xmi:XMI>
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.uml b/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.uml
index a59acf5bdfb..6ef5806f2a1 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.uml
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.uml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA">
   <uml:Model xmi:id="_VkhJIBLoEeeDV7UHoBIkeA" name="types" URI="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2">
-    <ownedComment xmi:type="uml:Comment" xmi:id="_DIG2kCXDEeueH428b_S_BA" annotatedElement="_NJtT0CXCEeueH428b_S_BA">
-      <body>{ subsets target }</body>
-    </ownedComment>
     <packagedElement xmi:type="uml:Class" xmi:id="_VkhwMBLoEeeDV7UHoBIkeA" name="ElementTypeSetConfiguration">
       <generalization xmi:type="uml:Generalization" xmi:id="_VkhwMRLoEeeDV7UHoBIkeA" general="_VkhwOxLoEeeDV7UHoBIkeA"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwMhLoEeeDV7UHoBIkeA" name="elementTypeConfigurations" type="_VkhwQhLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwVRLoEeeDV7UHoBIkeA">
@@ -41,6 +38,9 @@
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwPRLoEeeDV7UHoBIkeA"/>
       </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_UYr0ACjYEeuEo8scjf0hcw" name="owningType" type="_VkhwQhLoEeeDV7UHoBIkeA" association="_UYp-0CjYEeuEo8scjf0hcw">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_pH8RUCjYEeuEo8scjf0hcw"/>
+      </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Interface" xmi:id="_VkhwPhLoEeeDV7UHoBIkeA" name="IdentifiedConfiguration">
       <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwPxLoEeeDV7UHoBIkeA" name="identifier" visibility="public" isOrdered="true">
@@ -71,11 +71,15 @@
       <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwShLoEeeDV7UHoBIkeA" name="iconEntry" type="_VkhwThLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwUxLoEeeDV7UHoBIkeA">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwSxLoEeeDV7UHoBIkeA"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_NJxlQCXCEeueH428b_S_BA" name="ownedAdvice" type="_VkhwVxLoEeeDV7UHoBIkeA" aggregation="composite" association="_NJtT0CXCEeueH428b_S_BA">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_NJxlQCXCEeueH428b_S_BA" name="ownedAdvice" type="_VkhwVxLoEeeDV7UHoBIkeA" aggregation="composite" isDerived="true" subsettedProperty="_UYrM8CjYEeuEo8scjf0hcw" association="_NJtT0CXCEeueH428b_S_BA">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NJxlQSXCEeueH428b_S_BA"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NJxlQiXCEeueH428b_S_BA" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwVhLoEeeDV7UHoBIkeA" name="owningSet" type="_VkhwMBLoEeeDV7UHoBIkeA" association="_VkhwVRLoEeeDV7UHoBIkeA"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_UYrM8CjYEeuEo8scjf0hcw" name="ownedConfigurations" type="_VkhwOxLoEeeDV7UHoBIkeA" aggregation="composite" association="_UYp-0CjYEeuEo8scjf0hcw">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_UYrM8SjYEeuEo8scjf0hcw"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UYrM8ijYEeuEo8scjf0hcw" value="*"/>
+      </ownedAttribute>
       <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_VkhwTBLoEeeDV7UHoBIkeA" client="_VkhwQhLoEeeDV7UHoBIkeA" supplier="_VkhwPhLoEeeDV7UHoBIkeA" contract="_VkhwPhLoEeeDV7UHoBIkeA"/>
       <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_VkhwTRLoEeeDV7UHoBIkeA" client="_VkhwQhLoEeeDV7UHoBIkeA" supplier="_VkhwQBLoEeeDV7UHoBIkeA" contract="_VkhwQBLoEeeDV7UHoBIkeA"/>
     </packagedElement>
@@ -116,7 +120,7 @@
       <ownedAttribute xmi:type="uml:Property" xmi:id="_KRblkCKVEeu4pfq0yS8BRA" name="applyToAllTypes">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EBoolean"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_NJyMUCXCEeueH428b_S_BA" name="owningTarget" type="_VkhwQhLoEeeDV7UHoBIkeA" subsettedProperty="_VkhwWRLoEeeDV7UHoBIkeA" association="_NJtT0CXCEeueH428b_S_BA">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_NJyMUCXCEeueH428b_S_BA" name="owningTarget" type="_VkhwQhLoEeeDV7UHoBIkeA" isDerived="true" subsettedProperty="_VkhwWRLoEeeDV7UHoBIkeA _UYr0ACjYEeuEo8scjf0hcw" association="_NJtT0CXCEeueH428b_S_BA">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_W8te8CXCEeueH428b_S_BA"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwghLoEeeDV7UHoBIkeA" name="owningSet" type="_VkhwMBLoEeeDV7UHoBIkeA" association="_VkhwgRLoEeeDV7UHoBIkeA">
@@ -162,6 +166,7 @@ endif</body>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_VkhwbxLoEeeDV7UHoBIkeA" name="ContainerConfiguration">
+      <generalization xmi:type="uml:Generalization" xmi:id="_903PgCjcEeuEo8scjf0hcw" general="_VkhwOxLoEeeDV7UHoBIkeA"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwcBLoEeeDV7UHoBIkeA" name="containerMatcherConfiguration" type="_VkhwdRLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwdhLoEeeDV7UHoBIkeA">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwcRLoEeeDV7UHoBIkeA"/>
       </ownedAttribute>
@@ -170,8 +175,16 @@ endif</body>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwcxLoEeeDV7UHoBIkeA"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VkhwdBLoEeeDV7UHoBIkeA" value="*"/>
       </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwkxLoEeeDV7UHoBIkeA" name="containedType" type="_VkhwgxLoEeeDV7UHoBIkeA" subsettedProperty="_UYr0ACjYEeuEo8scjf0hcw" association="_VkhwkhLoEeeDV7UHoBIkeA">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_JrlGMCjaEeuEo8scjf0hcw"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_VkhwdRLoEeeDV7UHoBIkeA" name="AbstractMatcherConfiguration" isAbstract="true">
+      <generalization xmi:type="uml:Generalization" xmi:id="_ApiWkCjdEeuEo8scjf0hcw" general="_VkhwOxLoEeeDV7UHoBIkeA"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwlRLoEeeDV7UHoBIkeA" name="matchedType" type="_VkhwgxLoEeeDV7UHoBIkeA" subsettedProperty="_UYr0ACjYEeuEo8scjf0hcw" association="_VkhwlBLoEeeDV7UHoBIkeA">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2s_8UCjZEeuEo8scjf0hcw"/>
+      </ownedAttribute>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_VkhwdRLoEeeDV7UHoBIkeA" name="AbstractMatcherConfiguration" isAbstract="true"/>
     <packagedElement xmi:type="uml:Association" xmi:id="_VkhwdhLoEeeDV7UHoBIkeA" memberEnd="_VkhwcBLoEeeDV7UHoBIkeA _VkhwdxLoEeeDV7UHoBIkeA">
       <ownedEnd xmi:type="uml:Property" xmi:id="_VkhwdxLoEeeDV7UHoBIkeA" type="_VkhwbxLoEeeDV7UHoBIkeA" association="_VkhwdhLoEeeDV7UHoBIkeA"/>
     </packagedElement>
@@ -191,13 +204,13 @@ endif</body>
     <packagedElement xmi:type="uml:Association" xmi:id="_VkhwgRLoEeeDV7UHoBIkeA" memberEnd="_VkhwNRLoEeeDV7UHoBIkeA _VkhwghLoEeeDV7UHoBIkeA"/>
     <packagedElement xmi:type="uml:Class" xmi:id="_VkhwgxLoEeeDV7UHoBIkeA" name="SpecializationTypeConfiguration">
       <generalization xmi:type="uml:Generalization" xmi:id="_VkhwhBLoEeeDV7UHoBIkeA" general="_VkhwQhLoEeeDV7UHoBIkeA"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwhRLoEeeDV7UHoBIkeA" name="editHelperAdviceConfiguration" type="_VkhwjhLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwkRLoEeeDV7UHoBIkeA">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwhRLoEeeDV7UHoBIkeA" name="editHelperAdviceConfiguration" type="_VkhwjhLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" subsettedProperty="_UYrM8CjYEeuEo8scjf0hcw" association="_VkhwkRLoEeeDV7UHoBIkeA">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwhhLoEeeDV7UHoBIkeA"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwhxLoEeeDV7UHoBIkeA" name="containerConfiguration" type="_VkhwbxLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwkhLoEeeDV7UHoBIkeA">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwhxLoEeeDV7UHoBIkeA" name="containerConfiguration" type="_VkhwbxLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" subsettedProperty="_UYrM8CjYEeuEo8scjf0hcw" association="_VkhwkhLoEeeDV7UHoBIkeA">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwiBLoEeeDV7UHoBIkeA"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwiRLoEeeDV7UHoBIkeA" name="matcherConfiguration" type="_VkhwdRLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" association="_VkhwlBLoEeeDV7UHoBIkeA">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwiRLoEeeDV7UHoBIkeA" name="matcherConfiguration" type="_VkhwdRLoEeeDV7UHoBIkeA" isOrdered="true" aggregation="composite" subsettedProperty="_UYrM8CjYEeuEo8scjf0hcw" association="_VkhwlBLoEeeDV7UHoBIkeA">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VkhwihLoEeeDV7UHoBIkeA"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwixLoEeeDV7UHoBIkeA" name="specializedTypes" type="_VkhwQhLoEeeDV7UHoBIkeA" isOrdered="true" association="_VkhwlhLoEeeDV7UHoBIkeA">
@@ -207,15 +220,11 @@ endif</body>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_VkhwjhLoEeeDV7UHoBIkeA" name="AbstractEditHelperAdviceConfiguration" isAbstract="true">
       <generalization xmi:type="uml:Generalization" xmi:id="_VkhwjxLoEeeDV7UHoBIkeA" general="_VkhwYRLoEeeDV7UHoBIkeA"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwkBLoEeeDV7UHoBIkeA" name="target" type="_VkhwgxLoEeeDV7UHoBIkeA" isOrdered="true" association="_VkhwkRLoEeeDV7UHoBIkeA"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_VkhwkBLoEeeDV7UHoBIkeA" name="target" type="_VkhwgxLoEeeDV7UHoBIkeA" isOrdered="true" subsettedProperty="_UYr0ACjYEeuEo8scjf0hcw" association="_VkhwkRLoEeeDV7UHoBIkeA"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_VkhwkRLoEeeDV7UHoBIkeA" memberEnd="_VkhwhRLoEeeDV7UHoBIkeA _VkhwkBLoEeeDV7UHoBIkeA"/>
-    <packagedElement xmi:type="uml:Association" xmi:id="_VkhwkhLoEeeDV7UHoBIkeA" memberEnd="_VkhwhxLoEeeDV7UHoBIkeA _VkhwkxLoEeeDV7UHoBIkeA">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_VkhwkxLoEeeDV7UHoBIkeA" type="_VkhwgxLoEeeDV7UHoBIkeA" association="_VkhwkhLoEeeDV7UHoBIkeA"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_VkhwlBLoEeeDV7UHoBIkeA" memberEnd="_VkhwiRLoEeeDV7UHoBIkeA _VkhwlRLoEeeDV7UHoBIkeA">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_VkhwlRLoEeeDV7UHoBIkeA" type="_VkhwgxLoEeeDV7UHoBIkeA" association="_VkhwlBLoEeeDV7UHoBIkeA"/>
-    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_VkhwkhLoEeeDV7UHoBIkeA" memberEnd="_VkhwhxLoEeeDV7UHoBIkeA _VkhwkxLoEeeDV7UHoBIkeA"/>
+    <packagedElement xmi:type="uml:Association" xmi:id="_VkhwlBLoEeeDV7UHoBIkeA" memberEnd="_VkhwiRLoEeeDV7UHoBIkeA _VkhwlRLoEeeDV7UHoBIkeA"/>
     <packagedElement xmi:type="uml:Association" xmi:id="_VkhwlhLoEeeDV7UHoBIkeA" memberEnd="_VkhwixLoEeeDV7UHoBIkeA _VkhwlxLoEeeDV7UHoBIkeA">
       <ownedEnd xmi:type="uml:Property" xmi:id="_VkhwlxLoEeeDV7UHoBIkeA" type="_VkhwgxLoEeeDV7UHoBIkeA" association="_VkhwlhLoEeeDV7UHoBIkeA"/>
     </packagedElement>
@@ -267,6 +276,11 @@ endif</body>
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xnVfwSXIEeueH428b_S_BA" key="nature" value="UML_Nature"/>
       </eAnnotations>
     </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_UYp-0CjYEeuEo8scjf0hcw" memberEnd="_UYrM8CjYEeuEo8scjf0hcw _UYr0ACjYEeuEo8scjf0hcw">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UYql4CjYEeuEo8scjf0hcw" source="org.eclipse.papyrus">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UYql4SjYEeuEo8scjf0hcw" key="nature" value="UML_Nature"/>
+      </eAnnotations>
+    </packagedElement>
     <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_VkhwrRLoEeeDV7UHoBIkeA">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_VkhwrhLoEeeDV7UHoBIkeA" source="http://www.eclipse.org/uml2/2.0.0/UML">
         <references xmi:type="ecore:EPackage" href="pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA"/>
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/AbstractAdviceBindingConfiguration.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/AbstractAdviceBindingConfiguration.java
index e7ebda5cf01..baea039888e 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/AbstractAdviceBindingConfiguration.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/AbstractAdviceBindingConfiguration.java
@@ -11,7 +11,7 @@
  * 
  * Contributors:
  *  CEA LIST - Initial API and implementation
- *  Christian W. Damus - bug 568782
+ *  Christian W. Damus - bugs 568782, 568853
  */
 package org.eclipse.papyrus.infra.types;
 
@@ -225,13 +225,14 @@ public interface AbstractAdviceBindingConfiguration extends AdviceConfiguration,
 	ElementTypeSetConfiguration getElementTypeSet();
 
 	/**
-	 * Returns the value of the '<em><b>Owning Target</b></em>' container reference.
+	 * Returns the value of the '<em><b>Owning Target</b></em>' reference.
 	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.types.ElementTypeConfiguration#getOwnedAdvice <em>Owned Advice</em>}'.
 	 * <p>
 	 * This feature subsets the following features:
 	 * </p>
 	 * <ul>
 	 *   <li>'{@link org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration#getTarget() <em>Target</em>}'</li>
+	 *   <li>'{@link org.eclipse.papyrus.infra.types.ConfigurationElement#getOwningType() <em>Owning Type</em>}'</li>
 	 * </ul>
 	 * <!-- begin-user-doc -->
 	 * <p>
@@ -239,21 +240,21 @@ public interface AbstractAdviceBindingConfiguration extends AdviceConfiguration,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Owning Target</em>' container reference.
+	 * @return the value of the '<em>Owning Target</em>' reference.
 	 * @see #setOwningTarget(ElementTypeConfiguration)
 	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getAbstractAdviceBindingConfiguration_OwningTarget()
 	 * @see org.eclipse.papyrus.infra.types.ElementTypeConfiguration#getOwnedAdvice
-	 * @model opposite="ownedAdvice" transient="false" ordered="false"
+	 * @model opposite="ownedAdvice" transient="true" volatile="true" derived="true" ordered="false"
 	 *        annotation="subsets"
 	 * @generated
 	 */
 	ElementTypeConfiguration getOwningTarget();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration#getOwningTarget <em>Owning Target</em>}' container reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration#getOwningTarget <em>Owning Target</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Owning Target</em>' container reference.
+	 * @param value the new value of the '<em>Owning Target</em>' reference.
 	 * @see #getOwningTarget()
 	 * @generated
 	 */
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/AbstractEditHelperAdviceConfiguration.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/AbstractEditHelperAdviceConfiguration.java
index fad771d3d20..d82a35c6c5b 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/AbstractEditHelperAdviceConfiguration.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/AbstractEditHelperAdviceConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 CEA LIST.
+ * Copyright (c) 2014, 2020 CEA LIST, Christian W. Damus, and others.
  * 
  * 
  * All rights reserved. This program and the accompanying materials
@@ -11,6 +11,7 @@
  * 
  * Contributors:
  *  CEA LIST - Initial API and implementation
+ *  Christian W. Damus - bug 568853
  */
 package org.eclipse.papyrus.infra.types;
 
@@ -33,28 +34,35 @@ package org.eclipse.papyrus.infra.types;
  */
 public interface AbstractEditHelperAdviceConfiguration extends AdviceConfiguration {
 	/**
-	 * Returns the value of the '<em><b>Target</b></em>' container reference.
+	 * Returns the value of the '<em><b>Target</b></em>' reference.
 	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getEditHelperAdviceConfiguration <em>Edit Helper Advice Configuration</em>}'.
+	 * <p>
+	 * This feature subsets the following features:
+	 * </p>
+	 * <ul>
+	 *   <li>'{@link org.eclipse.papyrus.infra.types.ConfigurationElement#getOwningType() <em>Owning Type</em>}'</li>
+	 * </ul>
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Target</em>' container reference isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Target</em>' container reference.
+	 * @return the value of the '<em>Target</em>' reference.
 	 * @see #setTarget(SpecializationTypeConfiguration)
 	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getAbstractEditHelperAdviceConfiguration_Target()
 	 * @see org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getEditHelperAdviceConfiguration
-	 * @model opposite="editHelperAdviceConfiguration" required="true" transient="false"
+	 * @model opposite="editHelperAdviceConfiguration" required="true"
+	 *        annotation="subsets"
 	 * @generated
 	 */
 	SpecializationTypeConfiguration getTarget();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.AbstractEditHelperAdviceConfiguration#getTarget <em>Target</em>}' container reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.AbstractEditHelperAdviceConfiguration#getTarget <em>Target</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Target</em>' container reference.
+	 * @param value the new value of the '<em>Target</em>' reference.
 	 * @see #getTarget()
 	 * @generated
 	 */
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/AbstractMatcherConfiguration.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/AbstractMatcherConfiguration.java
index deb25075588..e3d86e0efba 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/AbstractMatcherConfiguration.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/AbstractMatcherConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 CEA LIST.
+ * Copyright (c) 2014, 2020 CEA LIST, Christian W. Damus, and others.
  * 
  * 
  * All rights reserved. This program and the accompanying materials
@@ -11,20 +11,60 @@
  * 
  * Contributors:
  *  CEA LIST - Initial API and implementation
+ *  Christian W. Damus - bug 568853
  */
 package org.eclipse.papyrus.infra.types;
 
-import org.eclipse.emf.ecore.EObject;
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Abstract Matcher Configuration</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration#getMatchedType <em>Matched Type</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getAbstractMatcherConfiguration()
  * @model abstract="true"
  * @generated
  */
-public interface AbstractMatcherConfiguration extends EObject {
+public interface AbstractMatcherConfiguration extends ConfigurationElement {
+
+	/**
+	 * Returns the value of the '<em><b>Matched Type</b></em>' reference.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getMatcherConfiguration <em>Matcher Configuration</em>}'.
+	 * <p>
+	 * This feature subsets the following features:
+	 * </p>
+	 * <ul>
+	 *   <li>'{@link org.eclipse.papyrus.infra.types.ConfigurationElement#getOwningType() <em>Owning Type</em>}'</li>
+	 * </ul>
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Matched Type</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Matched Type</em>' reference.
+	 * @see #setMatchedType(SpecializationTypeConfiguration)
+	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getAbstractMatcherConfiguration_MatchedType()
+	 * @see org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getMatcherConfiguration
+	 * @model opposite="matcherConfiguration" ordered="false"
+	 *        annotation="subsets"
+	 * @generated
+	 */
+	SpecializationTypeConfiguration getMatchedType();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration#getMatchedType <em>Matched Type</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Matched Type</em>' reference.
+	 * @see #getMatchedType()
+	 * @generated
+	 */
+	void setMatchedType(SpecializationTypeConfiguration value);
 } // AbstractMatcherConfiguration
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ConfigurationElement.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ConfigurationElement.java
index 62029870b71..f6617c7d3ea 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ConfigurationElement.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ConfigurationElement.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 CEA LIST.
+ * Copyright (c) 2014, 2020 CEA LIST, Christian W. Damus, and others.
  * 
  * 
  * All rights reserved. This program and the accompanying materials
@@ -11,6 +11,7 @@
  * 
  * Contributors:
  *  CEA LIST - Initial API and implementation
+ *  Christian W. Damus - bug 568853
  */
 package org.eclipse.papyrus.infra.types;
 
@@ -26,6 +27,7 @@ import org.eclipse.emf.ecore.EObject;
  * </p>
  * <ul>
  *   <li>{@link org.eclipse.papyrus.infra.types.ConfigurationElement#getDescription <em>Description</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.ConfigurationElement#getOwningType <em>Owning Type</em>}</li>
  * </ul>
  *
  * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getConfigurationElement()
@@ -59,4 +61,32 @@ public interface ConfigurationElement extends EObject {
 	 */
 	void setDescription(String value);
 
+	/**
+	 * Returns the value of the '<em><b>Owning Type</b></em>' container reference.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.types.ElementTypeConfiguration#getOwnedConfigurations <em>Owned Configurations</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Owning Type</em>' container reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Owning Type</em>' container reference.
+	 * @see #setOwningType(ElementTypeConfiguration)
+	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getConfigurationElement_OwningType()
+	 * @see org.eclipse.papyrus.infra.types.ElementTypeConfiguration#getOwnedConfigurations
+	 * @model opposite="ownedConfigurations" transient="false" ordered="false"
+	 * @generated
+	 */
+	ElementTypeConfiguration getOwningType();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.ConfigurationElement#getOwningType <em>Owning Type</em>}' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Owning Type</em>' container reference.
+	 * @see #getOwningType()
+	 * @generated
+	 */
+	void setOwningType(ElementTypeConfiguration value);
+
 } // ConfigurationElement
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ContainerConfiguration.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ContainerConfiguration.java
index 740093990bc..70cbca805ba 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ContainerConfiguration.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ContainerConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 CEA LIST.
+ * Copyright (c) 2014, 2020 CEA LIST, Christian W. Damus, and others.
  * 
  * 
  * All rights reserved. This program and the accompanying materials
@@ -11,12 +11,11 @@
  * 
  * Contributors:
  *  CEA LIST - Initial API and implementation
+ *  Christian W. Damus - bug 568853
  */
 package org.eclipse.papyrus.infra.types;
 
 import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
 
 /**
@@ -29,6 +28,7 @@ import org.eclipse.emf.ecore.EReference;
  * </p>
  * <ul>
  *   <li>{@link org.eclipse.papyrus.infra.types.ContainerConfiguration#getContainerMatcherConfiguration <em>Container Matcher Configuration</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.ContainerConfiguration#getContainedType <em>Contained Type</em>}</li>
  *   <li>{@link org.eclipse.papyrus.infra.types.ContainerConfiguration#getEContainmentFeatures <em>EContainment Features</em>}</li>
  * </ul>
  *
@@ -36,7 +36,7 @@ import org.eclipse.emf.ecore.EReference;
  * @model
  * @generated
  */
-public interface ContainerConfiguration extends EObject {
+public interface ContainerConfiguration extends ConfigurationElement {
 	/**
 	 * Returns the value of the '<em><b>Container Matcher Configuration</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
@@ -64,6 +64,41 @@ public interface ContainerConfiguration extends EObject {
 	void setContainerMatcherConfiguration(AbstractMatcherConfiguration value);
 
 	/**
+	 * Returns the value of the '<em><b>Contained Type</b></em>' reference.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getContainerConfiguration <em>Container Configuration</em>}'.
+	 * <p>
+	 * This feature subsets the following features:
+	 * </p>
+	 * <ul>
+	 *   <li>'{@link org.eclipse.papyrus.infra.types.ConfigurationElement#getOwningType() <em>Owning Type</em>}'</li>
+	 * </ul>
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Contained Type</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Contained Type</em>' reference.
+	 * @see #setContainedType(SpecializationTypeConfiguration)
+	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getContainerConfiguration_ContainedType()
+	 * @see org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getContainerConfiguration
+	 * @model opposite="containerConfiguration" ordered="false"
+	 *        annotation="subsets"
+	 * @generated
+	 */
+	SpecializationTypeConfiguration getContainedType();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.ContainerConfiguration#getContainedType <em>Contained Type</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Contained Type</em>' reference.
+	 * @see #getContainedType()
+	 * @generated
+	 */
+	void setContainedType(SpecializationTypeConfiguration value);
+
+	/**
 	 * Returns the value of the '<em><b>EContainment Features</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.emf.ecore.EReference}.
 	 * <!-- begin-user-doc -->
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ElementTypeConfiguration.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ElementTypeConfiguration.java
index be5f8489173..c84a67149f1 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ElementTypeConfiguration.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ElementTypeConfiguration.java
@@ -11,7 +11,7 @@
  * 
  * Contributors:
  *  CEA LIST - Initial API and implementation
- *  Christian W. Damus - bug 568782
+ *  Christian W. Damus - bugs 568782, 568853
  */
 package org.eclipse.papyrus.infra.types;
 
@@ -32,6 +32,7 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.eclipse.papyrus.infra.types.ElementTypeConfiguration#getIconEntry <em>Icon Entry</em>}</li>
  *   <li>{@link org.eclipse.papyrus.infra.types.ElementTypeConfiguration#getOwnedAdvice <em>Owned Advice</em>}</li>
  *   <li>{@link org.eclipse.papyrus.infra.types.ElementTypeConfiguration#getOwningSet <em>Owning Set</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.ElementTypeConfiguration#getOwnedConfigurations <em>Owned Configurations</em>}</li>
  * </ul>
  *
  * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getElementTypeConfiguration()
@@ -120,19 +121,26 @@ public interface ElementTypeConfiguration extends ConfigurationElement, Identifi
 	void setIconEntry(IconEntry value);
 
 	/**
-	 * Returns the value of the '<em><b>Owned Advice</b></em>' containment reference list.
+	 * Returns the value of the '<em><b>Owned Advice</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration}.
 	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration#getOwningTarget <em>Owning Target</em>}'.
+	 * <p>
+	 * This feature subsets the following features:
+	 * </p>
+	 * <ul>
+	 *   <li>'{@link org.eclipse.papyrus.infra.types.ElementTypeConfiguration#getOwnedConfigurations() <em>Owned Configurations</em>}'</li>
+	 * </ul>
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Owned Advice</em>' containment reference list isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Owned Advice</em>' containment reference list.
+	 * @return the value of the '<em>Owned Advice</em>' reference list.
 	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getElementTypeConfiguration_OwnedAdvice()
 	 * @see org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration#getOwningTarget
-	 * @model opposite="owningTarget" containment="true" ordered="false"
+	 * @model opposite="owningTarget" transient="true" volatile="true" derived="true" ordered="false"
+	 *        annotation="subsets"
 	 * @generated
 	 */
 	EList<AbstractAdviceBindingConfiguration> getOwnedAdvice();
@@ -165,4 +173,22 @@ public interface ElementTypeConfiguration extends ConfigurationElement, Identifi
 	 */
 	void setOwningSet(ElementTypeSetConfiguration value);
 
+	/**
+	 * Returns the value of the '<em><b>Owned Configurations</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.types.ConfigurationElement}.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.types.ConfigurationElement#getOwningType <em>Owning Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Owned Configurations</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Owned Configurations</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getElementTypeConfiguration_OwnedConfigurations()
+	 * @see org.eclipse.papyrus.infra.types.ConfigurationElement#getOwningType
+	 * @model opposite="owningType" containment="true" ordered="false"
+	 * @generated
+	 */
+	EList<ConfigurationElement> getOwnedConfigurations();
+
 } // ElementTypeConfiguration
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ElementTypeSetConfiguration.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ElementTypeSetConfiguration.java
index 7906f9bed45..0cac0500670 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ElementTypeSetConfiguration.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ElementTypeSetConfiguration.java
@@ -11,7 +11,7 @@
  * 
  * Contributors:
  *  CEA LIST - Initial API and implementation
- *  Christian W. Damus - bug 568782
+ *  Christian W. Damus - bugs 568782, 568853
  */
 package org.eclipse.papyrus.infra.types;
 
@@ -26,9 +26,9 @@ import org.eclipse.emf.common.util.EList;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration#getElementTypeConfigurations <em>Element Type Configurations</em>}</li>
  *   <li>{@link org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration#getAdviceBindingsConfigurations <em>Advice Bindings Configurations</em>}</li>
  *   <li>{@link org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration#getAllAdviceBindings <em>All Advice Bindings</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration#getElementTypeConfigurations <em>Element Type Configurations</em>}</li>
  *   <li>{@link org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration#getMetamodelNsURI <em>Metamodel Ns URI</em>}</li>
  * </ul>
  *
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ElementTypesConfigurationsPackage.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ElementTypesConfigurationsPackage.java
index c5a6a76d346..ddc9d925e19 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ElementTypesConfigurationsPackage.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ElementTypesConfigurationsPackage.java
@@ -11,7 +11,7 @@
  * 
  * Contributors:
  *  CEA LIST - Initial API and implementation
- *  Christian W. Damus - bug 568782
+ *  Christian W. Damus - bugs 568782, 568853
  */
 package org.eclipse.papyrus.infra.types;
 
@@ -100,13 +100,22 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int CONFIGURATION_ELEMENT__DESCRIPTION = 0;
 
 	/**
+	 * The feature id for the '<em><b>Owning Type</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONFIGURATION_ELEMENT__OWNING_TYPE = 1;
+
+	/**
 	 * The number of structural features of the '<em>Configuration Element</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CONFIGURATION_ELEMENT_FEATURE_COUNT = 1;
+	int CONFIGURATION_ELEMENT_FEATURE_COUNT = 2;
 
 	/**
 	 * The number of operations of the '<em>Configuration Element</em>' class.
@@ -137,6 +146,15 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int ELEMENT_TYPE_SET_CONFIGURATION__DESCRIPTION = CONFIGURATION_ELEMENT__DESCRIPTION;
 
 	/**
+	 * The feature id for the '<em><b>Owning Type</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ELEMENT_TYPE_SET_CONFIGURATION__OWNING_TYPE = CONFIGURATION_ELEMENT__OWNING_TYPE;
+
+	/**
 	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -155,31 +173,31 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int ELEMENT_TYPE_SET_CONFIGURATION__NAME = CONFIGURATION_ELEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Element Type Configurations</b></em>' containment reference list.
+	 * The feature id for the '<em><b>Advice Bindings Configurations</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS = CONFIGURATION_ELEMENT_FEATURE_COUNT + 2;
+	int ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS = CONFIGURATION_ELEMENT_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Advice Bindings Configurations</b></em>' containment reference list.
+	 * The feature id for the '<em><b>All Advice Bindings</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS = CONFIGURATION_ELEMENT_FEATURE_COUNT + 3;
+	int ELEMENT_TYPE_SET_CONFIGURATION__ALL_ADVICE_BINDINGS = CONFIGURATION_ELEMENT_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>All Advice Bindings</b></em>' reference list.
+	 * The feature id for the '<em><b>Element Type Configurations</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT_TYPE_SET_CONFIGURATION__ALL_ADVICE_BINDINGS = CONFIGURATION_ELEMENT_FEATURE_COUNT + 4;
+	int ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS = CONFIGURATION_ELEMENT_FEATURE_COUNT + 4;
 
 	/**
 	 * The feature id for the '<em><b>Metamodel Ns URI</b></em>' attribute.
@@ -237,6 +255,15 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int ELEMENT_TYPE_CONFIGURATION__DESCRIPTION = CONFIGURATION_ELEMENT__DESCRIPTION;
 
 	/**
+	 * The feature id for the '<em><b>Owning Type</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ELEMENT_TYPE_CONFIGURATION__OWNING_TYPE = CONFIGURATION_ELEMENT__OWNING_TYPE;
+
+	/**
 	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -282,7 +309,7 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY = CONFIGURATION_ELEMENT_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Owned Advice</b></em>' containment reference list.
+	 * The feature id for the '<em><b>Owned Advice</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -300,13 +327,22 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int ELEMENT_TYPE_CONFIGURATION__OWNING_SET = CONFIGURATION_ELEMENT_FEATURE_COUNT + 6;
 
 	/**
+	 * The feature id for the '<em><b>Owned Configurations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ELEMENT_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS = CONFIGURATION_ELEMENT_FEATURE_COUNT + 7;
+
+	/**
 	 * The number of structural features of the '<em>Element Type Configuration</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT_TYPE_CONFIGURATION_FEATURE_COUNT = CONFIGURATION_ELEMENT_FEATURE_COUNT + 7;
+	int ELEMENT_TYPE_CONFIGURATION_FEATURE_COUNT = CONFIGURATION_ELEMENT_FEATURE_COUNT + 8;
 
 	/**
 	 * The number of operations of the '<em>Element Type Configuration</em>' class.
@@ -371,7 +407,7 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getIdentifiedConfiguration()
 	 * @generated
 	 */
-	int IDENTIFIED_CONFIGURATION = 8;
+	int IDENTIFIED_CONFIGURATION = 10;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.infra.types.NamedConfiguration <em>Named Configuration</em>}' class.
@@ -381,7 +417,7 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getNamedConfiguration()
 	 * @generated
 	 */
-	int NAMED_CONFIGURATION = 9;
+	int NAMED_CONFIGURATION = 11;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.infra.types.impl.AdviceConfigurationImpl <em>Advice Configuration</em>}' class.
@@ -403,6 +439,15 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int ADVICE_CONFIGURATION__DESCRIPTION = CONFIGURATION_ELEMENT__DESCRIPTION;
 
 	/**
+	 * The feature id for the '<em><b>Owning Type</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ADVICE_CONFIGURATION__OWNING_TYPE = CONFIGURATION_ELEMENT__OWNING_TYPE;
+
+	/**
 	 * The feature id for the '<em><b>Before</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -458,6 +503,15 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int ABSTRACT_ADVICE_BINDING_CONFIGURATION__DESCRIPTION = ADVICE_CONFIGURATION__DESCRIPTION;
 
 	/**
+	 * The feature id for the '<em><b>Owning Type</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_ADVICE_BINDING_CONFIGURATION__OWNING_TYPE = ADVICE_CONFIGURATION__OWNING_TYPE;
+
+	/**
 	 * The feature id for the '<em><b>Before</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -548,7 +602,7 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int ABSTRACT_ADVICE_BINDING_CONFIGURATION__ELEMENT_TYPE_SET = ADVICE_CONFIGURATION_FEATURE_COUNT + 7;
 
 	/**
-	 * The feature id for the '<em><b>Owning Target</b></em>' container reference.
+	 * The feature id for the '<em><b>Owning Target</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -594,122 +648,122 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int CONTAINER_CONFIGURATION = 6;
 
 	/**
-	 * The feature id for the '<em><b>Container Matcher Configuration</b></em>' containment reference.
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CONTAINER_CONFIGURATION__CONTAINER_MATCHER_CONFIGURATION = 0;
+	int CONTAINER_CONFIGURATION__DESCRIPTION = CONFIGURATION_ELEMENT__DESCRIPTION;
 
 	/**
-	 * The feature id for the '<em><b>EContainment Features</b></em>' reference list.
+	 * The feature id for the '<em><b>Owning Type</b></em>' container reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CONTAINER_CONFIGURATION__ECONTAINMENT_FEATURES = 1;
+	int CONTAINER_CONFIGURATION__OWNING_TYPE = CONFIGURATION_ELEMENT__OWNING_TYPE;
 
 	/**
-	 * The number of structural features of the '<em>Container Configuration</em>' class.
+	 * The feature id for the '<em><b>Container Matcher Configuration</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CONTAINER_CONFIGURATION_FEATURE_COUNT = 2;
+	int CONTAINER_CONFIGURATION__CONTAINER_MATCHER_CONFIGURATION = CONFIGURATION_ELEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of operations of the '<em>Container Configuration</em>' class.
+	 * The feature id for the '<em><b>Contained Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CONTAINER_CONFIGURATION_OPERATION_COUNT = 0;
+	int CONTAINER_CONFIGURATION__CONTAINED_TYPE = CONFIGURATION_ELEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.types.impl.AbstractMatcherConfigurationImpl <em>Abstract Matcher Configuration</em>}' class.
+	 * The feature id for the '<em><b>EContainment Features</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.types.impl.AbstractMatcherConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getAbstractMatcherConfiguration()
 	 * @generated
+	 * @ordered
 	 */
-	int ABSTRACT_MATCHER_CONFIGURATION = 7;
+	int CONTAINER_CONFIGURATION__ECONTAINMENT_FEATURES = CONFIGURATION_ELEMENT_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of structural features of the '<em>Abstract Matcher Configuration</em>' class.
+	 * The number of structural features of the '<em>Container Configuration</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int ABSTRACT_MATCHER_CONFIGURATION_FEATURE_COUNT = 0;
+	int CONTAINER_CONFIGURATION_FEATURE_COUNT = CONFIGURATION_ELEMENT_FEATURE_COUNT + 3;
 
 	/**
-	 * The number of operations of the '<em>Abstract Matcher Configuration</em>' class.
+	 * The number of operations of the '<em>Container Configuration</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int ABSTRACT_MATCHER_CONFIGURATION_OPERATION_COUNT = 0;
+	int CONTAINER_CONFIGURATION_OPERATION_COUNT = CONFIGURATION_ELEMENT_OPERATION_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.types.impl.AbstractMatcherConfigurationImpl <em>Abstract Matcher Configuration</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.types.impl.AbstractMatcherConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getAbstractMatcherConfiguration()
 	 * @generated
-	 * @ordered
 	 */
-	int IDENTIFIED_CONFIGURATION__IDENTIFIER = 0;
+	int ABSTRACT_MATCHER_CONFIGURATION = 7;
 
 	/**
-	 * The number of structural features of the '<em>Identified Configuration</em>' class.
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int IDENTIFIED_CONFIGURATION_FEATURE_COUNT = 1;
+	int ABSTRACT_MATCHER_CONFIGURATION__DESCRIPTION = CONFIGURATION_ELEMENT__DESCRIPTION;
 
 	/**
-	 * The number of operations of the '<em>Identified Configuration</em>' class.
+	 * The feature id for the '<em><b>Owning Type</b></em>' container reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int IDENTIFIED_CONFIGURATION_OPERATION_COUNT = 0;
+	int ABSTRACT_MATCHER_CONFIGURATION__OWNING_TYPE = CONFIGURATION_ELEMENT__OWNING_TYPE;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * The feature id for the '<em><b>Matched Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int NAMED_CONFIGURATION__NAME = 0;
+	int ABSTRACT_MATCHER_CONFIGURATION__MATCHED_TYPE = CONFIGURATION_ELEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Named Configuration</em>' class.
+	 * The number of structural features of the '<em>Abstract Matcher Configuration</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int NAMED_CONFIGURATION_FEATURE_COUNT = 1;
+	int ABSTRACT_MATCHER_CONFIGURATION_FEATURE_COUNT = CONFIGURATION_ELEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of operations of the '<em>Named Configuration</em>' class.
+	 * The number of operations of the '<em>Abstract Matcher Configuration</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int NAMED_CONFIGURATION_OPERATION_COUNT = 0;
+	int ABSTRACT_MATCHER_CONFIGURATION_OPERATION_COUNT = CONFIGURATION_ELEMENT_OPERATION_COUNT + 0;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.infra.types.impl.SpecializationTypeConfigurationImpl <em>Specialization Type Configuration</em>}' class.
@@ -719,7 +773,7 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getSpecializationTypeConfiguration()
 	 * @generated
 	 */
-	int SPECIALIZATION_TYPE_CONFIGURATION = 10;
+	int SPECIALIZATION_TYPE_CONFIGURATION = 8;
 
 	/**
 	 * The feature id for the '<em><b>Description</b></em>' attribute.
@@ -731,6 +785,15 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int SPECIALIZATION_TYPE_CONFIGURATION__DESCRIPTION = ELEMENT_TYPE_CONFIGURATION__DESCRIPTION;
 
 	/**
+	 * The feature id for the '<em><b>Owning Type</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SPECIALIZATION_TYPE_CONFIGURATION__OWNING_TYPE = ELEMENT_TYPE_CONFIGURATION__OWNING_TYPE;
+
+	/**
 	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -776,7 +839,7 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int SPECIALIZATION_TYPE_CONFIGURATION__ICON_ENTRY = ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY;
 
 	/**
-	 * The feature id for the '<em><b>Owned Advice</b></em>' containment reference list.
+	 * The feature id for the '<em><b>Owned Advice</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -794,7 +857,16 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int SPECIALIZATION_TYPE_CONFIGURATION__OWNING_SET = ELEMENT_TYPE_CONFIGURATION__OWNING_SET;
 
 	/**
-	 * The feature id for the '<em><b>Edit Helper Advice Configuration</b></em>' containment reference.
+	 * The feature id for the '<em><b>Owned Configurations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SPECIALIZATION_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS = ELEMENT_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Edit Helper Advice Configuration</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -803,7 +875,7 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION = ELEMENT_TYPE_CONFIGURATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Container Configuration</b></em>' containment reference.
+	 * The feature id for the '<em><b>Container Configuration</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -812,22 +884,22 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION = ELEMENT_TYPE_CONFIGURATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Matcher Configuration</b></em>' containment reference.
+	 * The feature id for the '<em><b>Specialized Types</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION = ELEMENT_TYPE_CONFIGURATION_FEATURE_COUNT + 2;
+	int SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES = ELEMENT_TYPE_CONFIGURATION_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Specialized Types</b></em>' reference list.
+	 * The feature id for the '<em><b>Matcher Configuration</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES = ELEMENT_TYPE_CONFIGURATION_FEATURE_COUNT + 3;
+	int SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION = ELEMENT_TYPE_CONFIGURATION_FEATURE_COUNT + 3;
 
 	/**
 	 * The number of structural features of the '<em>Specialization Type Configuration</em>' class.
@@ -855,7 +927,7 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getAbstractEditHelperAdviceConfiguration()
 	 * @generated
 	 */
-	int ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION = 11;
+	int ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION = 9;
 
 	/**
 	 * The feature id for the '<em><b>Description</b></em>' attribute.
@@ -867,6 +939,15 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__DESCRIPTION = ADVICE_CONFIGURATION__DESCRIPTION;
 
 	/**
+	 * The feature id for the '<em><b>Owning Type</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__OWNING_TYPE = ADVICE_CONFIGURATION__OWNING_TYPE;
+
+	/**
 	 * The feature id for the '<em><b>Before</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -885,7 +966,7 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__AFTER = ADVICE_CONFIGURATION__AFTER;
 
 	/**
-	 * The feature id for the '<em><b>Target</b></em>' container reference.
+	 * The feature id for the '<em><b>Target</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -912,6 +993,60 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION_OPERATION_COUNT = ADVICE_CONFIGURATION_OPERATION_COUNT + 0;
 
 	/**
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IDENTIFIED_CONFIGURATION__IDENTIFIER = 0;
+
+	/**
+	 * The number of structural features of the '<em>Identified Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IDENTIFIED_CONFIGURATION_FEATURE_COUNT = 1;
+
+	/**
+	 * The number of operations of the '<em>Identified Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IDENTIFIED_CONFIGURATION_OPERATION_COUNT = 0;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NAMED_CONFIGURATION__NAME = 0;
+
+	/**
+	 * The number of structural features of the '<em>Named Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NAMED_CONFIGURATION_FEATURE_COUNT = 1;
+
+	/**
+	 * The number of operations of the '<em>Named Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NAMED_CONFIGURATION_OPERATION_COUNT = 0;
+
+	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.infra.types.impl.MetamodelTypeConfigurationImpl <em>Metamodel Type Configuration</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -931,6 +1066,15 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int METAMODEL_TYPE_CONFIGURATION__DESCRIPTION = ELEMENT_TYPE_CONFIGURATION__DESCRIPTION;
 
 	/**
+	 * The feature id for the '<em><b>Owning Type</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int METAMODEL_TYPE_CONFIGURATION__OWNING_TYPE = ELEMENT_TYPE_CONFIGURATION__OWNING_TYPE;
+
+	/**
 	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -976,7 +1120,7 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int METAMODEL_TYPE_CONFIGURATION__ICON_ENTRY = ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY;
 
 	/**
-	 * The feature id for the '<em><b>Owned Advice</b></em>' containment reference list.
+	 * The feature id for the '<em><b>Owned Advice</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -994,6 +1138,15 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int METAMODEL_TYPE_CONFIGURATION__OWNING_SET = ELEMENT_TYPE_CONFIGURATION__OWNING_SET;
 
 	/**
+	 * The feature id for the '<em><b>Owned Configurations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int METAMODEL_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS = ELEMENT_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS;
+
+	/**
 	 * The feature id for the '<em><b>EClass</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1049,6 +1202,15 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int EDIT_HELPER_ADVICE_CONFIGURATION__DESCRIPTION = ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__DESCRIPTION;
 
 	/**
+	 * The feature id for the '<em><b>Owning Type</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EDIT_HELPER_ADVICE_CONFIGURATION__OWNING_TYPE = ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__OWNING_TYPE;
+
+	/**
 	 * The feature id for the '<em><b>Before</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1067,7 +1229,7 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int EDIT_HELPER_ADVICE_CONFIGURATION__AFTER = ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__AFTER;
 
 	/**
-	 * The feature id for the '<em><b>Target</b></em>' container reference.
+	 * The feature id for the '<em><b>Target</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -1122,6 +1284,15 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int ADVICE_BINDING_CONFIGURATION__DESCRIPTION = ABSTRACT_ADVICE_BINDING_CONFIGURATION__DESCRIPTION;
 
 	/**
+	 * The feature id for the '<em><b>Owning Type</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ADVICE_BINDING_CONFIGURATION__OWNING_TYPE = ABSTRACT_ADVICE_BINDING_CONFIGURATION__OWNING_TYPE;
+
+	/**
 	 * The feature id for the '<em><b>Before</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1212,7 +1383,7 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int ADVICE_BINDING_CONFIGURATION__ELEMENT_TYPE_SET = ABSTRACT_ADVICE_BINDING_CONFIGURATION__ELEMENT_TYPE_SET;
 
 	/**
-	 * The feature id for the '<em><b>Owning Target</b></em>' container reference.
+	 * The feature id for the '<em><b>Owning Target</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -1267,6 +1438,33 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int MATCHER_CONFIGURATION = 15;
 
 	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MATCHER_CONFIGURATION__DESCRIPTION = ABSTRACT_MATCHER_CONFIGURATION__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Owning Type</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MATCHER_CONFIGURATION__OWNING_TYPE = ABSTRACT_MATCHER_CONFIGURATION__OWNING_TYPE;
+
+	/**
+	 * The feature id for the '<em><b>Matched Type</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MATCHER_CONFIGURATION__MATCHED_TYPE = ABSTRACT_MATCHER_CONFIGURATION__MATCHED_TYPE;
+
+	/**
 	 * The feature id for the '<em><b>Matcher Class Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1313,6 +1511,15 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int EXTERNALLY_REGISTERED_TYPE__DESCRIPTION = ELEMENT_TYPE_CONFIGURATION__DESCRIPTION;
 
 	/**
+	 * The feature id for the '<em><b>Owning Type</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTERNALLY_REGISTERED_TYPE__OWNING_TYPE = ELEMENT_TYPE_CONFIGURATION__OWNING_TYPE;
+
+	/**
 	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1358,7 +1565,7 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int EXTERNALLY_REGISTERED_TYPE__ICON_ENTRY = ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY;
 
 	/**
-	 * The feature id for the '<em><b>Owned Advice</b></em>' containment reference list.
+	 * The feature id for the '<em><b>Owned Advice</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -1376,6 +1583,15 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int EXTERNALLY_REGISTERED_TYPE__OWNING_SET = ELEMENT_TYPE_CONFIGURATION__OWNING_SET;
 
 	/**
+	 * The feature id for the '<em><b>Owned Configurations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTERNALLY_REGISTERED_TYPE__OWNED_CONFIGURATIONS = ELEMENT_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS;
+
+	/**
 	 * The number of structural features of the '<em>Externally Registered Type</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1413,6 +1629,15 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int EXTERNALLY_REGISTERED_ADVICE__DESCRIPTION = ADVICE_BINDING_CONFIGURATION__DESCRIPTION;
 
 	/**
+	 * The feature id for the '<em><b>Owning Type</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTERNALLY_REGISTERED_ADVICE__OWNING_TYPE = ADVICE_BINDING_CONFIGURATION__OWNING_TYPE;
+
+	/**
 	 * The feature id for the '<em><b>Before</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1503,7 +1728,7 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int EXTERNALLY_REGISTERED_ADVICE__ELEMENT_TYPE_SET = ADVICE_BINDING_CONFIGURATION__ELEMENT_TYPE_SET;
 
 	/**
-	 * The feature id for the '<em><b>Owning Target</b></em>' container reference.
+	 * The feature id for the '<em><b>Owning Target</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -1644,6 +1869,17 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	EAttribute getConfigurationElement_Description();
 
 	/**
+	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.infra.types.ConfigurationElement#getOwningType <em>Owning Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the container reference '<em>Owning Type</em>'.
+	 * @see org.eclipse.papyrus.infra.types.ConfigurationElement#getOwningType()
+	 * @see #getConfigurationElement()
+	 * @generated
+	 */
+	EReference getConfigurationElement_OwningType();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.types.ElementTypeConfiguration <em>Element Type Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1687,10 +1923,10 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	EReference getElementTypeConfiguration_IconEntry();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.types.ElementTypeConfiguration#getOwnedAdvice <em>Owned Advice</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.types.ElementTypeConfiguration#getOwnedAdvice <em>Owned Advice</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Owned Advice</em>'.
+	 * @return the meta object for the reference list '<em>Owned Advice</em>'.
 	 * @see org.eclipse.papyrus.infra.types.ElementTypeConfiguration#getOwnedAdvice()
 	 * @see #getElementTypeConfiguration()
 	 * @generated
@@ -1709,6 +1945,17 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	EReference getElementTypeConfiguration_OwningSet();
 
 	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.types.ElementTypeConfiguration#getOwnedConfigurations <em>Owned Configurations</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Owned Configurations</em>'.
+	 * @see org.eclipse.papyrus.infra.types.ElementTypeConfiguration#getOwnedConfigurations()
+	 * @see #getElementTypeConfiguration()
+	 * @generated
+	 */
+	EReference getElementTypeConfiguration_OwnedConfigurations();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.types.IconEntry <em>Icon Entry</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1870,10 +2117,10 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	EReference getAbstractAdviceBindingConfiguration_ElementTypeSet();
 
 	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration#getOwningTarget <em>Owning Target</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration#getOwningTarget <em>Owning Target</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the container reference '<em>Owning Target</em>'.
+	 * @return the meta object for the reference '<em>Owning Target</em>'.
 	 * @see org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration#getOwningTarget()
 	 * @see #getAbstractAdviceBindingConfiguration()
 	 * @generated
@@ -1944,6 +2191,17 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	EReference getContainerConfiguration_ContainerMatcherConfiguration();
 
 	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.types.ContainerConfiguration#getContainedType <em>Contained Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Contained Type</em>'.
+	 * @see org.eclipse.papyrus.infra.types.ContainerConfiguration#getContainedType()
+	 * @see #getContainerConfiguration()
+	 * @generated
+	 */
+	EReference getContainerConfiguration_ContainedType();
+
+	/**
 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.types.ContainerConfiguration#getEContainmentFeatures <em>EContainment Features</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1965,6 +2223,17 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	EClass getAbstractMatcherConfiguration();
 
 	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration#getMatchedType <em>Matched Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Matched Type</em>'.
+	 * @see org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration#getMatchedType()
+	 * @see #getAbstractMatcherConfiguration()
+	 * @generated
+	 */
+	EReference getAbstractMatcherConfiguration_MatchedType();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration <em>Specialization Type Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1975,10 +2244,10 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	EClass getSpecializationTypeConfiguration();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getEditHelperAdviceConfiguration <em>Edit Helper Advice Configuration</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getEditHelperAdviceConfiguration <em>Edit Helper Advice Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Edit Helper Advice Configuration</em>'.
+	 * @return the meta object for the reference '<em>Edit Helper Advice Configuration</em>'.
 	 * @see org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getEditHelperAdviceConfiguration()
 	 * @see #getSpecializationTypeConfiguration()
 	 * @generated
@@ -1986,10 +2255,10 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	EReference getSpecializationTypeConfiguration_EditHelperAdviceConfiguration();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getContainerConfiguration <em>Container Configuration</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getContainerConfiguration <em>Container Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Container Configuration</em>'.
+	 * @return the meta object for the reference '<em>Container Configuration</em>'.
 	 * @see org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getContainerConfiguration()
 	 * @see #getSpecializationTypeConfiguration()
 	 * @generated
@@ -1997,10 +2266,10 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	EReference getSpecializationTypeConfiguration_ContainerConfiguration();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getMatcherConfiguration <em>Matcher Configuration</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getMatcherConfiguration <em>Matcher Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Matcher Configuration</em>'.
+	 * @return the meta object for the reference '<em>Matcher Configuration</em>'.
 	 * @see org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getMatcherConfiguration()
 	 * @see #getSpecializationTypeConfiguration()
 	 * @generated
@@ -2029,10 +2298,10 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	EClass getAbstractEditHelperAdviceConfiguration();
 
 	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.infra.types.AbstractEditHelperAdviceConfiguration#getTarget <em>Target</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.types.AbstractEditHelperAdviceConfiguration#getTarget <em>Target</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the container reference '<em>Target</em>'.
+	 * @return the meta object for the reference '<em>Target</em>'.
 	 * @see org.eclipse.papyrus.infra.types.AbstractEditHelperAdviceConfiguration#getTarget()
 	 * @see #getAbstractEditHelperAdviceConfiguration()
 	 * @generated
@@ -2256,6 +2525,14 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 		EAttribute CONFIGURATION_ELEMENT__DESCRIPTION = eINSTANCE.getConfigurationElement_Description();
 
 		/**
+		 * The meta object literal for the '<em><b>Owning Type</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CONFIGURATION_ELEMENT__OWNING_TYPE = eINSTANCE.getConfigurationElement_OwningType();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.types.impl.ElementTypeConfigurationImpl <em>Element Type Configuration</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -2290,7 +2567,7 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 		EReference ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY = eINSTANCE.getElementTypeConfiguration_IconEntry();
 
 		/**
-		 * The meta object literal for the '<em><b>Owned Advice</b></em>' containment reference list feature.
+		 * The meta object literal for the '<em><b>Owned Advice</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
@@ -2306,6 +2583,14 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 		EReference ELEMENT_TYPE_CONFIGURATION__OWNING_SET = eINSTANCE.getElementTypeConfiguration_OwningSet();
 
 		/**
+		 * The meta object literal for the '<em><b>Owned Configurations</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ELEMENT_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS = eINSTANCE.getElementTypeConfiguration_OwnedConfigurations();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.types.impl.IconEntryImpl <em>Icon Entry</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -2434,7 +2719,7 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 		EReference ABSTRACT_ADVICE_BINDING_CONFIGURATION__ELEMENT_TYPE_SET = eINSTANCE.getAbstractAdviceBindingConfiguration_ElementTypeSet();
 
 		/**
-		 * The meta object literal for the '<em><b>Owning Target</b></em>' container reference feature.
+		 * The meta object literal for the '<em><b>Owning Target</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
@@ -2494,6 +2779,14 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 		EReference CONTAINER_CONFIGURATION__CONTAINER_MATCHER_CONFIGURATION = eINSTANCE.getContainerConfiguration_ContainerMatcherConfiguration();
 
 		/**
+		 * The meta object literal for the '<em><b>Contained Type</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CONTAINER_CONFIGURATION__CONTAINED_TYPE = eINSTANCE.getContainerConfiguration_ContainedType();
+
+		/**
 		 * The meta object literal for the '<em><b>EContainment Features</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -2512,6 +2805,14 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 		EClass ABSTRACT_MATCHER_CONFIGURATION = eINSTANCE.getAbstractMatcherConfiguration();
 
 		/**
+		 * The meta object literal for the '<em><b>Matched Type</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ABSTRACT_MATCHER_CONFIGURATION__MATCHED_TYPE = eINSTANCE.getAbstractMatcherConfiguration_MatchedType();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.types.impl.SpecializationTypeConfigurationImpl <em>Specialization Type Configuration</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -2522,7 +2823,7 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 		EClass SPECIALIZATION_TYPE_CONFIGURATION = eINSTANCE.getSpecializationTypeConfiguration();
 
 		/**
-		 * The meta object literal for the '<em><b>Edit Helper Advice Configuration</b></em>' containment reference feature.
+		 * The meta object literal for the '<em><b>Edit Helper Advice Configuration</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
@@ -2530,7 +2831,7 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 		EReference SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION = eINSTANCE.getSpecializationTypeConfiguration_EditHelperAdviceConfiguration();
 
 		/**
-		 * The meta object literal for the '<em><b>Container Configuration</b></em>' containment reference feature.
+		 * The meta object literal for the '<em><b>Container Configuration</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
@@ -2538,7 +2839,7 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 		EReference SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION = eINSTANCE.getSpecializationTypeConfiguration_ContainerConfiguration();
 
 		/**
-		 * The meta object literal for the '<em><b>Matcher Configuration</b></em>' containment reference feature.
+		 * The meta object literal for the '<em><b>Matcher Configuration</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
@@ -2564,7 +2865,7 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 		EClass ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION = eINSTANCE.getAbstractEditHelperAdviceConfiguration();
 
 		/**
-		 * The meta object literal for the '<em><b>Target</b></em>' container reference feature.
+		 * The meta object literal for the '<em><b>Target</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/SpecializationTypeConfiguration.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/SpecializationTypeConfiguration.java
index 60231375df5..340842f60ba 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/SpecializationTypeConfiguration.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/SpecializationTypeConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 CEA LIST.
+ * Copyright (c) 2014, 2020 CEA LIST, Christian W. Damus, and others.
  * 
  * 
  * All rights reserved. This program and the accompanying materials
@@ -11,6 +11,7 @@
  * 
  * Contributors:
  *  CEA LIST - Initial API and implementation
+ *  Christian W. Damus - bug 568853
  */
 package org.eclipse.papyrus.infra.types;
 
@@ -27,8 +28,8 @@ import org.eclipse.emf.common.util.EList;
  * <ul>
  *   <li>{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getEditHelperAdviceConfiguration <em>Edit Helper Advice Configuration</em>}</li>
  *   <li>{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getContainerConfiguration <em>Container Configuration</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getMatcherConfiguration <em>Matcher Configuration</em>}</li>
  *   <li>{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getSpecializedTypes <em>Specialized Types</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getMatcherConfiguration <em>Matcher Configuration</em>}</li>
  * </ul>
  *
  * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getSpecializationTypeConfiguration()
@@ -37,80 +38,105 @@ import org.eclipse.emf.common.util.EList;
  */
 public interface SpecializationTypeConfiguration extends ElementTypeConfiguration {
 	/**
-	 * Returns the value of the '<em><b>Edit Helper Advice Configuration</b></em>' containment reference.
+	 * Returns the value of the '<em><b>Edit Helper Advice Configuration</b></em>' reference.
 	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.types.AbstractEditHelperAdviceConfiguration#getTarget <em>Target</em>}'.
+	 * <p>
+	 * This feature subsets the following features:
+	 * </p>
+	 * <ul>
+	 *   <li>'{@link org.eclipse.papyrus.infra.types.ElementTypeConfiguration#getOwnedConfigurations() <em>Owned Configurations</em>}'</li>
+	 * </ul>
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Edit Helper Advice Configuration</em>' containment reference isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Edit Helper Advice Configuration</em>' containment reference.
+	 * @return the value of the '<em>Edit Helper Advice Configuration</em>' reference.
 	 * @see #setEditHelperAdviceConfiguration(AbstractEditHelperAdviceConfiguration)
 	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getSpecializationTypeConfiguration_EditHelperAdviceConfiguration()
 	 * @see org.eclipse.papyrus.infra.types.AbstractEditHelperAdviceConfiguration#getTarget
-	 * @model opposite="target" containment="true"
+	 * @model opposite="target"
+	 *        annotation="subsets"
 	 * @generated
 	 */
 	AbstractEditHelperAdviceConfiguration getEditHelperAdviceConfiguration();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getEditHelperAdviceConfiguration <em>Edit Helper Advice Configuration</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getEditHelperAdviceConfiguration <em>Edit Helper Advice Configuration</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Edit Helper Advice Configuration</em>' containment reference.
+	 * @param value the new value of the '<em>Edit Helper Advice Configuration</em>' reference.
 	 * @see #getEditHelperAdviceConfiguration()
 	 * @generated
 	 */
 	void setEditHelperAdviceConfiguration(AbstractEditHelperAdviceConfiguration value);
 
 	/**
-	 * Returns the value of the '<em><b>Container Configuration</b></em>' containment reference.
+	 * Returns the value of the '<em><b>Container Configuration</b></em>' reference.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.types.ContainerConfiguration#getContainedType <em>Contained Type</em>}'.
+	 * <p>
+	 * This feature subsets the following features:
+	 * </p>
+	 * <ul>
+	 *   <li>'{@link org.eclipse.papyrus.infra.types.ElementTypeConfiguration#getOwnedConfigurations() <em>Owned Configurations</em>}'</li>
+	 * </ul>
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Container Configuration</em>' containment reference isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Container Configuration</em>' containment reference.
+	 * @return the value of the '<em>Container Configuration</em>' reference.
 	 * @see #setContainerConfiguration(ContainerConfiguration)
 	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getSpecializationTypeConfiguration_ContainerConfiguration()
-	 * @model containment="true"
+	 * @see org.eclipse.papyrus.infra.types.ContainerConfiguration#getContainedType
+	 * @model opposite="containedType"
+	 *        annotation="subsets"
 	 * @generated
 	 */
 	ContainerConfiguration getContainerConfiguration();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getContainerConfiguration <em>Container Configuration</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getContainerConfiguration <em>Container Configuration</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Container Configuration</em>' containment reference.
+	 * @param value the new value of the '<em>Container Configuration</em>' reference.
 	 * @see #getContainerConfiguration()
 	 * @generated
 	 */
 	void setContainerConfiguration(ContainerConfiguration value);
 
 	/**
-	 * Returns the value of the '<em><b>Matcher Configuration</b></em>' containment reference.
+	 * Returns the value of the '<em><b>Matcher Configuration</b></em>' reference.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration#getMatchedType <em>Matched Type</em>}'.
+	 * <p>
+	 * This feature subsets the following features:
+	 * </p>
+	 * <ul>
+	 *   <li>'{@link org.eclipse.papyrus.infra.types.ElementTypeConfiguration#getOwnedConfigurations() <em>Owned Configurations</em>}'</li>
+	 * </ul>
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Matcher Configuration</em>' containment reference isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Matcher Configuration</em>' containment reference.
+	 * @return the value of the '<em>Matcher Configuration</em>' reference.
 	 * @see #setMatcherConfiguration(AbstractMatcherConfiguration)
 	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getSpecializationTypeConfiguration_MatcherConfiguration()
-	 * @model containment="true"
+	 * @see org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration#getMatchedType
+	 * @model opposite="matchedType"
+	 *        annotation="subsets"
 	 * @generated
 	 */
 	AbstractMatcherConfiguration getMatcherConfiguration();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getMatcherConfiguration <em>Matcher Configuration</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getMatcherConfiguration <em>Matcher Configuration</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Matcher Configuration</em>' containment reference.
+	 * @param value the new value of the '<em>Matcher Configuration</em>' reference.
 	 * @see #getMatcherConfiguration()
 	 * @generated
 	 */
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AbstractAdviceBindingConfigurationImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AbstractAdviceBindingConfigurationImpl.java
index 33f7ba62250..bd657d8f95c 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AbstractAdviceBindingConfigurationImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AbstractAdviceBindingConfigurationImpl.java
@@ -11,7 +11,7 @@
  * 
  * Contributors:
  *  CEA LIST - Initial API and implementation
- *  Christian W. Damus - bug 568782
+ *  Christian W. Damus - bugs 568782, 568853
  */
 package org.eclipse.papyrus.infra.types.impl;
 
@@ -23,7 +23,6 @@ import org.eclipse.emf.ecore.InternalEObject;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
-import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration;
 import org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration;
@@ -45,6 +44,7 @@ import org.eclipse.papyrus.infra.types.operations.AbstractAdviceBindingConfigura
  * <ul>
  *   <li>{@link org.eclipse.papyrus.infra.types.impl.AbstractAdviceBindingConfigurationImpl#getIdentifier <em>Identifier</em>}</li>
  *   <li>{@link org.eclipse.papyrus.infra.types.impl.AbstractAdviceBindingConfigurationImpl#getTarget <em>Target</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.AbstractAdviceBindingConfigurationImpl#getOwningType <em>Owning Type</em>}</li>
  *   <li>{@link org.eclipse.papyrus.infra.types.impl.AbstractAdviceBindingConfigurationImpl#getContainerConfiguration <em>Container Configuration</em>}</li>
  *   <li>{@link org.eclipse.papyrus.infra.types.impl.AbstractAdviceBindingConfigurationImpl#getMatcherConfiguration <em>Matcher Configuration</em>}</li>
  *   <li>{@link org.eclipse.papyrus.infra.types.impl.AbstractAdviceBindingConfigurationImpl#getInheritance <em>Inheritance</em>}</li>
@@ -226,25 +226,69 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi
 		target = newTarget;
 		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__TARGET, oldTarget, target));
-		Resource.Internal eInternalResource = eInternalResource();
-		if (eInternalResource == null || !eInternalResource.isLoading()) {
-			ElementTypeConfiguration owningTarget = getOwningTarget();
-			if (owningTarget != null && owningTarget != newTarget) {
-				setOwningTarget(null);
-			}
-		}
 	}
 	
 	@Override
 	public void setTarget(ElementTypeConfiguration value) {
-		ElementTypeSetConfiguration typeSet = getElementTypeSet();
 		ElementTypeConfiguration owningTarget = getOwningTarget();
-		Resource.Internal eInternalResource = eInternalResource();
 		setTargetGen(value);
-		if (typeSet != null && owningTarget != null && eInternalContainer() == null && eInternalResource != null && !eInternalResource.isLoading()) {
-			// We unset the owning target and so need to be re-homed in set. But not while loading the resource!
-			typeSet.getAdviceBindingsConfigurations().add(this);
+		if (owningTarget != null && owningTarget != value) {
+			// Maintain the subset constraint
+			setOwningTarget(null);
+		}
+	}
+
+	public NotificationChain basicSetTarget(ElementTypeConfiguration newTarget, NotificationChain msgs) {
+		ElementTypeConfiguration oldTarget = target;
+		target = newTarget;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__TARGET, oldTarget, newTarget);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ElementTypeConfiguration getOwningType() {
+		if (eContainerFeatureID() != ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__OWNING_TYPE) return null;
+		return (ElementTypeConfiguration)eInternalContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetOwningType(ElementTypeConfiguration newOwningType, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject)newOwningType, ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__OWNING_TYPE, msgs);
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setOwningType(ElementTypeConfiguration newOwningType) {
+		if (newOwningType != eInternalContainer() || (eContainerFeatureID() != ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__OWNING_TYPE && newOwningType != null)) {
+			if (EcoreUtil.isAncestor(this, newOwningType))
+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+			NotificationChain msgs = null;
+			if (eInternalContainer() != null)
+				msgs = eBasicRemoveFromContainer(msgs);
+			if (newOwningType != null)
+				msgs = ((InternalEObject)newOwningType).eInverseAdd(this, ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS, ElementTypeConfiguration.class, msgs);
+			msgs = basicSetOwningType(newOwningType, msgs);
+			if (msgs != null) msgs.dispatch();
 		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__OWNING_TYPE, newOwningType, newOwningType));
 	}
 
 	/**
@@ -453,48 +497,38 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi
 	 */
 	@Override
 	public ElementTypeConfiguration getOwningTarget() {
-		if (eContainerFeatureID() != ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__OWNING_TARGET) return null;
-		return (ElementTypeConfiguration)eInternalContainer();
+		ElementTypeConfiguration owningTarget = basicGetOwningTarget();
+		return owningTarget != null && owningTarget.eIsProxy() ? (ElementTypeConfiguration)eResolveProxy((InternalEObject)owningTarget) : owningTarget;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
-	public NotificationChain basicSetOwningTarget(ElementTypeConfiguration newOwningTarget, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newOwningTarget, ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__OWNING_TARGET, msgs);
-		Resource.Internal eInternalResource = eInternalResource();
-		if (eInternalResource == null || !eInternalResource.isLoading()) {
-			if (newOwningTarget != null) {
-				if (newOwningTarget != target) {
-					setTarget(newOwningTarget);
-				}
-			}
-		}
-		return msgs;
+	public ElementTypeConfiguration basicGetOwningTarget() {
+		InternalEObject result = eInternalContainer();
+		return result instanceof ElementTypeConfiguration
+			? (ElementTypeConfiguration) result
+			: null;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	@Override
 	public void setOwningTarget(ElementTypeConfiguration newOwningTarget) {
-		if (newOwningTarget != eInternalContainer() || (eContainerFeatureID() != ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__OWNING_TARGET && newOwningTarget != null)) {
-			if (EcoreUtil.isAncestor(this, newOwningTarget))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newOwningTarget != null)
-				msgs = ((InternalEObject)newOwningTarget).eInverseAdd(this, ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__OWNED_ADVICE, ElementTypeConfiguration.class, msgs);
-			msgs = basicSetOwningTarget(newOwningTarget, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__OWNING_TARGET, newOwningTarget, newOwningTarget));
+		if (newOwningTarget != eInternalContainer()) {
+			setOwningType(newOwningTarget);
+			if (newOwningTarget != null) {
+				// Maintain the subset constraint
+				setTarget(newOwningTarget);
+			}
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+				ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__OWNING_TARGET, newOwningTarget, newOwningTarget));
 	}
 
 	/**
@@ -502,20 +536,35 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+	public NotificationChain eInverseAddGen(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__OWNING_SET:
+			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__OWNING_TYPE:
 				if (eInternalContainer() != null)
 					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetOwningSet((ElementTypeSetConfiguration)otherEnd, msgs);
-			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__OWNING_TARGET:
+				return basicSetOwningType((ElementTypeConfiguration)otherEnd, msgs);
+			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__OWNING_SET:
 				if (eInternalContainer() != null)
 					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetOwningTarget((ElementTypeConfiguration)otherEnd, msgs);
+				return basicSetOwningSet((ElementTypeSetConfiguration)otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
+	
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		NotificationChain result = eInverseAddGen(otherEnd, featureID, msgs);
+
+		switch (featureID) {
+		case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__OWNING_TYPE:
+			if (otherEnd != null) {
+				// Maintain the subset constraint
+				result = basicSetTarget((ElementTypeConfiguration) otherEnd, result);
+			}
+			break;
+		}
+
+		return result;
+	}
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -525,14 +574,14 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
+			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__OWNING_TYPE:
+				return basicSetOwningType(null, msgs);
 			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION:
 				return basicSetContainerConfiguration(null, msgs);
 			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION:
 				return basicSetMatcherConfiguration(null, msgs);
 			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__OWNING_SET:
 				return basicSetOwningSet(null, msgs);
-			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__OWNING_TARGET:
-				return basicSetOwningTarget(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -545,10 +594,10 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi
 	@Override
 	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
 		switch (eContainerFeatureID()) {
+			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__OWNING_TYPE:
+				return eInternalContainer().eInverseRemove(this, ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS, ElementTypeConfiguration.class, msgs);
 			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__OWNING_SET:
 				return eInternalContainer().eInverseRemove(this, ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS, ElementTypeSetConfiguration.class, msgs);
-			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__OWNING_TARGET:
-				return eInternalContainer().eInverseRemove(this, ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__OWNED_ADVICE, ElementTypeConfiguration.class, msgs);
 		}
 		return super.eBasicRemoveFromContainerFeature(msgs);
 	}
@@ -580,7 +629,8 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi
 				if (resolve) return getElementTypeSet();
 				return basicGetElementTypeSet();
 			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__OWNING_TARGET:
-				return getOwningTarget();
+				if (resolve) return getOwningTarget();
+				return basicGetOwningTarget();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -669,6 +719,8 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi
 				return IDENTIFIER_EDEFAULT == null ? identifier != null : !IDENTIFIER_EDEFAULT.equals(identifier);
 			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__TARGET:
 				return target != null;
+			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__OWNING_TYPE:
+				return getOwningType() != null;
 			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION:
 				return containerConfiguration != null;
 			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION:
@@ -682,7 +734,7 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi
 			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__ELEMENT_TYPE_SET:
 				return basicGetElementTypeSet() != null;
 			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__OWNING_TARGET:
-				return getOwningTarget() != null;
+				return basicGetOwningTarget() != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AbstractEditHelperAdviceConfigurationImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AbstractEditHelperAdviceConfigurationImpl.java
index eec04937b27..7d04f8e812b 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AbstractEditHelperAdviceConfigurationImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AbstractEditHelperAdviceConfigurationImpl.java
@@ -1,30 +1,29 @@
 /**
- * Copyright (c) 2014 CEA LIST.
- * 
- * 
+ * Copyright (c) 2014, 2020 CEA LIST, Christian W. Damus, and others.
+ *
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
  *
  * SPDX-License-Identifier: EPL-2.0
- * 
+ *
  * Contributors:
  *  CEA LIST - Initial API and implementation
+ *  Christian W. Damus - bug 568853
  */
 package org.eclipse.papyrus.infra.types.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
+import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.EcoreUtil;
-
 import org.eclipse.papyrus.infra.types.AbstractEditHelperAdviceConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
 import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
 import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration;
 
@@ -36,6 +35,7 @@ import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration;
  * The following features are implemented:
  * </p>
  * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.AbstractEditHelperAdviceConfigurationImpl#getOwningType <em>Owning Type</em>}</li>
  *   <li>{@link org.eclipse.papyrus.infra.types.impl.AbstractEditHelperAdviceConfigurationImpl#getTarget <em>Target</em>}</li>
  * </ul>
  *
@@ -43,6 +43,16 @@ import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration;
  */
 public abstract class AbstractEditHelperAdviceConfigurationImpl extends AdviceConfigurationImpl implements AbstractEditHelperAdviceConfiguration {
 	/**
+	 * The cached value of the '{@link #getTarget() <em>Target</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTarget()
+	 * @generated
+	 * @ordered
+	 */
+	protected SpecializationTypeConfiguration target;
+
+	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -67,9 +77,9 @@ public abstract class AbstractEditHelperAdviceConfigurationImpl extends AdviceCo
 	 * @generated
 	 */
 	@Override
-	public SpecializationTypeConfiguration getTarget() {
-		if (eContainerFeatureID() != ElementTypesConfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET) return null;
-		return (SpecializationTypeConfiguration)eInternalContainer();
+	public ElementTypeConfiguration getOwningType() {
+		if (eContainerFeatureID() != ElementTypesConfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__OWNING_TYPE) return null;
+		return (ElementTypeConfiguration)eInternalContainer();
 	}
 
 	/**
@@ -77,8 +87,15 @@ public abstract class AbstractEditHelperAdviceConfigurationImpl extends AdviceCo
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain basicSetTarget(SpecializationTypeConfiguration newTarget, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newTarget, ElementTypesConfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET, msgs);
+	@Override
+	public NotificationChain basicSetOwningType(ElementTypeConfiguration newOwningType, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject)newOwningType, ElementTypesConfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__OWNING_TYPE, msgs);
+		Resource.Internal eInternalResource = eInternalResource();
+		if (eInternalResource == null || !eInternalResource.isLoading()) {
+			if (target != null && target != newOwningType) {
+				setTarget(null);
+			}
+		}
 		return msgs;
 	}
 
@@ -88,13 +105,84 @@ public abstract class AbstractEditHelperAdviceConfigurationImpl extends AdviceCo
 	 * @generated
 	 */
 	@Override
-	public void setTarget(SpecializationTypeConfiguration newTarget) {
-		if (newTarget != eInternalContainer() || (eContainerFeatureID() != ElementTypesConfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET && newTarget != null)) {
-			if (EcoreUtil.isAncestor(this, newTarget))
+	public void setOwningType(ElementTypeConfiguration newOwningType) {
+		if (newOwningType != eInternalContainer() || (eContainerFeatureID() != ElementTypesConfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__OWNING_TYPE && newOwningType != null)) {
+			if (EcoreUtil.isAncestor(this, newOwningType))
 				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
 			NotificationChain msgs = null;
 			if (eInternalContainer() != null)
 				msgs = eBasicRemoveFromContainer(msgs);
+			if (newOwningType != null)
+				msgs = ((InternalEObject)newOwningType).eInverseAdd(this, ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS, ElementTypeConfiguration.class, msgs);
+			msgs = basicSetOwningType(newOwningType, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__OWNING_TYPE, newOwningType, newOwningType));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public SpecializationTypeConfiguration getTarget() {
+		if (target != null && target.eIsProxy()) {
+			InternalEObject oldTarget = (InternalEObject)target;
+			target = (SpecializationTypeConfiguration)eResolveProxy(oldTarget);
+			if (target != oldTarget) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ElementTypesConfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET, oldTarget, target));
+			}
+		}
+		return target;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public SpecializationTypeConfiguration basicGetTarget() {
+		return target;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetTarget(SpecializationTypeConfiguration newTarget, NotificationChain msgs) {
+		SpecializationTypeConfiguration oldTarget = target;
+		target = newTarget;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET, oldTarget, newTarget);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		Resource.Internal eInternalResource = eInternalResource();
+		if (eInternalResource == null || !eInternalResource.isLoading()) {
+			if (newTarget != null) {
+				ElementTypeConfiguration owningType = getOwningType();
+				if (newTarget != owningType) {
+					setOwningType(newTarget);
+				}
+			}
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setTarget(SpecializationTypeConfiguration newTarget) {
+		if (newTarget != target) {
+			NotificationChain msgs = null;
+			if (target != null)
+				msgs = ((InternalEObject)target).eInverseRemove(this, ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION, SpecializationTypeConfiguration.class, msgs);
 			if (newTarget != null)
 				msgs = ((InternalEObject)newTarget).eInverseAdd(this, ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION, SpecializationTypeConfiguration.class, msgs);
 			msgs = basicSetTarget(newTarget, msgs);
@@ -112,9 +200,13 @@ public abstract class AbstractEditHelperAdviceConfigurationImpl extends AdviceCo
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ElementTypesConfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET:
+			case ElementTypesConfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__OWNING_TYPE:
 				if (eInternalContainer() != null)
 					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetOwningType((ElementTypeConfiguration)otherEnd, msgs);
+			case ElementTypesConfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET:
+				if (target != null)
+					msgs = ((InternalEObject)target).eInverseRemove(this, ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION, SpecializationTypeConfiguration.class, msgs);
 				return basicSetTarget((SpecializationTypeConfiguration)otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
@@ -128,6 +220,8 @@ public abstract class AbstractEditHelperAdviceConfigurationImpl extends AdviceCo
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
+			case ElementTypesConfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__OWNING_TYPE:
+				return basicSetOwningType(null, msgs);
 			case ElementTypesConfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET:
 				return basicSetTarget(null, msgs);
 		}
@@ -142,8 +236,8 @@ public abstract class AbstractEditHelperAdviceConfigurationImpl extends AdviceCo
 	@Override
 	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
 		switch (eContainerFeatureID()) {
-			case ElementTypesConfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET:
-				return eInternalContainer().eInverseRemove(this, ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION, SpecializationTypeConfiguration.class, msgs);
+			case ElementTypesConfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__OWNING_TYPE:
+				return eInternalContainer().eInverseRemove(this, ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS, ElementTypeConfiguration.class, msgs);
 		}
 		return super.eBasicRemoveFromContainerFeature(msgs);
 	}
@@ -157,7 +251,8 @@ public abstract class AbstractEditHelperAdviceConfigurationImpl extends AdviceCo
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
 			case ElementTypesConfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET:
-				return getTarget();
+				if (resolve) return getTarget();
+				return basicGetTarget();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -200,10 +295,12 @@ public abstract class AbstractEditHelperAdviceConfigurationImpl extends AdviceCo
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
+			case ElementTypesConfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__OWNING_TYPE:
+				return getOwningType() != null;
 			case ElementTypesConfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET:
-				return getTarget() != null;
+				return target != null;
 		}
 		return super.eIsSet(featureID);
 	}
 
-} //AbstractEditHelperAdviceConfigurationImpl
+} // AbstractEditHelperAdviceConfigurationImpl
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AbstractMatcherConfigurationImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AbstractMatcherConfigurationImpl.java
index 22b96ec35a5..e908357a83b 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AbstractMatcherConfigurationImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AbstractMatcherConfigurationImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 CEA LIST.
+ * Copyright (c) 2014, 2020 CEA LIST, Christian W. Damus, and others.
  * 
  * 
  * All rights reserved. This program and the accompanying materials
@@ -11,24 +11,48 @@
  * 
  * Contributors:
  *  CEA LIST - Initial API and implementation
+ *  Christian W. Damus - bug 568853
  */
 package org.eclipse.papyrus.infra.types.impl;
 
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.ecore.EClass;
 
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
 import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration;
 
 /**
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Abstract Matcher Configuration</b></em>'.
  * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.AbstractMatcherConfigurationImpl#getOwningType <em>Owning Type</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.AbstractMatcherConfigurationImpl#getMatchedType <em>Matched Type</em>}</li>
+ * </ul>
  *
  * @generated
  */
-public abstract class AbstractMatcherConfigurationImpl extends MinimalEObjectImpl.Container implements AbstractMatcherConfiguration {
+public abstract class AbstractMatcherConfigurationImpl extends ConfigurationElementImpl implements AbstractMatcherConfiguration {
+	/**
+	 * The cached value of the '{@link #getMatchedType() <em>Matched Type</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMatchedType()
+	 * @generated
+	 * @ordered
+	 */
+	protected SpecializationTypeConfiguration matchedType;
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -48,4 +72,235 @@ public abstract class AbstractMatcherConfigurationImpl extends MinimalEObjectImp
 		return ElementTypesConfigurationsPackage.Literals.ABSTRACT_MATCHER_CONFIGURATION;
 	}
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ElementTypeConfiguration getOwningType() {
+		if (eContainerFeatureID() != ElementTypesConfigurationsPackage.ABSTRACT_MATCHER_CONFIGURATION__OWNING_TYPE) return null;
+		return (ElementTypeConfiguration)eInternalContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetOwningType(ElementTypeConfiguration newOwningType, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject)newOwningType, ElementTypesConfigurationsPackage.ABSTRACT_MATCHER_CONFIGURATION__OWNING_TYPE, msgs);
+		Resource.Internal eInternalResource = eInternalResource();
+		if (eInternalResource == null || !eInternalResource.isLoading()) {
+			if (matchedType != null && matchedType != newOwningType) {
+				setMatchedType(null);
+			}
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setOwningType(ElementTypeConfiguration newOwningType) {
+		if (newOwningType != eInternalContainer() || (eContainerFeatureID() != ElementTypesConfigurationsPackage.ABSTRACT_MATCHER_CONFIGURATION__OWNING_TYPE && newOwningType != null)) {
+			if (EcoreUtil.isAncestor(this, newOwningType))
+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+			NotificationChain msgs = null;
+			if (eInternalContainer() != null)
+				msgs = eBasicRemoveFromContainer(msgs);
+			if (newOwningType != null)
+				msgs = ((InternalEObject)newOwningType).eInverseAdd(this, ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS, ElementTypeConfiguration.class, msgs);
+			msgs = basicSetOwningType(newOwningType, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.ABSTRACT_MATCHER_CONFIGURATION__OWNING_TYPE, newOwningType, newOwningType));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public SpecializationTypeConfiguration getMatchedType() {
+		if (matchedType != null && matchedType.eIsProxy()) {
+			InternalEObject oldMatchedType = (InternalEObject)matchedType;
+			matchedType = (SpecializationTypeConfiguration)eResolveProxy(oldMatchedType);
+			if (matchedType != oldMatchedType) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ElementTypesConfigurationsPackage.ABSTRACT_MATCHER_CONFIGURATION__MATCHED_TYPE, oldMatchedType, matchedType));
+			}
+		}
+		return matchedType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public SpecializationTypeConfiguration basicGetMatchedType() {
+		return matchedType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetMatchedType(SpecializationTypeConfiguration newMatchedType, NotificationChain msgs) {
+		SpecializationTypeConfiguration oldMatchedType = matchedType;
+		matchedType = newMatchedType;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.ABSTRACT_MATCHER_CONFIGURATION__MATCHED_TYPE, oldMatchedType, newMatchedType);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		Resource.Internal eInternalResource = eInternalResource();
+		if (eInternalResource == null || !eInternalResource.isLoading()) {
+			if (newMatchedType != null) {
+				ElementTypeConfiguration owningType = getOwningType();
+				if (newMatchedType != owningType) {
+					setOwningType(newMatchedType);
+				}
+			}
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setMatchedType(SpecializationTypeConfiguration newMatchedType) {
+		if (newMatchedType != matchedType) {
+			NotificationChain msgs = null;
+			if (matchedType != null)
+				msgs = ((InternalEObject)matchedType).eInverseRemove(this, ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION, SpecializationTypeConfiguration.class, msgs);
+			if (newMatchedType != null)
+				msgs = ((InternalEObject)newMatchedType).eInverseAdd(this, ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION, SpecializationTypeConfiguration.class, msgs);
+			msgs = basicSetMatchedType(newMatchedType, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.ABSTRACT_MATCHER_CONFIGURATION__MATCHED_TYPE, newMatchedType, newMatchedType));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case ElementTypesConfigurationsPackage.ABSTRACT_MATCHER_CONFIGURATION__OWNING_TYPE:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetOwningType((ElementTypeConfiguration)otherEnd, msgs);
+			case ElementTypesConfigurationsPackage.ABSTRACT_MATCHER_CONFIGURATION__MATCHED_TYPE:
+				if (matchedType != null)
+					msgs = ((InternalEObject)matchedType).eInverseRemove(this, ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION, SpecializationTypeConfiguration.class, msgs);
+				return basicSetMatchedType((SpecializationTypeConfiguration)otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case ElementTypesConfigurationsPackage.ABSTRACT_MATCHER_CONFIGURATION__OWNING_TYPE:
+				return basicSetOwningType(null, msgs);
+			case ElementTypesConfigurationsPackage.ABSTRACT_MATCHER_CONFIGURATION__MATCHED_TYPE:
+				return basicSetMatchedType(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+		switch (eContainerFeatureID()) {
+			case ElementTypesConfigurationsPackage.ABSTRACT_MATCHER_CONFIGURATION__OWNING_TYPE:
+				return eInternalContainer().eInverseRemove(this, ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS, ElementTypeConfiguration.class, msgs);
+		}
+		return super.eBasicRemoveFromContainerFeature(msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case ElementTypesConfigurationsPackage.ABSTRACT_MATCHER_CONFIGURATION__MATCHED_TYPE:
+				if (resolve) return getMatchedType();
+				return basicGetMatchedType();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case ElementTypesConfigurationsPackage.ABSTRACT_MATCHER_CONFIGURATION__MATCHED_TYPE:
+				setMatchedType((SpecializationTypeConfiguration)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ElementTypesConfigurationsPackage.ABSTRACT_MATCHER_CONFIGURATION__MATCHED_TYPE:
+				setMatchedType((SpecializationTypeConfiguration)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ElementTypesConfigurationsPackage.ABSTRACT_MATCHER_CONFIGURATION__OWNING_TYPE:
+				return getOwningType() != null;
+			case ElementTypesConfigurationsPackage.ABSTRACT_MATCHER_CONFIGURATION__MATCHED_TYPE:
+				return matchedType != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
 } //AbstractMatcherConfigurationImpl
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ConfigurationElementImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ConfigurationElementImpl.java
index 820184316bf..33ae1ab5f05 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ConfigurationElementImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ConfigurationElementImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 CEA LIST.
+ * Copyright (c) 2014, 2020 CEA LIST, Christian W. Damus, and others.
  * 
  * 
  * All rights reserved. This program and the accompanying materials
@@ -11,17 +11,22 @@
  * 
  * Contributors:
  *  CEA LIST - Initial API and implementation
+ *  Christian W. Damus - bug 568853
  */
 package org.eclipse.papyrus.infra.types.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
+import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.ecore.EClass;
 
+import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
+import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.papyrus.infra.types.ConfigurationElement;
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
 import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
 
 /**
@@ -33,6 +38,7 @@ import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
  * </p>
  * <ul>
  *   <li>{@link org.eclipse.papyrus.infra.types.impl.ConfigurationElementImpl#getDescription <em>Description</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.ConfigurationElementImpl#getOwningType <em>Owning Type</em>}</li>
  * </ul>
  *
  * @generated
@@ -106,10 +112,99 @@ public abstract class ConfigurationElementImpl extends MinimalEObjectImpl.Contai
 	 * @generated
 	 */
 	@Override
+	public ElementTypeConfiguration getOwningType() {
+		if (eContainerFeatureID() != ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__OWNING_TYPE) return null;
+		return (ElementTypeConfiguration)eInternalContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetOwningType(ElementTypeConfiguration newOwningType, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject)newOwningType, ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__OWNING_TYPE, msgs);
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setOwningType(ElementTypeConfiguration newOwningType) {
+		if (newOwningType != eInternalContainer() || (eContainerFeatureID() != ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__OWNING_TYPE && newOwningType != null)) {
+			if (EcoreUtil.isAncestor(this, newOwningType))
+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+			NotificationChain msgs = null;
+			if (eInternalContainer() != null)
+				msgs = eBasicRemoveFromContainer(msgs);
+			if (newOwningType != null)
+				msgs = ((InternalEObject)newOwningType).eInverseAdd(this, ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS, ElementTypeConfiguration.class, msgs);
+			msgs = basicSetOwningType(newOwningType, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__OWNING_TYPE, newOwningType, newOwningType));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__OWNING_TYPE:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetOwningType((ElementTypeConfiguration)otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__OWNING_TYPE:
+				return basicSetOwningType(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+		switch (eContainerFeatureID()) {
+			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__OWNING_TYPE:
+				return eInternalContainer().eInverseRemove(this, ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS, ElementTypeConfiguration.class, msgs);
+		}
+		return super.eBasicRemoveFromContainerFeature(msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
 			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__DESCRIPTION:
 				return getDescription();
+			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__OWNING_TYPE:
+				return getOwningType();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -125,6 +220,9 @@ public abstract class ConfigurationElementImpl extends MinimalEObjectImpl.Contai
 			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__DESCRIPTION:
 				setDescription((String)newValue);
 				return;
+			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__OWNING_TYPE:
+				setOwningType((ElementTypeConfiguration)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -140,6 +238,9 @@ public abstract class ConfigurationElementImpl extends MinimalEObjectImpl.Contai
 			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__DESCRIPTION:
 				setDescription(DESCRIPTION_EDEFAULT);
 				return;
+			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__OWNING_TYPE:
+				setOwningType((ElementTypeConfiguration)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -154,6 +255,8 @@ public abstract class ConfigurationElementImpl extends MinimalEObjectImpl.Contai
 		switch (featureID) {
 			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__DESCRIPTION:
 				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
+			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__OWNING_TYPE:
+				return getOwningType() != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ContainerConfigurationImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ContainerConfigurationImpl.java
index 1fe05192d09..af275dfcd7c 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ContainerConfigurationImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ContainerConfigurationImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 CEA LIST.
+ * Copyright (c) 2014, 2020 CEA LIST, Christian W. Damus, and others.
  * 
  * 
  * All rights reserved. This program and the accompanying materials
@@ -11,6 +11,7 @@
  * 
  * Contributors:
  *  CEA LIST - Initial API and implementation
+ *  Christian W. Damus - bug 568853
  */
 package org.eclipse.papyrus.infra.types.impl;
 
@@ -26,13 +27,15 @@ import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.InternalEObject;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
+import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 
+import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration;
 import org.eclipse.papyrus.infra.types.ContainerConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
 import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration;
 
 /**
  * <!-- begin-user-doc -->
@@ -42,13 +45,15 @@ import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
  * The following features are implemented:
  * </p>
  * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.ContainerConfigurationImpl#getOwningType <em>Owning Type</em>}</li>
  *   <li>{@link org.eclipse.papyrus.infra.types.impl.ContainerConfigurationImpl#getContainerMatcherConfiguration <em>Container Matcher Configuration</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.ContainerConfigurationImpl#getContainedType <em>Contained Type</em>}</li>
  *   <li>{@link org.eclipse.papyrus.infra.types.impl.ContainerConfigurationImpl#getEContainmentFeatures <em>EContainment Features</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class ContainerConfigurationImpl extends MinimalEObjectImpl.Container implements ContainerConfiguration {
+public class ContainerConfigurationImpl extends ConfigurationElementImpl implements ContainerConfiguration {
 	/**
 	 * The cached value of the '{@link #getContainerMatcherConfiguration() <em>Container Matcher Configuration</em>}' containment reference.
 	 * <!-- begin-user-doc -->
@@ -60,6 +65,16 @@ public class ContainerConfigurationImpl extends MinimalEObjectImpl.Container imp
 	protected AbstractMatcherConfiguration containerMatcherConfiguration;
 
 	/**
+	 * The cached value of the '{@link #getContainedType() <em>Contained Type</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getContainedType()
+	 * @generated
+	 * @ordered
+	 */
+	protected SpecializationTypeConfiguration containedType;
+
+	/**
 	 * The cached value of the '{@link #getEContainmentFeatures() <em>EContainment Features</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -94,6 +109,55 @@ public class ContainerConfigurationImpl extends MinimalEObjectImpl.Container imp
 	 * @generated
 	 */
 	@Override
+	public ElementTypeConfiguration getOwningType() {
+		if (eContainerFeatureID() != ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__OWNING_TYPE) return null;
+		return (ElementTypeConfiguration)eInternalContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetOwningType(ElementTypeConfiguration newOwningType, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject)newOwningType, ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__OWNING_TYPE, msgs);
+		Resource.Internal eInternalResource = eInternalResource();
+		if (eInternalResource == null || !eInternalResource.isLoading()) {
+			if (containedType != null && containedType != newOwningType) {
+				setContainedType(null);
+			}
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setOwningType(ElementTypeConfiguration newOwningType) {
+		if (newOwningType != eInternalContainer() || (eContainerFeatureID() != ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__OWNING_TYPE && newOwningType != null)) {
+			if (EcoreUtil.isAncestor(this, newOwningType))
+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+			NotificationChain msgs = null;
+			if (eInternalContainer() != null)
+				msgs = eBasicRemoveFromContainer(msgs);
+			if (newOwningType != null)
+				msgs = ((InternalEObject)newOwningType).eInverseAdd(this, ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS, ElementTypeConfiguration.class, msgs);
+			msgs = basicSetOwningType(newOwningType, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__OWNING_TYPE, newOwningType, newOwningType));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
 	public AbstractMatcherConfiguration getContainerMatcherConfiguration() {
 		return containerMatcherConfiguration;
 	}
@@ -139,6 +203,77 @@ public class ContainerConfigurationImpl extends MinimalEObjectImpl.Container imp
 	 * @generated
 	 */
 	@Override
+	public SpecializationTypeConfiguration getContainedType() {
+		if (containedType != null && containedType.eIsProxy()) {
+			InternalEObject oldContainedType = (InternalEObject)containedType;
+			containedType = (SpecializationTypeConfiguration)eResolveProxy(oldContainedType);
+			if (containedType != oldContainedType) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__CONTAINED_TYPE, oldContainedType, containedType));
+			}
+		}
+		return containedType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public SpecializationTypeConfiguration basicGetContainedType() {
+		return containedType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetContainedType(SpecializationTypeConfiguration newContainedType, NotificationChain msgs) {
+		SpecializationTypeConfiguration oldContainedType = containedType;
+		containedType = newContainedType;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__CONTAINED_TYPE, oldContainedType, newContainedType);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		Resource.Internal eInternalResource = eInternalResource();
+		if (eInternalResource == null || !eInternalResource.isLoading()) {
+			if (newContainedType != null) {
+				ElementTypeConfiguration owningType = getOwningType();
+				if (newContainedType != owningType) {
+					setOwningType(newContainedType);
+				}
+			}
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setContainedType(SpecializationTypeConfiguration newContainedType) {
+		if (newContainedType != containedType) {
+			NotificationChain msgs = null;
+			if (containedType != null)
+				msgs = ((InternalEObject)containedType).eInverseRemove(this, ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION, SpecializationTypeConfiguration.class, msgs);
+			if (newContainedType != null)
+				msgs = ((InternalEObject)newContainedType).eInverseAdd(this, ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION, SpecializationTypeConfiguration.class, msgs);
+			msgs = basicSetContainedType(newContainedType, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__CONTAINED_TYPE, newContainedType, newContainedType));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
 	public EList<EReference> getEContainmentFeatures() {
 		if (eContainmentFeatures == null) {
 			eContainmentFeatures = new EObjectResolvingEList<EReference>(EReference.class, this, ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__ECONTAINMENT_FEATURES);
@@ -152,10 +287,34 @@ public class ContainerConfigurationImpl extends MinimalEObjectImpl.Container imp
 	 * @generated
 	 */
 	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__OWNING_TYPE:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetOwningType((ElementTypeConfiguration)otherEnd, msgs);
+			case ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__CONTAINED_TYPE:
+				if (containedType != null)
+					msgs = ((InternalEObject)containedType).eInverseRemove(this, ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION, SpecializationTypeConfiguration.class, msgs);
+				return basicSetContainedType((SpecializationTypeConfiguration)otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
+			case ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__OWNING_TYPE:
+				return basicSetOwningType(null, msgs);
 			case ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__CONTAINER_MATCHER_CONFIGURATION:
 				return basicSetContainerMatcherConfiguration(null, msgs);
+			case ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__CONTAINED_TYPE:
+				return basicSetContainedType(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -166,10 +325,27 @@ public class ContainerConfigurationImpl extends MinimalEObjectImpl.Container imp
 	 * @generated
 	 */
 	@Override
+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+		switch (eContainerFeatureID()) {
+			case ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__OWNING_TYPE:
+				return eInternalContainer().eInverseRemove(this, ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS, ElementTypeConfiguration.class, msgs);
+		}
+		return super.eBasicRemoveFromContainerFeature(msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
 			case ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__CONTAINER_MATCHER_CONFIGURATION:
 				return getContainerMatcherConfiguration();
+			case ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__CONTAINED_TYPE:
+				if (resolve) return getContainedType();
+				return basicGetContainedType();
 			case ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__ECONTAINMENT_FEATURES:
 				return getEContainmentFeatures();
 		}
@@ -188,6 +364,9 @@ public class ContainerConfigurationImpl extends MinimalEObjectImpl.Container imp
 			case ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__CONTAINER_MATCHER_CONFIGURATION:
 				setContainerMatcherConfiguration((AbstractMatcherConfiguration)newValue);
 				return;
+			case ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__CONTAINED_TYPE:
+				setContainedType((SpecializationTypeConfiguration)newValue);
+				return;
 			case ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__ECONTAINMENT_FEATURES:
 				getEContainmentFeatures().clear();
 				getEContainmentFeatures().addAll((Collection<? extends EReference>)newValue);
@@ -207,6 +386,9 @@ public class ContainerConfigurationImpl extends MinimalEObjectImpl.Container imp
 			case ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__CONTAINER_MATCHER_CONFIGURATION:
 				setContainerMatcherConfiguration((AbstractMatcherConfiguration)null);
 				return;
+			case ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__CONTAINED_TYPE:
+				setContainedType((SpecializationTypeConfiguration)null);
+				return;
 			case ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__ECONTAINMENT_FEATURES:
 				getEContainmentFeatures().clear();
 				return;
@@ -222,8 +404,12 @@ public class ContainerConfigurationImpl extends MinimalEObjectImpl.Container imp
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
+			case ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__OWNING_TYPE:
+				return getOwningType() != null;
 			case ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__CONTAINER_MATCHER_CONFIGURATION:
 				return containerMatcherConfiguration != null;
+			case ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__CONTAINED_TYPE:
+				return containedType != null;
 			case ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__ECONTAINMENT_FEATURES:
 				return eContainmentFeatures != null && !eContainmentFeatures.isEmpty();
 		}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypeConfigurationImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypeConfigurationImpl.java
index e41384751aa..ee770dde8db 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypeConfigurationImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypeConfigurationImpl.java
@@ -11,7 +11,7 @@
  * 
  * Contributors:
  *  CEA LIST - Initial API and implementation
- *  Christian W. Damus - bug 568782
+ *  Christian W. Damus - bugs 568782, 568853
  */
 package org.eclipse.papyrus.infra.types.impl;
 
@@ -24,17 +24,18 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration;
+import org.eclipse.papyrus.infra.types.ConfigurationElement;
 import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
 import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;
 import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
 import org.eclipse.papyrus.infra.types.IconEntry;
 import org.eclipse.papyrus.infra.types.IdentifiedConfiguration;
 import org.eclipse.papyrus.infra.types.NamedConfiguration;
+import org.eclipse.uml2.common.util.DerivedSubsetEObjectEList;
 
 /**
  * <!-- begin-user-doc -->
@@ -46,6 +47,7 @@ import org.eclipse.papyrus.infra.types.NamedConfiguration;
  * <ul>
  *   <li>{@link org.eclipse.papyrus.infra.types.impl.ElementTypeConfigurationImpl#getIdentifier <em>Identifier</em>}</li>
  *   <li>{@link org.eclipse.papyrus.infra.types.impl.ElementTypeConfigurationImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.ElementTypeConfigurationImpl#getOwnedConfigurations <em>Owned Configurations</em>}</li>
  *   <li>{@link org.eclipse.papyrus.infra.types.impl.ElementTypeConfigurationImpl#getHint <em>Hint</em>}</li>
  *   <li>{@link org.eclipse.papyrus.infra.types.impl.ElementTypeConfigurationImpl#getKind <em>Kind</em>}</li>
  *   <li>{@link org.eclipse.papyrus.infra.types.impl.ElementTypeConfigurationImpl#getIconEntry <em>Icon Entry</em>}</li>
@@ -97,6 +99,16 @@ public abstract class ElementTypeConfigurationImpl extends ConfigurationElementI
 	protected String name = NAME_EDEFAULT;
 
 	/**
+	 * The cached value of the '{@link #getOwnedConfigurations() <em>Owned Configurations</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getOwnedConfigurations()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<ConfigurationElement> ownedConfigurations;
+
+	/**
 	 * The default value of the '{@link #getHint() <em>Hint</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -147,16 +159,6 @@ public abstract class ElementTypeConfigurationImpl extends ConfigurationElementI
 	protected IconEntry iconEntry;
 
 	/**
-	 * The cached value of the '{@link #getOwnedAdvice() <em>Owned Advice</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOwnedAdvice()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<AbstractAdviceBindingConfiguration> ownedAdvice;
-
-	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -227,6 +229,19 @@ public abstract class ElementTypeConfigurationImpl extends ConfigurationElementI
 	 * @generated
 	 */
 	@Override
+	public EList<ConfigurationElement> getOwnedConfigurations() {
+		if (ownedConfigurations == null) {
+			ownedConfigurations = new EObjectContainmentWithInverseEList<ConfigurationElement>(ConfigurationElement.class, this, ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS, ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__OWNING_TYPE);
+		}
+		return ownedConfigurations;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
 	public String getHint() {
 		return hint;
 	}
@@ -315,17 +330,25 @@ public abstract class ElementTypeConfigurationImpl extends ConfigurationElementI
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	@Override
 	public EList<AbstractAdviceBindingConfiguration> getOwnedAdvice() {
-		if (ownedAdvice == null) {
-			ownedAdvice = new EObjectContainmentWithInverseEList<AbstractAdviceBindingConfiguration>(AbstractAdviceBindingConfiguration.class, this, ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__OWNED_ADVICE, ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__OWNING_TARGET);
-		}
-		return ownedAdvice;
+		return new DerivedSubsetEObjectEList<AbstractAdviceBindingConfiguration>(AbstractAdviceBindingConfiguration.class, this,
+			ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS, OWNED_ADVICE_ESUPERSETS);
 	}
 
 	/**
+	 * The array of superset feature identifiers for the '{@link #getOwnedAdvice() <em>Owned Advice</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getOwnedAdvice()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int[] OWNED_ADVICE_ESUPERSETS = new int[] {ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS};
+
+	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -377,8 +400,8 @@ public abstract class ElementTypeConfigurationImpl extends ConfigurationElementI
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__OWNED_ADVICE:
-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getOwnedAdvice()).basicAdd(otherEnd, msgs);
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getOwnedConfigurations()).basicAdd(otherEnd, msgs);
 			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__OWNING_SET:
 				if (eInternalContainer() != null)
 					msgs = eBasicRemoveFromContainer(msgs);
@@ -395,10 +418,10 @@ public abstract class ElementTypeConfigurationImpl extends ConfigurationElementI
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS:
+				return ((InternalEList<?>)getOwnedConfigurations()).basicRemove(otherEnd, msgs);
 			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY:
 				return basicSetIconEntry(null, msgs);
-			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__OWNED_ADVICE:
-				return ((InternalEList<?>)getOwnedAdvice()).basicRemove(otherEnd, msgs);
 			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__OWNING_SET:
 				return basicSetOwningSet(null, msgs);
 		}
@@ -431,6 +454,8 @@ public abstract class ElementTypeConfigurationImpl extends ConfigurationElementI
 				return getIdentifier();
 			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__NAME:
 				return getName();
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS:
+				return getOwnedConfigurations();
 			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__HINT:
 				return getHint();
 			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__KIND:
@@ -460,6 +485,10 @@ public abstract class ElementTypeConfigurationImpl extends ConfigurationElementI
 			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__NAME:
 				setName((String)newValue);
 				return;
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS:
+				getOwnedConfigurations().clear();
+				getOwnedConfigurations().addAll((Collection<? extends ConfigurationElement>)newValue);
+				return;
 			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__HINT:
 				setHint((String)newValue);
 				return;
@@ -494,6 +523,9 @@ public abstract class ElementTypeConfigurationImpl extends ConfigurationElementI
 			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__NAME:
 				setName(NAME_EDEFAULT);
 				return;
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS:
+				getOwnedConfigurations().clear();
+				return;
 			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__HINT:
 				setHint(HINT_EDEFAULT);
 				return;
@@ -525,6 +557,8 @@ public abstract class ElementTypeConfigurationImpl extends ConfigurationElementI
 				return IDENTIFIER_EDEFAULT == null ? identifier != null : !IDENTIFIER_EDEFAULT.equals(identifier);
 			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__NAME:
 				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS:
+				return ownedConfigurations != null && !ownedConfigurations.isEmpty();
 			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__HINT:
 				return HINT_EDEFAULT == null ? hint != null : !HINT_EDEFAULT.equals(hint);
 			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__KIND:
@@ -532,7 +566,7 @@ public abstract class ElementTypeConfigurationImpl extends ConfigurationElementI
 			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY:
 				return iconEntry != null;
 			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__OWNED_ADVICE:
-				return ownedAdvice != null && !ownedAdvice.isEmpty();
+				return !getOwnedAdvice().isEmpty();
 			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__OWNING_SET:
 				return getOwningSet() != null;
 		}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypeSetConfigurationImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypeSetConfigurationImpl.java
index b19649fa422..8484988952c 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypeSetConfigurationImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypeSetConfigurationImpl.java
@@ -11,7 +11,7 @@
  * 
  * Contributors:
  *  CEA LIST - Initial API and implementation
- *  Christian W. Damus - bug 568782
+ *  Christian W. Damus - bugs 568782, 568853
  */
 package org.eclipse.papyrus.infra.types.impl;
 
@@ -45,9 +45,9 @@ import org.eclipse.papyrus.infra.types.operations.ElementTypeSetConfigurationOpe
  * <ul>
  *   <li>{@link org.eclipse.papyrus.infra.types.impl.ElementTypeSetConfigurationImpl#getIdentifier <em>Identifier</em>}</li>
  *   <li>{@link org.eclipse.papyrus.infra.types.impl.ElementTypeSetConfigurationImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.types.impl.ElementTypeSetConfigurationImpl#getElementTypeConfigurations <em>Element Type Configurations</em>}</li>
  *   <li>{@link org.eclipse.papyrus.infra.types.impl.ElementTypeSetConfigurationImpl#getAdviceBindingsConfigurations <em>Advice Bindings Configurations</em>}</li>
  *   <li>{@link org.eclipse.papyrus.infra.types.impl.ElementTypeSetConfigurationImpl#getAllAdviceBindings <em>All Advice Bindings</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.ElementTypeSetConfigurationImpl#getElementTypeConfigurations <em>Element Type Configurations</em>}</li>
  *   <li>{@link org.eclipse.papyrus.infra.types.impl.ElementTypeSetConfigurationImpl#getMetamodelNsURI <em>Metamodel Ns URI</em>}</li>
  * </ul>
  *
@@ -95,24 +95,24 @@ public class ElementTypeSetConfigurationImpl extends ConfigurationElementImpl im
 	protected String name = NAME_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getElementTypeConfigurations() <em>Element Type Configurations</em>}' containment reference list.
+	 * The cached value of the '{@link #getAdviceBindingsConfigurations() <em>Advice Bindings Configurations</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getElementTypeConfigurations()
+	 * @see #getAdviceBindingsConfigurations()
 	 * @generated
 	 * @ordered
 	 */
-	protected EList<ElementTypeConfiguration> elementTypeConfigurations;
+	protected EList<AbstractAdviceBindingConfiguration> adviceBindingsConfigurations;
 
 	/**
-	 * The cached value of the '{@link #getAdviceBindingsConfigurations() <em>Advice Bindings Configurations</em>}' containment reference list.
+	 * The cached value of the '{@link #getElementTypeConfigurations() <em>Element Type Configurations</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getAdviceBindingsConfigurations()
+	 * @see #getElementTypeConfigurations()
 	 * @generated
 	 * @ordered
 	 */
-	protected EList<AbstractAdviceBindingConfiguration> adviceBindingsConfigurations;
+	protected EList<ElementTypeConfiguration> elementTypeConfigurations;
 
 	/**
 	 * The default value of the '{@link #getMetamodelNsURI() <em>Metamodel Ns URI</em>}' attribute.
@@ -267,10 +267,10 @@ public class ElementTypeSetConfigurationImpl extends ConfigurationElementImpl im
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS:
-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getElementTypeConfigurations()).basicAdd(otherEnd, msgs);
 			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS:
 				return ((InternalEList<InternalEObject>)(InternalEList<?>)getAdviceBindingsConfigurations()).basicAdd(otherEnd, msgs);
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getElementTypeConfigurations()).basicAdd(otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
@@ -283,10 +283,10 @@ public class ElementTypeSetConfigurationImpl extends ConfigurationElementImpl im
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS:
-				return ((InternalEList<?>)getElementTypeConfigurations()).basicRemove(otherEnd, msgs);
 			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS:
 				return ((InternalEList<?>)getAdviceBindingsConfigurations()).basicRemove(otherEnd, msgs);
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS:
+				return ((InternalEList<?>)getElementTypeConfigurations()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -303,12 +303,12 @@ public class ElementTypeSetConfigurationImpl extends ConfigurationElementImpl im
 				return getIdentifier();
 			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__NAME:
 				return getName();
-			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS:
-				return getElementTypeConfigurations();
 			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS:
 				return getAdviceBindingsConfigurations();
 			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ALL_ADVICE_BINDINGS:
 				return getAllAdviceBindings();
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS:
+				return getElementTypeConfigurations();
 			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__METAMODEL_NS_URI:
 				return getMetamodelNsURI();
 		}
@@ -330,14 +330,14 @@ public class ElementTypeSetConfigurationImpl extends ConfigurationElementImpl im
 			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__NAME:
 				setName((String)newValue);
 				return;
-			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS:
-				getElementTypeConfigurations().clear();
-				getElementTypeConfigurations().addAll((Collection<? extends ElementTypeConfiguration>)newValue);
-				return;
 			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS:
 				getAdviceBindingsConfigurations().clear();
 				getAdviceBindingsConfigurations().addAll((Collection<? extends AbstractAdviceBindingConfiguration>)newValue);
 				return;
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS:
+				getElementTypeConfigurations().clear();
+				getElementTypeConfigurations().addAll((Collection<? extends ElementTypeConfiguration>)newValue);
+				return;
 			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__METAMODEL_NS_URI:
 				setMetamodelNsURI((String)newValue);
 				return;
@@ -359,12 +359,12 @@ public class ElementTypeSetConfigurationImpl extends ConfigurationElementImpl im
 			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__NAME:
 				setName(NAME_EDEFAULT);
 				return;
-			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS:
-				getElementTypeConfigurations().clear();
-				return;
 			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS:
 				getAdviceBindingsConfigurations().clear();
 				return;
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS:
+				getElementTypeConfigurations().clear();
+				return;
 			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__METAMODEL_NS_URI:
 				setMetamodelNsURI(METAMODEL_NS_URI_EDEFAULT);
 				return;
@@ -384,12 +384,12 @@ public class ElementTypeSetConfigurationImpl extends ConfigurationElementImpl im
 				return IDENTIFIER_EDEFAULT == null ? identifier != null : !IDENTIFIER_EDEFAULT.equals(identifier);
 			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__NAME:
 				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS:
-				return elementTypeConfigurations != null && !elementTypeConfigurations.isEmpty();
 			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS:
 				return adviceBindingsConfigurations != null && !adviceBindingsConfigurations.isEmpty();
 			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ALL_ADVICE_BINDINGS:
 				return !getAllAdviceBindings().isEmpty();
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS:
+				return elementTypeConfigurations != null && !elementTypeConfigurations.isEmpty();
 			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__METAMODEL_NS_URI:
 				return METAMODEL_NS_URI_EDEFAULT == null ? metamodelNsURI != null : !METAMODEL_NS_URI_EDEFAULT.equals(metamodelNsURI);
 		}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypesConfigurationsPackageImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypesConfigurationsPackageImpl.java
index 61f99babd95..f346c89b42f 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypesConfigurationsPackageImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypesConfigurationsPackageImpl.java
@@ -11,7 +11,7 @@
  * 
  * Contributors:
  *  CEA LIST - Initial API and implementation
- *  Christian W. Damus - bug 568782
+ *  Christian W. Damus - bugs 568782, 568853
  */
 package org.eclipse.papyrus.infra.types.impl;
 
@@ -281,7 +281,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
 	 */
 	@Override
 	public EReference getElementTypeSetConfiguration_ElementTypeConfigurations() {
-		return (EReference)elementTypeSetConfigurationEClass.getEStructuralFeatures().get(0);
+		return (EReference)elementTypeSetConfigurationEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -291,7 +291,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
 	 */
 	@Override
 	public EReference getElementTypeSetConfiguration_AdviceBindingsConfigurations() {
-		return (EReference)elementTypeSetConfigurationEClass.getEStructuralFeatures().get(1);
+		return (EReference)elementTypeSetConfigurationEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -301,7 +301,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
 	 */
 	@Override
 	public EReference getElementTypeSetConfiguration_AllAdviceBindings() {
-		return (EReference)elementTypeSetConfigurationEClass.getEStructuralFeatures().get(2);
+		return (EReference)elementTypeSetConfigurationEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -350,6 +350,16 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
 	 * @generated
 	 */
 	@Override
+	public EReference getConfigurationElement_OwningType() {
+		return (EReference)configurationElementEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
 	public EClass getElementTypeConfiguration() {
 		return elementTypeConfigurationEClass;
 	}
@@ -410,6 +420,16 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
 	 * @generated
 	 */
 	@Override
+	public EReference getElementTypeConfiguration_OwnedConfigurations() {
+		return (EReference)elementTypeConfigurationEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
 	public EClass getIconEntry() {
 		return iconEntryEClass;
 	}
@@ -630,7 +650,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
 	 * @generated
 	 */
 	@Override
-	public EReference getContainerConfiguration_EContainmentFeatures() {
+	public EReference getContainerConfiguration_ContainedType() {
 		return (EReference)containerConfigurationEClass.getEStructuralFeatures().get(1);
 	}
 
@@ -640,6 +660,16 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
 	 * @generated
 	 */
 	@Override
+	public EReference getContainerConfiguration_EContainmentFeatures() {
+		return (EReference)containerConfigurationEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
 	public EClass getAbstractMatcherConfiguration() {
 		return abstractMatcherConfigurationEClass;
 	}
@@ -650,6 +680,16 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
 	 * @generated
 	 */
 	@Override
+	public EReference getAbstractMatcherConfiguration_MatchedType() {
+		return (EReference)abstractMatcherConfigurationEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
 	public EClass getSpecializationTypeConfiguration() {
 		return specializationTypeConfigurationEClass;
 	}
@@ -681,7 +721,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
 	 */
 	@Override
 	public EReference getSpecializationTypeConfiguration_MatcherConfiguration() {
-		return (EReference)specializationTypeConfigurationEClass.getEStructuralFeatures().get(2);
+		return (EReference)specializationTypeConfigurationEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
@@ -691,7 +731,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
 	 */
 	@Override
 	public EReference getSpecializationTypeConfiguration_SpecializedTypes() {
-		return (EReference)specializationTypeConfigurationEClass.getEStructuralFeatures().get(3);
+		return (EReference)specializationTypeConfigurationEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -864,14 +904,15 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
 
 		// Create classes and their features
 		elementTypeSetConfigurationEClass = createEClass(ELEMENT_TYPE_SET_CONFIGURATION);
-		createEReference(elementTypeSetConfigurationEClass, ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS);
 		createEReference(elementTypeSetConfigurationEClass, ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS);
 		createEReference(elementTypeSetConfigurationEClass, ELEMENT_TYPE_SET_CONFIGURATION__ALL_ADVICE_BINDINGS);
+		createEReference(elementTypeSetConfigurationEClass, ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS);
 		createEAttribute(elementTypeSetConfigurationEClass, ELEMENT_TYPE_SET_CONFIGURATION__METAMODEL_NS_URI);
 		createEOperation(elementTypeSetConfigurationEClass, ELEMENT_TYPE_SET_CONFIGURATION___GET_ALL_ADVICE_BINDINGS);
 
 		configurationElementEClass = createEClass(CONFIGURATION_ELEMENT);
 		createEAttribute(configurationElementEClass, CONFIGURATION_ELEMENT__DESCRIPTION);
+		createEReference(configurationElementEClass, CONFIGURATION_ELEMENT__OWNING_TYPE);
 
 		elementTypeConfigurationEClass = createEClass(ELEMENT_TYPE_CONFIGURATION);
 		createEAttribute(elementTypeConfigurationEClass, ELEMENT_TYPE_CONFIGURATION__HINT);
@@ -879,6 +920,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
 		createEReference(elementTypeConfigurationEClass, ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY);
 		createEReference(elementTypeConfigurationEClass, ELEMENT_TYPE_CONFIGURATION__OWNED_ADVICE);
 		createEReference(elementTypeConfigurationEClass, ELEMENT_TYPE_CONFIGURATION__OWNING_SET);
+		createEReference(elementTypeConfigurationEClass, ELEMENT_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS);
 
 		iconEntryEClass = createEClass(ICON_ENTRY);
 		createEAttribute(iconEntryEClass, ICON_ENTRY__ICON_PATH);
@@ -901,25 +943,27 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
 
 		containerConfigurationEClass = createEClass(CONTAINER_CONFIGURATION);
 		createEReference(containerConfigurationEClass, CONTAINER_CONFIGURATION__CONTAINER_MATCHER_CONFIGURATION);
+		createEReference(containerConfigurationEClass, CONTAINER_CONFIGURATION__CONTAINED_TYPE);
 		createEReference(containerConfigurationEClass, CONTAINER_CONFIGURATION__ECONTAINMENT_FEATURES);
 
 		abstractMatcherConfigurationEClass = createEClass(ABSTRACT_MATCHER_CONFIGURATION);
-
-		identifiedConfigurationEClass = createEClass(IDENTIFIED_CONFIGURATION);
-		createEAttribute(identifiedConfigurationEClass, IDENTIFIED_CONFIGURATION__IDENTIFIER);
-
-		namedConfigurationEClass = createEClass(NAMED_CONFIGURATION);
-		createEAttribute(namedConfigurationEClass, NAMED_CONFIGURATION__NAME);
+		createEReference(abstractMatcherConfigurationEClass, ABSTRACT_MATCHER_CONFIGURATION__MATCHED_TYPE);
 
 		specializationTypeConfigurationEClass = createEClass(SPECIALIZATION_TYPE_CONFIGURATION);
 		createEReference(specializationTypeConfigurationEClass, SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION);
 		createEReference(specializationTypeConfigurationEClass, SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION);
-		createEReference(specializationTypeConfigurationEClass, SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION);
 		createEReference(specializationTypeConfigurationEClass, SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES);
+		createEReference(specializationTypeConfigurationEClass, SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION);
 
 		abstractEditHelperAdviceConfigurationEClass = createEClass(ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION);
 		createEReference(abstractEditHelperAdviceConfigurationEClass, ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET);
 
+		identifiedConfigurationEClass = createEClass(IDENTIFIED_CONFIGURATION);
+		createEAttribute(identifiedConfigurationEClass, IDENTIFIED_CONFIGURATION__IDENTIFIER);
+
+		namedConfigurationEClass = createEClass(NAMED_CONFIGURATION);
+		createEAttribute(namedConfigurationEClass, NAMED_CONFIGURATION__NAME);
+
 		metamodelTypeConfigurationEClass = createEClass(METAMODEL_TYPE_CONFIGURATION);
 		createEReference(metamodelTypeConfigurationEClass, METAMODEL_TYPE_CONFIGURATION__ECLASS);
 		createEAttribute(metamodelTypeConfigurationEClass, METAMODEL_TYPE_CONFIGURATION__EDIT_HELPER_CLASS_NAME);
@@ -981,6 +1025,8 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
 		abstractAdviceBindingConfigurationEClass.getESuperTypes().add(this.getAdviceConfiguration());
 		abstractAdviceBindingConfigurationEClass.getESuperTypes().add(this.getIdentifiedConfiguration());
 		adviceConfigurationEClass.getESuperTypes().add(this.getConfigurationElement());
+		containerConfigurationEClass.getESuperTypes().add(this.getConfigurationElement());
+		abstractMatcherConfigurationEClass.getESuperTypes().add(this.getConfigurationElement());
 		specializationTypeConfigurationEClass.getESuperTypes().add(this.getElementTypeConfiguration());
 		abstractEditHelperAdviceConfigurationEClass.getESuperTypes().add(this.getAdviceConfiguration());
 		metamodelTypeConfigurationEClass.getESuperTypes().add(this.getElementTypeConfiguration());
@@ -992,22 +1038,24 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
 
 		// Initialize classes, features, and operations; add parameters
 		initEClass(elementTypeSetConfigurationEClass, ElementTypeSetConfiguration.class, "ElementTypeSetConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getElementTypeSetConfiguration_ElementTypeConfigurations(), this.getElementTypeConfiguration(), this.getElementTypeConfiguration_OwningSet(), "elementTypeConfigurations", null, 0, -1, ElementTypeSetConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getElementTypeSetConfiguration_AdviceBindingsConfigurations(), this.getAbstractAdviceBindingConfiguration(), this.getAbstractAdviceBindingConfiguration_OwningSet(), "adviceBindingsConfigurations", null, 0, -1, ElementTypeSetConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getElementTypeSetConfiguration_AllAdviceBindings(), this.getAbstractAdviceBindingConfiguration(), this.getAbstractAdviceBindingConfiguration_ElementTypeSet(), "allAdviceBindings", null, 0, -1, ElementTypeSetConfiguration.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED);
+		initEReference(getElementTypeSetConfiguration_ElementTypeConfigurations(), this.getElementTypeConfiguration(), this.getElementTypeConfiguration_OwningSet(), "elementTypeConfigurations", null, 0, -1, ElementTypeSetConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getElementTypeSetConfiguration_MetamodelNsURI(), ecorePackage.getEString(), "metamodelNsURI", null, 1, 1, ElementTypeSetConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEOperation(getElementTypeSetConfiguration__GetAllAdviceBindings(), this.getAbstractAdviceBindingConfiguration(), "getAllAdviceBindings", 0, -1, IS_UNIQUE, !IS_ORDERED);
 
 		initEClass(configurationElementEClass, ConfigurationElement.class, "ConfigurationElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getConfigurationElement_Description(), ecorePackage.getEString(), "description", null, 0, 1, ConfigurationElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getConfigurationElement_OwningType(), this.getElementTypeConfiguration(), this.getElementTypeConfiguration_OwnedConfigurations(), "owningType", null, 0, 1, ConfigurationElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
 		initEClass(elementTypeConfigurationEClass, ElementTypeConfiguration.class, "ElementTypeConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getElementTypeConfiguration_Hint(), ecorePackage.getEString(), "hint", "", 0, 1, ElementTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getElementTypeConfiguration_Kind(), ecorePackage.getEString(), "kind", "org.eclipse.gmf.runtime.emf.type.core.IHintedType", 0, 1, ElementTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getElementTypeConfiguration_IconEntry(), this.getIconEntry(), null, "iconEntry", null, 0, 1, ElementTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getElementTypeConfiguration_OwnedAdvice(), this.getAbstractAdviceBindingConfiguration(), this.getAbstractAdviceBindingConfiguration_OwningTarget(), "ownedAdvice", null, 0, -1, ElementTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getElementTypeConfiguration_OwnedAdvice(), this.getAbstractAdviceBindingConfiguration(), this.getAbstractAdviceBindingConfiguration_OwningTarget(), "ownedAdvice", null, 0, -1, ElementTypeConfiguration.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED);
 		initEReference(getElementTypeConfiguration_OwningSet(), this.getElementTypeSetConfiguration(), this.getElementTypeSetConfiguration_ElementTypeConfigurations(), "owningSet", null, 1, 1, ElementTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getElementTypeConfiguration_OwnedConfigurations(), this.getConfigurationElement(), this.getConfigurationElement_OwningType(), "ownedConfigurations", null, 0, -1, ElementTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
 		initEClass(iconEntryEClass, IconEntry.class, "IconEntry", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getIconEntry_IconPath(), ecorePackage.getEString(), "iconPath", null, 0, 1, IconEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -1021,7 +1069,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
 		initEAttribute(getAbstractAdviceBindingConfiguration_ApplyToAllTypes(), ecorePackage.getEBoolean(), "applyToAllTypes", null, 1, 1, AbstractAdviceBindingConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getAbstractAdviceBindingConfiguration_OwningSet(), this.getElementTypeSetConfiguration(), this.getElementTypeSetConfiguration_AdviceBindingsConfigurations(), "owningSet", null, 0, 1, AbstractAdviceBindingConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getAbstractAdviceBindingConfiguration_ElementTypeSet(), this.getElementTypeSetConfiguration(), this.getElementTypeSetConfiguration_AllAdviceBindings(), "elementTypeSet", null, 1, 1, AbstractAdviceBindingConfiguration.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED);
-		initEReference(getAbstractAdviceBindingConfiguration_OwningTarget(), this.getElementTypeConfiguration(), this.getElementTypeConfiguration_OwnedAdvice(), "owningTarget", null, 0, 1, AbstractAdviceBindingConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getAbstractAdviceBindingConfiguration_OwningTarget(), this.getElementTypeConfiguration(), this.getElementTypeConfiguration_OwnedAdvice(), "owningTarget", null, 0, 1, AbstractAdviceBindingConfiguration.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED);
 
 		initEOperation(getAbstractAdviceBindingConfiguration__GetElementTypeSet(), this.getElementTypeSetConfiguration(), "getElementTypeSet", 1, 1, IS_UNIQUE, !IS_ORDERED);
 
@@ -1031,9 +1079,20 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
 
 		initEClass(containerConfigurationEClass, ContainerConfiguration.class, "ContainerConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getContainerConfiguration_ContainerMatcherConfiguration(), this.getAbstractMatcherConfiguration(), null, "containerMatcherConfiguration", null, 0, 1, ContainerConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getContainerConfiguration_ContainedType(), this.getSpecializationTypeConfiguration(), this.getSpecializationTypeConfiguration_ContainerConfiguration(), "containedType", null, 0, 1, ContainerConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getContainerConfiguration_EContainmentFeatures(), theEcorePackage.getEReference(), null, "eContainmentFeatures", null, 0, -1, ContainerConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(abstractMatcherConfigurationEClass, AbstractMatcherConfiguration.class, "AbstractMatcherConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getAbstractMatcherConfiguration_MatchedType(), this.getSpecializationTypeConfiguration(), this.getSpecializationTypeConfiguration_MatcherConfiguration(), "matchedType", null, 0, 1, AbstractMatcherConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		initEClass(specializationTypeConfigurationEClass, SpecializationTypeConfiguration.class, "SpecializationTypeConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getSpecializationTypeConfiguration_EditHelperAdviceConfiguration(), this.getAbstractEditHelperAdviceConfiguration(), this.getAbstractEditHelperAdviceConfiguration_Target(), "editHelperAdviceConfiguration", null, 0, 1, SpecializationTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getSpecializationTypeConfiguration_ContainerConfiguration(), this.getContainerConfiguration(), this.getContainerConfiguration_ContainedType(), "containerConfiguration", null, 0, 1, SpecializationTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getSpecializationTypeConfiguration_SpecializedTypes(), this.getElementTypeConfiguration(), null, "specializedTypes", null, 0, -1, SpecializationTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getSpecializationTypeConfiguration_MatcherConfiguration(), this.getAbstractMatcherConfiguration(), this.getAbstractMatcherConfiguration_MatchedType(), "matcherConfiguration", null, 0, 1, SpecializationTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(abstractEditHelperAdviceConfigurationEClass, AbstractEditHelperAdviceConfiguration.class, "AbstractEditHelperAdviceConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getAbstractEditHelperAdviceConfiguration_Target(), this.getSpecializationTypeConfiguration(), this.getSpecializationTypeConfiguration_EditHelperAdviceConfiguration(), "target", null, 1, 1, AbstractEditHelperAdviceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(identifiedConfigurationEClass, IdentifiedConfiguration.class, "IdentifiedConfiguration", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getIdentifiedConfiguration_Identifier(), ecorePackage.getEString(), "identifier", null, 1, 1, IdentifiedConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -1041,15 +1100,6 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
 		initEClass(namedConfigurationEClass, NamedConfiguration.class, "NamedConfiguration", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getNamedConfiguration_Name(), ecorePackage.getEString(), "name", null, 1, 1, NamedConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(specializationTypeConfigurationEClass, SpecializationTypeConfiguration.class, "SpecializationTypeConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getSpecializationTypeConfiguration_EditHelperAdviceConfiguration(), this.getAbstractEditHelperAdviceConfiguration(), this.getAbstractEditHelperAdviceConfiguration_Target(), "editHelperAdviceConfiguration", null, 0, 1, SpecializationTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getSpecializationTypeConfiguration_ContainerConfiguration(), this.getContainerConfiguration(), null, "containerConfiguration", null, 0, 1, SpecializationTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getSpecializationTypeConfiguration_MatcherConfiguration(), this.getAbstractMatcherConfiguration(), null, "matcherConfiguration", null, 0, 1, SpecializationTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getSpecializationTypeConfiguration_SpecializedTypes(), this.getElementTypeConfiguration(), null, "specializedTypes", null, 0, -1, SpecializationTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(abstractEditHelperAdviceConfigurationEClass, AbstractEditHelperAdviceConfiguration.class, "AbstractEditHelperAdviceConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getAbstractEditHelperAdviceConfiguration_Target(), this.getSpecializationTypeConfiguration(), this.getSpecializationTypeConfiguration_EditHelperAdviceConfiguration(), "target", null, 1, 1, AbstractEditHelperAdviceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
 		initEClass(metamodelTypeConfigurationEClass, MetamodelTypeConfiguration.class, "MetamodelTypeConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getMetamodelTypeConfiguration_EClass(), theEcorePackage.getEClass(), null, "eClass", null, 0, 1, MetamodelTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getMetamodelTypeConfiguration_EditHelperClassName(), ecorePackage.getEString(), "editHelperClassName", null, 0, 1, MetamodelTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -1080,10 +1130,10 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
 		createEcoreAnnotations();
 		// http://www.eclipse.org/uml2/2.0.0/UML
 		createUMLAnnotations();
-		// http://www.eclipse.org/emf/2002/Ecore/OCL
-		createOCLAnnotations();
 		// subsets
 		createSubsetsAnnotations();
+		// http://www.eclipse.org/emf/2002/Ecore/OCL
+		createOCLAnnotations();
 	}
 
 	/**
@@ -1155,12 +1205,69 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
 	protected void createSubsetsAnnotations() {
 		String source = "subsets";
 		addAnnotation
+		  (getElementTypeConfiguration_OwnedAdvice(),
+		   source,
+		   new String[] {
+		   },
+		   new URI[] {
+			 URI.createURI(eNS_URI).appendFragment("//ElementTypeConfiguration/ownedConfigurations")
+		   });
+		addAnnotation
 		  (getAbstractAdviceBindingConfiguration_OwningTarget(),
 		   source,
 		   new String[] {
 		   },
 		   new URI[] {
-			 URI.createURI(eNS_URI).appendFragment("//AbstractAdviceBindingConfiguration/target")
+			 URI.createURI(eNS_URI).appendFragment("//AbstractAdviceBindingConfiguration/target"),
+			 URI.createURI(eNS_URI).appendFragment("//ConfigurationElement/owningType")
+		   });
+		addAnnotation
+		  (getContainerConfiguration_ContainedType(),
+		   source,
+		   new String[] {
+		   },
+		   new URI[] {
+			 URI.createURI(eNS_URI).appendFragment("//ConfigurationElement/owningType")
+		   });
+		addAnnotation
+		  (getAbstractMatcherConfiguration_MatchedType(),
+		   source,
+		   new String[] {
+		   },
+		   new URI[] {
+			 URI.createURI(eNS_URI).appendFragment("//ConfigurationElement/owningType")
+		   });
+		addAnnotation
+		  (getSpecializationTypeConfiguration_EditHelperAdviceConfiguration(),
+		   source,
+		   new String[] {
+		   },
+		   new URI[] {
+			 URI.createURI(eNS_URI).appendFragment("//ElementTypeConfiguration/ownedConfigurations")
+		   });
+		addAnnotation
+		  (getSpecializationTypeConfiguration_ContainerConfiguration(),
+		   source,
+		   new String[] {
+		   },
+		   new URI[] {
+			 URI.createURI(eNS_URI).appendFragment("//ElementTypeConfiguration/ownedConfigurations")
+		   });
+		addAnnotation
+		  (getSpecializationTypeConfiguration_MatcherConfiguration(),
+		   source,
+		   new String[] {
+		   },
+		   new URI[] {
+			 URI.createURI(eNS_URI).appendFragment("//ElementTypeConfiguration/ownedConfigurations")
+		   });
+		addAnnotation
+		  (getAbstractEditHelperAdviceConfiguration_Target(),
+		   source,
+		   new String[] {
+		   },
+		   new URI[] {
+			 URI.createURI(eNS_URI).appendFragment("//ConfigurationElement/owningType")
 		   });
 	}
 
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/SpecializationTypeConfigurationImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/SpecializationTypeConfigurationImpl.java
index ded751d50dc..a7e2d9ac22a 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/SpecializationTypeConfigurationImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/SpecializationTypeConfigurationImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014 CEA LIST.
+ * Copyright (c) 2014, 2020 CEA LIST, Christian W. Damus, and others.
  * 
  * 
  * All rights reserved. This program and the accompanying materials
@@ -11,6 +11,7 @@
  * 
  * Contributors:
  *  CEA LIST - Initial API and implementation
+ *  Christian W. Damus - bug 568853
  */
 package org.eclipse.papyrus.infra.types.impl;
 
@@ -26,14 +27,18 @@ import org.eclipse.emf.ecore.InternalEObject;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
+import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 
+import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.papyrus.infra.types.AbstractEditHelperAdviceConfiguration;
 import org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration;
+import org.eclipse.papyrus.infra.types.ConfigurationElement;
 import org.eclipse.papyrus.infra.types.ContainerConfiguration;
 import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
 import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
 import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration;
+import org.eclipse.uml2.common.util.SubsetSupersetEObjectContainmentWithInverseEList;
 
 /**
  * <!-- begin-user-doc -->
@@ -43,17 +48,18 @@ import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration;
  * The following features are implemented:
  * </p>
  * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.SpecializationTypeConfigurationImpl#getOwnedConfigurations <em>Owned Configurations</em>}</li>
  *   <li>{@link org.eclipse.papyrus.infra.types.impl.SpecializationTypeConfigurationImpl#getEditHelperAdviceConfiguration <em>Edit Helper Advice Configuration</em>}</li>
  *   <li>{@link org.eclipse.papyrus.infra.types.impl.SpecializationTypeConfigurationImpl#getContainerConfiguration <em>Container Configuration</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.types.impl.SpecializationTypeConfigurationImpl#getMatcherConfiguration <em>Matcher Configuration</em>}</li>
  *   <li>{@link org.eclipse.papyrus.infra.types.impl.SpecializationTypeConfigurationImpl#getSpecializedTypes <em>Specialized Types</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.SpecializationTypeConfigurationImpl#getMatcherConfiguration <em>Matcher Configuration</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class SpecializationTypeConfigurationImpl extends ElementTypeConfigurationImpl implements SpecializationTypeConfiguration {
 	/**
-	 * The cached value of the '{@link #getEditHelperAdviceConfiguration() <em>Edit Helper Advice Configuration</em>}' containment reference.
+	 * The cached value of the '{@link #getEditHelperAdviceConfiguration() <em>Edit Helper Advice Configuration</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see #getEditHelperAdviceConfiguration()
@@ -63,7 +69,7 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
 	protected AbstractEditHelperAdviceConfiguration editHelperAdviceConfiguration;
 
 	/**
-	 * The cached value of the '{@link #getContainerConfiguration() <em>Container Configuration</em>}' containment reference.
+	 * The cached value of the '{@link #getContainerConfiguration() <em>Container Configuration</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see #getContainerConfiguration()
@@ -73,24 +79,24 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
 	protected ContainerConfiguration containerConfiguration;
 
 	/**
-	 * The cached value of the '{@link #getMatcherConfiguration() <em>Matcher Configuration</em>}' containment reference.
+	 * The cached value of the '{@link #getSpecializedTypes() <em>Specialized Types</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getMatcherConfiguration()
+	 * @see #getSpecializedTypes()
 	 * @generated
 	 * @ordered
 	 */
-	protected AbstractMatcherConfiguration matcherConfiguration;
+	protected EList<ElementTypeConfiguration> specializedTypes;
 
 	/**
-	 * The cached value of the '{@link #getSpecializedTypes() <em>Specialized Types</em>}' reference list.
+	 * The cached value of the '{@link #getMatcherConfiguration() <em>Matcher Configuration</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getSpecializedTypes()
+	 * @see #getMatcherConfiguration()
 	 * @generated
 	 * @ordered
 	 */
-	protected EList<ElementTypeConfiguration> specializedTypes;
+	protected AbstractMatcherConfiguration matcherConfiguration;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -117,7 +123,47 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
 	 * @generated
 	 */
 	@Override
+	public EList<ConfigurationElement> getOwnedConfigurations() {
+		if (ownedConfigurations == null) {
+			ownedConfigurations = new SubsetSupersetEObjectContainmentWithInverseEList<ConfigurationElement>(ConfigurationElement.class, this, ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS, null, OWNED_CONFIGURATIONS_ESUBSETS, ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__OWNING_TYPE);
+		}
+		return ownedConfigurations;
+	}
+
+	/**
+	 * The array of subset feature identifiers for the '{@link #getOwnedConfigurations() <em>Owned Configurations</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getOwnedConfigurations()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int[] OWNED_CONFIGURATIONS_ESUBSETS = new int[] {ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION, ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION, ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION};
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
 	public AbstractEditHelperAdviceConfiguration getEditHelperAdviceConfiguration() {
+		if (editHelperAdviceConfiguration != null && editHelperAdviceConfiguration.eIsProxy()) {
+			InternalEObject oldEditHelperAdviceConfiguration = (InternalEObject)editHelperAdviceConfiguration;
+			editHelperAdviceConfiguration = (AbstractEditHelperAdviceConfiguration)eResolveProxy(oldEditHelperAdviceConfiguration);
+			if (editHelperAdviceConfiguration != oldEditHelperAdviceConfiguration) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION, oldEditHelperAdviceConfiguration, editHelperAdviceConfiguration));
+			}
+		}
+		return editHelperAdviceConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractEditHelperAdviceConfiguration basicGetEditHelperAdviceConfiguration() {
 		return editHelperAdviceConfiguration;
 	}
 
@@ -133,6 +179,15 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION, oldEditHelperAdviceConfiguration, newEditHelperAdviceConfiguration);
 			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
+		Resource.Internal eInternalResource = eInternalResource();
+		if (eInternalResource == null || !eInternalResource.isLoading()) {
+			if (newEditHelperAdviceConfiguration != null) {
+				EList<ConfigurationElement> ownedConfigurations = getOwnedConfigurations();
+				if (!ownedConfigurations.contains(newEditHelperAdviceConfiguration)) {
+					ownedConfigurations.add(newEditHelperAdviceConfiguration);
+				}
+			}
+		}
 		return msgs;
 	}
 
@@ -163,6 +218,23 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
 	 */
 	@Override
 	public ContainerConfiguration getContainerConfiguration() {
+		if (containerConfiguration != null && containerConfiguration.eIsProxy()) {
+			InternalEObject oldContainerConfiguration = (InternalEObject)containerConfiguration;
+			containerConfiguration = (ContainerConfiguration)eResolveProxy(oldContainerConfiguration);
+			if (containerConfiguration != oldContainerConfiguration) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION, oldContainerConfiguration, containerConfiguration));
+			}
+		}
+		return containerConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ContainerConfiguration basicGetContainerConfiguration() {
 		return containerConfiguration;
 	}
 
@@ -178,6 +250,15 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION, oldContainerConfiguration, newContainerConfiguration);
 			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
+		Resource.Internal eInternalResource = eInternalResource();
+		if (eInternalResource == null || !eInternalResource.isLoading()) {
+			if (newContainerConfiguration != null) {
+				EList<ConfigurationElement> ownedConfigurations = getOwnedConfigurations();
+				if (!ownedConfigurations.contains(newContainerConfiguration)) {
+					ownedConfigurations.add(newContainerConfiguration);
+				}
+			}
+		}
 		return msgs;
 	}
 
@@ -191,9 +272,9 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
 		if (newContainerConfiguration != containerConfiguration) {
 			NotificationChain msgs = null;
 			if (containerConfiguration != null)
-				msgs = ((InternalEObject)containerConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION, null, msgs);
+				msgs = ((InternalEObject)containerConfiguration).eInverseRemove(this, ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__CONTAINED_TYPE, ContainerConfiguration.class, msgs);
 			if (newContainerConfiguration != null)
-				msgs = ((InternalEObject)newContainerConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION, null, msgs);
+				msgs = ((InternalEObject)newContainerConfiguration).eInverseAdd(this, ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__CONTAINED_TYPE, ContainerConfiguration.class, msgs);
 			msgs = basicSetContainerConfiguration(newContainerConfiguration, msgs);
 			if (msgs != null) msgs.dispatch();
 		}
@@ -208,6 +289,23 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
 	 */
 	@Override
 	public AbstractMatcherConfiguration getMatcherConfiguration() {
+		if (matcherConfiguration != null && matcherConfiguration.eIsProxy()) {
+			InternalEObject oldMatcherConfiguration = (InternalEObject)matcherConfiguration;
+			matcherConfiguration = (AbstractMatcherConfiguration)eResolveProxy(oldMatcherConfiguration);
+			if (matcherConfiguration != oldMatcherConfiguration) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION, oldMatcherConfiguration, matcherConfiguration));
+			}
+		}
+		return matcherConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractMatcherConfiguration basicGetMatcherConfiguration() {
 		return matcherConfiguration;
 	}
 
@@ -223,6 +321,15 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION, oldMatcherConfiguration, newMatcherConfiguration);
 			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
+		Resource.Internal eInternalResource = eInternalResource();
+		if (eInternalResource == null || !eInternalResource.isLoading()) {
+			if (newMatcherConfiguration != null) {
+				EList<ConfigurationElement> ownedConfigurations = getOwnedConfigurations();
+				if (!ownedConfigurations.contains(newMatcherConfiguration)) {
+					ownedConfigurations.add(newMatcherConfiguration);
+				}
+			}
+		}
 		return msgs;
 	}
 
@@ -236,9 +343,9 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
 		if (newMatcherConfiguration != matcherConfiguration) {
 			NotificationChain msgs = null;
 			if (matcherConfiguration != null)
-				msgs = ((InternalEObject)matcherConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION, null, msgs);
+				msgs = ((InternalEObject)matcherConfiguration).eInverseRemove(this, ElementTypesConfigurationsPackage.ABSTRACT_MATCHER_CONFIGURATION__MATCHED_TYPE, AbstractMatcherConfiguration.class, msgs);
 			if (newMatcherConfiguration != null)
-				msgs = ((InternalEObject)newMatcherConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION, null, msgs);
+				msgs = ((InternalEObject)newMatcherConfiguration).eInverseAdd(this, ElementTypesConfigurationsPackage.ABSTRACT_MATCHER_CONFIGURATION__MATCHED_TYPE, AbstractMatcherConfiguration.class, msgs);
 			msgs = basicSetMatcherConfiguration(newMatcherConfiguration, msgs);
 			if (msgs != null) msgs.dispatch();
 		}
@@ -264,13 +371,24 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@SuppressWarnings("unchecked")
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
+			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getOwnedConfigurations()).basicAdd(otherEnd, msgs);
 			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION:
 				if (editHelperAdviceConfiguration != null)
-					msgs = ((InternalEObject)editHelperAdviceConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION, null, msgs);
+					msgs = ((InternalEObject)editHelperAdviceConfiguration).eInverseRemove(this, ElementTypesConfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET, AbstractEditHelperAdviceConfiguration.class, msgs);
 				return basicSetEditHelperAdviceConfiguration((AbstractEditHelperAdviceConfiguration)otherEnd, msgs);
+			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION:
+				if (containerConfiguration != null)
+					msgs = ((InternalEObject)containerConfiguration).eInverseRemove(this, ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__CONTAINED_TYPE, ContainerConfiguration.class, msgs);
+				return basicSetContainerConfiguration((ContainerConfiguration)otherEnd, msgs);
+			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:
+				if (matcherConfiguration != null)
+					msgs = ((InternalEObject)matcherConfiguration).eInverseRemove(this, ElementTypesConfigurationsPackage.ABSTRACT_MATCHER_CONFIGURATION__MATCHED_TYPE, AbstractMatcherConfiguration.class, msgs);
+				return basicSetMatcherConfiguration((AbstractMatcherConfiguration)otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
@@ -283,6 +401,8 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
+			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS:
+				return ((InternalEList<?>)getOwnedConfigurations()).basicRemove(otherEnd, msgs);
 			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION:
 				return basicSetEditHelperAdviceConfiguration(null, msgs);
 			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION:
@@ -302,13 +422,16 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
 			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION:
-				return getEditHelperAdviceConfiguration();
+				if (resolve) return getEditHelperAdviceConfiguration();
+				return basicGetEditHelperAdviceConfiguration();
 			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION:
-				return getContainerConfiguration();
-			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:
-				return getMatcherConfiguration();
+				if (resolve) return getContainerConfiguration();
+				return basicGetContainerConfiguration();
 			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES:
 				return getSpecializedTypes();
+			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:
+				if (resolve) return getMatcherConfiguration();
+				return basicGetMatcherConfiguration();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -328,13 +451,13 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
 			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION:
 				setContainerConfiguration((ContainerConfiguration)newValue);
 				return;
-			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:
-				setMatcherConfiguration((AbstractMatcherConfiguration)newValue);
-				return;
 			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES:
 				getSpecializedTypes().clear();
 				getSpecializedTypes().addAll((Collection<? extends ElementTypeConfiguration>)newValue);
 				return;
+			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:
+				setMatcherConfiguration((AbstractMatcherConfiguration)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -353,12 +476,12 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
 			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION:
 				setContainerConfiguration((ContainerConfiguration)null);
 				return;
-			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:
-				setMatcherConfiguration((AbstractMatcherConfiguration)null);
-				return;
 			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES:
 				getSpecializedTypes().clear();
 				return;
+			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:
+				setMatcherConfiguration((AbstractMatcherConfiguration)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -371,14 +494,16 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
+			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS:
+				return ownedConfigurations != null && !ownedConfigurations.isEmpty();
 			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION:
 				return editHelperAdviceConfiguration != null;
 			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION:
 				return containerConfiguration != null;
-			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:
-				return matcherConfiguration != null;
 			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES:
 				return specializedTypes != null && !specializedTypes.isEmpty();
+			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:
+				return matcherConfiguration != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/util/ElementTypesConfigurationsAdapterFactory.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/util/ElementTypesConfigurationsAdapterFactory.java
index 2725e876e3f..a69566a6efd 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/util/ElementTypesConfigurationsAdapterFactory.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/util/ElementTypesConfigurationsAdapterFactory.java
@@ -11,7 +11,7 @@
  * 
  * Contributors:
  *  CEA LIST - Initial API and implementation
- *  Christian W. Damus - bug 568782
+ *  Christian W. Damus - bugs 568782, 568853
  */
 package org.eclipse.papyrus.infra.types.util;
 
@@ -113,14 +113,6 @@ public class ElementTypesConfigurationsAdapterFactory extends AdapterFactoryImpl
 				return createAbstractMatcherConfigurationAdapter();
 			}
 			@Override
-			public Adapter caseIdentifiedConfiguration(IdentifiedConfiguration object) {
-				return createIdentifiedConfigurationAdapter();
-			}
-			@Override
-			public Adapter caseNamedConfiguration(NamedConfiguration object) {
-				return createNamedConfigurationAdapter();
-			}
-			@Override
 			public Adapter caseSpecializationTypeConfiguration(SpecializationTypeConfiguration object) {
 				return createSpecializationTypeConfigurationAdapter();
 			}
@@ -129,6 +121,14 @@ public class ElementTypesConfigurationsAdapterFactory extends AdapterFactoryImpl
 				return createAbstractEditHelperAdviceConfigurationAdapter();
 			}
 			@Override
+			public Adapter caseIdentifiedConfiguration(IdentifiedConfiguration object) {
+				return createIdentifiedConfigurationAdapter();
+			}
+			@Override
+			public Adapter caseNamedConfiguration(NamedConfiguration object) {
+				return createNamedConfigurationAdapter();
+			}
+			@Override
 			public Adapter caseMetamodelTypeConfiguration(MetamodelTypeConfiguration object) {
 				return createMetamodelTypeConfigurationAdapter();
 			}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/util/ElementTypesConfigurationsSwitch.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/util/ElementTypesConfigurationsSwitch.java
index 89f06e7008d..79edb7f192f 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/util/ElementTypesConfigurationsSwitch.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/util/ElementTypesConfigurationsSwitch.java
@@ -11,7 +11,7 @@
  * 
  * Contributors:
  *  CEA LIST - Initial API and implementation
- *  Christian W. Damus - bug 568782
+ *  Christian W. Damus - bugs 568782, 568853
  */
 package org.eclipse.papyrus.infra.types.util;
 
@@ -128,24 +128,14 @@ public class ElementTypesConfigurationsSwitch<T> extends Switch<T> {
 			case ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION: {
 				ContainerConfiguration containerConfiguration = (ContainerConfiguration)theEObject;
 				T result = caseContainerConfiguration(containerConfiguration);
+				if (result == null) result = caseConfigurationElement(containerConfiguration);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
 			case ElementTypesConfigurationsPackage.ABSTRACT_MATCHER_CONFIGURATION: {
 				AbstractMatcherConfiguration abstractMatcherConfiguration = (AbstractMatcherConfiguration)theEObject;
 				T result = caseAbstractMatcherConfiguration(abstractMatcherConfiguration);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ElementTypesConfigurationsPackage.IDENTIFIED_CONFIGURATION: {
-				IdentifiedConfiguration identifiedConfiguration = (IdentifiedConfiguration)theEObject;
-				T result = caseIdentifiedConfiguration(identifiedConfiguration);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ElementTypesConfigurationsPackage.NAMED_CONFIGURATION: {
-				NamedConfiguration namedConfiguration = (NamedConfiguration)theEObject;
-				T result = caseNamedConfiguration(namedConfiguration);
+				if (result == null) result = caseConfigurationElement(abstractMatcherConfiguration);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
@@ -167,6 +157,18 @@ public class ElementTypesConfigurationsSwitch<T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
+			case ElementTypesConfigurationsPackage.IDENTIFIED_CONFIGURATION: {
+				IdentifiedConfiguration identifiedConfiguration = (IdentifiedConfiguration)theEObject;
+				T result = caseIdentifiedConfiguration(identifiedConfiguration);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ElementTypesConfigurationsPackage.NAMED_CONFIGURATION: {
+				NamedConfiguration namedConfiguration = (NamedConfiguration)theEObject;
+				T result = caseNamedConfiguration(namedConfiguration);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
 			case ElementTypesConfigurationsPackage.METAMODEL_TYPE_CONFIGURATION: {
 				MetamodelTypeConfiguration metamodelTypeConfiguration = (MetamodelTypeConfiguration)theEObject;
 				T result = caseMetamodelTypeConfiguration(metamodelTypeConfiguration);
@@ -200,6 +202,7 @@ public class ElementTypesConfigurationsSwitch<T> extends Switch<T> {
 				MatcherConfiguration matcherConfiguration = (MatcherConfiguration)theEObject;
 				T result = caseMatcherConfiguration(matcherConfiguration);
 				if (result == null) result = caseAbstractMatcherConfiguration(matcherConfiguration);
+				if (result == null) result = caseConfigurationElement(matcherConfiguration);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/util/ElementTypesConfigurationsValidator.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/util/ElementTypesConfigurationsValidator.java
index 688db0aceac..aeb067314e5 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/util/ElementTypesConfigurationsValidator.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/util/ElementTypesConfigurationsValidator.java
@@ -121,14 +121,14 @@ public class ElementTypesConfigurationsValidator extends EObjectValidator {
 				return validateContainerConfiguration((ContainerConfiguration)value, diagnostics, context);
 			case ElementTypesConfigurationsPackage.ABSTRACT_MATCHER_CONFIGURATION:
 				return validateAbstractMatcherConfiguration((AbstractMatcherConfiguration)value, diagnostics, context);
-			case ElementTypesConfigurationsPackage.IDENTIFIED_CONFIGURATION:
-				return validateIdentifiedConfiguration((IdentifiedConfiguration)value, diagnostics, context);
-			case ElementTypesConfigurationsPackage.NAMED_CONFIGURATION:
-				return validateNamedConfiguration((NamedConfiguration)value, diagnostics, context);
 			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION:
 				return validateSpecializationTypeConfiguration((SpecializationTypeConfiguration)value, diagnostics, context);
 			case ElementTypesConfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION:
 				return validateAbstractEditHelperAdviceConfiguration((AbstractEditHelperAdviceConfiguration)value, diagnostics, context);
+			case ElementTypesConfigurationsPackage.IDENTIFIED_CONFIGURATION:
+				return validateIdentifiedConfiguration((IdentifiedConfiguration)value, diagnostics, context);
+			case ElementTypesConfigurationsPackage.NAMED_CONFIGURATION:
+				return validateNamedConfiguration((NamedConfiguration)value, diagnostics, context);
 			case ElementTypesConfigurationsPackage.METAMODEL_TYPE_CONFIGURATION:
 				return validateMetamodelTypeConfiguration((MetamodelTypeConfiguration)value, diagnostics, context);
 			case ElementTypesConfigurationsPackage.EDIT_HELPER_ADVICE_CONFIGURATION:
diff --git a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src-gen/org/eclipse/papyrus/infra/types/tests/AbstractAdviceBindingConfigurationTest.java b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src-gen/org/eclipse/papyrus/infra/types/tests/AbstractAdviceBindingConfigurationTest.java
index 953da168fa7..7f68225c4b7 100644
--- a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src-gen/org/eclipse/papyrus/infra/types/tests/AbstractAdviceBindingConfigurationTest.java
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src-gen/org/eclipse/papyrus/infra/types/tests/AbstractAdviceBindingConfigurationTest.java
@@ -34,6 +34,7 @@ import org.eclipse.papyrus.infra.types.util.ElementTypesConfigurationsValidator;
  * The following features are tested:
  * <ul>
  *   <li>{@link org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration#getElementTypeSet() <em>Element Type Set</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration#getOwningTarget() <em>Owning Target</em>}</li>
  * </ul>
  * </p>
  * @generated
@@ -66,7 +67,7 @@ public abstract class AbstractAdviceBindingConfigurationTest extends AdviceConfi
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration#getElementTypeSet()
-	 * @generated not
+	 * @generated NOT
 	 */
 	public void testGetElementTypeSet() {
 		assertThat(getFixture().getElementTypeSet(), nullValue());
@@ -83,6 +84,56 @@ public abstract class AbstractAdviceBindingConfigurationTest extends AdviceConfi
 		assertThat(getFixture().getElementTypeSet(), is(set));
 	}
 	
+	/**
+	 * Tests the '{@link org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration#getOwningTarget() <em>Owning Target</em>}' feature getter.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration#getOwningTarget()
+	 * @generated NOT
+	 */
+	public void testGetOwningTarget() {
+		ElementTypeSetConfiguration set = ElementTypesConfigurationsFactory.eINSTANCE.createElementTypeSetConfiguration();
+		ElementTypeConfiguration type = ElementTypesConfigurationsFactory.eINSTANCE.createSpecializationTypeConfiguration();
+		set.getElementTypeConfigurations().add(type);
+		
+		assertThat(getFixture().getOwningTarget(), nullValue());
+		
+		type.getOwnedConfigurations().add(getFixture());
+		
+		assertThat(getFixture().getOwningTarget(), is(type));
+		assertThat(getFixture().getTarget(), is(type)); // The superset must get the subset value
+		
+		set.getAdviceBindingsConfigurations().add(getFixture());
+		
+		assertThat(getFixture().getOwningTarget(), nullValue());
+		assertThat(getFixture().getTarget(), is(type)); // The superset is not affected by the subset being cleared
+	}
+
+	/**
+	 * Tests the '{@link org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration#setOwningTarget(org.eclipse.papyrus.infra.types.ElementTypeConfiguration) <em>Owning Target</em>}' feature setter.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration#setOwningTarget(org.eclipse.papyrus.infra.types.ElementTypeConfiguration)
+	 * @generated NOT
+	 */
+	public void testSetOwningTarget() {
+		ElementTypeSetConfiguration set = ElementTypesConfigurationsFactory.eINSTANCE.createElementTypeSetConfiguration();
+		ElementTypeConfiguration type = ElementTypesConfigurationsFactory.eINSTANCE.createSpecializationTypeConfiguration();
+		set.getElementTypeConfigurations().add(type);
+		
+		assertThat(getFixture().getOwningTarget(), nullValue());
+		
+		getFixture().setOwningTarget(type);
+		
+		assertThat(getFixture().getOwningTarget(), is(type));
+		assertThat(getFixture().getTarget(), is(type)); // The superset must get the subset value
+		
+		getFixture().setOwningTarget(null);
+		
+		assertThat(getFixture().getOwningTarget(), nullValue());
+		assertThat(getFixture().getTarget(), is(type)); // The superset is not affected by the subset being cleared
+	}
+	
 	public void testValidateAbstractAdviceBindingConfiguration_apply_to_all_types() {
 		ElementTypesConfigurationsValidator validator = new ElementTypesConfigurationsValidator();
 		ElementTypeConfiguration type1 = ElementTypesConfigurationsFactory.eINSTANCE.createMetamodelTypeConfiguration();
diff --git a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src-gen/org/eclipse/papyrus/infra/types/tests/AbstractMatcherConfigurationTest.java b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src-gen/org/eclipse/papyrus/infra/types/tests/AbstractMatcherConfigurationTest.java
index 9fe066e0600..a85fe60714f 100644
--- a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src-gen/org/eclipse/papyrus/infra/types/tests/AbstractMatcherConfigurationTest.java
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src-gen/org/eclipse/papyrus/infra/types/tests/AbstractMatcherConfigurationTest.java
@@ -13,8 +13,6 @@
  */
 package org.eclipse.papyrus.infra.types.tests;
 
-import junit.framework.TestCase;
-
 import org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration;
 
 /**
@@ -23,15 +21,7 @@ import org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration;
  * <!-- end-user-doc -->
  * @generated
  */
-public abstract class AbstractMatcherConfigurationTest extends TestCase {
-
-	/**
-	 * The fixture for this Abstract Matcher Configuration test case.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AbstractMatcherConfiguration fixture = null;
+public abstract class AbstractMatcherConfigurationTest extends ConfigurationElementTest {
 
 	/**
 	 * Constructs a new Abstract Matcher Configuration test case with the given name.
@@ -44,23 +34,14 @@ public abstract class AbstractMatcherConfigurationTest extends TestCase {
 	}
 
 	/**
-	 * Sets the fixture for this Abstract Matcher Configuration test case.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void setFixture(AbstractMatcherConfiguration fixture) {
-		this.fixture = fixture;
-	}
-
-	/**
 	 * Returns the fixture for this Abstract Matcher Configuration test case.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	protected AbstractMatcherConfiguration getFixture() {
-		return fixture;
+		return (AbstractMatcherConfiguration)fixture;
 	}
 
 } //AbstractMatcherConfigurationTest
diff --git a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src-gen/org/eclipse/papyrus/infra/types/tests/ContainerConfigurationTest.java b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src-gen/org/eclipse/papyrus/infra/types/tests/ContainerConfigurationTest.java
index accab675fd8..aac5fde5520 100644
--- a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src-gen/org/eclipse/papyrus/infra/types/tests/ContainerConfigurationTest.java
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src-gen/org/eclipse/papyrus/infra/types/tests/ContainerConfigurationTest.java
@@ -13,8 +13,6 @@
  */
 package org.eclipse.papyrus.infra.types.tests;
 
-import junit.framework.TestCase;
-
 import junit.textui.TestRunner;
 
 import org.eclipse.papyrus.infra.types.ContainerConfiguration;
@@ -26,15 +24,7 @@ import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsFactory;
  * <!-- end-user-doc -->
  * @generated
  */
-public class ContainerConfigurationTest extends TestCase {
-
-	/**
-	 * The fixture for this Container Configuration test case.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ContainerConfiguration fixture = null;
+public class ContainerConfigurationTest extends ConfigurationElementTest {
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -56,23 +46,14 @@ public class ContainerConfigurationTest extends TestCase {
 	}
 
 	/**
-	 * Sets the fixture for this Container Configuration test case.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void setFixture(ContainerConfiguration fixture) {
-		this.fixture = fixture;
-	}
-
-	/**
 	 * Returns the fixture for this Container Configuration test case.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	protected ContainerConfiguration getFixture() {
-		return fixture;
+		return (ContainerConfiguration)fixture;
 	}
 
 	/**
diff --git a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src-gen/org/eclipse/papyrus/infra/types/tests/ElementTypeConfigurationTest.java b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src-gen/org/eclipse/papyrus/infra/types/tests/ElementTypeConfigurationTest.java
index 6fb39186d4e..455ec261903 100644
--- a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src-gen/org/eclipse/papyrus/infra/types/tests/ElementTypeConfigurationTest.java
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src-gen/org/eclipse/papyrus/infra/types/tests/ElementTypeConfigurationTest.java
@@ -13,12 +13,25 @@
  */
 package org.eclipse.papyrus.infra.types.tests;
 
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import java.util.List;
+
+import org.eclipse.papyrus.infra.types.AdviceBindingConfiguration;
 import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsFactory;
 
 /**
  * <!-- begin-user-doc -->
  * A test case for the model object '<em><b>Element Type Configuration</b></em>'.
  * <!-- end-user-doc -->
+ * <p>
+ * The following features are tested:
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.types.ElementTypeConfiguration#getOwnedAdvice() <em>Owned Advice</em>}</li>
+ * </ul>
+ * </p>
  * @generated
  */
 public abstract class ElementTypeConfigurationTest extends ConfigurationElementTest {
@@ -44,4 +57,28 @@ public abstract class ElementTypeConfigurationTest extends ConfigurationElementT
 		return (ElementTypeConfiguration)fixture;
 	}
 
+	/**
+	 * Tests the '{@link org.eclipse.papyrus.infra.types.ElementTypeConfiguration#getOwnedAdvice() <em>Owned Advice</em>}' feature getter.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.types.ElementTypeConfiguration#getOwnedAdvice()
+	 * @generated
+	 */
+	public void testGetOwnedAdvice() {
+		AdviceBindingConfiguration advice1 = ElementTypesConfigurationsFactory.eINSTANCE.createAdviceBindingConfiguration();
+		AdviceBindingConfiguration advice2 = ElementTypesConfigurationsFactory.eINSTANCE.createAdviceBindingConfiguration();
+		
+		assertThat(getFixture().getOwnedAdvice().size(), is(0));
+		
+		// Add to the superset
+		getFixture().getOwnedConfigurations().add(advice1);
+		
+		assertThat(getFixture().getOwnedAdvice(), is(List.of(advice1)));
+		
+		// Add to the subset
+		getFixture().getOwnedAdvice().add(advice2);
+		
+		assertThat(getFixture().getOwnedAdvice(), is(List.of(advice1, advice2)));
+	}
+
 } //ElementTypeConfigurationTest
diff --git a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src-gen/org/eclipse/papyrus/infra/types/tests/ElementTypesConfigurationsTests.java b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src-gen/org/eclipse/papyrus/infra/types/tests/ElementTypesConfigurationsTests.java
index 407f3bcfc71..5fe7adb48bd 100644
--- a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src-gen/org/eclipse/papyrus/infra/types/tests/ElementTypesConfigurationsTests.java
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src-gen/org/eclipse/papyrus/infra/types/tests/ElementTypesConfigurationsTests.java
@@ -43,7 +43,10 @@ public class ElementTypesConfigurationsTests extends TestSuite {
 	public static Test suite() {
 		TestSuite suite = new ElementTypesConfigurationsTests("types Tests");
 		suite.addTestSuite(ElementTypeSetConfigurationTest.class);
+		suite.addTestSuite(SpecializationTypeConfigurationTest.class);
+		suite.addTestSuite(MetamodelTypeConfigurationTest.class);
 		suite.addTestSuite(AdviceBindingConfigurationTest.class);
+		suite.addTestSuite(ExternallyRegisteredTypeTest.class);
 		suite.addTestSuite(ExternallyRegisteredAdviceTest.class);
 		return suite;
 	}
author	Christian W. Damus	2020-11-17 16:01:55 +0000
committer	Vincent Lorenzo	2021-03-24 14:06:46 +0000
commit	b9f6a34918a93b93cf427278ee569ac65222dc1b (patch)
tree	f6761abafd412ce98755aadaa3dc39d1ef9c9ca6
parent	92056ec5378f72436acc100a3f6f016a396e0908 (diff)
download	org.eclipse.papyrus-b9f6a34918a93b93cf427278ee569ac65222dc1b.tar.gz org.eclipse.papyrus-b9f6a34918a93b93cf427278ee569ac65222dc1b.tar.xz org.eclipse.papyrus-b9f6a34918a93b93cf427278ee569ac65222dc1b.zip