Bug 569356: [Toolsmiths] Support regeneration of ElementTypesConfiguration models

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

- Add an optional 'source' attribute to ConfigurationElements, to identify the source element used to generate them
- Regenerate all Types models to include the new 'source' attribute
- Add "generate extension points" option
- add README to list Element Types configurations Extensions
- These models (contained in separate plugins) need to be regenerated when the Element Types Configurations model changes
- update Element Types configurations model to include generic Annotations
- Remove the specific 'source' attribute used by the incremental generator; it will be replaced with an Annotation
- Regenerate all ElementTypesConfigurations models

Change-Id: I1bbea241a2d8989e27855bd3833d4e81604c8d5b
Signed-off-by: Camille Letavernier <cletavernier@eclipsesource.com>
Also-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>

31 files changed, 1601 insertions, 201 deletions

diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/RuntimeValuesAdvicePackage.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/RuntimeValuesAdvicePackage.java
index d5d4bcc6576..338523f9d22 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/RuntimeValuesAdvicePackage.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/RuntimeValuesAdvicePackage.java
@@ -100,6 +100,15 @@ public interface RuntimeValuesAdvicePackage extends EPackage {
 	int RUNTIME_VALUES_ADVICE_CONFIGURATION__OWNING_TYPE = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__OWNING_TYPE;
 
 	/**
+	 * The feature id for the '<em><b>Annotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RUNTIME_VALUES_ADVICE_CONFIGURATION__ANNOTATIONS = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__ANNOTATIONS;
+
+	/**
 	 * The feature id for the '<em><b>Before</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/SetValuesAdvicePackage.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/SetValuesAdvicePackage.java
index 884247c84bd..0ea388db191 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/SetValuesAdvicePackage.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/SetValuesAdvicePackage.java
@@ -99,6 +99,15 @@ public interface SetValuesAdvicePackage extends EPackage {
 	int SET_VALUES_ADVICE_CONFIGURATION__OWNING_TYPE = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__OWNING_TYPE;
 
 	/**
+	 * The feature id for the '<em><b>Annotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SET_VALUES_ADVICE_CONFIGURATION__ANNOTATIONS = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__ANNOTATIONS;
+
+	/**
 	 * The feature id for the '<em><b>Before</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/ctool16/CreateConfigurationElement_annotations_Annotation.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/ctool16/CreateConfigurationElement_annotations_Annotation.gif
new file mode 100644
index 00000000000..5c09fd488fb
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/ctool16/CreateConfigurationElement_annotations_Annotation.gif
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/obj16/Annotation.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/obj16/Annotation.gif
new file mode 100644
index 00000000000..90d10f94707
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/obj16/Annotation.gif
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 3c1b30df3e9..4fa40154a49 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
@@ -104,3 +104,8 @@ _UI_ConfigurationElement_owningType_feature = Owning Type
 _UI_ElementTypeConfiguration_ownedConfigurations_feature = Owned Configurations
 _UI_ContainerConfiguration_containedType_feature = Contained Type
 _UI_AbstractMatcherConfiguration_matchedType_feature = Matched Type
+_UI_Annotation_type = Annotation
+_UI_ConfigurationElement_annotations_feature = Annotations
+_UI_Annotation_source_feature = Source
+_UI_Annotation_value_feature = Value
+_UI_Annotation_configurationElement_feature = Configuration Element
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/AnnotationItemProvider.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/AnnotationItemProvider.java
new file mode 100644
index 00000000000..d6fdd66fe88
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/AnnotationItemProvider.java
@@ -0,0 +1,194 @@
+/**
+ * Copyright (c) 2020 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
+ * https://www.eclipse.org/legal/epl-2.0/
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.types.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+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.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.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+
+import org.eclipse.papyrus.infra.types.Annotation;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.types.Annotation} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class AnnotationItemProvider 
+	extends ItemProviderAdapter
+	implements
+		IEditingDomainItemProvider,
+		IStructuredItemContentProvider,
+		ITreeItemContentProvider,
+		IItemLabelProvider,
+		IItemPropertySource {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AnnotationItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addSourcePropertyDescriptor(object);
+			addValuePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Source feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addSourcePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_Annotation_source_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_Annotation_source_feature", "_UI_Annotation_type"),
+				 ElementTypesConfigurationsPackage.Literals.ANNOTATION__SOURCE,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Value feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addValuePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_Annotation_value_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_Annotation_value_feature", "_UI_Annotation_type"),
+				 ElementTypesConfigurationsPackage.Literals.ANNOTATION__VALUE,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns Annotation.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/Annotation"));
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((Annotation)object).getSource();
+		return label == null || label.length() == 0 ?
+			getString("_UI_Annotation_type") :
+			getString("_UI_Annotation_type") + " " + label;
+	}
+
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(Annotation.class)) {
+			case ElementTypesConfigurationsPackage.ANNOTATION__SOURCE:
+			case ElementTypesConfigurationsPackage.ANNOTATION__VALUE:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
+	}
+
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ConfigurationElementItemProvider.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ConfigurationElementItemProvider.java
index 3ddfa5882f5..8beb9ea7725 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ConfigurationElementItemProvider.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ConfigurationElementItemProvider.java
@@ -21,6 +21,7 @@ import java.util.List;
 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.EStructuralFeature;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IChildCreationExtender;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
@@ -33,6 +34,7 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.papyrus.infra.types.ConfigurationElement;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsFactory;
 import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
 
 /**
@@ -110,6 +112,36 @@ public class ConfigurationElementItemProvider
 	}
 
 	/**
+	 * 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}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
+			super.getChildrenFeatures(object);
+			childrenFeatures.add(ElementTypesConfigurationsPackage.Literals.CONFIGURATION_ELEMENT__ANNOTATIONS);
+		}
+		return childrenFeatures;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@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.
+
+		return super.getChildFeature(object, child);
+	}
+
+	/**
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -139,6 +171,9 @@ public class ConfigurationElementItemProvider
 			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__DESCRIPTION:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
+			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__ANNOTATIONS:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+				return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -153,6 +188,11 @@ public class ConfigurationElementItemProvider
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
+
+		newChildDescriptors.add
+			(createChildParameter
+				(ElementTypesConfigurationsPackage.Literals.CONFIGURATION_ELEMENT__ANNOTATIONS,
+				 ElementTypesConfigurationsFactory.eINSTANCE.createAnnotation()));
 	}
 
 	/**
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 454ebb504d0..3be476e4ac1 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
@@ -153,7 +153,7 @@ public class ElementTypeSetConfigurationItemProvider extends ConfigurationElemen
 	}
 	
 	@Override
-	protected Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
 		if (childrenFeatures == null) {
 			getChildrenFeaturesGen(object);
 
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ElementTypesConfigurationsItemProviderAdapterFactory.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ElementTypesConfigurationsItemProviderAdapterFactory.java
index eae94f73b41..2ce235dd1a9 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ElementTypesConfigurationsItemProviderAdapterFactory.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ElementTypesConfigurationsItemProviderAdapterFactory.java
@@ -193,6 +193,29 @@ public class ElementTypesConfigurationsItemProviderAdapterFactory extends Elemen
 	}
 
 	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.types.Annotation} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AnnotationItemProvider annotationItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.types.Annotation}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createAnnotationAdapter() {
+		if (annotationItemProvider == null) {
+			annotationItemProvider = new AnnotationItemProvider(this);
+		}
+
+		return annotationItemProvider;
+	}
+
+	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.types.MetamodelTypeConfiguration} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -466,6 +489,7 @@ public class ElementTypesConfigurationsItemProviderAdapterFactory extends Elemen
 		if (iconEntryItemProvider != null) iconEntryItemProvider.dispose();
 		if (containerConfigurationItemProvider != null) containerConfigurationItemProvider.dispose();
 		if (specializationTypeConfigurationItemProvider != null) specializationTypeConfigurationItemProvider.dispose();
+		if (annotationItemProvider != null) annotationItemProvider.dispose();
 		if (metamodelTypeConfigurationItemProvider != null) metamodelTypeConfigurationItemProvider.dispose();
 		if (editHelperAdviceConfigurationItemProvider != null) editHelperAdviceConfigurationItemProvider.dispose();
 		if (adviceBindingConfigurationItemProvider != null) adviceBindingConfigurationItemProvider.dispose();
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/RuleBasedPackage.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/RuleBasedPackage.java
index bb3b10615ac..c81ac2da92a 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/RuleBasedPackage.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/RuleBasedPackage.java
@@ -99,6 +99,15 @@ public interface RuleBasedPackage extends EPackage {
 	int RULE_BASED_TYPE_CONFIGURATION__OWNING_TYPE = ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__OWNING_TYPE;
 
 	/**
+	 * The feature id for the '<em><b>Annotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RULE_BASED_TYPE_CONFIGURATION__ANNOTATIONS = ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__ANNOTATIONS;
+
+	/**
 	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
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 7c0af4a533b..24670b4788f 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
@@ -30,6 +30,8 @@
     <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"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="annotations" ordered="false"
+        upperBound="-1" eType="#//Annotation" containment="true" eOpposite="#//Annotation/configurationElement"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ElementTypeConfiguration" abstract="true"
       eSuperTypes="#//ConfigurationElement #//IdentifiedConfiguration #//NamedConfiguration">
@@ -153,6 +155,14 @@
       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="Annotation">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="source" ordered="false"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" ordered="false"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="configurationElement" ordered="false"
+        lowerBound="1" eType="#//ConfigurationElement" eOpposite="#//ConfigurationElement/annotations"/>
+  </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 aa0dbe96afb..fa0d05c887c 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
@@ -64,6 +64,8 @@
       <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"/>
+      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
+          createChild="true" ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//ConfigurationElement/annotations"/>
     </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"/>
@@ -134,6 +136,12 @@
     <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#//Annotation">
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//Annotation/source"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//Annotation/value"/>
+      <genFeatures xsi:type="genmodel:GenFeature" property="None" notify="false" createChild="false"
+          ecoreFeature="ecore:EReference ElementTypesConfigurations.ecore#//Annotation/configurationElement"/>
+    </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 d39cd05371b..5913aa3712e 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
@@ -553,157 +553,191 @@
       <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">
+    <children xmi:type="notation:Shape" xmi:id="_2pVRq09XEeuzRKD6DSCmXg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_2pVRrE9XEeuzRKD6DSCmXg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2pVRrk9XEeuzRKD6DSCmXg" 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"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2pVRrU9XEeuzRKD6DSCmXg" 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">
+    <children xmi:type="notation:Shape" xmi:id="_2paKK09XEeuzRKD6DSCmXg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_2paKLE9XEeuzRKD6DSCmXg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2paxME9XEeuzRKD6DSCmXg" 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"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2paKLU9XEeuzRKD6DSCmXg" 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">
+    <children xmi:type="notation:Shape" xmi:id="_2ssusE9XEeuzRKD6DSCmXg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_2ssusU9XEeuzRKD6DSCmXg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2ssus09XEeuzRKD6DSCmXg" 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"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2ssusk9XEeuzRKD6DSCmXg" 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">
+    <children xmi:type="notation:Shape" xmi:id="_2swZF09XEeuzRKD6DSCmXg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_2swZGE9XEeuzRKD6DSCmXg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2swZGk9XEeuzRKD6DSCmXg" 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"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2swZGU9XEeuzRKD6DSCmXg" 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">
+    <children xmi:type="notation:Shape" xmi:id="_2s1Rl09XEeuzRKD6DSCmXg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_2s1RmE9XEeuzRKD6DSCmXg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2s1Rmk9XEeuzRKD6DSCmXg" 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"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2s1RmU9XEeuzRKD6DSCmXg" 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">
+    <children xmi:type="notation:Shape" xmi:id="_2tBe209XEeuzRKD6DSCmXg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_2tBe3E9XEeuzRKD6DSCmXg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2tBe3k9XEeuzRKD6DSCmXg" 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"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2tBe3U9XEeuzRKD6DSCmXg" 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">
+    <children xmi:type="notation:Shape" xmi:id="_2tFwSU9XEeuzRKD6DSCmXg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_2tFwSk9XEeuzRKD6DSCmXg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2tFwTE9XEeuzRKD6DSCmXg" 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"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2tFwS09XEeuzRKD6DSCmXg" 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">
+    <children xmi:type="notation:Shape" xmi:id="_2tL2409XEeuzRKD6DSCmXg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_2tL25E9XEeuzRKD6DSCmXg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2tL25k9XEeuzRKD6DSCmXg" 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"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2tL25U9XEeuzRKD6DSCmXg" 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">
+    <children xmi:type="notation:Shape" xmi:id="_2tR9gE9XEeuzRKD6DSCmXg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_2tR9gU9XEeuzRKD6DSCmXg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2tR9g09XEeuzRKD6DSCmXg" 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"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2tR9gk9XEeuzRKD6DSCmXg" 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">
+    <children xmi:type="notation:Shape" xmi:id="_2tWO_U9XEeuzRKD6DSCmXg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_2tWO_k9XEeuzRKD6DSCmXg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2tW2AE9XEeuzRKD6DSCmXg" 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"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2tWO_09XEeuzRKD6DSCmXg" 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">
+    <children xmi:type="notation:Shape" xmi:id="_2tbHfU9XEeuzRKD6DSCmXg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_2tbHfk9XEeuzRKD6DSCmXg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2tbHgE9XEeuzRKD6DSCmXg" 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"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2tbHf09XEeuzRKD6DSCmXg" 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">
+    <children xmi:type="notation:Shape" xmi:id="_2tfY409XEeuzRKD6DSCmXg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_2tfY5E9XEeuzRKD6DSCmXg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2tfY5k9XEeuzRKD6DSCmXg" 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"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2tfY5U9XEeuzRKD6DSCmXg" 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">
+    <children xmi:type="notation:Shape" xmi:id="_2tmto09XEeuzRKD6DSCmXg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_2tmtpE9XEeuzRKD6DSCmXg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2tmtpk9XEeuzRKD6DSCmXg" 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"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2tmtpU9XEeuzRKD6DSCmXg" 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">
+    <children xmi:type="notation:Shape" xmi:id="_2tvQjU9XEeuzRKD6DSCmXg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_2tvQjk9XEeuzRKD6DSCmXg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2tvQkE9XEeuzRKD6DSCmXg" 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"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2tvQj09XEeuzRKD6DSCmXg" 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">
+    <children xmi:type="notation:Shape" xmi:id="_2tzh-U9XEeuzRKD6DSCmXg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_2tzh-k9XEeuzRKD6DSCmXg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2tzh_E9XEeuzRKD6DSCmXg" 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"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2tzh-09XEeuzRKD6DSCmXg" 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">
+    <children xmi:type="notation:Shape" xmi:id="_2t4acE9XEeuzRKD6DSCmXg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_2t4acU9XEeuzRKD6DSCmXg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2t4ac09XEeuzRKD6DSCmXg" 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"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2t4ack9XEeuzRKD6DSCmXg" 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">
+    <children xmi:type="notation:Shape" xmi:id="_2t8r5U9XEeuzRKD6DSCmXg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_2t8r5k9XEeuzRKD6DSCmXg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2t8r6E9XEeuzRKD6DSCmXg" 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"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2t8r509XEeuzRKD6DSCmXg" 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">
+    <children xmi:type="notation:Shape" xmi:id="_2uCygE9XEeuzRKD6DSCmXg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_2uCygU9XEeuzRKD6DSCmXg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2uCyg09XEeuzRKD6DSCmXg" 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"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2uCygk9XEeuzRKD6DSCmXg" 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">
+    <children xmi:type="notation:Shape" xmi:id="_2uHD809XEeuzRKD6DSCmXg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_2uHD9E9XEeuzRKD6DSCmXg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2uHD9k9XEeuzRKD6DSCmXg" 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"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2uHD9U9XEeuzRKD6DSCmXg" x="1180" y="740"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_5evYgE9XEeuzRKD6DSCmXg" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_5evYgk9XEeuzRKD6DSCmXg" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_5evYg09XEeuzRKD6DSCmXg" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_5ev_kE9XEeuzRKD6DSCmXg" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5ev_kU9XEeuzRKD6DSCmXg" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_RXYooE9YEeuzRKD6DSCmXg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="ElementTypesConfigurations.uml#_RWf30E9YEeuzRKD6DSCmXg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_RXYooU9YEeuzRKD6DSCmXg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_UtUpsE9YEeuzRKD6DSCmXg" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="ElementTypesConfigurations.uml#_Usb44E9YEeuzRKD6DSCmXg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UtUpsU9YEeuzRKD6DSCmXg"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5ev_kk9XEeuzRKD6DSCmXg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_5ev_k09XEeuzRKD6DSCmXg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_5ev_lE9XEeuzRKD6DSCmXg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5ev_lU9XEeuzRKD6DSCmXg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5ev_lk9XEeuzRKD6DSCmXg" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5ev_l09XEeuzRKD6DSCmXg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_5ev_mE9XEeuzRKD6DSCmXg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_5ev_mU9XEeuzRKD6DSCmXg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5ev_mk9XEeuzRKD6DSCmXg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5ev_m09XEeuzRKD6DSCmXg" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5ev_nE9XEeuzRKD6DSCmXg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_5ev_nU9XEeuzRKD6DSCmXg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_5ev_nk9XEeuzRKD6DSCmXg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5ev_n09XEeuzRKD6DSCmXg"/>
+      </children>
+      <element xmi:type="uml:Class" href="ElementTypesConfigurations.uml#_5epR4E9XEeuzRKD6DSCmXg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5evYgU9XEeuzRKD6DSCmXg" x="140" y="80"/>
     </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"/>
@@ -1436,7 +1470,7 @@
       </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"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ua1wKSjYEeuEo8scjf0hcw" x="-97" y="-12"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_Ua1JESjYEeuEo8scjf0hcw"/>
       <element xmi:type="uml:Association" href="ElementTypesConfigurations.uml#_UYp-0CjYEeuEo8scjf0hcw"/>
@@ -1466,195 +1500,226 @@
       <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">
+    <edges xmi:type="notation:Connector" xmi:id="_2pV4sE9XEeuzRKD6DSCmXg" type="StereotypeCommentLink" source="_fr880BOQEeeTo_35pSTPiA" target="_2pVRq09XEeuzRKD6DSCmXg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_2pV4sU9XEeuzRKD6DSCmXg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2pV4tU9XEeuzRKD6DSCmXg" 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"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2pV4sk9XEeuzRKD6DSCmXg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2pV4s09XEeuzRKD6DSCmXg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2pV4tE9XEeuzRKD6DSCmXg"/>
     </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">
+    <edges xmi:type="notation:Connector" xmi:id="_2paxMU9XEeuzRKD6DSCmXg" type="StereotypeCommentLink" source="_mqbK0BOQEeeTo_35pSTPiA" target="_2paKK09XEeuzRKD6DSCmXg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_2paxMk9XEeuzRKD6DSCmXg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2paxNk9XEeuzRKD6DSCmXg" 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"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2paxM09XEeuzRKD6DSCmXg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2paxNE9XEeuzRKD6DSCmXg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2paxNU9XEeuzRKD6DSCmXg"/>
     </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">
+    <edges xmi:type="notation:Connector" xmi:id="_2ssutE9XEeuzRKD6DSCmXg" type="StereotypeCommentLink" source="_s12yUBOQEeeTo_35pSTPiA" target="_2ssusE9XEeuzRKD6DSCmXg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_2ssutU9XEeuzRKD6DSCmXg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2ssuuU9XEeuzRKD6DSCmXg" 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"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2ssutk9XEeuzRKD6DSCmXg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2ssut09XEeuzRKD6DSCmXg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2ssuuE9XEeuzRKD6DSCmXg"/>
     </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">
+    <edges xmi:type="notation:Connector" xmi:id="_2swZG09XEeuzRKD6DSCmXg" type="StereotypeCommentLink" source="_JMepoBOREeeTo_35pSTPiA" target="_2swZF09XEeuzRKD6DSCmXg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_2swZHE9XEeuzRKD6DSCmXg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2swZIE9XEeuzRKD6DSCmXg" 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"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2swZHU9XEeuzRKD6DSCmXg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2swZHk9XEeuzRKD6DSCmXg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2swZH09XEeuzRKD6DSCmXg"/>
     </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">
+    <edges xmi:type="notation:Connector" xmi:id="_2s1Rm09XEeuzRKD6DSCmXg" type="StereotypeCommentLink" source="_L_e8wBOREeeTo_35pSTPiA" target="_2s1Rl09XEeuzRKD6DSCmXg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_2s1RnE9XEeuzRKD6DSCmXg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2s1RoE9XEeuzRKD6DSCmXg" 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"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2s1RnU9XEeuzRKD6DSCmXg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2s1Rnk9XEeuzRKD6DSCmXg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2s1Rn09XEeuzRKD6DSCmXg"/>
     </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">
+    <edges xmi:type="notation:Connector" xmi:id="_2tBe309XEeuzRKD6DSCmXg" type="StereotypeCommentLink" source="_NBPUsBOREeeTo_35pSTPiA" target="_2tBe209XEeuzRKD6DSCmXg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_2tCF4E9XEeuzRKD6DSCmXg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2tCF5E9XEeuzRKD6DSCmXg" 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"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2tCF4U9XEeuzRKD6DSCmXg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2tCF4k9XEeuzRKD6DSCmXg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2tCF409XEeuzRKD6DSCmXg"/>
     </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">
+    <edges xmi:type="notation:Connector" xmi:id="_2tFwTU9XEeuzRKD6DSCmXg" type="StereotypeCommentLink" source="_QLaKoBOREeeTo_35pSTPiA" target="_2tFwSU9XEeuzRKD6DSCmXg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_2tFwTk9XEeuzRKD6DSCmXg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2tGXUU9XEeuzRKD6DSCmXg" 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"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2tFwT09XEeuzRKD6DSCmXg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2tFwUE9XEeuzRKD6DSCmXg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2tGXUE9XEeuzRKD6DSCmXg"/>
     </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">
+    <edges xmi:type="notation:Connector" xmi:id="_2tL2509XEeuzRKD6DSCmXg" type="StereotypeCommentLink" source="_Rv6DQBOREeeTo_35pSTPiA" target="_2tL2409XEeuzRKD6DSCmXg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_2tL26E9XEeuzRKD6DSCmXg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2tL27E9XEeuzRKD6DSCmXg" 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"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2tL26U9XEeuzRKD6DSCmXg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2tL26k9XEeuzRKD6DSCmXg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2tL2609XEeuzRKD6DSCmXg"/>
     </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">
+    <edges xmi:type="notation:Connector" xmi:id="_2tR9hE9XEeuzRKD6DSCmXg" type="StereotypeCommentLink" source="_S0fFsBOREeeTo_35pSTPiA" target="_2tR9gE9XEeuzRKD6DSCmXg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_2tR9hU9XEeuzRKD6DSCmXg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2tR9iU9XEeuzRKD6DSCmXg" 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"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2tR9hk9XEeuzRKD6DSCmXg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2tR9h09XEeuzRKD6DSCmXg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2tR9iE9XEeuzRKD6DSCmXg"/>
     </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">
+    <edges xmi:type="notation:Connector" xmi:id="_2tW2AU9XEeuzRKD6DSCmXg" type="StereotypeCommentLink" source="_UrV5oBOREeeTo_35pSTPiA" target="_2tWO_U9XEeuzRKD6DSCmXg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_2tW2Ak9XEeuzRKD6DSCmXg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2tW2Bk9XEeuzRKD6DSCmXg" 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"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2tW2A09XEeuzRKD6DSCmXg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2tW2BE9XEeuzRKD6DSCmXg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2tW2BU9XEeuzRKD6DSCmXg"/>
     </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">
+    <edges xmi:type="notation:Connector" xmi:id="_2tbHgU9XEeuzRKD6DSCmXg" type="StereotypeCommentLink" source="_VnxFoBOREeeTo_35pSTPiA" target="_2tbHfU9XEeuzRKD6DSCmXg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_2tbHgk9XEeuzRKD6DSCmXg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2tbHhk9XEeuzRKD6DSCmXg" 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"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2tbHg09XEeuzRKD6DSCmXg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2tbHhE9XEeuzRKD6DSCmXg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2tbHhU9XEeuzRKD6DSCmXg"/>
     </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">
+    <edges xmi:type="notation:Connector" xmi:id="_2tfY509XEeuzRKD6DSCmXg" type="StereotypeCommentLink" source="_Wr-7sBOREeeTo_35pSTPiA" target="_2tfY409XEeuzRKD6DSCmXg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_2tfY6E9XEeuzRKD6DSCmXg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2tfY7E9XEeuzRKD6DSCmXg" 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"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2tfY6U9XEeuzRKD6DSCmXg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2tfY6k9XEeuzRKD6DSCmXg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2tfY609XEeuzRKD6DSCmXg"/>
     </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">
+    <edges xmi:type="notation:Connector" xmi:id="_2tmtp09XEeuzRKD6DSCmXg" type="StereotypeCommentLink" source="_X2b8oBOREeeTo_35pSTPiA" target="_2tmto09XEeuzRKD6DSCmXg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_2tmtqE9XEeuzRKD6DSCmXg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2tmtrE9XEeuzRKD6DSCmXg" 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"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2tmtqU9XEeuzRKD6DSCmXg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2tmtqk9XEeuzRKD6DSCmXg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2tmtq09XEeuzRKD6DSCmXg"/>
     </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">
+    <edges xmi:type="notation:Connector" xmi:id="_2tvQkU9XEeuzRKD6DSCmXg" type="StereotypeCommentLink" source="_kigmoBOREeeTo_35pSTPiA" target="_2tvQjU9XEeuzRKD6DSCmXg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_2tvQkk9XEeuzRKD6DSCmXg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2tv3kk9XEeuzRKD6DSCmXg" 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"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2tvQk09XEeuzRKD6DSCmXg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2tv3kE9XEeuzRKD6DSCmXg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2tv3kU9XEeuzRKD6DSCmXg"/>
     </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">
+    <edges xmi:type="notation:Connector" xmi:id="_2tzh_U9XEeuzRKD6DSCmXg" type="StereotypeCommentLink" source="_mQmgIBOREeeTo_35pSTPiA" target="_2tzh-U9XEeuzRKD6DSCmXg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_2tzh_k9XEeuzRKD6DSCmXg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2tziAk9XEeuzRKD6DSCmXg" 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"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2tzh_09XEeuzRKD6DSCmXg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2tziAE9XEeuzRKD6DSCmXg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2tziAU9XEeuzRKD6DSCmXg"/>
     </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">
+    <edges xmi:type="notation:Connector" xmi:id="_2t4adE9XEeuzRKD6DSCmXg" type="StereotypeCommentLink" source="_n9jKIBOREeeTo_35pSTPiA" target="_2t4acE9XEeuzRKD6DSCmXg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_2t4adU9XEeuzRKD6DSCmXg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2t4aeU9XEeuzRKD6DSCmXg" 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"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2t4adk9XEeuzRKD6DSCmXg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2t4ad09XEeuzRKD6DSCmXg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2t4aeE9XEeuzRKD6DSCmXg"/>
     </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">
+    <edges xmi:type="notation:Connector" xmi:id="_2t8r6U9XEeuzRKD6DSCmXg" type="StereotypeCommentLink" source="_qGWpsBOREeeTo_35pSTPiA" target="_2t8r5U9XEeuzRKD6DSCmXg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_2t8r6k9XEeuzRKD6DSCmXg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2t8r7k9XEeuzRKD6DSCmXg" 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"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2t8r609XEeuzRKD6DSCmXg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2t8r7E9XEeuzRKD6DSCmXg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2t8r7U9XEeuzRKD6DSCmXg"/>
     </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">
+    <edges xmi:type="notation:Connector" xmi:id="_2uCyhE9XEeuzRKD6DSCmXg" type="StereotypeCommentLink" source="_qwUMsBOREeeTo_35pSTPiA" target="_2uCygE9XEeuzRKD6DSCmXg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_2uCyhU9XEeuzRKD6DSCmXg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2uCyiU9XEeuzRKD6DSCmXg" 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"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2uCyhk9XEeuzRKD6DSCmXg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2uCyh09XEeuzRKD6DSCmXg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2uCyiE9XEeuzRKD6DSCmXg"/>
     </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">
+    <edges xmi:type="notation:Connector" xmi:id="_2uHD909XEeuzRKD6DSCmXg" type="StereotypeCommentLink" source="_zrrvwBOSEeeTo_35pSTPiA" target="_2uHD809XEeuzRKD6DSCmXg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_2uHD-E9XEeuzRKD6DSCmXg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2uHD_E9XEeuzRKD6DSCmXg" 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"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2uHD-U9XEeuzRKD6DSCmXg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2uHD-k9XEeuzRKD6DSCmXg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2uHD-09XEeuzRKD6DSCmXg"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_8NLUsE9XEeuzRKD6DSCmXg" type="Association_Edge" source="_fr880BOQEeeTo_35pSTPiA" target="_5evYgE9XEeuzRKD6DSCmXg">
+      <children xmi:type="notation:DecorationNode" xmi:id="_8NL7wE9XEeuzRKD6DSCmXg" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_i-ELcE9YEeuzRKD6DSCmXg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8NL7wU9XEeuzRKD6DSCmXg" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_8NL7wk9XEeuzRKD6DSCmXg" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_i-548E9YEeuzRKD6DSCmXg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8NL7w09XEeuzRKD6DSCmXg" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_8NL7xE9XEeuzRKD6DSCmXg" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_i_0e8E9YEeuzRKD6DSCmXg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8NL7xU9XEeuzRKD6DSCmXg" x="85" y="-16"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_8NL7xk9XEeuzRKD6DSCmXg" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jAo-UE9YEeuzRKD6DSCmXg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8NL7x09XEeuzRKD6DSCmXg" x="-58" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_8NL7yE9XEeuzRKD6DSCmXg" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jBbogE9YEeuzRKD6DSCmXg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8NL7yU9XEeuzRKD6DSCmXg" x="35" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_8NL7yk9XEeuzRKD6DSCmXg" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jCQu8E9YEeuzRKD6DSCmXg" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8NL7y09XEeuzRKD6DSCmXg" x="-36" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_8NLUsU9XEeuzRKD6DSCmXg"/>
+      <element xmi:type="uml:Association" href="ElementTypesConfigurations.uml#_8MNrYE9XEeuzRKD6DSCmXg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8NLUsk9XEeuzRKD6DSCmXg" points="[573, 100, -643984, -643984]$[260, 100, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8O_SkE9XEeuzRKD6DSCmXg" id="(0.0,0.29)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8O_SkU9XEeuzRKD6DSCmXg" id="(1.0,0.17857142857142858)"/>
     </edges>
   </notation:Diagram>
   <css:ModelStyleSheets xmi:id="_4Ms-EDA4EeujiLBW1HgzCA">
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 6ef5806f2a1..9fb03b6586b 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
@@ -41,6 +41,10 @@
       <ownedAttribute xmi:type="uml:Property" xmi:id="_UYr0ACjYEeuEo8scjf0hcw" name="owningType" type="_VkhwQhLoEeeDV7UHoBIkeA" association="_UYp-0CjYEeuEo8scjf0hcw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_pH8RUCjYEeuEo8scjf0hcw"/>
       </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_8MTyAE9XEeuzRKD6DSCmXg" name="annotations" type="_5epR4E9XEeuzRKD6DSCmXg" aggregation="composite" association="_8MNrYE9XEeuzRKD6DSCmXg">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8MTyAU9XEeuzRKD6DSCmXg"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8MTyAk9XEeuzRKD6DSCmXg" value="*"/>
+      </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">
@@ -281,6 +285,22 @@ endif</body>
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UYql4SjYEeuEo8scjf0hcw" key="nature" value="UML_Nature"/>
       </eAnnotations>
     </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_5epR4E9XEeuzRKD6DSCmXg" name="Annotation">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_RWf30E9YEeuzRKD6DSCmXg" name="source">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gENpcE9YEeuzRKD6DSCmXg"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_Usb44E9YEeuzRKD6DSCmXg" name="value">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_g6_gcE9YEeuzRKD6DSCmXg"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_8MTyA09XEeuzRKD6DSCmXg" name="configurationElement" type="_VkhwOxLoEeeDV7UHoBIkeA" association="_8MNrYE9XEeuzRKD6DSCmXg"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_8MNrYE9XEeuzRKD6DSCmXg" memberEnd="_8MTyAE9XEeuzRKD6DSCmXg _8MTyA09XEeuzRKD6DSCmXg">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8MSj4E9XEeuzRKD6DSCmXg" source="org.eclipse.papyrus">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8MSj4U9XEeuzRKD6DSCmXg" 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/model/README.txt b/plugins/infra/types/org.eclipse.papyrus.infra.types/model/README.txt
new file mode 100644
index 00000000000..de16a97afe6
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/model/README.txt
@@ -0,0 +1,17 @@
+The ElementTypesConfigurations model is extended by many language- or domain-specific models in Papyrus. If changes are made to the ElementTypesConfiguration model, *all* other models must be regenerated as well.
+
+Here's a list of known models extending this one (grouped by plug-in):
+
+	- org.eclipse.papyrus.infra.types.rulebased
+		- RuleBased.ecore
+	- org.eclipse.papyrus.infra.emf.types
+		- InvariantContainerRule.ecore
+		- SetValuesAdvice.ecore
+	- org.eclipse.papyrus.infra.emf.types.ui
+		- RuntimeValuesAdvice.ecore
+	- org.eclipse.papyrus.uml.types.core
+		- ApplyStereotypeAdvice.ecore
+		- InvariantStereotypeRule.ecore
+		- SetTypeAdvice.ecore
+		- StereotypeMatcher.uml
+		- StereotypePropertyReferenceEdgeAdvice.ecore
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/Annotation.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/Annotation.java
new file mode 100644
index 00000000000..0a7a2088957
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/Annotation.java
@@ -0,0 +1,117 @@
+/**
+ * Copyright (c) 2020 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
+ * https://www.eclipse.org/legal/epl-2.0/
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.types;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Annotation</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.types.Annotation#getSource <em>Source</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.Annotation#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.Annotation#getConfigurationElement <em>Configuration Element</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getAnnotation()
+ * @model
+ * @generated
+ */
+public interface Annotation extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Source</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Source</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Source</em>' attribute.
+	 * @see #setSource(String)
+	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getAnnotation_Source()
+	 * @model ordered="false"
+	 * @generated
+	 */
+	String getSource();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.Annotation#getSource <em>Source</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Source</em>' attribute.
+	 * @see #getSource()
+	 * @generated
+	 */
+	void setSource(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Value</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Value</em>' attribute.
+	 * @see #setValue(String)
+	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getAnnotation_Value()
+	 * @model ordered="false"
+	 * @generated
+	 */
+	String getValue();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.Annotation#getValue <em>Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Value</em>' attribute.
+	 * @see #getValue()
+	 * @generated
+	 */
+	void setValue(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Configuration Element</b></em>' container reference.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.types.ConfigurationElement#getAnnotations <em>Annotations</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Configuration Element</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>Configuration Element</em>' container reference.
+	 * @see #setConfigurationElement(ConfigurationElement)
+	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getAnnotation_ConfigurationElement()
+	 * @see org.eclipse.papyrus.infra.types.ConfigurationElement#getAnnotations
+	 * @model opposite="annotations" required="true" transient="false" ordered="false"
+	 * @generated
+	 */
+	ConfigurationElement getConfigurationElement();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.Annotation#getConfigurationElement <em>Configuration Element</em>}' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Configuration Element</em>' container reference.
+	 * @see #getConfigurationElement()
+	 * @generated
+	 */
+	void setConfigurationElement(ConfigurationElement value);
+
+} // Annotation
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 f6617c7d3ea..e2ec065930b 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
@@ -15,6 +15,7 @@
  */
 package org.eclipse.papyrus.infra.types;
 
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
 
 /**
@@ -28,6 +29,7 @@ import org.eclipse.emf.ecore.EObject;
  * <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>
+ *   <li>{@link org.eclipse.papyrus.infra.types.ConfigurationElement#getAnnotations <em>Annotations</em>}</li>
  * </ul>
  *
  * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getConfigurationElement()
@@ -89,4 +91,22 @@ public interface ConfigurationElement extends EObject {
 	 */
 	void setOwningType(ElementTypeConfiguration value);
 
+	/**
+	 * Returns the value of the '<em><b>Annotations</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.types.Annotation}.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.types.Annotation#getConfigurationElement <em>Configuration Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Annotations</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>Annotations</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getConfigurationElement_Annotations()
+	 * @see org.eclipse.papyrus.infra.types.Annotation#getConfigurationElement
+	 * @model opposite="configurationElement" containment="true" ordered="false"
+	 * @generated
+	 */
+	EList<Annotation> getAnnotations();
+
 } // ConfigurationElement
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ElementTypesConfigurationsFactory.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ElementTypesConfigurationsFactory.java
index b52085731f7..a7e6c89fb91 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ElementTypesConfigurationsFactory.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ElementTypesConfigurationsFactory.java
@@ -70,6 +70,15 @@ public interface ElementTypesConfigurationsFactory extends EFactory {
 	SpecializationTypeConfiguration createSpecializationTypeConfiguration();
 
 	/**
+	 * Returns a new object of class '<em>Annotation</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Annotation</em>'.
+	 * @generated
+	 */
+	Annotation createAnnotation();
+
+	/**
 	 * Returns a new object of class '<em>Metamodel Type Configuration</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
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 ddc9d925e19..9d555a944cc 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
@@ -109,13 +109,22 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int CONFIGURATION_ELEMENT__OWNING_TYPE = 1;
 
 	/**
+	 * The feature id for the '<em><b>Annotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONFIGURATION_ELEMENT__ANNOTATIONS = 2;
+
+	/**
 	 * 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 = 2;
+	int CONFIGURATION_ELEMENT_FEATURE_COUNT = 3;
 
 	/**
 	 * The number of operations of the '<em>Configuration Element</em>' class.
@@ -155,6 +164,15 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int ELEMENT_TYPE_SET_CONFIGURATION__OWNING_TYPE = CONFIGURATION_ELEMENT__OWNING_TYPE;
 
 	/**
+	 * The feature id for the '<em><b>Annotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ELEMENT_TYPE_SET_CONFIGURATION__ANNOTATIONS = CONFIGURATION_ELEMENT__ANNOTATIONS;
+
+	/**
 	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -264,6 +282,15 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int ELEMENT_TYPE_CONFIGURATION__OWNING_TYPE = CONFIGURATION_ELEMENT__OWNING_TYPE;
 
 	/**
+	 * The feature id for the '<em><b>Annotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ELEMENT_TYPE_CONFIGURATION__ANNOTATIONS = CONFIGURATION_ELEMENT__ANNOTATIONS;
+
+	/**
 	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -448,6 +475,15 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int ADVICE_CONFIGURATION__OWNING_TYPE = CONFIGURATION_ELEMENT__OWNING_TYPE;
 
 	/**
+	 * The feature id for the '<em><b>Annotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ADVICE_CONFIGURATION__ANNOTATIONS = CONFIGURATION_ELEMENT__ANNOTATIONS;
+
+	/**
 	 * The feature id for the '<em><b>Before</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -512,6 +548,15 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int ABSTRACT_ADVICE_BINDING_CONFIGURATION__OWNING_TYPE = ADVICE_CONFIGURATION__OWNING_TYPE;
 
 	/**
+	 * The feature id for the '<em><b>Annotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_ADVICE_BINDING_CONFIGURATION__ANNOTATIONS = ADVICE_CONFIGURATION__ANNOTATIONS;
+
+	/**
 	 * The feature id for the '<em><b>Before</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -666,6 +711,15 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int CONTAINER_CONFIGURATION__OWNING_TYPE = CONFIGURATION_ELEMENT__OWNING_TYPE;
 
 	/**
+	 * The feature id for the '<em><b>Annotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTAINER_CONFIGURATION__ANNOTATIONS = CONFIGURATION_ELEMENT__ANNOTATIONS;
+
+	/**
 	 * The feature id for the '<em><b>Container Matcher Configuration</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -739,6 +793,15 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int ABSTRACT_MATCHER_CONFIGURATION__OWNING_TYPE = CONFIGURATION_ELEMENT__OWNING_TYPE;
 
 	/**
+	 * The feature id for the '<em><b>Annotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_MATCHER_CONFIGURATION__ANNOTATIONS = CONFIGURATION_ELEMENT__ANNOTATIONS;
+
+	/**
 	 * The feature id for the '<em><b>Matched Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -794,6 +857,15 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int SPECIALIZATION_TYPE_CONFIGURATION__OWNING_TYPE = ELEMENT_TYPE_CONFIGURATION__OWNING_TYPE;
 
 	/**
+	 * The feature id for the '<em><b>Annotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SPECIALIZATION_TYPE_CONFIGURATION__ANNOTATIONS = ELEMENT_TYPE_CONFIGURATION__ANNOTATIONS;
+
+	/**
 	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -948,6 +1020,15 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__OWNING_TYPE = ADVICE_CONFIGURATION__OWNING_TYPE;
 
 	/**
+	 * The feature id for the '<em><b>Annotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__ANNOTATIONS = ADVICE_CONFIGURATION__ANNOTATIONS;
+
+	/**
 	 * The feature id for the '<em><b>Before</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1047,6 +1128,61 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int NAMED_CONFIGURATION_OPERATION_COUNT = 0;
 
 	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.types.impl.AnnotationImpl <em>Annotation</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.types.impl.AnnotationImpl
+	 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getAnnotation()
+	 * @generated
+	 */
+	int ANNOTATION = 12;
+
+	/**
+	 * The feature id for the '<em><b>Source</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ANNOTATION__SOURCE = 0;
+
+	/**
+	 * The feature id for the '<em><b>Value</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ANNOTATION__VALUE = 1;
+
+	/**
+	 * The feature id for the '<em><b>Configuration Element</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ANNOTATION__CONFIGURATION_ELEMENT = 2;
+
+	/**
+	 * The number of structural features of the '<em>Annotation</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ANNOTATION_FEATURE_COUNT = 3;
+
+	/**
+	 * The number of operations of the '<em>Annotation</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ANNOTATION_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 -->
@@ -1054,7 +1190,7 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getMetamodelTypeConfiguration()
 	 * @generated
 	 */
-	int METAMODEL_TYPE_CONFIGURATION = 12;
+	int METAMODEL_TYPE_CONFIGURATION = 13;
 
 	/**
 	 * The feature id for the '<em><b>Description</b></em>' attribute.
@@ -1075,6 +1211,15 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int METAMODEL_TYPE_CONFIGURATION__OWNING_TYPE = ELEMENT_TYPE_CONFIGURATION__OWNING_TYPE;
 
 	/**
+	 * The feature id for the '<em><b>Annotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int METAMODEL_TYPE_CONFIGURATION__ANNOTATIONS = ELEMENT_TYPE_CONFIGURATION__ANNOTATIONS;
+
+	/**
 	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1190,7 +1335,7 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getEditHelperAdviceConfiguration()
 	 * @generated
 	 */
-	int EDIT_HELPER_ADVICE_CONFIGURATION = 13;
+	int EDIT_HELPER_ADVICE_CONFIGURATION = 14;
 
 	/**
 	 * The feature id for the '<em><b>Description</b></em>' attribute.
@@ -1211,6 +1356,15 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int EDIT_HELPER_ADVICE_CONFIGURATION__OWNING_TYPE = ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__OWNING_TYPE;
 
 	/**
+	 * The feature id for the '<em><b>Annotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EDIT_HELPER_ADVICE_CONFIGURATION__ANNOTATIONS = ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__ANNOTATIONS;
+
+	/**
 	 * The feature id for the '<em><b>Before</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1272,7 +1426,7 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getAdviceBindingConfiguration()
 	 * @generated
 	 */
-	int ADVICE_BINDING_CONFIGURATION = 14;
+	int ADVICE_BINDING_CONFIGURATION = 15;
 
 	/**
 	 * The feature id for the '<em><b>Description</b></em>' attribute.
@@ -1293,6 +1447,15 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int ADVICE_BINDING_CONFIGURATION__OWNING_TYPE = ABSTRACT_ADVICE_BINDING_CONFIGURATION__OWNING_TYPE;
 
 	/**
+	 * The feature id for the '<em><b>Annotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ADVICE_BINDING_CONFIGURATION__ANNOTATIONS = ABSTRACT_ADVICE_BINDING_CONFIGURATION__ANNOTATIONS;
+
+	/**
 	 * The feature id for the '<em><b>Before</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1435,7 +1598,7 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getMatcherConfiguration()
 	 * @generated
 	 */
-	int MATCHER_CONFIGURATION = 15;
+	int MATCHER_CONFIGURATION = 16;
 
 	/**
 	 * The feature id for the '<em><b>Description</b></em>' attribute.
@@ -1456,6 +1619,15 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int MATCHER_CONFIGURATION__OWNING_TYPE = ABSTRACT_MATCHER_CONFIGURATION__OWNING_TYPE;
 
 	/**
+	 * The feature id for the '<em><b>Annotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MATCHER_CONFIGURATION__ANNOTATIONS = ABSTRACT_MATCHER_CONFIGURATION__ANNOTATIONS;
+
+	/**
 	 * The feature id for the '<em><b>Matched Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1499,7 +1671,7 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getExternallyRegisteredType()
 	 * @generated
 	 */
-	int EXTERNALLY_REGISTERED_TYPE = 16;
+	int EXTERNALLY_REGISTERED_TYPE = 17;
 
 	/**
 	 * The feature id for the '<em><b>Description</b></em>' attribute.
@@ -1520,6 +1692,15 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int EXTERNALLY_REGISTERED_TYPE__OWNING_TYPE = ELEMENT_TYPE_CONFIGURATION__OWNING_TYPE;
 
 	/**
+	 * The feature id for the '<em><b>Annotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTERNALLY_REGISTERED_TYPE__ANNOTATIONS = ELEMENT_TYPE_CONFIGURATION__ANNOTATIONS;
+
+	/**
 	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1617,7 +1798,7 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getExternallyRegisteredAdvice()
 	 * @generated
 	 */
-	int EXTERNALLY_REGISTERED_ADVICE = 17;
+	int EXTERNALLY_REGISTERED_ADVICE = 18;
 
 	/**
 	 * The feature id for the '<em><b>Description</b></em>' attribute.
@@ -1638,6 +1819,15 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int EXTERNALLY_REGISTERED_ADVICE__OWNING_TYPE = ADVICE_BINDING_CONFIGURATION__OWNING_TYPE;
 
 	/**
+	 * The feature id for the '<em><b>Annotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTERNALLY_REGISTERED_ADVICE__ANNOTATIONS = ADVICE_BINDING_CONFIGURATION__ANNOTATIONS;
+
+	/**
 	 * The feature id for the '<em><b>Before</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1780,7 +1970,7 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getInheritanceKind()
 	 * @generated
 	 */
-	int INHERITANCE_KIND = 18;
+	int INHERITANCE_KIND = 19;
 
 
 	/**
@@ -1880,6 +2070,17 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	EReference getConfigurationElement_OwningType();
 
 	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.types.ConfigurationElement#getAnnotations <em>Annotations</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Annotations</em>'.
+	 * @see org.eclipse.papyrus.infra.types.ConfigurationElement#getAnnotations()
+	 * @see #getConfigurationElement()
+	 * @generated
+	 */
+	EReference getConfigurationElement_Annotations();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.types.ElementTypeConfiguration <em>Element Type Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -2030,6 +2231,49 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	EAttribute getNamedConfiguration_Name();
 
 	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.types.Annotation <em>Annotation</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Annotation</em>'.
+	 * @see org.eclipse.papyrus.infra.types.Annotation
+	 * @generated
+	 */
+	EClass getAnnotation();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.types.Annotation#getSource <em>Source</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Source</em>'.
+	 * @see org.eclipse.papyrus.infra.types.Annotation#getSource()
+	 * @see #getAnnotation()
+	 * @generated
+	 */
+	EAttribute getAnnotation_Source();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.types.Annotation#getValue <em>Value</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Value</em>'.
+	 * @see org.eclipse.papyrus.infra.types.Annotation#getValue()
+	 * @see #getAnnotation()
+	 * @generated
+	 */
+	EAttribute getAnnotation_Value();
+
+	/**
+	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.infra.types.Annotation#getConfigurationElement <em>Configuration Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the container reference '<em>Configuration Element</em>'.
+	 * @see org.eclipse.papyrus.infra.types.Annotation#getConfigurationElement()
+	 * @see #getAnnotation()
+	 * @generated
+	 */
+	EReference getAnnotation_ConfigurationElement();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration <em>Abstract Advice Binding Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -2533,6 +2777,14 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 		EReference CONFIGURATION_ELEMENT__OWNING_TYPE = eINSTANCE.getConfigurationElement_OwningType();
 
 		/**
+		 * The meta object literal for the '<em><b>Annotations</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CONFIGURATION_ELEMENT__ANNOTATIONS = eINSTANCE.getConfigurationElement_Annotations();
+
+		/**
 		 * 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 -->
@@ -2653,6 +2905,40 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 		EAttribute NAMED_CONFIGURATION__NAME = eINSTANCE.getNamedConfiguration_Name();
 
 		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.types.impl.AnnotationImpl <em>Annotation</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.types.impl.AnnotationImpl
+		 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getAnnotation()
+		 * @generated
+		 */
+		EClass ANNOTATION = eINSTANCE.getAnnotation();
+
+		/**
+		 * The meta object literal for the '<em><b>Source</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute ANNOTATION__SOURCE = eINSTANCE.getAnnotation_Source();
+
+		/**
+		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute ANNOTATION__VALUE = eINSTANCE.getAnnotation_Value();
+
+		/**
+		 * The meta object literal for the '<em><b>Configuration Element</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ANNOTATION__CONFIGURATION_ELEMENT = eINSTANCE.getAnnotation_ConfigurationElement();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.types.impl.AbstractAdviceBindingConfigurationImpl <em>Abstract Advice Binding Configuration</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AnnotationImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AnnotationImpl.java
new file mode 100644
index 00000000000..2860b7cb406
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AnnotationImpl.java
@@ -0,0 +1,335 @@
+/**
+ * Copyright (c) 2020 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
+ * https://www.eclipse.org/legal/epl-2.0/
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ */
+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.Annotation;
+import org.eclipse.papyrus.infra.types.ConfigurationElement;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Annotation</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.AnnotationImpl#getSource <em>Source</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.AnnotationImpl#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.AnnotationImpl#getConfigurationElement <em>Configuration Element</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class AnnotationImpl extends MinimalEObjectImpl.Container implements Annotation {
+	/**
+	 * The default value of the '{@link #getSource() <em>Source</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSource()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SOURCE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getSource() <em>Source</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSource()
+	 * @generated
+	 * @ordered
+	 */
+	protected String source = SOURCE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String VALUE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected String value = VALUE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AnnotationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ElementTypesConfigurationsPackage.Literals.ANNOTATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getSource() {
+		return source;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setSource(String newSource) {
+		String oldSource = source;
+		source = newSource;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.ANNOTATION__SOURCE, oldSource, source));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getValue() {
+		return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setValue(String newValue) {
+		String oldValue = value;
+		value = newValue;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.ANNOTATION__VALUE, oldValue, value));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ConfigurationElement getConfigurationElement() {
+		if (eContainerFeatureID() != ElementTypesConfigurationsPackage.ANNOTATION__CONFIGURATION_ELEMENT) return null;
+		return (ConfigurationElement)eInternalContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetConfigurationElement(ConfigurationElement newConfigurationElement, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject)newConfigurationElement, ElementTypesConfigurationsPackage.ANNOTATION__CONFIGURATION_ELEMENT, msgs);
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setConfigurationElement(ConfigurationElement newConfigurationElement) {
+		if (newConfigurationElement != eInternalContainer() || (eContainerFeatureID() != ElementTypesConfigurationsPackage.ANNOTATION__CONFIGURATION_ELEMENT && newConfigurationElement != null)) {
+			if (EcoreUtil.isAncestor(this, newConfigurationElement))
+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+			NotificationChain msgs = null;
+			if (eInternalContainer() != null)
+				msgs = eBasicRemoveFromContainer(msgs);
+			if (newConfigurationElement != null)
+				msgs = ((InternalEObject)newConfigurationElement).eInverseAdd(this, ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__ANNOTATIONS, ConfigurationElement.class, msgs);
+			msgs = basicSetConfigurationElement(newConfigurationElement, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.ANNOTATION__CONFIGURATION_ELEMENT, newConfigurationElement, newConfigurationElement));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case ElementTypesConfigurationsPackage.ANNOTATION__CONFIGURATION_ELEMENT:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetConfigurationElement((ConfigurationElement)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.ANNOTATION__CONFIGURATION_ELEMENT:
+				return basicSetConfigurationElement(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.ANNOTATION__CONFIGURATION_ELEMENT:
+				return eInternalContainer().eInverseRemove(this, ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__ANNOTATIONS, ConfigurationElement.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.ANNOTATION__SOURCE:
+				return getSource();
+			case ElementTypesConfigurationsPackage.ANNOTATION__VALUE:
+				return getValue();
+			case ElementTypesConfigurationsPackage.ANNOTATION__CONFIGURATION_ELEMENT:
+				return getConfigurationElement();
+		}
+		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.ANNOTATION__SOURCE:
+				setSource((String)newValue);
+				return;
+			case ElementTypesConfigurationsPackage.ANNOTATION__VALUE:
+				setValue((String)newValue);
+				return;
+			case ElementTypesConfigurationsPackage.ANNOTATION__CONFIGURATION_ELEMENT:
+				setConfigurationElement((ConfigurationElement)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ElementTypesConfigurationsPackage.ANNOTATION__SOURCE:
+				setSource(SOURCE_EDEFAULT);
+				return;
+			case ElementTypesConfigurationsPackage.ANNOTATION__VALUE:
+				setValue(VALUE_EDEFAULT);
+				return;
+			case ElementTypesConfigurationsPackage.ANNOTATION__CONFIGURATION_ELEMENT:
+				setConfigurationElement((ConfigurationElement)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ElementTypesConfigurationsPackage.ANNOTATION__SOURCE:
+				return SOURCE_EDEFAULT == null ? source != null : !SOURCE_EDEFAULT.equals(source);
+			case ElementTypesConfigurationsPackage.ANNOTATION__VALUE:
+				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
+			case ElementTypesConfigurationsPackage.ANNOTATION__CONFIGURATION_ELEMENT:
+				return getConfigurationElement() != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (source: ");
+		result.append(source);
+		result.append(", value: ");
+		result.append(value);
+		result.append(')');
+		return result.toString();
+	}
+
+} //AnnotationImpl
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 33ae1ab5f05..12a03f35097 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
@@ -15,16 +15,21 @@
  */
 package org.eclipse.papyrus.infra.types.impl;
 
+import java.util.Collection;
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
 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.EObjectContainmentWithInverseEList;
 import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.types.Annotation;
 import org.eclipse.papyrus.infra.types.ConfigurationElement;
 import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
 import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
@@ -39,6 +44,7 @@ import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
  * <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>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.ConfigurationElementImpl#getAnnotations <em>Annotations</em>}</li>
  * </ul>
  *
  * @generated
@@ -65,6 +71,16 @@ public abstract class ConfigurationElementImpl extends MinimalEObjectImpl.Contai
 	protected String description = DESCRIPTION_EDEFAULT;
 
 	/**
+	 * The cached value of the '{@link #getAnnotations() <em>Annotations</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAnnotations()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Annotation> annotations;
+
+	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -155,12 +171,28 @@ public abstract class ConfigurationElementImpl extends MinimalEObjectImpl.Contai
 	 * @generated
 	 */
 	@Override
+	public EList<Annotation> getAnnotations() {
+		if (annotations == null) {
+			annotations = new EObjectContainmentWithInverseEList<Annotation>(Annotation.class, this, ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__ANNOTATIONS, ElementTypesConfigurationsPackage.ANNOTATION__CONFIGURATION_ELEMENT);
+		}
+		return annotations;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@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);
+			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__ANNOTATIONS:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getAnnotations()).basicAdd(otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
@@ -175,6 +207,8 @@ public abstract class ConfigurationElementImpl extends MinimalEObjectImpl.Contai
 		switch (featureID) {
 			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__OWNING_TYPE:
 				return basicSetOwningType(null, msgs);
+			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__ANNOTATIONS:
+				return ((InternalEList<?>)getAnnotations()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -205,6 +239,8 @@ public abstract class ConfigurationElementImpl extends MinimalEObjectImpl.Contai
 				return getDescription();
 			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__OWNING_TYPE:
 				return getOwningType();
+			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__ANNOTATIONS:
+				return getAnnotations();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -214,6 +250,7 @@ public abstract class ConfigurationElementImpl extends MinimalEObjectImpl.Contai
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
@@ -223,6 +260,10 @@ public abstract class ConfigurationElementImpl extends MinimalEObjectImpl.Contai
 			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__OWNING_TYPE:
 				setOwningType((ElementTypeConfiguration)newValue);
 				return;
+			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__ANNOTATIONS:
+				getAnnotations().clear();
+				getAnnotations().addAll((Collection<? extends Annotation>)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -241,6 +282,9 @@ public abstract class ConfigurationElementImpl extends MinimalEObjectImpl.Contai
 			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__OWNING_TYPE:
 				setOwningType((ElementTypeConfiguration)null);
 				return;
+			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__ANNOTATIONS:
+				getAnnotations().clear();
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -257,6 +301,8 @@ public abstract class ConfigurationElementImpl extends MinimalEObjectImpl.Contai
 				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
 			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__OWNING_TYPE:
 				return getOwningType() != null;
+			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__ANNOTATIONS:
+				return annotations != null && !annotations.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypesConfigurationsFactoryImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypesConfigurationsFactoryImpl.java
index eae1643bc2d..c1aa612984d 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypesConfigurationsFactoryImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypesConfigurationsFactoryImpl.java
@@ -73,6 +73,7 @@ public class ElementTypesConfigurationsFactoryImpl extends EFactoryImpl implemen
 			case ElementTypesConfigurationsPackage.ICON_ENTRY: return createIconEntry();
 			case ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION: return createContainerConfiguration();
 			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION: return createSpecializationTypeConfiguration();
+			case ElementTypesConfigurationsPackage.ANNOTATION: return createAnnotation();
 			case ElementTypesConfigurationsPackage.METAMODEL_TYPE_CONFIGURATION: return createMetamodelTypeConfiguration();
 			case ElementTypesConfigurationsPackage.EDIT_HELPER_ADVICE_CONFIGURATION: return createEditHelperAdviceConfiguration();
 			case ElementTypesConfigurationsPackage.ADVICE_BINDING_CONFIGURATION: return createAdviceBindingConfiguration();
@@ -164,6 +165,17 @@ public class ElementTypesConfigurationsFactoryImpl extends EFactoryImpl implemen
 	 * @generated
 	 */
 	@Override
+	public Annotation createAnnotation() {
+		AnnotationImpl annotation = new AnnotationImpl();
+		return annotation;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
 	public MetamodelTypeConfiguration createMetamodelTypeConfiguration() {
 		MetamodelTypeConfigurationImpl metamodelTypeConfiguration = new MetamodelTypeConfigurationImpl();
 		return metamodelTypeConfiguration;
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 f346c89b42f..cffaed68ba6 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
@@ -32,6 +32,7 @@ import org.eclipse.papyrus.infra.types.AbstractEditHelperAdviceConfiguration;
 import org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration;
 import org.eclipse.papyrus.infra.types.AdviceBindingConfiguration;
 import org.eclipse.papyrus.infra.types.AdviceConfiguration;
+import org.eclipse.papyrus.infra.types.Annotation;
 import org.eclipse.papyrus.infra.types.ConfigurationElement;
 import org.eclipse.papyrus.infra.types.ContainerConfiguration;
 import org.eclipse.papyrus.infra.types.EditHelperAdviceConfiguration;
@@ -104,6 +105,13 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	private EClass annotationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	private EClass abstractAdviceBindingConfigurationEClass = null;
 
 	/**
@@ -360,6 +368,16 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
 	 * @generated
 	 */
 	@Override
+	public EReference getConfigurationElement_Annotations() {
+		return (EReference)configurationElementEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
 	public EClass getElementTypeConfiguration() {
 		return elementTypeConfigurationEClass;
 	}
@@ -500,6 +518,46 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
 	 * @generated
 	 */
 	@Override
+	public EClass getAnnotation() {
+		return annotationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getAnnotation_Source() {
+		return (EAttribute)annotationEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getAnnotation_Value() {
+		return (EAttribute)annotationEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getAnnotation_ConfigurationElement() {
+		return (EReference)annotationEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
 	public EClass getAbstractAdviceBindingConfiguration() {
 		return abstractAdviceBindingConfigurationEClass;
 	}
@@ -913,6 +971,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
 		configurationElementEClass = createEClass(CONFIGURATION_ELEMENT);
 		createEAttribute(configurationElementEClass, CONFIGURATION_ELEMENT__DESCRIPTION);
 		createEReference(configurationElementEClass, CONFIGURATION_ELEMENT__OWNING_TYPE);
+		createEReference(configurationElementEClass, CONFIGURATION_ELEMENT__ANNOTATIONS);
 
 		elementTypeConfigurationEClass = createEClass(ELEMENT_TYPE_CONFIGURATION);
 		createEAttribute(elementTypeConfigurationEClass, ELEMENT_TYPE_CONFIGURATION__HINT);
@@ -964,6 +1023,11 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
 		namedConfigurationEClass = createEClass(NAMED_CONFIGURATION);
 		createEAttribute(namedConfigurationEClass, NAMED_CONFIGURATION__NAME);
 
+		annotationEClass = createEClass(ANNOTATION);
+		createEAttribute(annotationEClass, ANNOTATION__SOURCE);
+		createEAttribute(annotationEClass, ANNOTATION__VALUE);
+		createEReference(annotationEClass, ANNOTATION__CONFIGURATION_ELEMENT);
+
 		metamodelTypeConfigurationEClass = createEClass(METAMODEL_TYPE_CONFIGURATION);
 		createEReference(metamodelTypeConfigurationEClass, METAMODEL_TYPE_CONFIGURATION__ECLASS);
 		createEAttribute(metamodelTypeConfigurationEClass, METAMODEL_TYPE_CONFIGURATION__EDIT_HELPER_CLASS_NAME);
@@ -1048,6 +1112,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
 		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);
+		initEReference(getConfigurationElement_Annotations(), this.getAnnotation(), this.getAnnotation_ConfigurationElement(), "annotations", 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);
@@ -1100,6 +1165,11 @@ 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(annotationEClass, Annotation.class, "Annotation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getAnnotation_Source(), ecorePackage.getEString(), "source", null, 0, 1, Annotation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getAnnotation_Value(), ecorePackage.getEString(), "value", null, 0, 1, Annotation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getAnnotation_ConfigurationElement(), this.getConfigurationElement(), this.getConfigurationElement_Annotations(), "configurationElement", null, 1, 1, Annotation.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);
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 a69566a6efd..2f5055d9c27 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
@@ -129,6 +129,10 @@ public class ElementTypesConfigurationsAdapterFactory extends AdapterFactoryImpl
 				return createNamedConfigurationAdapter();
 			}
 			@Override
+			public Adapter caseAnnotation(Annotation object) {
+				return createAnnotationAdapter();
+			}
+			@Override
 			public Adapter caseMetamodelTypeConfiguration(MetamodelTypeConfiguration object) {
 				return createMetamodelTypeConfigurationAdapter();
 			}
@@ -257,6 +261,20 @@ public class ElementTypesConfigurationsAdapterFactory extends AdapterFactoryImpl
 	}
 
 	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.Annotation <em>Annotation</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.infra.types.Annotation
+	 * @generated
+	 */
+	public Adapter createAnnotationAdapter() {
+		return null;
+	}
+
+	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration <em>Abstract Advice Binding Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
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 79edb7f192f..792012c3bd9 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
@@ -169,6 +169,12 @@ public class ElementTypesConfigurationsSwitch<T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
+			case ElementTypesConfigurationsPackage.ANNOTATION: {
+				Annotation annotation = (Annotation)theEObject;
+				T result = caseAnnotation(annotation);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
 			case ElementTypesConfigurationsPackage.METAMODEL_TYPE_CONFIGURATION: {
 				MetamodelTypeConfiguration metamodelTypeConfiguration = (MetamodelTypeConfiguration)theEObject;
 				T result = caseMetamodelTypeConfiguration(metamodelTypeConfiguration);
@@ -322,6 +328,21 @@ public class ElementTypesConfigurationsSwitch<T> extends Switch<T> {
 	}
 
 	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Annotation</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Annotation</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseAnnotation(Annotation object) {
+		return null;
+	}
+
+	/**
 	 * Returns the result of interpreting the object as an instance of '<em>Abstract Advice Binding Configuration</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
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 aeb067314e5..1af96704185 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
@@ -129,6 +129,8 @@ public class ElementTypesConfigurationsValidator extends EObjectValidator {
 				return validateIdentifiedConfiguration((IdentifiedConfiguration)value, diagnostics, context);
 			case ElementTypesConfigurationsPackage.NAMED_CONFIGURATION:
 				return validateNamedConfiguration((NamedConfiguration)value, diagnostics, context);
+			case ElementTypesConfigurationsPackage.ANNOTATION:
+				return validateAnnotation((Annotation)value, diagnostics, context);
 			case ElementTypesConfigurationsPackage.METAMODEL_TYPE_CONFIGURATION:
 				return validateMetamodelTypeConfiguration((MetamodelTypeConfiguration)value, diagnostics, context);
 			case ElementTypesConfigurationsPackage.EDIT_HELPER_ADVICE_CONFIGURATION:
@@ -282,6 +284,15 @@ public class ElementTypesConfigurationsValidator extends EObjectValidator {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public boolean validateAnnotation(Annotation annotation, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return validate_EveryDefaultConstraint(annotation, diagnostics, context);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public boolean validateSpecializationTypeConfiguration(SpecializationTypeConfiguration specializationTypeConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return validate_EveryDefaultConstraint(specializationTypeConfiguration, diagnostics, context);
 	}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/ApplyStereotypeAdvicePackage.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/ApplyStereotypeAdvicePackage.java
index 6a53edf0bab..0141a40d20f 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/ApplyStereotypeAdvicePackage.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/ApplyStereotypeAdvicePackage.java
@@ -99,6 +99,15 @@ public interface ApplyStereotypeAdvicePackage extends EPackage {
 	int APPLY_STEREOTYPE_ADVICE_CONFIGURATION__OWNING_TYPE = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__OWNING_TYPE;
 
 	/**
+	 * The feature id for the '<em><b>Annotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int APPLY_STEREOTYPE_ADVICE_CONFIGURATION__ANNOTATIONS = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__ANNOTATIONS;
+
+	/**
 	 * The feature id for the '<em><b>Before</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/settype/SetTypeAdviceConfigurationPackage.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/settype/SetTypeAdviceConfigurationPackage.java
index a526d19028e..b46c56c79f7 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/settype/SetTypeAdviceConfigurationPackage.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/settype/SetTypeAdviceConfigurationPackage.java
@@ -99,6 +99,15 @@ public interface SetTypeAdviceConfigurationPackage extends EPackage {
 	int SET_TYPE_ADVICE_CONFIGURATION__OWNING_TYPE = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__OWNING_TYPE;
 
 	/**
+	 * The feature id for the '<em><b>Annotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SET_TYPE_ADVICE_CONFIGURATION__ANNOTATIONS = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__ANNOTATIONS;
+
+	/**
 	 * The feature id for the '<em><b>Before</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/stereotypepropertyreferenceedgeadvice/StereotypePropertyReferenceEdgeAdvicePackage.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/stereotypepropertyreferenceedgeadvice/StereotypePropertyReferenceEdgeAdvicePackage.java
index f09b4f4b27b..7c84514de85 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/stereotypepropertyreferenceedgeadvice/StereotypePropertyReferenceEdgeAdvicePackage.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/stereotypepropertyreferenceedgeadvice/StereotypePropertyReferenceEdgeAdvicePackage.java
@@ -100,6 +100,15 @@ public interface StereotypePropertyReferenceEdgeAdvicePackage extends EPackage {
 	int STEREOTYPE_PROPERTY_REFERENCE_EDGE_ADVICE_CONFIGURATION__OWNING_TYPE = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__OWNING_TYPE;
 
 	/**
+	 * The feature id for the '<em><b>Annotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STEREOTYPE_PROPERTY_REFERENCE_EDGE_ADVICE_CONFIGURATION__ANNOTATIONS = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__ANNOTATIONS;
+
+	/**
 	 * The feature id for the '<em><b>Before</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/matchers/stereotype/StereotypeApplicationMatcherPackage.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/matchers/stereotype/StereotypeApplicationMatcherPackage.java
index ee355973737..2f3e6cb40d6 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/matchers/stereotype/StereotypeApplicationMatcherPackage.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/matchers/stereotype/StereotypeApplicationMatcherPackage.java
@@ -99,6 +99,15 @@ public interface StereotypeApplicationMatcherPackage extends EPackage {
 	int STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION__OWNING_TYPE = ElementTypesConfigurationsPackage.ABSTRACT_MATCHER_CONFIGURATION__OWNING_TYPE;
 
 	/**
+	 * The feature id for the '<em><b>Annotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION__ANNOTATIONS = ElementTypesConfigurationsPackage.ABSTRACT_MATCHER_CONFIGURATION__ANNOTATIONS;
+
+	/**
 	 * The feature id for the '<em><b>Matched Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -173,6 +182,15 @@ public interface StereotypeApplicationMatcherPackage extends EPackage {
 	int STEREOTYPE_MATCHER_ADVICE_CONFIGURATION__OWNING_TYPE = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__OWNING_TYPE;
 
 	/**
+	 * The feature id for the '<em><b>Annotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STEREOTYPE_MATCHER_ADVICE_CONFIGURATION__ANNOTATIONS = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__ANNOTATIONS;
+
+	/**
 	 * The feature id for the '<em><b>Before</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/matchers/stereotype/impl/StereotypeMatcherAdviceConfigurationImpl.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/matchers/stereotype/impl/StereotypeMatcherAdviceConfigurationImpl.java
index 35cfbead720..9e79da6f446 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/matchers/stereotype/impl/StereotypeMatcherAdviceConfigurationImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/matchers/stereotype/impl/StereotypeMatcherAdviceConfigurationImpl.java
@@ -290,7 +290,7 @@ public class StereotypeMatcherAdviceConfigurationImpl extends AbstractAdviceBind
 					msgs = ((InternalEObject)matchedType).eInverseRemove(this, ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION, SpecializationTypeConfiguration.class, msgs);
 				return basicSetMatchedType((SpecializationTypeConfiguration)otherEnd, msgs);
 		}
-		return super.eInverseAddGen(otherEnd, featureID, msgs);
+		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
 	
 	@Override