Bug 569356: [Toolsmiths] Support regeneration of

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

- Regenerate all ElementTypesConfigurations models

29 files changed, 1093 insertions, 152 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 53e4e8cbf2f..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,13 +100,13 @@ 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>Source</b></em>' attribute.
+	 * 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__SOURCE = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__SOURCE;
+	int RUNTIME_VALUES_ADVICE_CONFIGURATION__ANNOTATIONS = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__ANNOTATIONS;
 
 	/**
 	 * The feature id for the '<em><b>Before</b></em>' reference list.
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 cfab1cc4867..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,13 +99,13 @@ 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>Source</b></em>' attribute.
+	 * 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__SOURCE = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__SOURCE;
+	int SET_VALUES_ADVICE_CONFIGURATION__ANNOTATIONS = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__ANNOTATIONS;
 
 	/**
 	 * The feature id for the '<em><b>Before</b></em>' reference list.
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 7acd26ee72f..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,4 +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_ConfigurationElement_source_feature = Source
+_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 a489dff26d9..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;
 
 /**
@@ -83,7 +85,6 @@ public class ConfigurationElementItemProvider
 			super.getPropertyDescriptors(object);
 
 			addDescriptionPropertyDescriptor(object);
-			addSourcePropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
@@ -111,25 +112,33 @@ public class ConfigurationElementItemProvider
 	}
 
 	/**
-	 * This adds a property descriptor for the Source feature.
+	 * 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
 	 */
-	protected void addSourcePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ConfigurationElement_source_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_ConfigurationElement_source_feature", "_UI_ConfigurationElement_type"),
-				 ElementTypesConfigurationsPackage.Literals.CONFIGURATION_ELEMENT__SOURCE,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+	@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);
 	}
 
 	/**
@@ -160,9 +169,11 @@ public class ConfigurationElementItemProvider
 
 		switch (notification.getFeatureID(ConfigurationElement.class)) {
 			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__DESCRIPTION:
-			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__SOURCE:
 				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);
 	}
@@ -177,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 7e2e1846b79..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,13 +99,13 @@ 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>Source</b></em>' attribute.
+	 * 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__SOURCE = ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__SOURCE;
+	int RULE_BASED_TYPE_CONFIGURATION__ANNOTATIONS = ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__ANNOTATIONS;
 
 	/**
 	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
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 b1847b26fda..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,12 +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:EAttribute" name="source" ordered="false"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The source of this configuration element. For ConfigurationElements that have been generated from a Model Element, this can be used to reference e.g. the URI of the source element."/>
-      </eAnnotations>
-    </eStructuralFeatures>
+    <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">
@@ -159,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 3d16a950aa3..af8537c1b06 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
@@ -12,7 +12,7 @@
     editPluginID="org.eclipse.papyrus.infra.types.edit" editorPluginID="org.eclipse.papyrus.infra.types.editor"
     testsPluginID="org.eclipse.papyrus.infra.types.tests" usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"
     operationReflection="true" importOrganizing="true" pluginKey="ElementTypesConfigurations"
-    decoration="Live" operationsFolder="src-gen/">
+    decoration="Live">
   <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/importer/org.eclipse.uml2.uml.ecore.importer">
     <details key="OPPOSITE_ROLE_NAMES" value="IGNORE"/>
     <details key="DUPLICATE_FEATURES" value="DISCARD"/>
@@ -64,7 +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" createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//ConfigurationElement/source"/>
+      <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"/>
@@ -135,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/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 bf710d5047a..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,7 +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#getSource <em>Source</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.ConfigurationElement#getAnnotations <em>Annotations</em>}</li>
  * </ul>
  *
  * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getConfigurationElement()
@@ -91,32 +92,21 @@ public interface ConfigurationElement extends EObject {
 	void setOwningType(ElementTypeConfiguration value);
 
 	/**
-	 * Returns the value of the '<em><b>Source</b></em>' attribute.
+	 * 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>Source</em>' attribute isn't clear,
+	 * 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 -->
-	 * <!-- begin-model-doc -->
-	 * The source of this configuration element. For ConfigurationElements that have been generated from a Model Element, this can be used to reference e.g. the URI of the source element.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Source</em>' attribute.
-	 * @see #setSource(String)
-	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getConfigurationElement_Source()
-	 * @model ordered="false"
+	 * @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
 	 */
-	String getSource();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.ConfigurationElement#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);
+	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 a9cd2e06855..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,13 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int CONFIGURATION_ELEMENT__OWNING_TYPE = 1;
 
 	/**
-	 * The feature id for the '<em><b>Source</b></em>' attribute.
+	 * The feature id for the '<em><b>Annotations</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CONFIGURATION_ELEMENT__SOURCE = 2;
+	int CONFIGURATION_ELEMENT__ANNOTATIONS = 2;
 
 	/**
 	 * The number of structural features of the '<em>Configuration Element</em>' class.
@@ -164,13 +164,13 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int ELEMENT_TYPE_SET_CONFIGURATION__OWNING_TYPE = CONFIGURATION_ELEMENT__OWNING_TYPE;
 
 	/**
-	 * The feature id for the '<em><b>Source</b></em>' attribute.
+	 * 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__SOURCE = CONFIGURATION_ELEMENT__SOURCE;
+	int ELEMENT_TYPE_SET_CONFIGURATION__ANNOTATIONS = CONFIGURATION_ELEMENT__ANNOTATIONS;
 
 	/**
 	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
@@ -282,13 +282,13 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int ELEMENT_TYPE_CONFIGURATION__OWNING_TYPE = CONFIGURATION_ELEMENT__OWNING_TYPE;
 
 	/**
-	 * The feature id for the '<em><b>Source</b></em>' attribute.
+	 * 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__SOURCE = CONFIGURATION_ELEMENT__SOURCE;
+	int ELEMENT_TYPE_CONFIGURATION__ANNOTATIONS = CONFIGURATION_ELEMENT__ANNOTATIONS;
 
 	/**
 	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
@@ -475,13 +475,13 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int ADVICE_CONFIGURATION__OWNING_TYPE = CONFIGURATION_ELEMENT__OWNING_TYPE;
 
 	/**
-	 * The feature id for the '<em><b>Source</b></em>' attribute.
+	 * The feature id for the '<em><b>Annotations</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int ADVICE_CONFIGURATION__SOURCE = CONFIGURATION_ELEMENT__SOURCE;
+	int ADVICE_CONFIGURATION__ANNOTATIONS = CONFIGURATION_ELEMENT__ANNOTATIONS;
 
 	/**
 	 * The feature id for the '<em><b>Before</b></em>' reference list.
@@ -548,13 +548,13 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int ABSTRACT_ADVICE_BINDING_CONFIGURATION__OWNING_TYPE = ADVICE_CONFIGURATION__OWNING_TYPE;
 
 	/**
-	 * The feature id for the '<em><b>Source</b></em>' attribute.
+	 * 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__SOURCE = ADVICE_CONFIGURATION__SOURCE;
+	int ABSTRACT_ADVICE_BINDING_CONFIGURATION__ANNOTATIONS = ADVICE_CONFIGURATION__ANNOTATIONS;
 
 	/**
 	 * The feature id for the '<em><b>Before</b></em>' reference list.
@@ -711,13 +711,13 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int CONTAINER_CONFIGURATION__OWNING_TYPE = CONFIGURATION_ELEMENT__OWNING_TYPE;
 
 	/**
-	 * The feature id for the '<em><b>Source</b></em>' attribute.
+	 * The feature id for the '<em><b>Annotations</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CONTAINER_CONFIGURATION__SOURCE = CONFIGURATION_ELEMENT__SOURCE;
+	int CONTAINER_CONFIGURATION__ANNOTATIONS = CONFIGURATION_ELEMENT__ANNOTATIONS;
 
 	/**
 	 * The feature id for the '<em><b>Container Matcher Configuration</b></em>' containment reference.
@@ -793,13 +793,13 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int ABSTRACT_MATCHER_CONFIGURATION__OWNING_TYPE = CONFIGURATION_ELEMENT__OWNING_TYPE;
 
 	/**
-	 * The feature id for the '<em><b>Source</b></em>' attribute.
+	 * 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__SOURCE = CONFIGURATION_ELEMENT__SOURCE;
+	int ABSTRACT_MATCHER_CONFIGURATION__ANNOTATIONS = CONFIGURATION_ELEMENT__ANNOTATIONS;
 
 	/**
 	 * The feature id for the '<em><b>Matched Type</b></em>' reference.
@@ -857,13 +857,13 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int SPECIALIZATION_TYPE_CONFIGURATION__OWNING_TYPE = ELEMENT_TYPE_CONFIGURATION__OWNING_TYPE;
 
 	/**
-	 * The feature id for the '<em><b>Source</b></em>' attribute.
+	 * 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__SOURCE = ELEMENT_TYPE_CONFIGURATION__SOURCE;
+	int SPECIALIZATION_TYPE_CONFIGURATION__ANNOTATIONS = ELEMENT_TYPE_CONFIGURATION__ANNOTATIONS;
 
 	/**
 	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
@@ -1020,13 +1020,13 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__OWNING_TYPE = ADVICE_CONFIGURATION__OWNING_TYPE;
 
 	/**
-	 * The feature id for the '<em><b>Source</b></em>' attribute.
+	 * 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__SOURCE = ADVICE_CONFIGURATION__SOURCE;
+	int ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__ANNOTATIONS = ADVICE_CONFIGURATION__ANNOTATIONS;
 
 	/**
 	 * The feature id for the '<em><b>Before</b></em>' reference list.
@@ -1128,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 -->
@@ -1135,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.
@@ -1156,13 +1211,13 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int METAMODEL_TYPE_CONFIGURATION__OWNING_TYPE = ELEMENT_TYPE_CONFIGURATION__OWNING_TYPE;
 
 	/**
-	 * The feature id for the '<em><b>Source</b></em>' attribute.
+	 * 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__SOURCE = ELEMENT_TYPE_CONFIGURATION__SOURCE;
+	int METAMODEL_TYPE_CONFIGURATION__ANNOTATIONS = ELEMENT_TYPE_CONFIGURATION__ANNOTATIONS;
 
 	/**
 	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
@@ -1280,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.
@@ -1301,13 +1356,13 @@ 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>Source</b></em>' attribute.
+	 * 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__SOURCE = ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__SOURCE;
+	int EDIT_HELPER_ADVICE_CONFIGURATION__ANNOTATIONS = ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__ANNOTATIONS;
 
 	/**
 	 * The feature id for the '<em><b>Before</b></em>' reference list.
@@ -1371,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.
@@ -1392,13 +1447,13 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int ADVICE_BINDING_CONFIGURATION__OWNING_TYPE = ABSTRACT_ADVICE_BINDING_CONFIGURATION__OWNING_TYPE;
 
 	/**
-	 * The feature id for the '<em><b>Source</b></em>' attribute.
+	 * 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__SOURCE = ABSTRACT_ADVICE_BINDING_CONFIGURATION__SOURCE;
+	int ADVICE_BINDING_CONFIGURATION__ANNOTATIONS = ABSTRACT_ADVICE_BINDING_CONFIGURATION__ANNOTATIONS;
 
 	/**
 	 * The feature id for the '<em><b>Before</b></em>' reference list.
@@ -1543,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.
@@ -1564,13 +1619,13 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int MATCHER_CONFIGURATION__OWNING_TYPE = ABSTRACT_MATCHER_CONFIGURATION__OWNING_TYPE;
 
 	/**
-	 * The feature id for the '<em><b>Source</b></em>' attribute.
+	 * The feature id for the '<em><b>Annotations</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MATCHER_CONFIGURATION__SOURCE = ABSTRACT_MATCHER_CONFIGURATION__SOURCE;
+	int MATCHER_CONFIGURATION__ANNOTATIONS = ABSTRACT_MATCHER_CONFIGURATION__ANNOTATIONS;
 
 	/**
 	 * The feature id for the '<em><b>Matched Type</b></em>' reference.
@@ -1616,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.
@@ -1637,13 +1692,13 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int EXTERNALLY_REGISTERED_TYPE__OWNING_TYPE = ELEMENT_TYPE_CONFIGURATION__OWNING_TYPE;
 
 	/**
-	 * The feature id for the '<em><b>Source</b></em>' attribute.
+	 * 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__SOURCE = ELEMENT_TYPE_CONFIGURATION__SOURCE;
+	int EXTERNALLY_REGISTERED_TYPE__ANNOTATIONS = ELEMENT_TYPE_CONFIGURATION__ANNOTATIONS;
 
 	/**
 	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
@@ -1743,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.
@@ -1764,13 +1819,13 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	int EXTERNALLY_REGISTERED_ADVICE__OWNING_TYPE = ADVICE_BINDING_CONFIGURATION__OWNING_TYPE;
 
 	/**
-	 * The feature id for the '<em><b>Source</b></em>' attribute.
+	 * 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__SOURCE = ADVICE_BINDING_CONFIGURATION__SOURCE;
+	int EXTERNALLY_REGISTERED_ADVICE__ANNOTATIONS = ADVICE_BINDING_CONFIGURATION__ANNOTATIONS;
 
 	/**
 	 * The feature id for the '<em><b>Before</b></em>' reference list.
@@ -1915,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;
 
 
 	/**
@@ -2015,15 +2070,15 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 	EReference getConfigurationElement_OwningType();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.types.ConfigurationElement#getSource <em>Source</em>}'.
+	 * 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 attribute '<em>Source</em>'.
-	 * @see org.eclipse.papyrus.infra.types.ConfigurationElement#getSource()
+	 * @return the meta object for the containment reference list '<em>Annotations</em>'.
+	 * @see org.eclipse.papyrus.infra.types.ConfigurationElement#getAnnotations()
 	 * @see #getConfigurationElement()
 	 * @generated
 	 */
-	EAttribute getConfigurationElement_Source();
+	EReference getConfigurationElement_Annotations();
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.types.ElementTypeConfiguration <em>Element Type Configuration</em>}'.
@@ -2176,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 -->
@@ -2679,12 +2777,12 @@ public interface ElementTypesConfigurationsPackage extends EPackage {
 		EReference CONFIGURATION_ELEMENT__OWNING_TYPE = eINSTANCE.getConfigurationElement_OwningType();
 
 		/**
-		 * The meta object literal for the '<em><b>Source</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Annotations</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute CONFIGURATION_ELEMENT__SOURCE = eINSTANCE.getConfigurationElement_Source();
+		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.
@@ -2807,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 057685e77a6..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,7 +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#getSource <em>Source</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.ConfigurationElementImpl#getAnnotations <em>Annotations</em>}</li>
  * </ul>
  *
  * @generated
@@ -66,24 +71,14 @@ public abstract class ConfigurationElementImpl extends MinimalEObjectImpl.Contai
 	protected String description = DESCRIPTION_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSource() <em>Source</em>}' attribute.
+	 * The cached value of the '{@link #getAnnotations() <em>Annotations</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getSource()
+	 * @see #getAnnotations()
 	 * @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;
+	protected EList<Annotation> annotations;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -176,21 +171,11 @@ public abstract class ConfigurationElementImpl extends MinimalEObjectImpl.Contai
 	 * @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.CONFIGURATION_ELEMENT__SOURCE, oldSource, source));
+	public EList<Annotation> getAnnotations() {
+		if (annotations == null) {
+			annotations = new EObjectContainmentWithInverseEList<Annotation>(Annotation.class, this, ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__ANNOTATIONS, ElementTypesConfigurationsPackage.ANNOTATION__CONFIGURATION_ELEMENT);
+		}
+		return annotations;
 	}
 
 	/**
@@ -198,6 +183,7 @@ public abstract class ConfigurationElementImpl extends MinimalEObjectImpl.Contai
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@SuppressWarnings("unchecked")
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
@@ -205,6 +191,8 @@ public abstract class ConfigurationElementImpl extends MinimalEObjectImpl.Contai
 				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);
 	}
@@ -219,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);
 	}
@@ -249,8 +239,8 @@ public abstract class ConfigurationElementImpl extends MinimalEObjectImpl.Contai
 				return getDescription();
 			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__OWNING_TYPE:
 				return getOwningType();
-			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__SOURCE:
-				return getSource();
+			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__ANNOTATIONS:
+				return getAnnotations();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -260,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) {
@@ -269,8 +260,9 @@ public abstract class ConfigurationElementImpl extends MinimalEObjectImpl.Contai
 			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__OWNING_TYPE:
 				setOwningType((ElementTypeConfiguration)newValue);
 				return;
-			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__SOURCE:
-				setSource((String)newValue);
+			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__ANNOTATIONS:
+				getAnnotations().clear();
+				getAnnotations().addAll((Collection<? extends Annotation>)newValue);
 				return;
 		}
 		super.eSet(featureID, newValue);
@@ -290,8 +282,8 @@ public abstract class ConfigurationElementImpl extends MinimalEObjectImpl.Contai
 			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__OWNING_TYPE:
 				setOwningType((ElementTypeConfiguration)null);
 				return;
-			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__SOURCE:
-				setSource(SOURCE_EDEFAULT);
+			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__ANNOTATIONS:
+				getAnnotations().clear();
 				return;
 		}
 		super.eUnset(featureID);
@@ -309,8 +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__SOURCE:
-				return SOURCE_EDEFAULT == null ? source != null : !SOURCE_EDEFAULT.equals(source);
+			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__ANNOTATIONS:
+				return annotations != null && !annotations.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -327,8 +319,6 @@ public abstract class ConfigurationElementImpl extends MinimalEObjectImpl.Contai
 		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (description: ");
 		result.append(description);
-		result.append(", source: ");
-		result.append(source);
 		result.append(')');
 		return result.toString();
 	}
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 1bb9be553c0..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,8 +368,8 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
 	 * @generated
 	 */
 	@Override
-	public EAttribute getConfigurationElement_Source() {
-		return (EAttribute)configurationElementEClass.getEStructuralFeatures().get(2);
+	public EReference getConfigurationElement_Annotations() {
+		return (EReference)configurationElementEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -510,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;
 	}
@@ -923,7 +971,7 @@ public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implemen
 		configurationElementEClass = createEClass(CONFIGURATION_ELEMENT);
 		createEAttribute(configurationElementEClass, CONFIGURATION_ELEMENT__DESCRIPTION);
 		createEReference(configurationElementEClass, CONFIGURATION_ELEMENT__OWNING_TYPE);
-		createEAttribute(configurationElementEClass, CONFIGURATION_ELEMENT__SOURCE);
+		createEReference(configurationElementEClass, CONFIGURATION_ELEMENT__ANNOTATIONS);
 
 		elementTypeConfigurationEClass = createEClass(ELEMENT_TYPE_CONFIGURATION);
 		createEAttribute(elementTypeConfigurationEClass, ELEMENT_TYPE_CONFIGURATION__HINT);
@@ -975,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);
@@ -1059,7 +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);
-		initEAttribute(getConfigurationElement_Source(), ecorePackage.getEString(), "source", null, 0, 1, ConfigurationElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, 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);
@@ -1112,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/impl/SpecializationTypeConfigurationImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/SpecializationTypeConfigurationImpl.java
index f34ce4229ad..a7e2d9ac22a 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/SpecializationTypeConfigurationImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/SpecializationTypeConfigurationImpl.java
@@ -123,7 +123,6 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
 	 * @generated
 	 */
 	@Override
-	@Override
 	public EList<ConfigurationElement> getOwnedConfigurations() {
 		if (ownedConfigurations == null) {
 			ownedConfigurations = new SubsetSupersetEObjectContainmentWithInverseEList<ConfigurationElement>(ConfigurationElement.class, this, ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__OWNED_CONFIGURATIONS, null, OWNED_CONFIGURATIONS_ESUBSETS, ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__OWNING_TYPE);
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 fc40fb3e689..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,13 +99,13 @@ 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>Source</b></em>' attribute.
+	 * 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__SOURCE = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__SOURCE;
+	int APPLY_STEREOTYPE_ADVICE_CONFIGURATION__ANNOTATIONS = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__ANNOTATIONS;
 
 	/**
 	 * The feature id for the '<em><b>Before</b></em>' reference list.
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 87f29916d07..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,13 +99,13 @@ 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>Source</b></em>' attribute.
+	 * 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__SOURCE = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__SOURCE;
+	int SET_TYPE_ADVICE_CONFIGURATION__ANNOTATIONS = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__ANNOTATIONS;
 
 	/**
 	 * The feature id for the '<em><b>Before</b></em>' reference list.
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 05f43382d31..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,13 +100,13 @@ 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>Source</b></em>' attribute.
+	 * 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__SOURCE = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__SOURCE;
+	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.
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 90d68f57b3a..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,13 +99,13 @@ 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>Source</b></em>' attribute.
+	 * 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__SOURCE = ElementTypesConfigurationsPackage.ABSTRACT_MATCHER_CONFIGURATION__SOURCE;
+	int STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION__ANNOTATIONS = ElementTypesConfigurationsPackage.ABSTRACT_MATCHER_CONFIGURATION__ANNOTATIONS;
 
 	/**
 	 * The feature id for the '<em><b>Matched Type</b></em>' reference.
@@ -182,13 +182,13 @@ 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>Source</b></em>' attribute.
+	 * 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__SOURCE = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__SOURCE;
+	int STEREOTYPE_MATCHER_ADVICE_CONFIGURATION__ANNOTATIONS = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__ANNOTATIONS;
 
 	/**
 	 * The feature id for the '<em><b>Before</b></em>' reference list.
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