[525261] Add technical id on Sirius meta-model

* Add specification
* Every classes of Sirius meta-model that does not inherit from a Sirius
class, now inherits from IdentifiedElement. Classes from Description
packages are not concerned.
* IdentifiedElement has a uid EAttribute of type String that represents
the unique id of the element. This attribute is valued in the
constructor. DRepresentation:uid attribute has been removed as it is
replaced by IDentifiedElement:uid
* AirdResourceImpl overrides attachedHelper method to uses uid of
IdentifiedElement as id in the id <=> EObject cache of the
AirdResourceImpl resources
* Add a migration participant to update IdentifiedElement.uid from the
previously serialized xmi:id and update
DRepresentationDescriptor:repPath
* Modify RepresentationsFileXMIHelper.getId() to return null for
IdentifiedElement instances and avoid to serialize an xmi:id in favor of
the uid which will also be used as href.
* Make Sirius EqualityHelper overrides Ecore.EqualityHelper so that
EAttribute of type ID=true are ignored to know if two EObjects are
equal.
* Add a test to ensure that all meta-classes, that should inherit from
IdentifiedElement, do it effectively.
* Add a test for migration

Bug: 525261
Change-Id: I2a9bc8d1abae7b63a4d100d0db71c7bfe8476aef
Signed-off-by: Laurent Fasani <laurent.fasani@obeo.fr>
Signed-off-by: Maxime Porhel <maxime.porhel@obeo.fr>

160 files changed, 3224 insertions, 1096 deletions

diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/EqualityHelper.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/EqualityHelper.java
index 63ad0b9c22..af67a72f78 100644
--- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/EqualityHelper.java
+++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/EqualityHelper.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009 THALES GLOBAL SERVICES.
+ * Copyright (c) 2009, 2018 THALES GLOBAL SERVICES.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,6 +14,7 @@ import java.util.Collection;
 import java.util.Iterator;
 
 import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.resource.Resource;
@@ -21,25 +22,27 @@ import org.eclipse.emf.ecore.resource.Resource;
 import com.google.common.base.Objects;
 
 /**
- * An helper to check EObject equality.
+ * An helper to check EObject equality.</br>
+ * It extends and override EcoreUtil.EqualityHelper so that equals methods ignore EAttribute that are ID=true.
  * 
  * @author mchauvin
  */
-public final class EqualityHelper {
+public final class EqualityHelper extends org.eclipse.emf.ecore.util.EcoreUtil.EqualityHelper {
 
-    private EqualityHelper() {
+    @Override
+    protected boolean haveEqualAttribute(EObject eObject1, EObject eObject2, EAttribute attribute) {
+        boolean isID = attribute.isID();
+        return isID || super.haveEqualAttribute(eObject1, eObject2, attribute);
     }
 
     /**
-     * Check if a Collection of EObjects contains an EObject, based on their
-     * resource and URI fragment.
+     * Check if a Collection of EObjects contains an EObject, based on their resource and URI fragment.
      * 
      * @param collection
      *            the collection to watch
      * @param eObj
      *            the EObject to find
-     * @return <code>true</code> if the collection contains the object,
-     *         <code>false</code> otherwise
+     * @return <code>true</code> if the collection contains the object, <code>false</code> otherwise
      */
     public static boolean contains(final Collection<? extends EObject> collection, final EObject eObj) {
         for (final EObject object : collection) {
@@ -51,8 +54,7 @@ public final class EqualityHelper {
     }
 
     /**
-     * Remove from a Collection, an EObject, based on their resource and URI
-     * fragment.
+     * Remove from a Collection, an EObject, based on their resource and URI fragment.
      * 
      * @param collection
      *            the collection
@@ -70,16 +72,14 @@ public final class EqualityHelper {
     }
 
     /**
-     * Check if two EObject are the same, based on their resource and URI
-     * fragment.
+     * Check if two EObject are the same, based on their resource and URI fragment.
      * 
      * @param eObj1
      *            the first EObject to compare
      * @param eObj2
      *            the second EObject to compare
-     * @return <code>true</code> if they are equals, <code>false</code>
-     *         otherwise. If the two objects are both <code>null</code> return
-     *         <code>true</code>, otherwise if only one of them is null, return
+     * @return <code>true</code> if they are equals, <code>false</code> otherwise. If the two objects are both
+     *         <code>null</code> return <code>true</code>, otherwise if only one of them is null, return
      *         <code>false</code>
      */
     public static boolean areEquals(EObject eObj1, EObject eObj2) {
@@ -114,8 +114,7 @@ public final class EqualityHelper {
                 }
             } else {
                 /*
-                 * one of the containers is null.. no chance both objects are
-                 * sharing the same URI.
+                 * one of the containers is null.. no chance both objects are sharing the same URI.
                  */
             }
 
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/SequencePackage.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/SequencePackage.java
index 0d078c06b0..08eaf4c257 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/SequencePackage.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/SequencePackage.java
@@ -69,12 +69,12 @@ public interface SequencePackage extends EPackage {
     int SEQUENCE_DDIAGRAM = 0;
 
     /**
-     * The feature id for the '<em><b>Documentation</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
      * @ordered
      */
-    int SEQUENCE_DDIAGRAM__DOCUMENTATION = DiagramPackage.DSEMANTIC_DIAGRAM__DOCUMENTATION;
+    int SEQUENCE_DDIAGRAM__UID = DiagramPackage.DSEMANTIC_DIAGRAM__UID;
 
     /**
      * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list. <!-- begin-user-doc --> <!--
@@ -86,6 +86,14 @@ public interface SequencePackage extends EPackage {
     int SEQUENCE_DDIAGRAM__EANNOTATIONS = DiagramPackage.DSEMANTIC_DIAGRAM__EANNOTATIONS;
 
     /**
+     * The feature id for the '<em><b>Documentation</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int SEQUENCE_DDIAGRAM__DOCUMENTATION = DiagramPackage.DSEMANTIC_DIAGRAM__DOCUMENTATION;
+
+    /**
      * The feature id for the '<em><b>Owned Representation Elements</b></em>' reference list. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      *
@@ -130,14 +138,6 @@ public interface SequencePackage extends EPackage {
     int SEQUENCE_DDIAGRAM__UI_STATE = DiagramPackage.DSEMANTIC_DIAGRAM__UI_STATE;
 
     /**
-     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int SEQUENCE_DDIAGRAM__UID = DiagramPackage.DSEMANTIC_DIAGRAM__UID;
-
-    /**
      * The feature id for the '<em><b>Owned Diagram Elements</b></em>' containment reference list. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
      *
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/util/SequenceAdapterFactory.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/util/SequenceAdapterFactory.java
index 65698351dd..68032e5186 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/util/SequenceAdapterFactory.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/util/SequenceAdapterFactory.java
@@ -22,6 +22,7 @@ import org.eclipse.sirius.diagram.sequence.SequencePackage;
 import org.eclipse.sirius.viewpoint.DRefreshable;
 import org.eclipse.sirius.viewpoint.DRepresentation;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
+import org.eclipse.sirius.viewpoint.IdentifiedElement;
 import org.eclipse.sirius.viewpoint.description.DModelElement;
 import org.eclipse.sirius.viewpoint.description.DocumentedElement;
 
@@ -82,6 +83,16 @@ public class SequenceAdapterFactory extends AdapterFactoryImpl {
         }
 
         @Override
+        public Adapter caseIdentifiedElement(IdentifiedElement object) {
+            return createIdentifiedElementAdapter();
+        }
+
+        @Override
+        public Adapter caseDModelElement(DModelElement object) {
+            return createDModelElementAdapter();
+        }
+
+        @Override
         public Adapter caseDocumentedElement(DocumentedElement object) {
             return createDocumentedElementAdapter();
         }
@@ -92,11 +103,6 @@ public class SequenceAdapterFactory extends AdapterFactoryImpl {
         }
 
         @Override
-        public Adapter caseDModelElement(DModelElement object) {
-            return createDModelElementAdapter();
-        }
-
-        @Override
         public Adapter caseDRepresentation(DRepresentation object) {
             return createDRepresentationAdapter();
         }
@@ -155,6 +161,20 @@ public class SequenceAdapterFactory extends AdapterFactoryImpl {
     }
 
     /**
+     * Creates a new adapter for an object of class '{@link org.eclipse.sirius.viewpoint.IdentifiedElement
+     * <em>Identified Element</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+     * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+     * end-user-doc -->
+     *
+     * @return the new adapter.
+     * @see org.eclipse.sirius.viewpoint.IdentifiedElement
+     * @generated
+     */
+    public Adapter createIdentifiedElementAdapter() {
+        return null;
+    }
+
+    /**
      * Creates a new adapter for an object of class '{@link org.eclipse.sirius.viewpoint.description.DocumentedElement
      * <em>Documented Element</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
      * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/util/SequenceSwitch.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/util/SequenceSwitch.java
index 9a19853a68..05a08e2ac7 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/util/SequenceSwitch.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/util/SequenceSwitch.java
@@ -22,6 +22,7 @@ import org.eclipse.sirius.diagram.sequence.SequencePackage;
 import org.eclipse.sirius.viewpoint.DRefreshable;
 import org.eclipse.sirius.viewpoint.DRepresentation;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
+import org.eclipse.sirius.viewpoint.IdentifiedElement;
 import org.eclipse.sirius.viewpoint.description.DModelElement;
 import org.eclipse.sirius.viewpoint.description.DocumentedElement;
 
@@ -108,13 +109,16 @@ public class SequenceSwitch<T> {
                 result = caseDragAndDropTarget(sequenceDDiagram);
             }
             if (result == null) {
-                result = caseDocumentedElement(sequenceDDiagram);
+                result = caseIdentifiedElement(sequenceDDiagram);
             }
             if (result == null) {
-                result = caseDRefreshable(sequenceDDiagram);
+                result = caseDModelElement(sequenceDDiagram);
             }
             if (result == null) {
-                result = caseDModelElement(sequenceDDiagram);
+                result = caseDocumentedElement(sequenceDDiagram);
+            }
+            if (result == null) {
+                result = caseDRefreshable(sequenceDDiagram);
             }
             if (result == null) {
                 result = defaultCase(theEObject);
@@ -141,6 +145,21 @@ public class SequenceSwitch<T> {
     }
 
     /**
+     * Returns the result of interpreting the object as an instance of '<em>Identified Element</em>'. <!--
+     * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
+     * end-user-doc -->
+     *
+     * @param object
+     *            the target of the switch.
+     * @return the result of interpreting the object as an instance of '<em>Identified Element</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseIdentifiedElement(IdentifiedElement object) {
+        return null;
+    }
+
+    /**
      * Returns the result of interpreting the object as an instance of '<em>Documented Element</em>'. <!--
      * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
      * end-user-doc -->
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/query/CustomizableQuery.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/query/CustomizableQuery.java
index da8d8ebf78..d93f840552 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/query/CustomizableQuery.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/query/CustomizableQuery.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 THALES GLOBAL SERVICES.
+ * Copyright (c) 2015, 2018 THALES GLOBAL SERVICES.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -49,8 +49,9 @@ public class CustomizableQuery {
         List<String> customizableFeatureNames = new ArrayList<String>();
         for (EStructuralFeature feature : customizable.eClass().getEAllStructuralFeatures()) {
             // CHECKSTYLE:OFF
-            if (!ViewpointPackage.Literals.STYLE__DESCRIPTION.equals(feature) && !ViewpointPackage.Literals.CUSTOMIZABLE__CUSTOM_FEATURES.equals(feature) && !isUselessFeature(feature)
-                    && !isGaugeCompositeSectionsFeature(feature) && !isEdgeStyleBeginCenterEndFeature(feature) && !isProvidedShapeIdFeature(feature)) {
+            if (!ViewpointPackage.Literals.IDENTIFIED_ELEMENT__UID.equals(feature) && !ViewpointPackage.Literals.STYLE__DESCRIPTION.equals(feature)
+                    && !ViewpointPackage.Literals.CUSTOMIZABLE__CUSTOM_FEATURES.equals(feature) && !isUselessFeature(feature) && !isGaugeCompositeSectionsFeature(feature)
+                    && !isEdgeStyleBeginCenterEndFeature(feature) && !isProvidedShapeIdFeature(feature)) {
                 // CHECKSTYLE:ON
                 // TODO : BORDERED_STYLE__BORDER_SIZE is updated according to
                 // borderSizeComputationExpression is this last is a copy of the
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/AbsoluteBoundsFilterItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/AbsoluteBoundsFilterItemProvider.java
index a00d0fbfbf..7450aa34ba 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/AbsoluteBoundsFilterItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/AbsoluteBoundsFilterItemProvider.java
@@ -16,20 +16,12 @@ 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.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.sirius.diagram.AbsoluteBoundsFilter;
 import org.eclipse.sirius.diagram.DiagramPackage;
-import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.sirius.diagram.AbsoluteBoundsFilter} object. <!--
@@ -37,8 +29,7 @@ import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
  *
  * @generated
  */
-public class AbsoluteBoundsFilterItemProvider extends ItemProviderAdapter
-        implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class AbsoluteBoundsFilterItemProvider extends GraphicalFilterItemProvider {
     /**
      * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -131,8 +122,7 @@ public class AbsoluteBoundsFilterItemProvider extends ItemProviderAdapter
      */
     @Override
     public String getText(Object object) {
-        Integer labelValue = ((AbsoluteBoundsFilter) object).getX();
-        String label = labelValue == null ? null : labelValue.toString();
+        String label = ((AbsoluteBoundsFilter) object).getUid();
         return label == null || label.length() == 0 ? getString("_UI_AbsoluteBoundsFilter_type") : //$NON-NLS-1$
                 getString("_UI_AbsoluteBoundsFilter_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
@@ -170,14 +160,4 @@ public class AbsoluteBoundsFilterItemProvider extends ItemProviderAdapter
         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 DiagramUIPlugin.INSTANCE;
-    }
-
 }
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/AppliedCompositeFiltersItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/AppliedCompositeFiltersItemProvider.java
index 3fd67b3b06..c20368ecee 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/AppliedCompositeFiltersItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/AppliedCompositeFiltersItemProvider.java
@@ -16,17 +16,10 @@ 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.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+import org.eclipse.sirius.diagram.AppliedCompositeFilters;
 import org.eclipse.sirius.diagram.DiagramPackage;
-import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.sirius.diagram.AppliedCompositeFilters} object. <!--
@@ -34,8 +27,7 @@ import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
  *
  * @generated
  */
-public class AppliedCompositeFiltersItemProvider extends ItemProviderAdapter
-        implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class AppliedCompositeFiltersItemProvider extends GraphicalFilterItemProvider {
     /**
      * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -90,7 +82,9 @@ public class AppliedCompositeFiltersItemProvider extends ItemProviderAdapter
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_AppliedCompositeFilters_type"); //$NON-NLS-1$
+        String label = ((AppliedCompositeFilters) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_AppliedCompositeFilters_type") : //$NON-NLS-1$
+                getString("_UI_AppliedCompositeFilters_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -117,14 +111,4 @@ public class AppliedCompositeFiltersItemProvider extends ItemProviderAdapter
         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 DiagramUIPlugin.INSTANCE;
-    }
-
 }
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/BeginLabelStyleItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/BeginLabelStyleItemProvider.java
index d114b8f5f6..605b817a12 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/BeginLabelStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/BeginLabelStyleItemProvider.java
@@ -69,8 +69,9 @@ public class BeginLabelStyleItemProvider extends BasicLabelStyleItemProvider {
      */
     @Override
     public String getText(Object object) {
-        BeginLabelStyle beginLabelStyle = (BeginLabelStyle) object;
-        return getString("_UI_BeginLabelStyle_type") + " " + beginLabelStyle.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
+        String label = ((BeginLabelStyle) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_BeginLabelStyle_type") : //$NON-NLS-1$
+                getString("_UI_BeginLabelStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/BorderedStyleItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/BorderedStyleItemProvider.java
index 434252e065..3299ac6b22 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/BorderedStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/BorderedStyleItemProvider.java
@@ -115,8 +115,7 @@ public class BorderedStyleItemProvider extends StyleItemProvider {
      */
     @Override
     public String getText(Object object) {
-        Integer labelValue = ((BorderedStyle) object).getBorderSize();
-        String label = labelValue == null ? null : labelValue.toString();
+        String label = ((BorderedStyle) object).getUid();
         return label == null || label.length() == 0 ? getString("_UI_BorderedStyle_type") : //$NON-NLS-1$
                 getString("_UI_BorderedStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/BracketEdgeStyleItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/BracketEdgeStyleItemProvider.java
index ee09b381df..c73c1989d3 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/BracketEdgeStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/BracketEdgeStyleItemProvider.java
@@ -18,7 +18,6 @@ import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.sirius.diagram.BracketEdgeStyle;
-import org.eclipse.sirius.diagram.LineStyle;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.sirius.diagram.BracketEdgeStyle} object. <!--
@@ -67,8 +66,7 @@ public class BracketEdgeStyleItemProvider extends EdgeStyleItemProvider {
      */
     @Override
     public String getText(Object object) {
-        LineStyle labelValue = ((BracketEdgeStyle) object).getLineStyle();
-        String label = labelValue == null ? null : labelValue.toString();
+        String label = ((BracketEdgeStyle) object).getUid();
         return label == null || label.length() == 0 ? getString("_UI_BracketEdgeStyle_type") : //$NON-NLS-1$
                 getString("_UI_BracketEdgeStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/BundledImageItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/BundledImageItemProvider.java
index f7dad4ceb1..eb2425585c 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/BundledImageItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/BundledImageItemProvider.java
@@ -111,8 +111,9 @@ public class BundledImageItemProvider extends NodeStyleItemProvider {
      */
     @Override
     public String getText(Object object) {
-        BundledImage bundledImage = (BundledImage) object;
-        return getString("_UI_BundledImage_type") + " " + bundledImage.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
+        String label = ((BundledImage) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_BundledImage_type") : //$NON-NLS-1$
+                getString("_UI_BundledImage_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/CenterLabelStyleItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/CenterLabelStyleItemProvider.java
index 4a797f7fa2..7aeff7eeb4 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/CenterLabelStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/CenterLabelStyleItemProvider.java
@@ -69,8 +69,9 @@ public class CenterLabelStyleItemProvider extends BasicLabelStyleItemProvider {
      */
     @Override
     public String getText(Object object) {
-        CenterLabelStyle centerLabelStyle = (CenterLabelStyle) object;
-        return getString("_UI_CenterLabelStyle_type") + " " + centerLabelStyle.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
+        String label = ((CenterLabelStyle) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_CenterLabelStyle_type") : //$NON-NLS-1$
+                getString("_UI_CenterLabelStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/CollapseFilterItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/CollapseFilterItemProvider.java
index 7bfedbfe16..1b96f7b14b 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/CollapseFilterItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/CollapseFilterItemProvider.java
@@ -16,20 +16,12 @@ 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.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.sirius.diagram.CollapseFilter;
 import org.eclipse.sirius.diagram.DiagramPackage;
-import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.sirius.diagram.CollapseFilter} object. <!-- begin-user-doc
@@ -37,8 +29,7 @@ import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
  *
  * @generated
  */
-public class CollapseFilterItemProvider extends ItemProviderAdapter
-        implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class CollapseFilterItemProvider extends GraphicalFilterItemProvider {
     /**
      * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -105,8 +96,9 @@ public class CollapseFilterItemProvider extends ItemProviderAdapter
      */
     @Override
     public String getText(Object object) {
-        CollapseFilter collapseFilter = (CollapseFilter) object;
-        return getString("_UI_CollapseFilter_type") + " " + collapseFilter.getWidth(); //$NON-NLS-1$ //$NON-NLS-2$
+        String label = ((CollapseFilter) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_CollapseFilter_type") : //$NON-NLS-1$
+                getString("_UI_CollapseFilter_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -140,14 +132,4 @@ public class CollapseFilterItemProvider extends ItemProviderAdapter
         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 DiagramUIPlugin.INSTANCE;
-    }
-
 }
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/ComputedStyleDescriptionRegistryItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/ComputedStyleDescriptionRegistryItemProvider.java
index 7ea23e4510..4a0b80fbf1 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/ComputedStyleDescriptionRegistryItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/ComputedStyleDescriptionRegistryItemProvider.java
@@ -18,18 +18,13 @@ 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.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.sirius.diagram.ComputedStyleDescriptionRegistry;
 import org.eclipse.sirius.diagram.DiagramPackage;
 import org.eclipse.sirius.diagram.description.style.StyleFactory;
 import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
+import org.eclipse.sirius.viewpoint.provider.IdentifiedElementItemProvider;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.sirius.diagram.ComputedStyleDescriptionRegistry} object.
@@ -37,8 +32,7 @@ import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
  *
  * @generated
  */
-public class ComputedStyleDescriptionRegistryItemProvider extends ItemProviderAdapter
-        implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class ComputedStyleDescriptionRegistryItemProvider extends IdentifiedElementItemProvider {
     /**
      * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -109,7 +103,9 @@ public class ComputedStyleDescriptionRegistryItemProvider extends ItemProviderAd
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_ComputedStyleDescriptionRegistry_type"); //$NON-NLS-1$
+        String label = ((ComputedStyleDescriptionRegistry) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_ComputedStyleDescriptionRegistry_type") : //$NON-NLS-1$
+                getString("_UI_ComputedStyleDescriptionRegistry_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/ContainerStyleItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/ContainerStyleItemProvider.java
index 578ac36a47..be58c65082 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/ContainerStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/ContainerStyleItemProvider.java
@@ -132,8 +132,9 @@ public class ContainerStyleItemProvider extends LabelStyleItemProvider {
      */
     @Override
     public String getText(Object object) {
-        ContainerStyle containerStyle = (ContainerStyle) object;
-        return getString("_UI_ContainerStyle_type") + " " + containerStyle.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
+        String label = ((ContainerStyle) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_ContainerStyle_type") : //$NON-NLS-1$
+                getString("_UI_ContainerStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DotItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DotItemProvider.java
index c10a32f777..c5058f7f40 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DotItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DotItemProvider.java
@@ -97,8 +97,9 @@ public class DotItemProvider extends NodeStyleItemProvider {
      */
     @Override
     public String getText(Object object) {
-        Dot dot = (Dot) object;
-        return getString("_UI_Dot_type") + " " + dot.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
+        String label = ((Dot) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_Dot_type") : //$NON-NLS-1$
+                getString("_UI_Dot_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DragAndDropTargetItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DragAndDropTargetItemProvider.java
index 2ace210c7a..9860cb447b 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DragAndDropTargetItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DragAndDropTargetItemProvider.java
@@ -17,14 +17,10 @@ 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.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+import org.eclipse.sirius.diagram.DragAndDropTarget;
 import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
+import org.eclipse.sirius.viewpoint.provider.IdentifiedElementItemProvider;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.sirius.diagram.DragAndDropTarget} object. <!--
@@ -32,8 +28,7 @@ import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
  *
  * @generated
  */
-public class DragAndDropTargetItemProvider extends ItemProviderAdapter
-        implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class DragAndDropTargetItemProvider extends IdentifiedElementItemProvider {
     /**
      * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -74,7 +69,9 @@ public class DragAndDropTargetItemProvider extends ItemProviderAdapter
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_DragAndDropTarget_type"); //$NON-NLS-1$
+        String label = ((DragAndDropTarget) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_DragAndDropTarget_type") : //$NON-NLS-1$
+                getString("_UI_DragAndDropTarget_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/EObjectVariableValueItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/EObjectVariableValueItemProvider.java
index 51c57e07c1..29f805f496 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/EObjectVariableValueItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/EObjectVariableValueItemProvider.java
@@ -18,6 +18,7 @@ import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.sirius.diagram.DiagramPackage;
+import org.eclipse.sirius.diagram.EObjectVariableValue;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.sirius.diagram.EObjectVariableValue} object. <!--
@@ -93,7 +94,9 @@ public class EObjectVariableValueItemProvider extends VariableValueItemProvider
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_EObjectVariableValue_type"); //$NON-NLS-1$
+        String label = ((EObjectVariableValue) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_EObjectVariableValue_type") : //$NON-NLS-1$
+                getString("_UI_EObjectVariableValue_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/EdgeStyleItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/EdgeStyleItemProvider.java
index 5aeb6c5789..549c2ae2c5 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/EdgeStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/EdgeStyleItemProvider.java
@@ -25,7 +25,6 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.sirius.diagram.DiagramFactory;
 import org.eclipse.sirius.diagram.DiagramPackage;
 import org.eclipse.sirius.diagram.EdgeStyle;
-import org.eclipse.sirius.diagram.LineStyle;
 import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
 import org.eclipse.sirius.viewpoint.provider.StyleItemProvider;
 
@@ -212,8 +211,7 @@ public class EdgeStyleItemProvider extends StyleItemProvider {
      */
     @Override
     public String getText(Object object) {
-        LineStyle labelValue = ((EdgeStyle) object).getLineStyle();
-        String label = labelValue == null ? null : labelValue.toString();
+        String label = ((EdgeStyle) object).getUid();
         return label == null || label.length() == 0 ? getString("_UI_EdgeStyle_type") : //$NON-NLS-1$
                 getString("_UI_EdgeStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/EdgeTargetItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/EdgeTargetItemProvider.java
index bcc590e88b..57b29372af 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/EdgeTargetItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/EdgeTargetItemProvider.java
@@ -18,15 +18,11 @@ 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.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.sirius.diagram.DiagramPackage;
+import org.eclipse.sirius.diagram.EdgeTarget;
 import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
+import org.eclipse.sirius.viewpoint.provider.IdentifiedElementItemProvider;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.sirius.diagram.EdgeTarget} object. <!-- begin-user-doc -->
@@ -34,8 +30,7 @@ import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
  *
  * @generated
  */
-public class EdgeTargetItemProvider extends ItemProviderAdapter
-        implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class EdgeTargetItemProvider extends IdentifiedElementItemProvider {
     /**
      * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -92,7 +87,9 @@ public class EdgeTargetItemProvider extends ItemProviderAdapter
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_EdgeTarget_type"); //$NON-NLS-1$
+        String label = ((EdgeTarget) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_EdgeTarget_type") : //$NON-NLS-1$
+                getString("_UI_EdgeTarget_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/EllipseItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/EllipseItemProvider.java
index 18bc906703..67488a7b61 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/EllipseItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/EllipseItemProvider.java
@@ -109,8 +109,9 @@ public class EllipseItemProvider extends NodeStyleItemProvider {
      */
     @Override
     public String getText(Object object) {
-        Ellipse ellipse = (Ellipse) object;
-        return getString("_UI_Ellipse_type") + " " + ellipse.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
+        String label = ((Ellipse) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_Ellipse_type") : //$NON-NLS-1$
+                getString("_UI_Ellipse_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/EndLabelStyleItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/EndLabelStyleItemProvider.java
index c97b1f2341..41fd400d7a 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/EndLabelStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/EndLabelStyleItemProvider.java
@@ -69,8 +69,9 @@ public class EndLabelStyleItemProvider extends BasicLabelStyleItemProvider {
      */
     @Override
     public String getText(Object object) {
-        EndLabelStyle endLabelStyle = (EndLabelStyle) object;
-        return getString("_UI_EndLabelStyle_type") + " " + endLabelStyle.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
+        String label = ((EndLabelStyle) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_EndLabelStyle_type") : //$NON-NLS-1$
+                getString("_UI_EndLabelStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/FilterVariableHistoryItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/FilterVariableHistoryItemProvider.java
index e7aeb7721b..80152bf537 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/FilterVariableHistoryItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/FilterVariableHistoryItemProvider.java
@@ -18,18 +18,13 @@ 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.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.sirius.diagram.DiagramFactory;
 import org.eclipse.sirius.diagram.DiagramPackage;
 import org.eclipse.sirius.diagram.FilterVariableHistory;
 import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
+import org.eclipse.sirius.viewpoint.provider.IdentifiedElementItemProvider;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.sirius.diagram.FilterVariableHistory} object. <!--
@@ -37,8 +32,7 @@ import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
  *
  * @generated
  */
-public class FilterVariableHistoryItemProvider extends ItemProviderAdapter
-        implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class FilterVariableHistoryItemProvider extends IdentifiedElementItemProvider {
     /**
      * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -109,7 +103,9 @@ public class FilterVariableHistoryItemProvider extends ItemProviderAdapter
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_FilterVariableHistory_type"); //$NON-NLS-1$
+        String label = ((FilterVariableHistory) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_FilterVariableHistory_type") : //$NON-NLS-1$
+                getString("_UI_FilterVariableHistory_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/FlatContainerStyleItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/FlatContainerStyleItemProvider.java
index 5db9de6a77..407c1e623e 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/FlatContainerStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/FlatContainerStyleItemProvider.java
@@ -112,8 +112,9 @@ public class FlatContainerStyleItemProvider extends ContainerStyleItemProvider {
      */
     @Override
     public String getText(Object object) {
-        FlatContainerStyle flatContainerStyle = (FlatContainerStyle) object;
-        return getString("_UI_FlatContainerStyle_type") + " " + flatContainerStyle.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
+        String label = ((FlatContainerStyle) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_FlatContainerStyle_type") : //$NON-NLS-1$
+                getString("_UI_FlatContainerStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/FoldingFilterItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/FoldingFilterItemProvider.java
index 2e7313f1a8..4c76bdd88c 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/FoldingFilterItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/FoldingFilterItemProvider.java
@@ -16,15 +16,8 @@ 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.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
+import org.eclipse.sirius.diagram.FoldingFilter;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.sirius.diagram.FoldingFilter} object. <!-- begin-user-doc
@@ -32,8 +25,7 @@ import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
  *
  * @generated
  */
-public class FoldingFilterItemProvider extends ItemProviderAdapter
-        implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class FoldingFilterItemProvider extends GraphicalFilterItemProvider {
     /**
      * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -74,7 +66,9 @@ public class FoldingFilterItemProvider extends ItemProviderAdapter
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_FoldingFilter_type"); //$NON-NLS-1$
+        String label = ((FoldingFilter) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_FoldingFilter_type") : //$NON-NLS-1$
+                getString("_UI_FoldingFilter_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -101,14 +95,4 @@ public class FoldingFilterItemProvider extends ItemProviderAdapter
         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 DiagramUIPlugin.INSTANCE;
-    }
-
 }
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/FoldingPointFilterItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/FoldingPointFilterItemProvider.java
index 3682fbec76..6348826dab 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/FoldingPointFilterItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/FoldingPointFilterItemProvider.java
@@ -16,15 +16,8 @@ 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.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
+import org.eclipse.sirius.diagram.FoldingPointFilter;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.sirius.diagram.FoldingPointFilter} object. <!--
@@ -32,8 +25,7 @@ import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
  *
  * @generated
  */
-public class FoldingPointFilterItemProvider extends ItemProviderAdapter
-        implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class FoldingPointFilterItemProvider extends GraphicalFilterItemProvider {
     /**
      * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -74,7 +66,9 @@ public class FoldingPointFilterItemProvider extends ItemProviderAdapter
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_FoldingPointFilter_type"); //$NON-NLS-1$
+        String label = ((FoldingPointFilter) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_FoldingPointFilter_type") : //$NON-NLS-1$
+                getString("_UI_FoldingPointFilter_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -101,14 +95,4 @@ public class FoldingPointFilterItemProvider extends ItemProviderAdapter
         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 DiagramUIPlugin.INSTANCE;
-    }
-
 }
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/GaugeCompositeStyleItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/GaugeCompositeStyleItemProvider.java
index b34748b5ab..5e430e8281 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/GaugeCompositeStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/GaugeCompositeStyleItemProvider.java
@@ -116,8 +116,9 @@ public class GaugeCompositeStyleItemProvider extends NodeStyleItemProvider {
      */
     @Override
     public String getText(Object object) {
-        GaugeCompositeStyle gaugeCompositeStyle = (GaugeCompositeStyle) object;
-        return getString("_UI_GaugeCompositeStyle_type") + " " + gaugeCompositeStyle.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
+        String label = ((GaugeCompositeStyle) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_GaugeCompositeStyle_type") : //$NON-NLS-1$
+                getString("_UI_GaugeCompositeStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/GaugeSectionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/GaugeSectionItemProvider.java
index 90b43dc188..85f9274a69 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/GaugeSectionItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/GaugeSectionItemProvider.java
@@ -113,8 +113,7 @@ public class GaugeSectionItemProvider extends CustomizableItemProvider {
      */
     @Override
     public String getText(Object object) {
-        Integer labelValue = ((GaugeSection) object).getMin();
-        String label = labelValue == null ? null : labelValue.toString();
+        String label = ((GaugeSection) object).getUid();
         return label == null || label.length() == 0 ? getString("_UI_GaugeSection_type") : //$NON-NLS-1$
                 getString("_UI_GaugeSection_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/GraphicalFilterItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/GraphicalFilterItemProvider.java
new file mode 100644
index 0000000000..58b0a7d13a
--- /dev/null
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/GraphicalFilterItemProvider.java
@@ -0,0 +1,101 @@
+/**
+ * Copyright (c) 2007, 2017 THALES GLOBAL SERVICES.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.diagram.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.IItemPropertyDescriptor;
+import org.eclipse.sirius.diagram.GraphicalFilter;
+import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
+import org.eclipse.sirius.viewpoint.provider.IdentifiedElementItemProvider;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.sirius.diagram.GraphicalFilter} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class GraphicalFilterItemProvider extends IdentifiedElementItemProvider {
+    /**
+     * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    public GraphicalFilterItemProvider(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);
+
+        }
+        return itemPropertyDescriptors;
+    }
+
+    /**
+     * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public String getText(Object object) {
+        String label = ((GraphicalFilter) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_GraphicalFilter_type") : //$NON-NLS-1$
+                getString("_UI_GraphicalFilter_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+    }
+
+    /**
+     * 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);
+        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 DiagramUIPlugin.INSTANCE;
+    }
+
+}
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/HideFilterItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/HideFilterItemProvider.java
index 397faff0af..e12dc70c1a 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/HideFilterItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/HideFilterItemProvider.java
@@ -16,15 +16,8 @@ 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.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
+import org.eclipse.sirius.diagram.HideFilter;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.sirius.diagram.HideFilter} object. <!-- begin-user-doc -->
@@ -32,8 +25,7 @@ import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
  *
  * @generated
  */
-public class HideFilterItemProvider extends ItemProviderAdapter
-        implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class HideFilterItemProvider extends GraphicalFilterItemProvider {
     /**
      * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -74,7 +66,9 @@ public class HideFilterItemProvider extends ItemProviderAdapter
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_HideFilter_type"); //$NON-NLS-1$
+        String label = ((HideFilter) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_HideFilter_type") : //$NON-NLS-1$
+                getString("_UI_HideFilter_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -101,14 +95,4 @@ public class HideFilterItemProvider extends ItemProviderAdapter
         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 DiagramUIPlugin.INSTANCE;
-    }
-
 }
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/HideLabelFilterItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/HideLabelFilterItemProvider.java
index 142eaee9e8..84653f1416 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/HideLabelFilterItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/HideLabelFilterItemProvider.java
@@ -16,15 +16,8 @@ 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.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
+import org.eclipse.sirius.diagram.HideLabelFilter;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.sirius.diagram.HideLabelFilter} object. <!--
@@ -32,8 +25,7 @@ import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
  *
  * @generated
  */
-public class HideLabelFilterItemProvider extends ItemProviderAdapter
-        implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class HideLabelFilterItemProvider extends GraphicalFilterItemProvider {
     /**
      * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -74,7 +66,9 @@ public class HideLabelFilterItemProvider extends ItemProviderAdapter
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_HideLabelFilter_type"); //$NON-NLS-1$
+        String label = ((HideLabelFilter) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_HideLabelFilter_type") : //$NON-NLS-1$
+                getString("_UI_HideLabelFilter_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -101,14 +95,4 @@ public class HideLabelFilterItemProvider extends ItemProviderAdapter
         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 DiagramUIPlugin.INSTANCE;
-    }
-
 }
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/IndirectlyCollapseFilterItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/IndirectlyCollapseFilterItemProvider.java
index a74c41de78..f2d23a2e69 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/IndirectlyCollapseFilterItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/IndirectlyCollapseFilterItemProvider.java
@@ -66,8 +66,9 @@ public class IndirectlyCollapseFilterItemProvider extends CollapseFilterItemProv
      */
     @Override
     public String getText(Object object) {
-        IndirectlyCollapseFilter indirectlyCollapseFilter = (IndirectlyCollapseFilter) object;
-        return getString("_UI_IndirectlyCollapseFilter_type") + " " + indirectlyCollapseFilter.getWidth(); //$NON-NLS-1$ //$NON-NLS-2$
+        String label = ((IndirectlyCollapseFilter) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_IndirectlyCollapseFilter_type") : //$NON-NLS-1$
+                getString("_UI_IndirectlyCollapseFilter_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/LozengeItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/LozengeItemProvider.java
index a3cb12fd69..5538869043 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/LozengeItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/LozengeItemProvider.java
@@ -106,8 +106,9 @@ public class LozengeItemProvider extends NodeStyleItemProvider {
      */
     @Override
     public String getText(Object object) {
-        Lozenge lozenge = (Lozenge) object;
-        return getString("_UI_Lozenge_type") + " " + lozenge.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
+        String label = ((Lozenge) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_Lozenge_type") : //$NON-NLS-1$
+                getString("_UI_Lozenge_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/NodeStyleItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/NodeStyleItemProvider.java
index 99afcee479..8f22119de7 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/NodeStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/NodeStyleItemProvider.java
@@ -145,8 +145,9 @@ public class NodeStyleItemProvider extends LabelStyleItemProvider {
      */
     @Override
     public String getText(Object object) {
-        NodeStyle nodeStyle = (NodeStyle) object;
-        return getString("_UI_NodeStyle_type") + " " + nodeStyle.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
+        String label = ((NodeStyle) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_NodeStyle_type") : //$NON-NLS-1$
+                getString("_UI_NodeStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/NoteItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/NoteItemProvider.java
index 51ab4a8921..0cea742813 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/NoteItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/NoteItemProvider.java
@@ -83,8 +83,9 @@ public class NoteItemProvider extends NodeStyleItemProvider {
      */
     @Override
     public String getText(Object object) {
-        Note note = (Note) object;
-        return getString("_UI_Note_type") + " " + note.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
+        String label = ((Note) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_Note_type") : //$NON-NLS-1$
+                getString("_UI_Note_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/ShapeContainerStyleItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/ShapeContainerStyleItemProvider.java
index a5abb1bbb6..621a5c5918 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/ShapeContainerStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/ShapeContainerStyleItemProvider.java
@@ -98,8 +98,9 @@ public class ShapeContainerStyleItemProvider extends ContainerStyleItemProvider
      */
     @Override
     public String getText(Object object) {
-        ShapeContainerStyle shapeContainerStyle = (ShapeContainerStyle) object;
-        return getString("_UI_ShapeContainerStyle_type") + " " + shapeContainerStyle.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
+        String label = ((ShapeContainerStyle) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_ShapeContainerStyle_type") : //$NON-NLS-1$
+                getString("_UI_ShapeContainerStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/SquareItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/SquareItemProvider.java
index 9b92abfc27..dd3b426d02 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/SquareItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/SquareItemProvider.java
@@ -108,8 +108,9 @@ public class SquareItemProvider extends NodeStyleItemProvider {
      */
     @Override
     public String getText(Object object) {
-        Square square = (Square) object;
-        return getString("_UI_Square_type") + " " + square.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
+        String label = ((Square) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_Square_type") : //$NON-NLS-1$
+                getString("_UI_Square_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/TypedVariableValueItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/TypedVariableValueItemProvider.java
index 67227de00b..8e326ee858 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/TypedVariableValueItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/TypedVariableValueItemProvider.java
@@ -96,7 +96,7 @@ public class TypedVariableValueItemProvider extends VariableValueItemProvider {
      */
     @Override
     public String getText(Object object) {
-        String label = ((TypedVariableValue) object).getValue();
+        String label = ((TypedVariableValue) object).getUid();
         return label == null || label.length() == 0 ? getString("_UI_TypedVariableValue_type") : //$NON-NLS-1$
                 getString("_UI_TypedVariableValue_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/VariableValueItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/VariableValueItemProvider.java
index 8e59afc40c..1777278fa2 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/VariableValueItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/VariableValueItemProvider.java
@@ -16,14 +16,10 @@ 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.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+import org.eclipse.sirius.diagram.VariableValue;
 import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
+import org.eclipse.sirius.viewpoint.provider.IdentifiedElementItemProvider;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.sirius.diagram.VariableValue} object. <!-- begin-user-doc
@@ -31,8 +27,7 @@ import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
  *
  * @generated
  */
-public class VariableValueItemProvider extends ItemProviderAdapter
-        implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class VariableValueItemProvider extends IdentifiedElementItemProvider {
     /**
      * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -73,7 +68,9 @@ public class VariableValueItemProvider extends ItemProviderAdapter
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_VariableValue_type"); //$NON-NLS-1$
+        String label = ((VariableValue) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_VariableValue_type") : //$NON-NLS-1$
+                getString("_UI_VariableValue_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/WorkspaceImageItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/WorkspaceImageItemProvider.java
index 21633d8f89..28c272002a 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/WorkspaceImageItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/WorkspaceImageItemProvider.java
@@ -84,8 +84,9 @@ public class WorkspaceImageItemProvider extends NodeStyleItemProvider {
      */
     @Override
     public String getText(Object object) {
-        WorkspaceImage workspaceImage = (WorkspaceImage) object;
-        return getString("_UI_WorkspaceImage_type") + " " + workspaceImage.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
+        String label = ((WorkspaceImage) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_WorkspaceImage_type") : //$NON-NLS-1$
+                getString("_UI_WorkspaceImage_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram/model/diagram.ecore b/plugins/org.eclipse.sirius.diagram/model/diagram.ecore
index b16c0c89d4..097a7d69e7 100644
--- a/plugins/org.eclipse.sirius.diagram/model/diagram.ecore
+++ b/plugins/org.eclipse.sirius.diagram/model/diagram.ecore
@@ -180,7 +180,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="GraphicalFilter" abstract="true" interface="true">
+  <eClassifiers xsi:type="ecore:EClass" name="GraphicalFilter" abstract="true" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//IdentifiedElement">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="A filter that allow to graphically filter the owner DDiagramElement."/>
     </eAnnotations>
@@ -714,7 +714,7 @@
     <eLiterals name="ring" value="5"/>
     <eLiterals name="providedShape" value="6"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EdgeTarget" abstract="true">
+  <eClassifiers xsi:type="ecore:EClass" name="EdgeTarget" abstract="true" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//IdentifiedElement">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="The target of a ViewEdge."/>
     </eAnnotations>
@@ -907,7 +907,7 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="color" eType="ecore:EDataType ../../org.eclipse.sirius/model/viewpoint.ecore#//RGBValues"
         defaultValueLiteral="252,233,79"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FilterVariableHistory">
+  <eClassifiers xsi:type="ecore:EClass" name="FilterVariableHistory" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//IdentifiedElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="ownedValues" upperBound="-1"
         eType="#//VariableValue" containment="true"/>
   </eClassifiers>
@@ -958,12 +958,12 @@
     </eOperations>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="BracketEdgeStyle" eSuperTypes="#//EdgeStyle"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ComputedStyleDescriptionRegistry">
+  <eClassifiers xsi:type="ecore:EClass" name="ComputedStyleDescriptionRegistry" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//IdentifiedElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="computedStyleDescriptions"
         upperBound="-1" eType="ecore:EClass ../../org.eclipse.sirius/model/viewpoint.ecore#//description/style/StyleDescription"
         containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DragAndDropTarget">
+  <eClassifiers xsi:type="ecore:EClass" name="DragAndDropTarget" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//IdentifiedElement">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="A DragAndDropTarget is an element that can managed drop requests."/>
     </eAnnotations>
@@ -982,7 +982,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="VariableValue" abstract="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="VariableValue" abstract="true" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//IdentifiedElement"/>
   <eClassifiers xsi:type="ecore:EClass" name="TypedVariableValue" eSuperTypes="#//VariableValue">
     <eStructuralFeatures xsi:type="ecore:EReference" name="variableDefinition" lowerBound="1"
         eType="ecore:EClass ../../org.eclipse.sirius/model/viewpoint.ecore#//description/TypedVariable"/>
diff --git a/plugins/org.eclipse.sirius.diagram/plugin.properties b/plugins/org.eclipse.sirius.diagram/plugin.properties
index b7e22caac3..055fe76711 100644
--- a/plugins/org.eclipse.sirius.diagram/plugin.properties
+++ b/plugins/org.eclipse.sirius.diagram/plugin.properties
@@ -227,7 +227,7 @@ NodeFilter_notNullErrorMsg = The node must not be null
 NodeIdentifier_parametersErrorMsg = semantic & mappingName are mandatories
 NodeMappingHelper_methodInvocationErrorMsg = [NodeMapping.getNodesCandidates(EObject semanticOrigin, EObject container)] This method must not be invoked. Use [NodeMapping.getNodesCandidates(EObject semanticOrigin, EObject container, EObject containerView)] instead.
 NodeMappingHelper_nodeCreationErrorMsg = Error creating nodes : domain class is not defined on a mapping
-NoteAttachmentWithoutSourceOrTargetMigrationParticipant_title=Migration done for "Corrupted note attachments" (the result of this migration will be saved on the next session save):
+NoteAttachmentWithoutSourceOrTargetMigrationParticipant_title=Migration done on {0} for "Corrupted note attachments" (the result of this migration will be saved on the next session save):
 NoteAttachmentWithoutSourceOrTargetMigrationParticipant_edgesRemoved=\n\t* {0} corrupted note attachments have been removed from diagram "{1}".
 PasteCommandBuilder_pasteLabel = Paste
 PinElementsCommand_commandLabel = Pin elements
diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/helper/EdgeMappingHelper.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/helper/EdgeMappingHelper.java
index d089e6b26d..1491dc8c86 100644
--- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/helper/EdgeMappingHelper.java
+++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/helper/EdgeMappingHelper.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2016 THALES GLOBAL SERVICES and others.
+ * Copyright (c) 2009, 2018 THALES GLOBAL SERVICES and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -30,6 +30,7 @@ import org.eclipse.sirius.common.tools.DslCommonPlugin;
 import org.eclipse.sirius.common.tools.api.interpreter.EvaluationException;
 import org.eclipse.sirius.common.tools.api.interpreter.IInterpreter;
 import org.eclipse.sirius.common.tools.api.interpreter.IInterpreterSiriusVariables;
+import org.eclipse.sirius.common.tools.api.util.EqualityHelper;
 import org.eclipse.sirius.common.tools.api.util.StringUtil;
 import org.eclipse.sirius.diagram.DDiagram;
 import org.eclipse.sirius.diagram.DDiagramElement;
@@ -61,8 +62,7 @@ import org.eclipse.sirius.viewpoint.description.style.StyleDescription;
 import org.eclipse.sirius.viewpoint.description.style.StylePackage;
 
 /**
- * Common utils between
- * {@link org.eclipse.sirius.diagram.business.internal.metamodel.description.spec.EdgeMappingSpec}
+ * Common utils between {@link org.eclipse.sirius.diagram.business.internal.metamodel.description.spec.EdgeMappingSpec}
  * and {@link EdgeMappingImportWrapper}.
  * 
  * @author <a href="mailto:laurent.redor@obeo.fr">Laurent Redor</a>
@@ -240,9 +240,8 @@ public final class EdgeMappingHelper {
         }
 
         /*
-         * Validation does not work here : getParentDiagram is still unknown.
-         * Let's check the fact that we can find back the target from the source
-         * using the target finder expression
+         * Validation does not work here : getParentDiagram is still unknown. Let's check the fact that we can find back
+         * the target from the source using the target finder expression
          */
         // if (!newEdge.validate()) {
         // SiriusPlugin.getDefault().warning("The newly created edge is not
@@ -315,7 +314,7 @@ public final class EdgeMappingHelper {
                 }
             }
 
-            org.eclipse.emf.ecore.util.EcoreUtil.EqualityHelper equalityHelper = new org.eclipse.emf.ecore.util.EcoreUtil.EqualityHelper();
+            EqualityHelper equalityHelper = new EqualityHelper();
 
             // Change path only if new list is different from original one
             if (!equalityHelper.equals((List) edge.getPath(), (List) newPath)) {
@@ -510,8 +509,7 @@ public final class EdgeMappingHelper {
      *            The potentially imported mapping
      * @param edgeMappingImport
      *            The potential importer
-     * @return true if mapping is imported by edgeMappingImport or a subMapping,
-     *         false otherwise
+     * @return true if mapping is imported by edgeMappingImport or a subMapping, false otherwise
      */
     public static boolean isImported(final IEdgeMapping mapping, final EdgeMappingImport edgeMappingImport) {
         boolean result = false;
diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/helper/StyleHelper.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/helper/StyleHelper.java
index b2bb49eaeb..01b219b5db 100644
--- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/helper/StyleHelper.java
+++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/helper/StyleHelper.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2017 THALES GLOBAL SERVICES and others.
+ * Copyright (c) 2007, 2018 THALES GLOBAL SERVICES and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -1058,7 +1058,7 @@ public final class StyleHelper {
             newGaugeSections.add(styleSection);
         }
 
-        org.eclipse.emf.ecore.util.EcoreUtil.EqualityHelper equalityHelper = new org.eclipse.emf.ecore.util.EcoreUtil.EqualityHelper();
+        EqualityHelper equalityHelper = new EqualityHelper();
         // Change sections only if new list is different from original one
         if (!equalityHelper.equals((List) style.getSections(), (List) newGaugeSections) && !style.getCustomFeatures().contains(DiagramPackage.Literals.GAUGE_COMPOSITE_STYLE__SECTIONS.getName())) {
             style.getSections().clear();
diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/migration/NoteAttachmentWithoutSourceOrTargetMigrationParticipant.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/migration/NoteAttachmentWithoutSourceOrTargetMigrationParticipant.java
index 07cb93d71e..64bc31e330 100644
--- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/migration/NoteAttachmentWithoutSourceOrTargetMigrationParticipant.java
+++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/migration/NoteAttachmentWithoutSourceOrTargetMigrationParticipant.java
@@ -89,7 +89,7 @@ public class NoteAttachmentWithoutSourceOrTargetMigrationParticipant extends Abs
     @Override
     public void postLoad(XMLResource resource, String loadedVersion) {
         deletionOccured = false;
-        sb = new StringBuilder(Messages.NoteAttachmentWithoutSourceOrTargetMigrationParticipant_title);
+        sb = new StringBuilder(MessageFormat.format(Messages.NoteAttachmentWithoutSourceOrTargetMigrationParticipant_title, resource.getURI().toPlatformString(true)));
         super.postLoad(resource, loadedVersion);
         if (deletionOccured) {
             DiagramPlugin.getDefault().logInfo(sb.toString());
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/ComputedStyleDescriptionRegistry.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/ComputedStyleDescriptionRegistry.java
index b80c802219..54d00cd2db 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/ComputedStyleDescriptionRegistry.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/ComputedStyleDescriptionRegistry.java
@@ -12,7 +12,7 @@
 package org.eclipse.sirius.diagram;
 
 import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
+import org.eclipse.sirius.viewpoint.IdentifiedElement;
 import org.eclipse.sirius.viewpoint.description.style.StyleDescription;
 
 /**
@@ -31,7 +31,7 @@ import org.eclipse.sirius.viewpoint.description.style.StyleDescription;
  * @model
  * @generated
  */
-public interface ComputedStyleDescriptionRegistry extends EObject {
+public interface ComputedStyleDescriptionRegistry extends IdentifiedElement {
     /**
      * Returns the value of the '<em><b>Computed Style Descriptions</b></em>' containment reference list. The list
      * contents are of type {@link org.eclipse.sirius.viewpoint.description.style.StyleDescription}. <!-- begin-user-doc
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/DiagramPackage.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/DiagramPackage.java
index f2a494797c..d28dd0aa8a 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/DiagramPackage.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/DiagramPackage.java
@@ -72,12 +72,12 @@ public interface DiagramPackage extends EPackage {
     int DDIAGRAM = 0;
 
     /**
-     * The feature id for the '<em><b>Documentation</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
      * @ordered
      */
-    int DDIAGRAM__DOCUMENTATION = ViewpointPackage.DREPRESENTATION__DOCUMENTATION;
+    int DDIAGRAM__UID = ViewpointPackage.DREPRESENTATION__UID;
 
     /**
      * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list. <!-- begin-user-doc --> <!--
@@ -89,6 +89,14 @@ public interface DiagramPackage extends EPackage {
     int DDIAGRAM__EANNOTATIONS = ViewpointPackage.DREPRESENTATION__EANNOTATIONS;
 
     /**
+     * The feature id for the '<em><b>Documentation</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DDIAGRAM__DOCUMENTATION = ViewpointPackage.DREPRESENTATION__DOCUMENTATION;
+
+    /**
      * The feature id for the '<em><b>Owned Representation Elements</b></em>' reference list. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      *
@@ -133,14 +141,6 @@ public interface DiagramPackage extends EPackage {
     int DDIAGRAM__UI_STATE = ViewpointPackage.DREPRESENTATION__UI_STATE;
 
     /**
-     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int DDIAGRAM__UID = ViewpointPackage.DREPRESENTATION__UID;
-
-    /**
      * The feature id for the '<em><b>Owned Diagram Elements</b></em>' containment reference list. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
      *
@@ -332,12 +332,12 @@ public interface DiagramPackage extends EPackage {
     int DSEMANTIC_DIAGRAM = 1;
 
     /**
-     * The feature id for the '<em><b>Documentation</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
      * @ordered
      */
-    int DSEMANTIC_DIAGRAM__DOCUMENTATION = DiagramPackage.DDIAGRAM__DOCUMENTATION;
+    int DSEMANTIC_DIAGRAM__UID = DiagramPackage.DDIAGRAM__UID;
 
     /**
      * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list. <!-- begin-user-doc --> <!--
@@ -349,6 +349,14 @@ public interface DiagramPackage extends EPackage {
     int DSEMANTIC_DIAGRAM__EANNOTATIONS = DiagramPackage.DDIAGRAM__EANNOTATIONS;
 
     /**
+     * The feature id for the '<em><b>Documentation</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DSEMANTIC_DIAGRAM__DOCUMENTATION = DiagramPackage.DDIAGRAM__DOCUMENTATION;
+
+    /**
      * The feature id for the '<em><b>Owned Representation Elements</b></em>' reference list. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      *
@@ -393,14 +401,6 @@ public interface DiagramPackage extends EPackage {
     int DSEMANTIC_DIAGRAM__UI_STATE = DiagramPackage.DDIAGRAM__UI_STATE;
 
     /**
-     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int DSEMANTIC_DIAGRAM__UID = DiagramPackage.DDIAGRAM__UID;
-
-    /**
      * The feature id for the '<em><b>Owned Diagram Elements</b></em>' containment reference list. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
      *
@@ -601,6 +601,14 @@ public interface DiagramPackage extends EPackage {
     int DDIAGRAM_ELEMENT = 2;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DDIAGRAM_ELEMENT__UID = ViewpointPackage.DREPRESENTATION_ELEMENT__UID;
+
+    /**
      * The feature id for the '<em><b>Target</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
@@ -696,23 +704,31 @@ public interface DiagramPackage extends EPackage {
     int DDIAGRAM_ELEMENT_FEATURE_COUNT = ViewpointPackage.DREPRESENTATION_ELEMENT_FEATURE_COUNT + 7;
 
     /**
-     * The meta object id for the '{@link org.eclipse.sirius.diagram.GraphicalFilter <em>Graphical Filter</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The meta object id for the '{@link org.eclipse.sirius.diagram.impl.GraphicalFilterImpl <em>Graphical
+     * Filter</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
-     * @see org.eclipse.sirius.diagram.GraphicalFilter
+     * @see org.eclipse.sirius.diagram.impl.GraphicalFilterImpl
      * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getGraphicalFilter()
      * @generated
      */
     int GRAPHICAL_FILTER = 3;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int GRAPHICAL_FILTER__UID = ViewpointPackage.IDENTIFIED_ELEMENT__UID;
+
+    /**
      * The number of structural features of the '<em>Graphical Filter</em>' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      *
      * @generated
      * @ordered
      */
-    int GRAPHICAL_FILTER_FEATURE_COUNT = 0;
+    int GRAPHICAL_FILTER_FEATURE_COUNT = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 0;
 
     /**
      * The meta object id for the '{@link org.eclipse.sirius.diagram.impl.HideFilterImpl <em>Hide Filter</em>}' class.
@@ -725,6 +741,14 @@ public interface DiagramPackage extends EPackage {
     int HIDE_FILTER = 4;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int HIDE_FILTER__UID = DiagramPackage.GRAPHICAL_FILTER__UID;
+
+    /**
      * The number of structural features of the '<em>Hide Filter</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
      *
@@ -744,6 +768,14 @@ public interface DiagramPackage extends EPackage {
     int HIDE_LABEL_FILTER = 5;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int HIDE_LABEL_FILTER__UID = DiagramPackage.GRAPHICAL_FILTER__UID;
+
+    /**
      * The number of structural features of the '<em>Hide Label Filter</em>' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      *
@@ -763,6 +795,14 @@ public interface DiagramPackage extends EPackage {
     int FOLDING_POINT_FILTER = 6;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int FOLDING_POINT_FILTER__UID = DiagramPackage.GRAPHICAL_FILTER__UID;
+
+    /**
      * The number of structural features of the '<em>Folding Point Filter</em>' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      *
@@ -782,6 +822,14 @@ public interface DiagramPackage extends EPackage {
     int FOLDING_FILTER = 7;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int FOLDING_FILTER__UID = DiagramPackage.GRAPHICAL_FILTER__UID;
+
+    /**
      * The number of structural features of the '<em>Folding Filter</em>' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      *
@@ -801,6 +849,14 @@ public interface DiagramPackage extends EPackage {
     int APPLIED_COMPOSITE_FILTERS = 8;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int APPLIED_COMPOSITE_FILTERS__UID = DiagramPackage.GRAPHICAL_FILTER__UID;
+
+    /**
      * The feature id for the '<em><b>Composite Filter Descriptions</b></em>' reference list. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      *
@@ -829,6 +885,14 @@ public interface DiagramPackage extends EPackage {
     int ABSOLUTE_BOUNDS_FILTER = 9;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int ABSOLUTE_BOUNDS_FILTER__UID = DiagramPackage.GRAPHICAL_FILTER__UID;
+
+    /**
      * The feature id for the '<em><b>X</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
@@ -880,6 +944,14 @@ public interface DiagramPackage extends EPackage {
     int ABSTRACT_DNODE = 10;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int ABSTRACT_DNODE__UID = DiagramPackage.DDIAGRAM_ELEMENT__UID;
+
+    /**
      * The feature id for the '<em><b>Target</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
@@ -1003,6 +1075,14 @@ public interface DiagramPackage extends EPackage {
     int DNODE = 11;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DNODE__UID = DiagramPackage.ABSTRACT_DNODE__UID;
+
+    /**
      * The feature id for the '<em><b>Target</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
@@ -1209,6 +1289,14 @@ public interface DiagramPackage extends EPackage {
     int DDIAGRAM_ELEMENT_CONTAINER = 12;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DDIAGRAM_ELEMENT_CONTAINER__UID = DiagramPackage.ABSTRACT_DNODE__UID;
+
+    /**
      * The feature id for the '<em><b>Target</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
@@ -1424,6 +1512,14 @@ public interface DiagramPackage extends EPackage {
     int DNODE_CONTAINER = 13;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DNODE_CONTAINER__UID = DiagramPackage.DDIAGRAM_ELEMENT_CONTAINER__UID;
+
+    /**
      * The feature id for the '<em><b>Target</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
@@ -1657,6 +1753,14 @@ public interface DiagramPackage extends EPackage {
     int DNODE_LIST = 14;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DNODE_LIST__UID = DiagramPackage.DDIAGRAM_ELEMENT_CONTAINER__UID;
+
+    /**
      * The feature id for the '<em><b>Target</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
@@ -1881,6 +1985,14 @@ public interface DiagramPackage extends EPackage {
     int DNODE_LIST_ELEMENT = 15;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DNODE_LIST_ELEMENT__UID = DiagramPackage.ABSTRACT_DNODE__UID;
+
+    /**
      * The feature id for the '<em><b>Target</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
@@ -2038,6 +2150,14 @@ public interface DiagramPackage extends EPackage {
     int DEDGE = 16;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DEDGE__UID = DiagramPackage.DDIAGRAM_ELEMENT__UID;
+
+    /**
      * The feature id for the '<em><b>Target</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
@@ -2266,6 +2386,14 @@ public interface DiagramPackage extends EPackage {
     int NODE_STYLE = 17;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int NODE_STYLE__UID = ViewpointPackage.LABEL_STYLE__UID;
+
+    /**
      * The feature id for the '<em><b>Custom Features</b></em>' attribute list. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      *
@@ -2402,6 +2530,14 @@ public interface DiagramPackage extends EPackage {
     int DOT = 18;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DOT__UID = DiagramPackage.NODE_STYLE__UID;
+
+    /**
      * The feature id for the '<em><b>Custom Features</b></em>' attribute list. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      *
@@ -2555,6 +2691,14 @@ public interface DiagramPackage extends EPackage {
     int GAUGE_SECTION = 19;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int GAUGE_SECTION__UID = ViewpointPackage.CUSTOMIZABLE__UID;
+
+    /**
      * The feature id for the '<em><b>Custom Features</b></em>' attribute list. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      *
@@ -2633,6 +2777,14 @@ public interface DiagramPackage extends EPackage {
     int CONTAINER_STYLE = 20;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int CONTAINER_STYLE__UID = ViewpointPackage.LABEL_STYLE__UID;
+
+    /**
      * The feature id for the '<em><b>Custom Features</b></em>' attribute list. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      *
@@ -2761,6 +2913,14 @@ public interface DiagramPackage extends EPackage {
     int FLAT_CONTAINER_STYLE = 21;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int FLAT_CONTAINER_STYLE__UID = DiagramPackage.CONTAINER_STYLE__UID;
+
+    /**
      * The feature id for the '<em><b>Custom Features</b></em>' attribute list. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      *
@@ -2916,6 +3076,14 @@ public interface DiagramPackage extends EPackage {
     int SHAPE_CONTAINER_STYLE = 22;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int SHAPE_CONTAINER_STYLE__UID = DiagramPackage.CONTAINER_STYLE__UID;
+
+    /**
      * The feature id for the '<em><b>Custom Features</b></em>' attribute list. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      *
@@ -3061,6 +3229,14 @@ public interface DiagramPackage extends EPackage {
     int SQUARE = 23;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int SQUARE__UID = DiagramPackage.NODE_STYLE__UID;
+
+    /**
      * The feature id for the '<em><b>Custom Features</b></em>' attribute list. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      *
@@ -3220,6 +3396,14 @@ public interface DiagramPackage extends EPackage {
     int ELLIPSE = 24;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int ELLIPSE__UID = DiagramPackage.NODE_STYLE__UID;
+
+    /**
      * The feature id for the '<em><b>Custom Features</b></em>' attribute list. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      *
@@ -3381,6 +3565,14 @@ public interface DiagramPackage extends EPackage {
     int LOZENGE = 25;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int LOZENGE__UID = DiagramPackage.NODE_STYLE__UID;
+
+    /**
      * The feature id for the '<em><b>Custom Features</b></em>' attribute list. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      *
@@ -3540,6 +3732,14 @@ public interface DiagramPackage extends EPackage {
     int BUNDLED_IMAGE = 26;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int BUNDLED_IMAGE__UID = DiagramPackage.NODE_STYLE__UID;
+
+    /**
      * The feature id for the '<em><b>Custom Features</b></em>' attribute list. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      *
@@ -3701,6 +3901,14 @@ public interface DiagramPackage extends EPackage {
     int WORKSPACE_IMAGE = 27;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int WORKSPACE_IMAGE__UID = DiagramPackage.NODE_STYLE__UID;
+
+    /**
      * The feature id for the '<em><b>Custom Features</b></em>' attribute list. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      *
@@ -3845,6 +4053,14 @@ public interface DiagramPackage extends EPackage {
     int CUSTOM_STYLE = 28;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int CUSTOM_STYLE__UID = DiagramPackage.NODE_STYLE__UID;
+
+    /**
      * The feature id for the '<em><b>Custom Features</b></em>' attribute list. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      *
@@ -3989,13 +4205,21 @@ public interface DiagramPackage extends EPackage {
     int EDGE_TARGET = 29;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int EDGE_TARGET__UID = ViewpointPackage.IDENTIFIED_ELEMENT__UID;
+
+    /**
      * The feature id for the '<em><b>Outgoing Edges</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
      *
      * @generated
      * @ordered
      */
-    int EDGE_TARGET__OUTGOING_EDGES = 0;
+    int EDGE_TARGET__OUTGOING_EDGES = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 0;
 
     /**
      * The feature id for the '<em><b>Incoming Edges</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc
@@ -4004,7 +4228,7 @@ public interface DiagramPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int EDGE_TARGET__INCOMING_EDGES = 1;
+    int EDGE_TARGET__INCOMING_EDGES = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 1;
 
     /**
      * The number of structural features of the '<em>Edge Target</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
@@ -4013,7 +4237,7 @@ public interface DiagramPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int EDGE_TARGET_FEATURE_COUNT = 2;
+    int EDGE_TARGET_FEATURE_COUNT = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 2;
 
     /**
      * The meta object id for the '{@link org.eclipse.sirius.diagram.impl.EdgeStyleImpl <em>Edge Style</em>}' class.
@@ -4026,6 +4250,14 @@ public interface DiagramPackage extends EPackage {
     int EDGE_STYLE = 30;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int EDGE_STYLE__UID = ViewpointPackage.STYLE__UID;
+
+    /**
      * The feature id for the '<em><b>Custom Features</b></em>' attribute list. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      *
@@ -4153,6 +4385,14 @@ public interface DiagramPackage extends EPackage {
     int GAUGE_COMPOSITE_STYLE = 31;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int GAUGE_COMPOSITE_STYLE__UID = DiagramPackage.NODE_STYLE__UID;
+
+    /**
      * The feature id for the '<em><b>Custom Features</b></em>' attribute list. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      *
@@ -4306,6 +4546,14 @@ public interface DiagramPackage extends EPackage {
     int BORDERED_STYLE = 32;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int BORDERED_STYLE__UID = ViewpointPackage.STYLE__UID;
+
+    /**
      * The feature id for the '<em><b>Custom Features</b></em>' attribute list. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      *
@@ -4376,6 +4624,14 @@ public interface DiagramPackage extends EPackage {
     int NOTE = 33;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int NOTE__UID = DiagramPackage.NODE_STYLE__UID;
+
+    /**
      * The feature id for the '<em><b>Custom Features</b></em>' attribute list. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      *
@@ -4519,13 +4775,21 @@ public interface DiagramPackage extends EPackage {
     int FILTER_VARIABLE_HISTORY = 34;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int FILTER_VARIABLE_HISTORY__UID = ViewpointPackage.IDENTIFIED_ELEMENT__UID;
+
+    /**
      * The feature id for the '<em><b>Owned Values</b></em>' containment reference list. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      *
      * @generated
      * @ordered
      */
-    int FILTER_VARIABLE_HISTORY__OWNED_VALUES = 0;
+    int FILTER_VARIABLE_HISTORY__OWNED_VALUES = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 0;
 
     /**
      * The number of structural features of the '<em>Filter Variable History</em>' class. <!-- begin-user-doc --> <!--
@@ -4534,7 +4798,7 @@ public interface DiagramPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int FILTER_VARIABLE_HISTORY_FEATURE_COUNT = 1;
+    int FILTER_VARIABLE_HISTORY_FEATURE_COUNT = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 1;
 
     /**
      * The meta object id for the '{@link org.eclipse.sirius.diagram.impl.CollapseFilterImpl <em>Collapse Filter</em>}'
@@ -4547,6 +4811,14 @@ public interface DiagramPackage extends EPackage {
     int COLLAPSE_FILTER = 35;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int COLLAPSE_FILTER__UID = DiagramPackage.GRAPHICAL_FILTER__UID;
+
+    /**
      * The feature id for the '<em><b>Width</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
@@ -4582,6 +4854,14 @@ public interface DiagramPackage extends EPackage {
     int INDIRECTLY_COLLAPSE_FILTER = 36;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int INDIRECTLY_COLLAPSE_FILTER__UID = DiagramPackage.COLLAPSE_FILTER__UID;
+
+    /**
      * The feature id for the '<em><b>Width</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
@@ -4617,6 +4897,14 @@ public interface DiagramPackage extends EPackage {
     int BEGIN_LABEL_STYLE = 37;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int BEGIN_LABEL_STYLE__UID = ViewpointPackage.BASIC_LABEL_STYLE__UID;
+
+    /**
      * The feature id for the '<em><b>Custom Features</b></em>' attribute list. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      *
@@ -4686,6 +4974,14 @@ public interface DiagramPackage extends EPackage {
     int CENTER_LABEL_STYLE = 38;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int CENTER_LABEL_STYLE__UID = ViewpointPackage.BASIC_LABEL_STYLE__UID;
+
+    /**
      * The feature id for the '<em><b>Custom Features</b></em>' attribute list. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      *
@@ -4755,6 +5051,14 @@ public interface DiagramPackage extends EPackage {
     int END_LABEL_STYLE = 39;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int END_LABEL_STYLE__UID = ViewpointPackage.BASIC_LABEL_STYLE__UID;
+
+    /**
      * The feature id for the '<em><b>Custom Features</b></em>' attribute list. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      *
@@ -4824,6 +5128,14 @@ public interface DiagramPackage extends EPackage {
     int BRACKET_EDGE_STYLE = 40;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int BRACKET_EDGE_STYLE__UID = DiagramPackage.EDGE_STYLE__UID;
+
+    /**
      * The feature id for the '<em><b>Custom Features</b></em>' attribute list. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      *
@@ -4951,13 +5263,21 @@ public interface DiagramPackage extends EPackage {
     int COMPUTED_STYLE_DESCRIPTION_REGISTRY = 41;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int COMPUTED_STYLE_DESCRIPTION_REGISTRY__UID = ViewpointPackage.IDENTIFIED_ELEMENT__UID;
+
+    /**
      * The feature id for the '<em><b>Computed Style Descriptions</b></em>' containment reference list. <!--
      * begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
      * @ordered
      */
-    int COMPUTED_STYLE_DESCRIPTION_REGISTRY__COMPUTED_STYLE_DESCRIPTIONS = 0;
+    int COMPUTED_STYLE_DESCRIPTION_REGISTRY__COMPUTED_STYLE_DESCRIPTIONS = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 0;
 
     /**
      * The number of structural features of the '<em>Computed Style Description Registry</em>' class. <!--
@@ -4966,7 +5286,7 @@ public interface DiagramPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int COMPUTED_STYLE_DESCRIPTION_REGISTRY_FEATURE_COUNT = 1;
+    int COMPUTED_STYLE_DESCRIPTION_REGISTRY_FEATURE_COUNT = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 1;
 
     /**
      * The meta object id for the '{@link org.eclipse.sirius.diagram.impl.DragAndDropTargetImpl <em>Drag And Drop
@@ -4979,13 +5299,21 @@ public interface DiagramPackage extends EPackage {
     int DRAG_AND_DROP_TARGET = 42;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DRAG_AND_DROP_TARGET__UID = ViewpointPackage.IDENTIFIED_ELEMENT__UID;
+
+    /**
      * The number of structural features of the '<em>Drag And Drop Target</em>' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      *
      * @generated
      * @ordered
      */
-    int DRAG_AND_DROP_TARGET_FEATURE_COUNT = 0;
+    int DRAG_AND_DROP_TARGET_FEATURE_COUNT = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 0;
 
     /**
      * The meta object id for the '{@link org.eclipse.sirius.diagram.HideLabelCapabilityStyle <em>Hide Label Capability
@@ -5026,13 +5354,21 @@ public interface DiagramPackage extends EPackage {
     int VARIABLE_VALUE = 44;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int VARIABLE_VALUE__UID = ViewpointPackage.IDENTIFIED_ELEMENT__UID;
+
+    /**
      * The number of structural features of the '<em>Variable Value</em>' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      *
      * @generated
      * @ordered
      */
-    int VARIABLE_VALUE_FEATURE_COUNT = 0;
+    int VARIABLE_VALUE_FEATURE_COUNT = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 0;
 
     /**
      * The meta object id for the '{@link org.eclipse.sirius.diagram.impl.TypedVariableValueImpl <em>Typed Variable
@@ -5045,6 +5381,14 @@ public interface DiagramPackage extends EPackage {
     int TYPED_VARIABLE_VALUE = 45;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int TYPED_VARIABLE_VALUE__UID = DiagramPackage.VARIABLE_VALUE__UID;
+
+    /**
      * The feature id for the '<em><b>Variable Definition</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
      *
@@ -5081,6 +5425,14 @@ public interface DiagramPackage extends EPackage {
     int EOBJECT_VARIABLE_VALUE = 46;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int EOBJECT_VARIABLE_VALUE__UID = DiagramPackage.VARIABLE_VALUE__UID;
+
+    /**
      * The feature id for the '<em><b>Variable Definition</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
      *
@@ -7511,10 +7863,10 @@ public interface DiagramPackage extends EPackage {
         EReference DDIAGRAM_ELEMENT__GRAPHICAL_FILTERS = DiagramPackage.eINSTANCE.getDDiagramElement_GraphicalFilters();
 
         /**
-         * The meta object literal for the '{@link org.eclipse.sirius.diagram.GraphicalFilter <em>Graphical
+         * The meta object literal for the '{@link org.eclipse.sirius.diagram.impl.GraphicalFilterImpl <em>Graphical
          * Filter</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
          *
-         * @see org.eclipse.sirius.diagram.GraphicalFilter
+         * @see org.eclipse.sirius.diagram.impl.GraphicalFilterImpl
          * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getGraphicalFilter()
          * @generated
          */
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/DragAndDropTarget.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/DragAndDropTarget.java
index 0636268a95..f206dfc821 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/DragAndDropTarget.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/DragAndDropTarget.java
@@ -11,8 +11,8 @@
  */
 package org.eclipse.sirius.diagram;
 
-import org.eclipse.emf.ecore.EObject;
 import org.eclipse.sirius.diagram.description.DragAndDropTargetDescription;
+import org.eclipse.sirius.viewpoint.IdentifiedElement;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Drag And Drop Target</b></em>'. <!--
@@ -25,7 +25,7 @@ import org.eclipse.sirius.diagram.description.DragAndDropTargetDescription;
  * @model
  * @generated
  */
-public interface DragAndDropTarget extends EObject {
+public interface DragAndDropTarget extends IdentifiedElement {
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> Return the description of this Drag&Drop
      * Target. <!-- end-model-doc -->
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/EdgeTarget.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/EdgeTarget.java
index 44298b0f6b..f53b3657be 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/EdgeTarget.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/EdgeTarget.java
@@ -12,7 +12,7 @@
 package org.eclipse.sirius.diagram;
 
 import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
+import org.eclipse.sirius.viewpoint.IdentifiedElement;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Edge Target</b></em>'. <!-- end-user-doc -->
@@ -31,7 +31,7 @@ import org.eclipse.emf.ecore.EObject;
  * @model abstract="true"
  * @generated
  */
-public interface EdgeTarget extends EObject {
+public interface EdgeTarget extends IdentifiedElement {
     /**
      * Returns the value of the '<em><b>Outgoing Edges</b></em>' reference list. The list contents are of type
      * {@link org.eclipse.sirius.diagram.DEdge}. It is bidirectional and its opposite is '
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/FilterVariableHistory.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/FilterVariableHistory.java
index 1b44dc0765..f333967e3a 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/FilterVariableHistory.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/FilterVariableHistory.java
@@ -12,7 +12,7 @@
 package org.eclipse.sirius.diagram;
 
 import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
+import org.eclipse.sirius.viewpoint.IdentifiedElement;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Filter Variable History</b></em>'. <!--
@@ -29,7 +29,7 @@ import org.eclipse.emf.ecore.EObject;
  * @model
  * @generated
  */
-public interface FilterVariableHistory extends EObject {
+public interface FilterVariableHistory extends IdentifiedElement {
     /**
      * Returns the value of the '<em><b>Owned Values</b></em>' containment reference list. The list contents are of type
      * {@link org.eclipse.sirius.diagram.VariableValue}. <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/GraphicalFilter.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/GraphicalFilter.java
index 65f51b39df..1a6ba7713d 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/GraphicalFilter.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/GraphicalFilter.java
@@ -11,7 +11,7 @@
  */
 package org.eclipse.sirius.diagram;
 
-import org.eclipse.emf.ecore.EObject;
+import org.eclipse.sirius.viewpoint.IdentifiedElement;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Graphical Filter</b></em>'. <!-- end-user-doc
@@ -24,5 +24,5 @@ import org.eclipse.emf.ecore.EObject;
  * @model interface="true" abstract="true"
  * @generated
  */
-public interface GraphicalFilter extends EObject {
+public interface GraphicalFilter extends IdentifiedElement {
 } // GraphicalFilter
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/VariableValue.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/VariableValue.java
index 2e1b2129cf..d1b0687d41 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/VariableValue.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/VariableValue.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.sirius.diagram;
 
-import org.eclipse.emf.ecore.EObject;
+import org.eclipse.sirius.viewpoint.IdentifiedElement;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Variable Value</b></em>'. <!-- end-user-doc -->
@@ -20,6 +20,6 @@ import org.eclipse.emf.ecore.EObject;
  * @model abstract="true"
  * @generated
  */
-public interface VariableValue extends EObject {
+public interface VariableValue extends IdentifiedElement {
 
 } // VariableValue
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/AbsoluteBoundsFilterImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/AbsoluteBoundsFilterImpl.java
index 5217d92814..f3835315ab 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/AbsoluteBoundsFilterImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/AbsoluteBoundsFilterImpl.java
@@ -14,7 +14,6 @@ package org.eclipse.sirius.diagram.impl;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.sirius.diagram.AbsoluteBoundsFilter;
 import org.eclipse.sirius.diagram.DiagramPackage;
 
@@ -33,7 +32,7 @@ import org.eclipse.sirius.diagram.DiagramPackage;
  *
  * @generated
  */
-public class AbsoluteBoundsFilterImpl extends MinimalEObjectImpl.Container implements AbsoluteBoundsFilter {
+public class AbsoluteBoundsFilterImpl extends GraphicalFilterImpl implements AbsoluteBoundsFilter {
     /**
      * The default value of the '{@link #getX() <em>X</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/AppliedCompositeFiltersImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/AppliedCompositeFiltersImpl.java
index 8a3beeee74..112c9f70cc 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/AppliedCompositeFiltersImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/AppliedCompositeFiltersImpl.java
@@ -15,7 +15,6 @@ import java.util.Collection;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 import org.eclipse.sirius.diagram.AppliedCompositeFilters;
 import org.eclipse.sirius.diagram.DiagramPackage;
@@ -34,7 +33,7 @@ import org.eclipse.sirius.diagram.description.filter.CompositeFilterDescription;
  *
  * @generated
  */
-public class AppliedCompositeFiltersImpl extends MinimalEObjectImpl.Container implements AppliedCompositeFilters {
+public class AppliedCompositeFiltersImpl extends GraphicalFilterImpl implements AppliedCompositeFilters {
     /**
      * The cached value of the '{@link #getCompositeFilterDescriptions() <em>Composite Filter Descriptions</em>}'
      * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/CollapseFilterImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/CollapseFilterImpl.java
index feeaa81d76..62bf929c28 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/CollapseFilterImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/CollapseFilterImpl.java
@@ -14,7 +14,6 @@ package org.eclipse.sirius.diagram.impl;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.sirius.diagram.CollapseFilter;
 import org.eclipse.sirius.diagram.DiagramPackage;
 
@@ -31,7 +30,7 @@ import org.eclipse.sirius.diagram.DiagramPackage;
  *
  * @generated
  */
-public class CollapseFilterImpl extends MinimalEObjectImpl.Container implements CollapseFilter {
+public class CollapseFilterImpl extends GraphicalFilterImpl implements CollapseFilter {
     /**
      * The default value of the '{@link #getWidth() <em>Width</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/ComputedStyleDescriptionRegistryImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/ComputedStyleDescriptionRegistryImpl.java
index 015fac9670..a0fbed4ffa 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/ComputedStyleDescriptionRegistryImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/ComputedStyleDescriptionRegistryImpl.java
@@ -17,12 +17,12 @@ 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.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.sirius.diagram.ComputedStyleDescriptionRegistry;
 import org.eclipse.sirius.diagram.DiagramPackage;
 import org.eclipse.sirius.viewpoint.description.style.StyleDescription;
+import org.eclipse.sirius.viewpoint.impl.IdentifiedElementImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Computed Style Description Registry</b></em>'.
@@ -37,7 +37,7 @@ import org.eclipse.sirius.viewpoint.description.style.StyleDescription;
  *
  * @generated
  */
-public class ComputedStyleDescriptionRegistryImpl extends MinimalEObjectImpl.Container implements ComputedStyleDescriptionRegistry {
+public class ComputedStyleDescriptionRegistryImpl extends IdentifiedElementImpl implements ComputedStyleDescriptionRegistry {
     /**
      * The cached value of the '{@link #getComputedStyleDescriptions() <em>Computed Style Descriptions</em>}'
      * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DiagramPackageImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DiagramPackageImpl.java
index 6866bb21a9..ceabf6dc0c 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DiagramPackageImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DiagramPackageImpl.java
@@ -2777,6 +2777,7 @@ public class DiagramPackageImpl extends EPackageImpl implements DiagramPackage {
         dSemanticDiagramEClass.getESuperTypes().add(this.getDDiagram());
         dSemanticDiagramEClass.getESuperTypes().add(theViewpointPackage.getDSemanticDecorator());
         dDiagramElementEClass.getESuperTypes().add(theViewpointPackage.getDRepresentationElement());
+        graphicalFilterEClass.getESuperTypes().add(theViewpointPackage.getIdentifiedElement());
         hideFilterEClass.getESuperTypes().add(this.getGraphicalFilter());
         hideLabelFilterEClass.getESuperTypes().add(this.getGraphicalFilter());
         foldingPointFilterEClass.getESuperTypes().add(this.getGraphicalFilter());
@@ -2814,16 +2815,21 @@ public class DiagramPackageImpl extends EPackageImpl implements DiagramPackage {
         workspaceImageEClass.getESuperTypes().add(this.getNodeStyle());
         workspaceImageEClass.getESuperTypes().add(this.getContainerStyle());
         customStyleEClass.getESuperTypes().add(this.getNodeStyle());
+        edgeTargetEClass.getESuperTypes().add(theViewpointPackage.getIdentifiedElement());
         edgeStyleEClass.getESuperTypes().add(theViewpointPackage.getStyle());
         gaugeCompositeStyleEClass.getESuperTypes().add(this.getNodeStyle());
         borderedStyleEClass.getESuperTypes().add(theViewpointPackage.getStyle());
         noteEClass.getESuperTypes().add(this.getNodeStyle());
+        filterVariableHistoryEClass.getESuperTypes().add(theViewpointPackage.getIdentifiedElement());
         collapseFilterEClass.getESuperTypes().add(this.getGraphicalFilter());
         indirectlyCollapseFilterEClass.getESuperTypes().add(this.getCollapseFilter());
         beginLabelStyleEClass.getESuperTypes().add(theViewpointPackage.getBasicLabelStyle());
         centerLabelStyleEClass.getESuperTypes().add(theViewpointPackage.getBasicLabelStyle());
         endLabelStyleEClass.getESuperTypes().add(theViewpointPackage.getBasicLabelStyle());
         bracketEdgeStyleEClass.getESuperTypes().add(this.getEdgeStyle());
+        computedStyleDescriptionRegistryEClass.getESuperTypes().add(theViewpointPackage.getIdentifiedElement());
+        dragAndDropTargetEClass.getESuperTypes().add(theViewpointPackage.getIdentifiedElement());
+        variableValueEClass.getESuperTypes().add(theViewpointPackage.getIdentifiedElement());
         typedVariableValueEClass.getESuperTypes().add(this.getVariableValue());
         eObjectVariableValueEClass.getESuperTypes().add(this.getVariableValue());
 
@@ -2919,7 +2925,7 @@ public class DiagramPackageImpl extends EPackageImpl implements DiagramPackage {
 
         addEOperation(dDiagramElementEClass, this.getDDiagram(), "getParentDiagram", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
 
-        initEClass(graphicalFilterEClass, GraphicalFilter.class, "GraphicalFilter", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEClass(graphicalFilterEClass, GraphicalFilter.class, "GraphicalFilter", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
         initEClass(hideFilterEClass, HideFilter.class, "HideFilter", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DragAndDropTargetImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DragAndDropTargetImpl.java
index 26f0c2decb..a523106113 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DragAndDropTargetImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DragAndDropTargetImpl.java
@@ -12,10 +12,10 @@
 package org.eclipse.sirius.diagram.impl;
 
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.sirius.diagram.DiagramPackage;
 import org.eclipse.sirius.diagram.DragAndDropTarget;
 import org.eclipse.sirius.diagram.description.DragAndDropTargetDescription;
+import org.eclipse.sirius.viewpoint.impl.IdentifiedElementImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Drag And Drop Target</b></em>'. <!--
@@ -23,7 +23,7 @@ import org.eclipse.sirius.diagram.description.DragAndDropTargetDescription;
  *
  * @generated
  */
-public class DragAndDropTargetImpl extends MinimalEObjectImpl.Container implements DragAndDropTarget {
+public class DragAndDropTargetImpl extends IdentifiedElementImpl implements DragAndDropTarget {
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/EdgeTargetImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/EdgeTargetImpl.java
index cc7f10de57..76e292c081 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/EdgeTargetImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/EdgeTargetImpl.java
@@ -17,12 +17,12 @@ 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.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.sirius.diagram.DEdge;
 import org.eclipse.sirius.diagram.DiagramPackage;
 import org.eclipse.sirius.diagram.EdgeTarget;
+import org.eclipse.sirius.viewpoint.impl.IdentifiedElementImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Edge Target</b></em>'. <!-- end-user-doc -->
@@ -36,7 +36,7 @@ import org.eclipse.sirius.diagram.EdgeTarget;
  *
  * @generated
  */
-public abstract class EdgeTargetImpl extends MinimalEObjectImpl.Container implements EdgeTarget {
+public abstract class EdgeTargetImpl extends IdentifiedElementImpl implements EdgeTarget {
     /**
      * The cached value of the '{@link #getOutgoingEdges() <em>Outgoing Edges</em>}' reference list. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/FilterVariableHistoryImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/FilterVariableHistoryImpl.java
index bc090da40c..4b1d00659d 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/FilterVariableHistoryImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/FilterVariableHistoryImpl.java
@@ -17,12 +17,12 @@ 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.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.sirius.diagram.DiagramPackage;
 import org.eclipse.sirius.diagram.FilterVariableHistory;
 import org.eclipse.sirius.diagram.VariableValue;
+import org.eclipse.sirius.viewpoint.impl.IdentifiedElementImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Filter Variable History</b></em>'. <!--
@@ -36,7 +36,7 @@ import org.eclipse.sirius.diagram.VariableValue;
  *
  * @generated
  */
-public class FilterVariableHistoryImpl extends MinimalEObjectImpl.Container implements FilterVariableHistory {
+public class FilterVariableHistoryImpl extends IdentifiedElementImpl implements FilterVariableHistory {
     /**
      * The cached value of the '{@link #getOwnedValues() <em>Owned Values</em>}' containment reference list. <!--
      * begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/FoldingFilterImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/FoldingFilterImpl.java
index c2c3f45151..b55ec0a958 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/FoldingFilterImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/FoldingFilterImpl.java
@@ -12,7 +12,6 @@
 package org.eclipse.sirius.diagram.impl;
 
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.sirius.diagram.DiagramPackage;
 import org.eclipse.sirius.diagram.FoldingFilter;
 
@@ -22,7 +21,7 @@ import org.eclipse.sirius.diagram.FoldingFilter;
  *
  * @generated
  */
-public class FoldingFilterImpl extends MinimalEObjectImpl.Container implements FoldingFilter {
+public class FoldingFilterImpl extends GraphicalFilterImpl implements FoldingFilter {
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/FoldingPointFilterImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/FoldingPointFilterImpl.java
index 0e515603b0..8a354fe18c 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/FoldingPointFilterImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/FoldingPointFilterImpl.java
@@ -12,7 +12,6 @@
 package org.eclipse.sirius.diagram.impl;
 
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.sirius.diagram.DiagramPackage;
 import org.eclipse.sirius.diagram.FoldingPointFilter;
 
@@ -22,7 +21,7 @@ import org.eclipse.sirius.diagram.FoldingPointFilter;
  *
  * @generated
  */
-public class FoldingPointFilterImpl extends MinimalEObjectImpl.Container implements FoldingPointFilter {
+public class FoldingPointFilterImpl extends GraphicalFilterImpl implements FoldingPointFilter {
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/GraphicalFilterImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/GraphicalFilterImpl.java
new file mode 100644
index 0000000000..ef91e9c306
--- /dev/null
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/GraphicalFilterImpl.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright (c) 2007, 2017 THALES GLOBAL SERVICES.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.diagram.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.sirius.diagram.DiagramPackage;
+import org.eclipse.sirius.diagram.GraphicalFilter;
+import org.eclipse.sirius.viewpoint.impl.IdentifiedElementImpl;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Graphical Filter</b></em>'. <!-- end-user-doc
+ * -->
+ *
+ * @generated
+ */
+public abstract class GraphicalFilterImpl extends IdentifiedElementImpl implements GraphicalFilter {
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected GraphicalFilterImpl() {
+        super();
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected EClass eStaticClass() {
+        return DiagramPackage.Literals.GRAPHICAL_FILTER;
+    }
+
+} // GraphicalFilterImpl
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/HideFilterImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/HideFilterImpl.java
index 1fb3d21161..bdd2927e4f 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/HideFilterImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/HideFilterImpl.java
@@ -12,7 +12,6 @@
 package org.eclipse.sirius.diagram.impl;
 
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.sirius.diagram.DiagramPackage;
 import org.eclipse.sirius.diagram.HideFilter;
 
@@ -21,7 +20,7 @@ import org.eclipse.sirius.diagram.HideFilter;
  *
  * @generated
  */
-public class HideFilterImpl extends MinimalEObjectImpl.Container implements HideFilter {
+public class HideFilterImpl extends GraphicalFilterImpl implements HideFilter {
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/HideLabelFilterImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/HideLabelFilterImpl.java
index 25631b3930..425793c27b 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/HideLabelFilterImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/HideLabelFilterImpl.java
@@ -12,7 +12,6 @@
 package org.eclipse.sirius.diagram.impl;
 
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.sirius.diagram.DiagramPackage;
 import org.eclipse.sirius.diagram.HideLabelFilter;
 
@@ -22,7 +21,7 @@ import org.eclipse.sirius.diagram.HideLabelFilter;
  *
  * @generated
  */
-public class HideLabelFilterImpl extends MinimalEObjectImpl.Container implements HideLabelFilter {
+public class HideLabelFilterImpl extends GraphicalFilterImpl implements HideLabelFilter {
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/VariableValueImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/VariableValueImpl.java
index 52a3083207..6d75cdeb22 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/VariableValueImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/VariableValueImpl.java
@@ -11,9 +11,9 @@
 package org.eclipse.sirius.diagram.impl;
 
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.sirius.diagram.DiagramPackage;
 import org.eclipse.sirius.diagram.VariableValue;
+import org.eclipse.sirius.viewpoint.impl.IdentifiedElementImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Variable Value</b></em>'. <!-- end-user-doc
@@ -21,7 +21,7 @@ import org.eclipse.sirius.diagram.VariableValue;
  *
  * @generated
  */
-public abstract class VariableValueImpl extends MinimalEObjectImpl.Container implements VariableValue {
+public abstract class VariableValueImpl extends IdentifiedElementImpl implements VariableValue {
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/util/DiagramAdapterFactory.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/util/DiagramAdapterFactory.java
index dcf0927d49..27d831f49d 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/util/DiagramAdapterFactory.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/util/DiagramAdapterFactory.java
@@ -71,6 +71,7 @@ import org.eclipse.sirius.viewpoint.DRepresentation;
 import org.eclipse.sirius.viewpoint.DRepresentationElement;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
 import org.eclipse.sirius.viewpoint.DStylizable;
+import org.eclipse.sirius.viewpoint.IdentifiedElement;
 import org.eclipse.sirius.viewpoint.LabelStyle;
 import org.eclipse.sirius.viewpoint.Style;
 import org.eclipse.sirius.viewpoint.description.DModelElement;
@@ -363,6 +364,16 @@ public class DiagramAdapterFactory extends AdapterFactoryImpl {
         }
 
         @Override
+        public Adapter caseIdentifiedElement(IdentifiedElement object) {
+            return createIdentifiedElementAdapter();
+        }
+
+        @Override
+        public Adapter caseDModelElement(DModelElement object) {
+            return createDModelElementAdapter();
+        }
+
+        @Override
         public Adapter caseDocumentedElement(DocumentedElement object) {
             return createDocumentedElementAdapter();
         }
@@ -373,11 +384,6 @@ public class DiagramAdapterFactory extends AdapterFactoryImpl {
         }
 
         @Override
-        public Adapter caseDModelElement(DModelElement object) {
-            return createDModelElementAdapter();
-        }
-
-        @Override
         public Adapter caseDRepresentation(DRepresentation object) {
             return createDRepresentationAdapter();
         }
@@ -1066,6 +1072,20 @@ public class DiagramAdapterFactory extends AdapterFactoryImpl {
     }
 
     /**
+     * Creates a new adapter for an object of class '{@link org.eclipse.sirius.viewpoint.IdentifiedElement
+     * <em>Identified Element</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+     * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+     * end-user-doc -->
+     *
+     * @return the new adapter.
+     * @see org.eclipse.sirius.viewpoint.IdentifiedElement
+     * @generated
+     */
+    public Adapter createIdentifiedElementAdapter() {
+        return null;
+    }
+
+    /**
      * Creates a new adapter for an object of class '{@link org.eclipse.sirius.viewpoint.description.DocumentedElement
      * <em>Documented Element</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
      * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/util/DiagramSwitch.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/util/DiagramSwitch.java
index 1d70f2298b..03c926d68f 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/util/DiagramSwitch.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/util/DiagramSwitch.java
@@ -71,6 +71,7 @@ import org.eclipse.sirius.viewpoint.DRepresentation;
 import org.eclipse.sirius.viewpoint.DRepresentationElement;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
 import org.eclipse.sirius.viewpoint.DStylizable;
+import org.eclipse.sirius.viewpoint.IdentifiedElement;
 import org.eclipse.sirius.viewpoint.LabelStyle;
 import org.eclipse.sirius.viewpoint.Style;
 import org.eclipse.sirius.viewpoint.description.DModelElement;
@@ -150,13 +151,16 @@ public class DiagramSwitch<T> {
                 result = caseDragAndDropTarget(dDiagram);
             }
             if (result == null) {
-                result = caseDocumentedElement(dDiagram);
+                result = caseIdentifiedElement(dDiagram);
             }
             if (result == null) {
-                result = caseDRefreshable(dDiagram);
+                result = caseDModelElement(dDiagram);
             }
             if (result == null) {
-                result = caseDModelElement(dDiagram);
+                result = caseDocumentedElement(dDiagram);
+            }
+            if (result == null) {
+                result = caseDRefreshable(dDiagram);
             }
             if (result == null) {
                 result = defaultCase(theEObject);
@@ -179,13 +183,16 @@ public class DiagramSwitch<T> {
                 result = caseDragAndDropTarget(dSemanticDiagram);
             }
             if (result == null) {
-                result = caseDocumentedElement(dSemanticDiagram);
+                result = caseIdentifiedElement(dSemanticDiagram);
             }
             if (result == null) {
-                result = caseDRefreshable(dSemanticDiagram);
+                result = caseDModelElement(dSemanticDiagram);
             }
             if (result == null) {
-                result = caseDModelElement(dSemanticDiagram);
+                result = caseDocumentedElement(dSemanticDiagram);
+            }
+            if (result == null) {
+                result = caseDRefreshable(dSemanticDiagram);
             }
             if (result == null) {
                 result = defaultCase(theEObject);
@@ -211,6 +218,9 @@ public class DiagramSwitch<T> {
                 result = caseDSemanticDecorator(dDiagramElement);
             }
             if (result == null) {
+                result = caseIdentifiedElement(dDiagramElement);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -219,6 +229,9 @@ public class DiagramSwitch<T> {
             GraphicalFilter graphicalFilter = (GraphicalFilter) theEObject;
             T result = caseGraphicalFilter(graphicalFilter);
             if (result == null) {
+                result = caseIdentifiedElement(graphicalFilter);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -230,6 +243,9 @@ public class DiagramSwitch<T> {
                 result = caseGraphicalFilter(hideFilter);
             }
             if (result == null) {
+                result = caseIdentifiedElement(hideFilter);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -241,6 +257,9 @@ public class DiagramSwitch<T> {
                 result = caseGraphicalFilter(hideLabelFilter);
             }
             if (result == null) {
+                result = caseIdentifiedElement(hideLabelFilter);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -252,6 +271,9 @@ public class DiagramSwitch<T> {
                 result = caseGraphicalFilter(foldingPointFilter);
             }
             if (result == null) {
+                result = caseIdentifiedElement(foldingPointFilter);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -263,6 +285,9 @@ public class DiagramSwitch<T> {
                 result = caseGraphicalFilter(foldingFilter);
             }
             if (result == null) {
+                result = caseIdentifiedElement(foldingFilter);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -274,6 +299,9 @@ public class DiagramSwitch<T> {
                 result = caseGraphicalFilter(appliedCompositeFilters);
             }
             if (result == null) {
+                result = caseIdentifiedElement(appliedCompositeFilters);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -285,6 +313,9 @@ public class DiagramSwitch<T> {
                 result = caseGraphicalFilter(absoluteBoundsFilter);
             }
             if (result == null) {
+                result = caseIdentifiedElement(absoluteBoundsFilter);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -311,6 +342,9 @@ public class DiagramSwitch<T> {
                 result = caseDSemanticDecorator(abstractDNode);
             }
             if (result == null) {
+                result = caseIdentifiedElement(abstractDNode);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -346,6 +380,9 @@ public class DiagramSwitch<T> {
                 result = caseDSemanticDecorator(dNode);
             }
             if (result == null) {
+                result = caseIdentifiedElement(dNode);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -381,6 +418,9 @@ public class DiagramSwitch<T> {
                 result = caseDSemanticDecorator(dDiagramElementContainer);
             }
             if (result == null) {
+                result = caseIdentifiedElement(dDiagramElementContainer);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -419,6 +459,9 @@ public class DiagramSwitch<T> {
                 result = caseDSemanticDecorator(dNodeContainer);
             }
             if (result == null) {
+                result = caseIdentifiedElement(dNodeContainer);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -457,6 +500,9 @@ public class DiagramSwitch<T> {
                 result = caseDSemanticDecorator(dNodeList);
             }
             if (result == null) {
+                result = caseIdentifiedElement(dNodeList);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -486,6 +532,9 @@ public class DiagramSwitch<T> {
                 result = caseDSemanticDecorator(dNodeListElement);
             }
             if (result == null) {
+                result = caseIdentifiedElement(dNodeListElement);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -515,6 +564,9 @@ public class DiagramSwitch<T> {
                 result = caseDSemanticDecorator(dEdge);
             }
             if (result == null) {
+                result = caseIdentifiedElement(dEdge);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -544,6 +596,9 @@ public class DiagramSwitch<T> {
                 result = caseCustomizable(nodeStyle);
             }
             if (result == null) {
+                result = caseIdentifiedElement(nodeStyle);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -576,6 +631,9 @@ public class DiagramSwitch<T> {
                 result = caseCustomizable(dot);
             }
             if (result == null) {
+                result = caseIdentifiedElement(dot);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -587,6 +645,9 @@ public class DiagramSwitch<T> {
                 result = caseCustomizable(gaugeSection);
             }
             if (result == null) {
+                result = caseIdentifiedElement(gaugeSection);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -616,6 +677,9 @@ public class DiagramSwitch<T> {
                 result = caseCustomizable(containerStyle);
             }
             if (result == null) {
+                result = caseIdentifiedElement(containerStyle);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -648,6 +712,9 @@ public class DiagramSwitch<T> {
                 result = caseCustomizable(flatContainerStyle);
             }
             if (result == null) {
+                result = caseIdentifiedElement(flatContainerStyle);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -680,6 +747,9 @@ public class DiagramSwitch<T> {
                 result = caseCustomizable(shapeContainerStyle);
             }
             if (result == null) {
+                result = caseIdentifiedElement(shapeContainerStyle);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -712,6 +782,9 @@ public class DiagramSwitch<T> {
                 result = caseCustomizable(square);
             }
             if (result == null) {
+                result = caseIdentifiedElement(square);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -744,6 +817,9 @@ public class DiagramSwitch<T> {
                 result = caseCustomizable(ellipse);
             }
             if (result == null) {
+                result = caseIdentifiedElement(ellipse);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -776,6 +852,9 @@ public class DiagramSwitch<T> {
                 result = caseCustomizable(lozenge);
             }
             if (result == null) {
+                result = caseIdentifiedElement(lozenge);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -808,6 +887,9 @@ public class DiagramSwitch<T> {
                 result = caseCustomizable(bundledImage);
             }
             if (result == null) {
+                result = caseIdentifiedElement(bundledImage);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -843,6 +925,9 @@ public class DiagramSwitch<T> {
                 result = caseCustomizable(workspaceImage);
             }
             if (result == null) {
+                result = caseIdentifiedElement(workspaceImage);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -875,6 +960,9 @@ public class DiagramSwitch<T> {
                 result = caseCustomizable(customStyle);
             }
             if (result == null) {
+                result = caseIdentifiedElement(customStyle);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -883,6 +971,9 @@ public class DiagramSwitch<T> {
             EdgeTarget edgeTarget = (EdgeTarget) theEObject;
             T result = caseEdgeTarget(edgeTarget);
             if (result == null) {
+                result = caseIdentifiedElement(edgeTarget);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -900,6 +991,9 @@ public class DiagramSwitch<T> {
                 result = caseCustomizable(edgeStyle);
             }
             if (result == null) {
+                result = caseIdentifiedElement(edgeStyle);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -932,6 +1026,9 @@ public class DiagramSwitch<T> {
                 result = caseCustomizable(gaugeCompositeStyle);
             }
             if (result == null) {
+                result = caseIdentifiedElement(gaugeCompositeStyle);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -949,6 +1046,9 @@ public class DiagramSwitch<T> {
                 result = caseCustomizable(borderedStyle);
             }
             if (result == null) {
+                result = caseIdentifiedElement(borderedStyle);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -981,6 +1081,9 @@ public class DiagramSwitch<T> {
                 result = caseCustomizable(note);
             }
             if (result == null) {
+                result = caseIdentifiedElement(note);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -989,6 +1092,9 @@ public class DiagramSwitch<T> {
             FilterVariableHistory filterVariableHistory = (FilterVariableHistory) theEObject;
             T result = caseFilterVariableHistory(filterVariableHistory);
             if (result == null) {
+                result = caseIdentifiedElement(filterVariableHistory);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -1000,6 +1106,9 @@ public class DiagramSwitch<T> {
                 result = caseGraphicalFilter(collapseFilter);
             }
             if (result == null) {
+                result = caseIdentifiedElement(collapseFilter);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -1014,6 +1123,9 @@ public class DiagramSwitch<T> {
                 result = caseGraphicalFilter(indirectlyCollapseFilter);
             }
             if (result == null) {
+                result = caseIdentifiedElement(indirectlyCollapseFilter);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -1028,6 +1140,9 @@ public class DiagramSwitch<T> {
                 result = caseCustomizable(beginLabelStyle);
             }
             if (result == null) {
+                result = caseIdentifiedElement(beginLabelStyle);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -1042,6 +1157,9 @@ public class DiagramSwitch<T> {
                 result = caseCustomizable(centerLabelStyle);
             }
             if (result == null) {
+                result = caseIdentifiedElement(centerLabelStyle);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -1056,6 +1174,9 @@ public class DiagramSwitch<T> {
                 result = caseCustomizable(endLabelStyle);
             }
             if (result == null) {
+                result = caseIdentifiedElement(endLabelStyle);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -1076,6 +1197,9 @@ public class DiagramSwitch<T> {
                 result = caseCustomizable(bracketEdgeStyle);
             }
             if (result == null) {
+                result = caseIdentifiedElement(bracketEdgeStyle);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -1084,6 +1208,9 @@ public class DiagramSwitch<T> {
             ComputedStyleDescriptionRegistry computedStyleDescriptionRegistry = (ComputedStyleDescriptionRegistry) theEObject;
             T result = caseComputedStyleDescriptionRegistry(computedStyleDescriptionRegistry);
             if (result == null) {
+                result = caseIdentifiedElement(computedStyleDescriptionRegistry);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -1092,6 +1219,9 @@ public class DiagramSwitch<T> {
             DragAndDropTarget dragAndDropTarget = (DragAndDropTarget) theEObject;
             T result = caseDragAndDropTarget(dragAndDropTarget);
             if (result == null) {
+                result = caseIdentifiedElement(dragAndDropTarget);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -1108,6 +1238,9 @@ public class DiagramSwitch<T> {
             VariableValue variableValue = (VariableValue) theEObject;
             T result = caseVariableValue(variableValue);
             if (result == null) {
+                result = caseIdentifiedElement(variableValue);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -1119,6 +1252,9 @@ public class DiagramSwitch<T> {
                 result = caseVariableValue(typedVariableValue);
             }
             if (result == null) {
+                result = caseIdentifiedElement(typedVariableValue);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -1130,6 +1266,9 @@ public class DiagramSwitch<T> {
                 result = caseVariableValue(eObjectVariableValue);
             }
             if (result == null) {
+                result = caseIdentifiedElement(eObjectVariableValue);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -1829,6 +1968,21 @@ public class DiagramSwitch<T> {
     }
 
     /**
+     * Returns the result of interpreting the object as an instance of '<em>Identified Element</em>'. <!--
+     * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
+     * end-user-doc -->
+     *
+     * @param object
+     *            the target of the switch.
+     * @return the result of interpreting the object as an instance of '<em>Identified Element</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseIdentifiedElement(IdentifiedElement object) {
+        return null;
+    }
+
+    /**
      * Returns the result of interpreting the object as an instance of '<em>Documented Element</em>'. <!--
      * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
      * end-user-doc -->
diff --git a/plugins/org.eclipse.sirius.doc/specs/proposal/525261_AddTechnicalId/SPEC_TechnicalId.md b/plugins/org.eclipse.sirius.doc/specs/proposal/525261_AddTechnicalId/SPEC_TechnicalId.md
new file mode 100644
index 0000000000..4a20d71706
--- /dev/null
+++ b/plugins/org.eclipse.sirius.doc/specs/proposal/525261_AddTechnicalId/SPEC_TechnicalId.md
@@ -0,0 +1,162 @@
+
+# Replace xmiid by technical id
+
+
+
+## Reference
+
+Affected ticket
+bug: 525261 Add a technical id for elements in aird resource
+
+
+## Context
+
+Currently, for a local modeling project, the aird resource uses UUIds(org.eclipse.sirius.business.internal.resource.AirDResourceImpl.useUUIDs() returns true) for its contained elements.
+In the persisted aird file, it results of of xmiid attribute for every xml elements.
+
+Some other applications based on Sirius may serialize the aird resource differently for example in a database. In that case, AirDResourceImpl is not used but a resource which is not a XMIResourceImpl.
+
+The consequence is when the application converts AirdResource from an implementation that not have xmiids to the AirDResourceImpl one, the xmiid are recreated and are different from the one used at the last AirDResourceImpl instanciation.
+
+The consequence is that the aird file which has passed through the mechanism of conversion becomes different while no contained elements has changed.
+That is problematic for workflow that consider aird changes. Typically for file versioning application such as git.
+
+
+## Specification
+
+### Proposal
+
+The proposal is to have a technical id attribute (intrinsic ID) for every object in the aird resource. This technical id would be used as uuid and, as any other attributes, would be persisted whatever the aird resource implementation is used.
+
+As a consequence, the meta-model of objects persisted in aird resource has to be changed. It covers:
+* sirius meta model (viewpoint.ecore, diagram.ecore, tree.ecore, table.ecore, sequence.ecore). Actually, only viewpoint.ecore would be changed as it defined the super class of all other classes in other meta-models.
+* (optional)viewpoint description metamodel (viewpoint.ecore)
+* (optional)GMF meta-model (annotation.ecore)
+
+For a first step, only Sirius meta-model is concerned to add the technical id.
+
+
+### Technical
+
+#### Requirements
+
+Technical requirements
+* The technical id must be:
+** mandatory
+** unique
+** must not be copied when the instance is duplicated
+** must not be changed
+* URIs to aird element used from other application must keep being resolvable.
+
+#### Technical thoughts
+
+To ensure the mandatory and the uniqueness of the technical id, it could be set in the factory or in the object constructor.
+
+In the resource loading process, when deserializing the aird xmi file, the instances are created using the Factory. Then the attributes are set.
+Consequently, it is not matter if the object is initialized with a new/incorrect id because it will be erased later in the loading process.
+
+But, on the other hand, for the old models we would like to keep the same uri fragment for objects being migrated: they could be referenced from other objects (in the same or from another resource). This might require to adapt some parts of the AirdHandler in order to be able to migrate the xmi:id attribute to some feature from the Sirius metamodel (the uid) but we will keep the value as id in the XMLResource id <=> EObject cache maps. Generally to do that, we create a migration participant that would indicate which feature to use to store the value read from the xmi:id value.
+
+There is a special case to handle: the DRepresentation concept already has an uid which is used in DRepresentation.repPath to reference the DRepresentation. For the instances of DRepresentation the xmi:id will be kept and the previous uid id will be dropped. For example Capella still reference the DRepresentation from its RichText description properties views and it uses the xmi:id. So we need to keep the same uriFragment for objects before and after migration. This case invalidate the AirdHandler lead as we will need both old uid and xmi:id during the repPath migration. 
+
+We will need to wait and update the resource id <=> EObject cache in the postLoad phase in order to let the load correctly do the id ref resolution (which is currently done very late for performance reasons, see OPTION_DEFER_IDREF_RESOLUTION) and keep the possibility to call DRepresentationDescriptor.getRepresentation(true). 
+
+We will also need to test that the resolution of the GMF Diagram.element reference is still working after migration.
+
+AirdResource
+
+AirdResource is the resource corresponding to the aird file and AirdResourceImpl is the implementation inheriting from XMIResourceImpl.
+As AirdResource will keep containing GMF element that will keep having their xmiid as unique identifier, the method *AirdResourceImpl.useUUIDs* will keep returning *true*.
+
+The uri will keep being based on xmiids extrinsic id for every elements which are not instances of IdentifiedElement.
+There will be no xmi:id in the serialization for instances of IdentifiedElement (See javadoc of org.eclipse.emf.ecore.xmi.XMLHelper.getID(EObject eObject): return id or null to suppress).
+
+To ensure the uniqueness, when the element is copied:
+* if org.eclipse.emf.ecore.util.EcoreUtil.Copier is used, a check is done on EStructuralFeature.isChangeble but only if the EAttribute is a FeatureMap (FeatureMapUtil.isFeatureMap(eAttribute));
+* else the applicative code had to ensure that the id attribute is not copied on another instance.
+In conclusion, we can not rely on changeable state and consider that it is up to the applicative code to set the right uid to the copied element. 
+
+
+#### Documentation
+
+https://fr.slideshare.net/kenn.hussey/performance-and-extensibility-with-emf
+https://www.eclipse.org/forums/index.php?t=msg&th=130100/
+https://www.eclipse.org/forums/index.php/t/127193/
+
+
+### Changes to do 
+
+#### Where to add the technical id
+
+A base Class *IdentifiedElement* is added that will be implemented by all Sirius model element. To mutualize code, there should be *IdentifiedElement* API and *IdentifiedElementImpl* abstract that should be inherited by all top level implementation of Sirius model Element.
+In viewpoint.ecore model, *IdentifiedElement* should be have _Abstract=true_ and _Interface=false_
+
+In *IdentifiedElementImpl* constructor, the uiid is set using EcoreUtil.generateUUID()
+
+Warning: For the copied EObjects, applicative code must ensure that a different uid is set compared to the original element.
+
+Classes that should inherit from *IdentifiedElement*
+* viewpoint
+
+DAnalysis
+DFeatureExtension
+DSemanticDecorator
+DRepresentationDescriptor->DModelElement
+DocumentedElement
+DRepresentationElement
+DView
+MetaModelExtension
+Decoration
+DAnalysisCustomData
+Customizable
+Style
+DFile
+DResourceContainer
+UIState (transient)
+
+* diagram
+
+GraphicalFilter (that has been set interface=false)
+(HideFilter)
+(HideLabelFilter)
+(FoldingPointFilter)
+(FoldingFilter)
+(AppliedCompositeFilters)
+(AbsoluteBoundsFilter)
+EdgeTarget
+FilterVariableHistory
+ComputedStyleDescriptionRegistry
+DragAndDropTarget
+VariableValue
+
+* table, tree
+
+DTableElementStyle
+DTreeElementSynchronizer
+
+* sequence
+
+EventEndsOrdering
+EventEnd
+InstanceRolesOrdering
+TTransformer
+(TSequenceDiagram inherits now from TTransformer first)
+TMessageExtremity
+
+
+### AirdResource
+
+
+The method *AirdResourceImpl.useUUIDs* will keep returning *true*.
+
+The *attachedHelper* method is overridden to initialize use the uid in the id <=> EObject cache. It corresponds when attaching a new element or creating AirdResource from another resource(CDO for example)
+
+The uri/urifragment of IdentifiedElement instances now uses the uid.
+
+
+#### Migration
+
+For old model, a participant will change the uid of all IdentifiedElement to be equal to xmi:id.
+The DRepresentationDescription.repPath needs migration. 
+The GMF Diagram.element href should continue to work fine as we will conserve the same urifragment for DRepresentations (and other IdentifiedElements).
+
diff --git a/plugins/org.eclipse.sirius.editor/help/contexts.xml b/plugins/org.eclipse.sirius.editor/help/contexts.xml
index d01c3affc4..b341765082 100644
--- a/plugins/org.eclipse.sirius.editor/help/contexts.xml
+++ b/plugins/org.eclipse.sirius.editor/help/contexts.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <contexts>
+   <context id="IdentifiedElement">
+     <description>
+       
+       
+         
+   <!-- Start of user code IdentifiedElement description -->
+   
+   <!-- End of user code IdentifiedElement description -->
+   
+      </description>
+   </context>
    <context id="DAnalysis">
      <description>
        
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DCellStyleItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DCellStyleItemProvider.java
index d60ab5ce58..ac5da9330e 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DCellStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DCellStyleItemProvider.java
@@ -95,8 +95,9 @@ public class DCellStyleItemProvider extends DTableElementStyleItemProvider {
      */
     @Override
     public String getText(Object object) {
-        DCellStyle dCellStyle = (DCellStyle) object;
-        return getString("_UI_DCellStyle_type") + " " + dCellStyle.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
+        String label = ((DCellStyle) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_DCellStyle_type") : //$NON-NLS-1$
+                getString("_UI_DCellStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DTableElementStyleItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DTableElementStyleItemProvider.java
index 746d3529f1..1157f88b2b 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DTableElementStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/DTableElementStyleItemProvider.java
@@ -17,17 +17,12 @@ 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.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.sirius.table.metamodel.table.DTableElementStyle;
 import org.eclipse.sirius.table.metamodel.table.TablePackage;
+import org.eclipse.sirius.viewpoint.provider.IdentifiedElementItemProvider;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.sirius.table.metamodel.table.DTableElementStyle} object.
@@ -35,8 +30,7 @@ import org.eclipse.sirius.table.metamodel.table.TablePackage;
  *
  * @generated
  */
-public class DTableElementStyleItemProvider extends ItemProviderAdapter
-        implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class DTableElementStyleItemProvider extends IdentifiedElementItemProvider {
     /**
      * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -157,8 +151,9 @@ public class DTableElementStyleItemProvider extends ItemProviderAdapter
      */
     @Override
     public String getText(Object object) {
-        DTableElementStyle dTableElementStyle = (DTableElementStyle) object;
-        return getString("_UI_DTableElementStyle_type") + " " + dTableElementStyle.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
+        String label = ((DTableElementStyle) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_DTableElementStyle_type") : //$NON-NLS-1$
+                getString("_UI_DTableElementStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/LineContainerItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/LineContainerItemProvider.java
index b5ac4fc0b0..88d316bffb 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/LineContainerItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/provider/LineContainerItemProvider.java
@@ -91,7 +91,9 @@ public class LineContainerItemProvider extends DSemanticDecoratorItemProvider {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_LineContainer_type"); //$NON-NLS-1$
+        String label = ((LineContainer) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_LineContainer_type") : //$NON-NLS-1$
+                getString("_UI_LineContainer_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.table/model/table.ecore b/plugins/org.eclipse.sirius.table/model/table.ecore
index 75c1d9cfd6..7494ca96dc 100644
--- a/plugins/org.eclipse.sirius.table/model/table.ecore
+++ b/plugins/org.eclipse.sirius.table/model/table.ecore
@@ -114,7 +114,7 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="featureName" lowerBound="1"
         eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DTableElementStyle">
+  <eClassifiers xsi:type="ecore:EClass" name="DTableElementStyle" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//IdentifiedElement">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="labelSize" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EInt"
         defaultValueLiteral="8">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/DTableElementStyle.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/DTableElementStyle.java
index 59a798457e..7332ad31d9 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/DTableElementStyle.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/DTableElementStyle.java
@@ -11,8 +11,8 @@
 package org.eclipse.sirius.table.metamodel.table;
 
 import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
 import org.eclipse.sirius.viewpoint.FontFormat;
+import org.eclipse.sirius.viewpoint.IdentifiedElement;
 import org.eclipse.sirius.viewpoint.RGBValues;
 
 /**
@@ -39,7 +39,7 @@ import org.eclipse.sirius.viewpoint.RGBValues;
  * @model
  * @generated
  */
-public interface DTableElementStyle extends EObject {
+public interface DTableElementStyle extends IdentifiedElement {
     /**
      * Returns the value of the '<em><b>Label Size</b></em>' attribute. The default value is <code>"8"</code>. <!--
      * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> The font size. <!-- end-model-doc -->
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/TablePackage.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/TablePackage.java
index 84e5d7729d..bcf328976a 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/TablePackage.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/TablePackage.java
@@ -70,12 +70,12 @@ public interface TablePackage extends EPackage {
     int DTABLE = 0;
 
     /**
-     * The feature id for the '<em><b>Documentation</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
      * @ordered
      */
-    int DTABLE__DOCUMENTATION = ViewpointPackage.DREPRESENTATION__DOCUMENTATION;
+    int DTABLE__UID = ViewpointPackage.DREPRESENTATION__UID;
 
     /**
      * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list. <!-- begin-user-doc --> <!--
@@ -87,6 +87,14 @@ public interface TablePackage extends EPackage {
     int DTABLE__EANNOTATIONS = ViewpointPackage.DREPRESENTATION__EANNOTATIONS;
 
     /**
+     * The feature id for the '<em><b>Documentation</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DTABLE__DOCUMENTATION = ViewpointPackage.DREPRESENTATION__DOCUMENTATION;
+
+    /**
      * The feature id for the '<em><b>Owned Representation Elements</b></em>' reference list. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      *
@@ -131,14 +139,6 @@ public interface TablePackage extends EPackage {
     int DTABLE__UI_STATE = ViewpointPackage.DREPRESENTATION__UI_STATE;
 
     /**
-     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int DTABLE__UID = ViewpointPackage.DREPRESENTATION__UID;
-
-    /**
      * The feature id for the '<em><b>Target</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
@@ -200,6 +200,14 @@ public interface TablePackage extends EPackage {
     int DTABLE_ELEMENT = 1;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DTABLE_ELEMENT__UID = ViewpointPackage.DREPRESENTATION_ELEMENT__UID;
+
+    /**
      * The feature id for the '<em><b>Target</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
@@ -253,6 +261,14 @@ public interface TablePackage extends EPackage {
     int LINE_CONTAINER = 2;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int LINE_CONTAINER__UID = ViewpointPackage.DSEMANTIC_DECORATOR__UID;
+
+    /**
      * The feature id for the '<em><b>Target</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
@@ -289,6 +305,14 @@ public interface TablePackage extends EPackage {
     int DLINE = 3;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DLINE__UID = TablePackage.LINE_CONTAINER__UID;
+
+    /**
      * The feature id for the '<em><b>Target</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
@@ -418,6 +442,14 @@ public interface TablePackage extends EPackage {
     int DCELL = 4;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DCELL__UID = ViewpointPackage.DSEMANTIC_DECORATOR__UID;
+
+    /**
      * The feature id for the '<em><b>Target</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
@@ -520,12 +552,20 @@ public interface TablePackage extends EPackage {
     int DTABLE_ELEMENT_STYLE = 9;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DTABLE_ELEMENT_STYLE__UID = ViewpointPackage.IDENTIFIED_ELEMENT__UID;
+
+    /**
      * The feature id for the '<em><b>Label Size</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
      * @ordered
      */
-    int DTABLE_ELEMENT_STYLE__LABEL_SIZE = 0;
+    int DTABLE_ELEMENT_STYLE__LABEL_SIZE = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 0;
 
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
@@ -534,7 +574,7 @@ public interface TablePackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DTABLE_ELEMENT_STYLE__LABEL_FORMAT = 1;
+    int DTABLE_ELEMENT_STYLE__LABEL_FORMAT = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 1;
 
     /**
      * The feature id for the '<em><b>Default Foreground Style</b></em>' attribute. <!-- begin-user-doc --> <!--
@@ -543,7 +583,7 @@ public interface TablePackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DTABLE_ELEMENT_STYLE__DEFAULT_FOREGROUND_STYLE = 2;
+    int DTABLE_ELEMENT_STYLE__DEFAULT_FOREGROUND_STYLE = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 2;
 
     /**
      * The feature id for the '<em><b>Default Background Style</b></em>' attribute. <!-- begin-user-doc --> <!--
@@ -552,7 +592,7 @@ public interface TablePackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DTABLE_ELEMENT_STYLE__DEFAULT_BACKGROUND_STYLE = 3;
+    int DTABLE_ELEMENT_STYLE__DEFAULT_BACKGROUND_STYLE = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 3;
 
     /**
      * The feature id for the '<em><b>Foreground Color</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
@@ -561,7 +601,7 @@ public interface TablePackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DTABLE_ELEMENT_STYLE__FOREGROUND_COLOR = 4;
+    int DTABLE_ELEMENT_STYLE__FOREGROUND_COLOR = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 4;
 
     /**
      * The feature id for the '<em><b>Background Color</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
@@ -570,7 +610,7 @@ public interface TablePackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DTABLE_ELEMENT_STYLE__BACKGROUND_COLOR = 5;
+    int DTABLE_ELEMENT_STYLE__BACKGROUND_COLOR = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 5;
 
     /**
      * The number of structural features of the '<em>DTable Element Style</em>' class. <!-- begin-user-doc --> <!--
@@ -579,7 +619,7 @@ public interface TablePackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DTABLE_ELEMENT_STYLE_FEATURE_COUNT = 6;
+    int DTABLE_ELEMENT_STYLE_FEATURE_COUNT = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 6;
 
     /**
      * The meta object id for the '{@link org.eclipse.sirius.table.metamodel.table.impl.DCellStyleImpl <em>DCell
@@ -592,6 +632,14 @@ public interface TablePackage extends EPackage {
     int DCELL_STYLE = 5;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DCELL_STYLE__UID = TablePackage.DTABLE_ELEMENT_STYLE__UID;
+
+    /**
      * The feature id for the '<em><b>Label Size</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
@@ -682,6 +730,14 @@ public interface TablePackage extends EPackage {
     int DCOLUMN = 6;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DCOLUMN__UID = TablePackage.DTABLE_ELEMENT__UID;
+
+    /**
      * The feature id for the '<em><b>Target</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
@@ -800,6 +856,14 @@ public interface TablePackage extends EPackage {
     int DTARGET_COLUMN = 7;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DTARGET_COLUMN__UID = ViewpointPackage.DSEMANTIC_DECORATOR__UID;
+
+    /**
      * The feature id for the '<em><b>Target</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
@@ -919,6 +983,14 @@ public interface TablePackage extends EPackage {
     int DFEATURE_COLUMN = 8;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DFEATURE_COLUMN__UID = TablePackage.DCOLUMN__UID;
+
+    /**
      * The feature id for the '<em><b>Target</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/DTableElementStyleImpl.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/DTableElementStyleImpl.java
index 3f47b680dd..4ce8262f56 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/DTableElementStyleImpl.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/DTableElementStyleImpl.java
@@ -16,7 +16,6 @@ import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
 import org.eclipse.sirius.table.metamodel.table.DTableElementStyle;
 import org.eclipse.sirius.table.metamodel.table.TablePackage;
@@ -24,6 +23,7 @@ import org.eclipse.sirius.viewpoint.FontFormat;
 import org.eclipse.sirius.viewpoint.RGBValues;
 import org.eclipse.sirius.viewpoint.ViewpointFactory;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
+import org.eclipse.sirius.viewpoint.impl.IdentifiedElementImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>DTable Element Style</b></em>'. <!--
@@ -48,7 +48,7 @@ import org.eclipse.sirius.viewpoint.ViewpointPackage;
  *
  * @generated
  */
-public class DTableElementStyleImpl extends MinimalEObjectImpl.Container implements DTableElementStyle {
+public class DTableElementStyleImpl extends IdentifiedElementImpl implements DTableElementStyle {
 
     /**
      * The default value of the '{@link #getLabelSize() <em>Label Size</em>}' attribute. <!-- begin-user-doc --> <!--
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/TablePackageImpl.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/TablePackageImpl.java
index 9ec0a3a923..6e81e16330 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/TablePackageImpl.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/impl/TablePackageImpl.java
@@ -779,6 +779,7 @@ public class TablePackageImpl extends EPackageImpl implements TablePackage {
         dTargetColumnEClass.getESuperTypes().add(theViewpointPackage.getDSemanticDecorator());
         dTargetColumnEClass.getESuperTypes().add(this.getDColumn());
         dFeatureColumnEClass.getESuperTypes().add(this.getDColumn());
+        dTableElementStyleEClass.getESuperTypes().add(theViewpointPackage.getIdentifiedElement());
 
         // Initialize classes and features; add operations and parameters
         initEClass(dTableEClass, DTable.class, "DTable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/util/TableAdapterFactory.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/util/TableAdapterFactory.java
index 2151c2777f..247de7e8dd 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/util/TableAdapterFactory.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/util/TableAdapterFactory.java
@@ -31,6 +31,7 @@ import org.eclipse.sirius.viewpoint.DRepresentation;
 import org.eclipse.sirius.viewpoint.DRepresentationElement;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
 import org.eclipse.sirius.viewpoint.DStylizable;
+import org.eclipse.sirius.viewpoint.IdentifiedElement;
 import org.eclipse.sirius.viewpoint.description.DModelElement;
 import org.eclipse.sirius.viewpoint.description.DocumentedElement;
 
@@ -136,6 +137,16 @@ public class TableAdapterFactory extends AdapterFactoryImpl {
         }
 
         @Override
+        public Adapter caseIdentifiedElement(IdentifiedElement object) {
+            return createIdentifiedElementAdapter();
+        }
+
+        @Override
+        public Adapter caseDModelElement(DModelElement object) {
+            return createDModelElementAdapter();
+        }
+
+        @Override
         public Adapter caseDocumentedElement(DocumentedElement object) {
             return createDocumentedElementAdapter();
         }
@@ -146,11 +157,6 @@ public class TableAdapterFactory extends AdapterFactoryImpl {
         }
 
         @Override
-        public Adapter caseDModelElement(DModelElement object) {
-            return createDModelElementAdapter();
-        }
-
-        @Override
         public Adapter caseDRepresentation(DRepresentation object) {
             return createDRepresentationAdapter();
         }
@@ -331,6 +337,20 @@ public class TableAdapterFactory extends AdapterFactoryImpl {
     }
 
     /**
+     * Creates a new adapter for an object of class '{@link org.eclipse.sirius.viewpoint.IdentifiedElement
+     * <em>Identified Element</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+     * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+     * end-user-doc -->
+     *
+     * @return the new adapter.
+     * @see org.eclipse.sirius.viewpoint.IdentifiedElement
+     * @generated
+     */
+    public Adapter createIdentifiedElementAdapter() {
+        return null;
+    }
+
+    /**
      * Creates a new adapter for an object of class '{@link org.eclipse.sirius.viewpoint.description.DocumentedElement
      * <em>Documented Element</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
      * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/util/TableSwitch.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/util/TableSwitch.java
index 50275a6a0a..5c354aec94 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/util/TableSwitch.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/util/TableSwitch.java
@@ -31,6 +31,7 @@ import org.eclipse.sirius.viewpoint.DRepresentation;
 import org.eclipse.sirius.viewpoint.DRepresentationElement;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
 import org.eclipse.sirius.viewpoint.DStylizable;
+import org.eclipse.sirius.viewpoint.IdentifiedElement;
 import org.eclipse.sirius.viewpoint.description.DModelElement;
 import org.eclipse.sirius.viewpoint.description.DocumentedElement;
 
@@ -108,16 +109,19 @@ public class TableSwitch<T> {
                 result = caseLineContainer(dTable);
             }
             if (result == null) {
+                result = caseDModelElement(dTable);
+            }
+            if (result == null) {
                 result = caseDocumentedElement(dTable);
             }
             if (result == null) {
                 result = caseDRefreshable(dTable);
             }
             if (result == null) {
-                result = caseDModelElement(dTable);
+                result = caseDSemanticDecorator(dTable);
             }
             if (result == null) {
-                result = caseDSemanticDecorator(dTable);
+                result = caseIdentifiedElement(dTable);
             }
             if (result == null) {
                 result = defaultCase(theEObject);
@@ -143,6 +147,9 @@ public class TableSwitch<T> {
                 result = caseDSemanticDecorator(dTableElement);
             }
             if (result == null) {
+                result = caseIdentifiedElement(dTableElement);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -154,6 +161,9 @@ public class TableSwitch<T> {
                 result = caseDSemanticDecorator(lineContainer);
             }
             if (result == null) {
+                result = caseIdentifiedElement(lineContainer);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -174,6 +184,9 @@ public class TableSwitch<T> {
                 result = caseDSemanticDecorator(dLine);
             }
             if (result == null) {
+                result = caseIdentifiedElement(dLine);
+            }
+            if (result == null) {
                 result = caseDMappingBased(dLine);
             }
             if (result == null) {
@@ -200,6 +213,9 @@ public class TableSwitch<T> {
                 result = caseDSemanticDecorator(dCell);
             }
             if (result == null) {
+                result = caseIdentifiedElement(dCell);
+            }
+            if (result == null) {
                 result = caseDMappingBased(dCell);
             }
             if (result == null) {
@@ -220,6 +236,9 @@ public class TableSwitch<T> {
                 result = caseDTableElementStyle(dCellStyle);
             }
             if (result == null) {
+                result = caseIdentifiedElement(dCellStyle);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -246,6 +265,9 @@ public class TableSwitch<T> {
                 result = caseDSemanticDecorator(dColumn);
             }
             if (result == null) {
+                result = caseIdentifiedElement(dColumn);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -266,6 +288,9 @@ public class TableSwitch<T> {
                 result = caseDSemanticDecorator(dTargetColumn);
             }
             if (result == null) {
+                result = caseIdentifiedElement(dTargetColumn);
+            }
+            if (result == null) {
                 result = caseDMappingBased(dTargetColumn);
             }
             if (result == null) {
@@ -304,6 +329,9 @@ public class TableSwitch<T> {
                 result = caseDSemanticDecorator(dFeatureColumn);
             }
             if (result == null) {
+                result = caseIdentifiedElement(dFeatureColumn);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -312,6 +340,9 @@ public class TableSwitch<T> {
             DTableElementStyle dTableElementStyle = (DTableElementStyle) theEObject;
             T result = caseDTableElementStyle(dTableElementStyle);
             if (result == null) {
+                result = caseIdentifiedElement(dTableElementStyle);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -467,6 +498,21 @@ public class TableSwitch<T> {
     }
 
     /**
+     * Returns the result of interpreting the object as an instance of '<em>Identified Element</em>'. <!--
+     * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
+     * end-user-doc -->
+     *
+     * @param object
+     *            the target of the switch.
+     * @return the result of interpreting the object as an instance of '<em>Identified Element</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseIdentifiedElement(IdentifiedElement object) {
+        return null;
+    }
+
+    /**
      * Returns the result of interpreting the object as an instance of '<em>Documented Element</em>'. <!--
      * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
      * end-user-doc -->
diff --git a/plugins/org.eclipse.sirius.tests.junit/.settings/org.eclipse.core.runtime.prefs b/plugins/org.eclipse.sirius.tests.junit/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 22669f9831..0000000000
--- a/plugins/org.eclipse.sirius.tests.junit/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Sep 24 15:04:54 CEST 2007
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/migration/do_not_migrate/technicalUid/technicalUid.aird b/plugins/org.eclipse.sirius.tests.junit/data/unit/migration/do_not_migrate/technicalUid/technicalUid.aird
new file mode 100644
index 0000000000..4f6231d025
--- /dev/null
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/migration/do_not_migrate/technicalUid/technicalUid.aird
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/style">
+  <viewpoint:DAnalysis xmi:id="_kgUH0InWEeiSiblR-QI2Dg" selectedViews="_p2YNkInWEeiSiblR-QI2Dg" version="13.0.0.201804031646">
+    <semanticResources>technicalUid.ecore</semanticResources>
+    <ownedViews xmi:type="viewpoint:DView" xmi:id="_p2YNkInWEeiSiblR-QI2Dg">
+      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/>
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" xmi:id="_sH155YnWEeiSiblR-QI2Dg" name="root package entities" repPath="#_sGbkoInWEeiSiblR-QI2Dg">
+        <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
+        <target xmi:type="ecore:EPackage" href="technicalUid.ecore#/"/>
+      </ownedRepresentationDescriptors>
+    </ownedViews>
+  </viewpoint:DAnalysis>
+  <diagram:DSemanticDiagram xmi:id="_sH154InWEeiSiblR-QI2Dg" name="root package entities" uid="_sGbkoInWEeiSiblR-QI2Dg" synchronized="false">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_sH154YnWEeiSiblR-QI2Dg" source="DANNOTATION_CUSTOMIZATION_KEY">
+      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_sH154onWEeiSiblR-QI2Dg"/>
+    </ownedAnnotationEntries>
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_sH2g8InWEeiSiblR-QI2Dg" source="GMF_DIAGRAMS">
+      <data xmi:type="notation:Diagram" xmi:id="_sH2g8YnWEeiSiblR-QI2Dg" type="Sirius" element="_sH154InWEeiSiblR-QI2Dg" measurementUnit="Pixel">
+        <children xmi:type="notation:Node" xmi:id="_tCb54InWEeiSiblR-QI2Dg" type="2003" element="_tBdpgInWEeiSiblR-QI2Dg">
+          <children xmi:type="notation:Node" xmi:id="_tChZcInWEeiSiblR-QI2Dg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_tCiAgInWEeiSiblR-QI2Dg" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_tCiAgYnWEeiSiblR-QI2Dg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_tCiAgonWEeiSiblR-QI2Dg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_tCb54YnWEeiSiblR-QI2Dg" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tCb54onWEeiSiblR-QI2Dg" x="200" y="130"/>
+        </children>
+        <styles xmi:type="notation:DiagramStyle" xmi:id="_sH2g8onWEeiSiblR-QI2Dg"/>
+      </data>
+    </ownedAnnotationEntries>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_tBdpgInWEeiSiblR-QI2Dg" name="NewEClass1" tooltipText="root.NewEClass1">
+      <target xmi:type="ecore:EClass" href="technicalUid.ecore#//NewEClass1"/>
+      <semanticElements xmi:type="ecore:EClass" href="technicalUid.ecore#//NewEClass1"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_tBkXMInWEeiSiblR-QI2Dg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
+    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_sH155InWEeiSiblR-QI2Dg"/>
+    <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/>
+    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']"/>
+    <target xmi:type="ecore:EPackage" href="technicalUid.ecore#/"/>
+  </diagram:DSemanticDiagram>
+</xmi:XMI>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/migration/do_not_migrate/technicalUid/technicalUid.ecore b/plugins/org.eclipse.sirius.tests.junit/data/unit/migration/do_not_migrate/technicalUid/technicalUid.ecore
new file mode 100644
index 0000000000..02994d88eb
--- /dev/null
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/migration/do_not_migrate/technicalUid/technicalUid.ecore
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="root">
+  <eClassifiers xsi:type="ecore:EClass" name="NewEClass1"/>
+</ecore:EPackage>
diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/suite/common/AllCommonPluginTests.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/suite/common/AllCommonPluginTests.java
index a2383eff38..f7151b49fc 100644
--- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/suite/common/AllCommonPluginTests.java
+++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/suite/common/AllCommonPluginTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2017 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2018 THALES GLOBAL SERVICES.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -150,6 +150,8 @@ import org.eclipse.sirius.tests.unit.diagram.migration.RgbValuesEDataTypeMigrati
 import org.eclipse.sirius.tests.unit.diagram.migration.RunRepairTest;
 import org.eclipse.sirius.tests.unit.diagram.migration.SetVersionTest;
 import org.eclipse.sirius.tests.unit.diagram.migration.SnapBackDistantLabelsMigrationTest;
+import org.eclipse.sirius.tests.unit.diagram.migration.TechnicalUidMigrationTest;
+import org.eclipse.sirius.tests.unit.diagram.migration.TransientLayerMigrationTest;
 import org.eclipse.sirius.tests.unit.multipageeditor.SiriusMultiPageEditorTest;
 import org.eclipse.sirius.tests.unit.perf.common.CommonPreferencesTest;
 import org.eclipse.sirius.tests.unit.perf.common.Session1MillionTests;
@@ -236,6 +238,8 @@ public class AllCommonPluginTests extends TestCase {
         suite.addTestSuite(DRepInDViewToRootObjectsAndWithDRepDescRepPathMigrationTest.class);
         suite.addTestSuite(DecorationDescriptionImageExpressionMigrationTest.class);
         suite.addTestSuite(RepairGMFbendpointsMigrationParticipantTest.class);
+        suite.addTestSuite(TransientLayerMigrationTest.class);
+        suite.addTestSuite(TechnicalUidMigrationTest.class);
 
         suite.addTest(new JUnit4TestAdapter(CommonPreferencesTest.class));
         suite.addTest(new JUnit4TestAdapter(GroupingContentProviderTest.class));
diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/mm/MMTest.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/mm/MMTest.java
index 1c411d31f0..9b13725e5e 100644
--- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/mm/MMTest.java
+++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/mm/MMTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2018 THALES GLOBAL SERVICES.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,24 +10,38 @@
  *******************************************************************************/
 package org.eclipse.sirius.tests.unit.api.mm;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.sirius.common.tools.api.util.StringUtil;
 import org.eclipse.sirius.diagram.DDiagram;
+import org.eclipse.sirius.diagram.DiagramPackage;
 import org.eclipse.sirius.diagram.description.DiagramDescription;
 import org.eclipse.sirius.diagram.description.tool.DiagramCreationDescription;
 import org.eclipse.sirius.diagram.description.tool.DiagramNavigationDescription;
+import org.eclipse.sirius.diagram.sequence.SequencePackage;
+import org.eclipse.sirius.table.metamodel.table.TablePackage;
 import org.eclipse.sirius.table.metamodel.table.description.TableCreationDescription;
 import org.eclipse.sirius.table.metamodel.table.description.TableNavigationDescription;
 import org.eclipse.sirius.tests.SiriusTestsPlugin;
 import org.eclipse.sirius.tests.support.api.EclipseTestsSupportHelper;
 import org.eclipse.sirius.tests.support.api.SiriusDiagramTestCase;
+import org.eclipse.sirius.tree.TreePackage;
 import org.eclipse.sirius.tree.description.TreeCreationDescription;
 import org.eclipse.sirius.tree.description.TreeNavigationDescription;
+import org.eclipse.sirius.viewpoint.IdentifiedElement;
+import org.eclipse.sirius.viewpoint.ViewpointPackage;
 import org.eclipse.sirius.viewpoint.description.tool.ToolEntry;
 
 /**
  * Test some override of the MetaModel :
  * <UL>
- * <LI>VP-2534 : Problem of getMappings override (use of wrong crossReferencer
- * in some cases).</LI>
+ * <LI>VP-2534 : Problem of getMappings override (use of wrong crossReferencer in some cases).</LI>
  * </UL>
  * 
  * @author lredor
@@ -44,7 +58,10 @@ public class MMTest extends SiriusDiagramTestCase {
 
     private static final int NUMBER_OF_MAPPINGS = 4;
 
-    String REPRESENTATION_DESC__NAME = "Diagram";
+    private static final String REPRESENTATION_DESC__NAME = "Diagram";
+
+    private static final List<EClass> TRANSIENT_OBJECTS_WHITE_LIST = Arrays.asList(ViewpointPackage.eINSTANCE.getDAnalysisSessionEObject(), ViewpointPackage.eINSTANCE.getUIState(),
+            ViewpointPackage.eINSTANCE.getSessionManagerEObject());
 
     @Override
     protected void setUp() throws Exception {
@@ -56,11 +73,9 @@ public class MMTest extends SiriusDiagramTestCase {
     }
 
     /**
-     * This method checks that the number of mappings return by each
-     * specializations of method getMappings are OK.
+     * This method checks that the number of mappings return by each specializations of method getMappings are OK.
      * 
-     * VP-2534 : Problem of getMappings override (use of wrong crossReferencer
-     * in some cases).
+     * VP-2534 : Problem of getMappings override (use of wrong crossReferencer in some cases).
      * 
      * @throws Exception
      *             in case of problem
@@ -84,4 +99,40 @@ public class MMTest extends SiriusDiagramTestCase {
         }
     }
 
+    /**
+     * This test ensures that every serializable instance of Sirius meta-model inherits from {@link IdentifiedElement}
+     * class so that they have an uid attribute. This test considers every classes of Sirius Package excluding some
+     * EClass that we know that they are never serialized.
+     */
+    public void testIdentifiedElementInheritence() {
+        int uuidLength = EcoreUtil.generateUUID().length();
+        List<EClassifier> allClassifiers = new ArrayList<>(ViewpointPackage.eINSTANCE.getEClassifiers());
+        allClassifiers.addAll(DiagramPackage.eINSTANCE.getEClassifiers());
+        allClassifiers.addAll(TreePackage.eINSTANCE.getEClassifiers());
+        allClassifiers.addAll(TablePackage.eINSTANCE.getEClassifiers());
+        allClassifiers.addAll(SequencePackage.eINSTANCE.getEClassifiers());
+
+        List<EClass> allClasses = allClassifiers.stream().filter(EClass.class::isInstance).map(EClass.class::cast).filter(cl -> !cl.isInterface()).collect(Collectors.toList());
+
+        allClasses.removeAll(TRANSIENT_OBJECTS_WHITE_LIST);
+
+        List<String> invalidEClasses = new ArrayList<>();
+        List<String> invalidInstances = new ArrayList<>();
+        for (EClass eClass : allClasses) {
+            Class<?> instanceClass = eClass.getInstanceClass();
+            if (!IdentifiedElement.class.isAssignableFrom(instanceClass)) {
+                invalidEClasses.add(eClass.getName());
+            } else if (!eClass.isAbstract() && !eClass.isInterface()) {
+                IdentifiedElement identifiedElement = (IdentifiedElement) EcoreUtil.create(eClass);
+              String uid=  identifiedElement.getUid();
+               if(StringUtil.isEmpty(uid) || uid.length() != uuidLength) {
+                   invalidInstances.add(eClass.getName());
+               }
+            }
+        }
+
+        assertTrue("The following classes should inherit from IdentifiedElement class:\n" + invalidEClasses, invalidEClasses.isEmpty());
+        assertTrue("The instances of the following classes should have an uid after creation:\n" + invalidInstances, invalidInstances.isEmpty());
+    }
+
 }
diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/session/SessionEditorInputTests.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/session/SessionEditorInputTests.java
index 6d9df1c0be..1d0ae1c262 100644
--- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/session/SessionEditorInputTests.java
+++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/session/SessionEditorInputTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015, 2017 Obeo.
+ * Copyright (c) 2015, 2018 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -119,8 +119,12 @@ public class SessionEditorInputTests extends TestCase {
         DRepresentationDescriptor descriptor1 = query.getRepresentationDescriptor();
         query = new DRepresentationQuery(dRepresentation2);
         DRepresentationDescriptor descriptor2 = query.getRepresentationDescriptor();
-        URI dRepresentation1URI = EcoreUtil.getURI(dRepresentation1);
-        URI dRepresentation2URI = EcoreUtil.getURI(dRepresentation2);
+        URI dRepresentation1InitialURI = EcoreUtil.getURI(dRepresentation1);
+        URI dRepresentation2InitialURI = EcoreUtil.getURI(dRepresentation2);
+
+        URI representation1GMFDiagramInitialURI = EcoreUtil.getURI(new DDiagramGraphicalQuery((DDiagram) dRepresentation1).getAssociatedGMFDiagram().get());
+        URI representation2GMFDiagramInitialURI = EcoreUtil.getURI(new DDiagramGraphicalQuery((DDiagram) dRepresentation2).getAssociatedGMFDiagram().get());
+
         Command moveCmd = new RecordingCommand(session.getTransactionalEditingDomain()) {
             @Override
             protected void doExecute() {
@@ -130,9 +134,19 @@ public class SessionEditorInputTests extends TestCase {
             }
         };
         session.getTransactionalEditingDomain().getCommandStack().execute(moveCmd);
-        String assertMessage = "DRepresentation's URI should have changed as they are stored in a InMemoryResourceImpl with xpath based uriFragment";
-        assertEquals(assertMessage, dRepresentation1URI, EcoreUtil.getURI(dRepresentation2));
-        assertEquals(assertMessage, dRepresentation2URI, EcoreUtil.getURI(dRepresentation1));
+
+        URI dRepresentation1URI = EcoreUtil.getURI(dRepresentation1);
+        URI dRepresentation2URI = EcoreUtil.getURI(dRepresentation2);
+        URI representation1GMFDiagramURI = EcoreUtil.getURI(new DDiagramGraphicalQuery((DDiagram) dRepresentation1).getAssociatedGMFDiagram().get());
+        URI representation2GMFDiagramURI = EcoreUtil.getURI(new DDiagramGraphicalQuery((DDiagram) dRepresentation2).getAssociatedGMFDiagram().get());
+
+        String representationAssertMessage = "DRepresentation's URI should not have changed as they are stored in a InMemoryResourceImpl with uid based uriFragment";
+        assertEquals(representationAssertMessage, dRepresentation1InitialURI, dRepresentation1URI);
+        assertEquals(representationAssertMessage, dRepresentation2InitialURI, dRepresentation2URI);
+        String gmfAssertMessage = "GMF diagram's URI should have changed as they are stored in a InMemoryResourceImpl with xpath based uriFragment";
+        assertEquals(gmfAssertMessage, representation1GMFDiagramInitialURI, representation2GMFDiagramURI);
+        assertEquals(gmfAssertMessage, representation2GMFDiagramInitialURI, representation1GMFDiagramURI);
+
         IEditorPart newEditor = DialectUIManager.INSTANCE.openEditor(session, dRepresentation1, new NullProgressMonitor());
         assertNotSame(editor1, newEditor);
         assertEquals("Editor for representation1 should be opened", 2, EclipseUIUtil.getActivePage().getEditorReferences().length);
@@ -142,8 +156,6 @@ public class SessionEditorInputTests extends TestCase {
         assertTrue(editor2Input instanceof SessionEditorInput);
         SessionEditorInput sessionNewEditorInput = (SessionEditorInput) newEditor.getEditorInput();
         SessionEditorInput sessionEditor2Input = (SessionEditorInput) editor2.getEditorInput();
-        URI representation1GMFDiagramURI = EcoreUtil.getURI(new DDiagramGraphicalQuery((DDiagram) dRepresentation1).getAssociatedGMFDiagram().get());
-        URI representation2GMFDiagramURI = EcoreUtil.getURI(new DDiagramGraphicalQuery((DDiagram) dRepresentation2).getAssociatedGMFDiagram().get());
         assertEquals(representation1GMFDiagramURI, sessionNewEditorInput.getURI());
         assertEquals(representation2GMFDiagramURI, sessionEditor2Input.getURI());
         assertEquals(new SessionEditorInput(representation1GMFDiagramURI, dRepresentation1.getName(), session), sessionNewEditorInput);
diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/migration/TechnicalUidMigrationTest.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/migration/TechnicalUidMigrationTest.java
new file mode 100644
index 0000000000..0896ddf84f
--- /dev/null
+++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/migration/TechnicalUidMigrationTest.java
@@ -0,0 +1,196 @@
+/*******************************************************************************
+ * Copyright (c) 2018 THALES GLOBAL SERVICES.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.tests.unit.diagram.migration;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ExtensibleURIConverterImpl;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.sirius.business.api.query.DRepresentationQuery;
+import org.eclipse.sirius.business.api.session.CustomDataConstants;
+import org.eclipse.sirius.business.internal.migration.RepresentationsFileMigrationService;
+import org.eclipse.sirius.business.internal.migration.TechnicalUidMigrationParticipant;
+import org.eclipse.sirius.common.tools.api.util.StringUtil;
+import org.eclipse.sirius.ecore.extender.tool.api.ModelUtils;
+import org.eclipse.sirius.tests.SiriusTestsPlugin;
+import org.eclipse.sirius.tests.support.api.SiriusTestCase;
+import org.eclipse.sirius.tools.api.command.ICommandFactory;
+import org.eclipse.sirius.viewpoint.DAnalysis;
+import org.eclipse.sirius.viewpoint.DRepresentationDescriptor;
+import org.osgi.framework.Version;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
+
+/**
+ * Test class to test the migration of to set IdentifiedElement.uid for DRepresentation instances.
+ * 
+ * @author lfasani
+ */
+public class TechnicalUidMigrationTest extends SiriusTestCase {
+
+    private static final String DREPRESENTATION_INITIAL_XMIID = "_sH154InWEeiSiblR-QI2Dg";
+
+    private static final String DREPRESENTATION_INITIAL_UID = "_sGbkoInWEeiSiblR-QI2Dg";
+
+    private static final String PATH = "/data/unit/migration/do_not_migrate/technicalUid/";
+
+    private static final String SESSION_RESOURCE_NAME = "technicalUid.aird";
+
+    private static final String SEMANTIC_MODEL_FILENAME = "technicalUid.ecore";
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        genericSetUp();
+        copyFilesToTestProject(SiriusTestsPlugin.PLUGIN_ID, PATH, SEMANTIC_MODEL_FILENAME, SESSION_RESOURCE_NAME);
+    }
+
+    /**
+     * Test that the data were not migrated on the repo. It allows to check the effect of the migration in the other
+     * test.
+     */
+    public void testMigrationIsNeededOnData() {
+        Version migrationVersion = TechnicalUidMigrationParticipant.MIGRATION_VERSION;
+
+        // Check that the representation file migration is needed.
+        URI uri = URI.createPlatformPluginURI(SiriusTestsPlugin.PLUGIN_ID + PATH + SESSION_RESOURCE_NAME, true);
+        Version loadedVersion = checkRepresentationFileMigrationStatus(uri, true);
+        assertTrue("The technical uid migration must be required on test data.", migrationVersion.compareTo(loadedVersion) > 0);
+
+        // check the file contains DRepresentationContainer
+        Collection<String> uidAttributes = getXmlAttributes(uri, "uid");
+        assertEquals("The uid attribute should be only on the DDiagram", 1, uidAttributes.size());
+        Collection<String> xmiIdAttributes = getXmlAttributes(uri, "xmi:id");
+        assertEquals("The xmi:id attribute should on every elements", 19, xmiIdAttributes.size());
+        assertTrue(xmiIdAttributes.contains(DREPRESENTATION_INITIAL_XMIID) && uidAttributes.contains(DREPRESENTATION_INITIAL_UID));
+    }
+
+    private Collection<String> getXmlAttributes(URI uri, final String xmlQName) {
+        List<String> xmlValues = new ArrayList<>();
+
+        ExtensibleURIConverterImpl uriConverterImpl = new ExtensibleURIConverterImpl();
+        InputStream inputStream = null;
+        try {
+            inputStream = uriConverterImpl.createInputStream(uri);
+            SAXParserFactory factory = SAXParserFactory.newInstance();
+            SAXParser saxParser = factory.newSAXParser();
+            saxParser.parse(inputStream, new DefaultHandler() {
+
+                @Override
+                public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
+                    String value = attributes.getValue(xmlQName);
+                    if (!StringUtil.isEmpty(value)) {
+                        xmlValues.add(value);
+                    }
+                }
+            });
+        } catch (Exception e) {
+            failCheckData();
+        } finally {
+            if (inputStream != null) {
+                try {
+                    inputStream.close();
+                } catch (final IOException e) {
+                    failCheckData();
+                }
+            }
+        }
+
+        return xmlValues;
+    }
+
+    private void failCheckData() {
+        fail("Check the test data, we should not fail here.");
+    }
+
+    /**
+     * Check the migration is done and does not produce errors during representation load.
+     */
+    public void testTechnicalUidMigrationDone() {
+        ResourceSet set = new ResourceSetImpl();
+        DAnalysis analysis = null;
+        try {
+            analysis = (DAnalysis) ModelUtils.load(URI.createPlatformResourceURI(TEMPORARY_PROJECT_NAME + "/" + SESSION_RESOURCE_NAME, true), set);
+        } catch (IOException e) {
+            failCheckData();
+        }
+
+        Collection<String> initialXmiIdAttributes = getXmlAttributes(analysis.eResource().getURI(), "xmi:id");
+
+        // Check that the migration was done.
+        assertNotNull("Check the representation file test data.", analysis);
+
+        // Check there are no elements typed as AnyType, ie. there is no unrecognized elements or attribute after the
+        // migration.
+        assertTrue("Check the migration logic.", ((XMLResource) analysis.eResource()).getEObjectToExtensionMap().isEmpty());
+
+        // The version will change on save, so migration service will still
+        // indicates that the migration is needed.
+        String version = analysis.getVersion();
+        assertTrue("Before save, the migration framework will return true even if the migration has been done during load.",
+                RepresentationsFileMigrationService.getInstance().isMigrationNeeded(Version.parseVersion(version)));
+
+        try {
+            analysis.eResource().save(Collections.emptyMap());
+        } catch (IOException e) {
+            failCheckData();
+        }
+        // Save should update the version.
+        version = analysis.getVersion();
+        assertFalse("The version tag should now be set telling that the migration was done.", RepresentationsFileMigrationService.getInstance().isMigrationNeeded(Version.parseVersion(version)));
+
+        // Check that the migration went well on the xml level
+        Collection<String> uidAttributes = getXmlAttributes(analysis.eResource().getURI(), "uid");
+        assertEquals("Bad number of elements with uid attribute", 8, uidAttributes.size());
+
+        Collection<String> xmiIdAttributes = getXmlAttributes(analysis.eResource().getURI(), "xmi:id");
+        assertEquals("Bad number of elements with xmi:id attribute", 11, xmiIdAttributes.size());
+
+        List<String> newUids = uidAttributes.stream().filter(s -> !initialXmiIdAttributes.contains(s)).collect(Collectors.toList());
+        assertTrue("Migration should not introduce new uids and all uid must come from the pevious xmi:id", newUids.isEmpty());
+
+        assertTrue("There should be no xmi:id for the DRepresentation", initialXmiIdAttributes.contains(DREPRESENTATION_INITIAL_XMIID) && uidAttributes.contains(DREPRESENTATION_INITIAL_XMIID));
+        assertTrue("The xmi:id of the DRepresentation must be serialized in the uid tag",
+                !uidAttributes.contains(DREPRESENTATION_INITIAL_UID) && uidAttributes.contains(DREPRESENTATION_INITIAL_XMIID));
+
+        // Check that old DRepresentation.uid has correctly been updated with the xmiid of that DRepresentation
+        DRepresentationDescriptor dRepresentationDescriptor = analysis.getOwnedViews().get(0).getOwnedRepresentationDescriptors().get(0);
+        assertTrue("The DRepresentationDescriptor.repPath should contain the uid of the DRepresentation",
+                dRepresentationDescriptor.getRepPath().getResourceURI().toString().contains(DREPRESENTATION_INITIAL_XMIID));
+        assertEquals("Bad DRepresentation.uid. It should equals the xmiid of the DRepresentation.", DREPRESENTATION_INITIAL_XMIID, dRepresentationDescriptor.getRepresentation().getUid());
+
+        // Check that the DDiagram has been correctly retrieved from the GMF Diagram (xmi:id has been dropped in favor
+        // of the uid of the representation).
+        Diagram gmfDiag = (Diagram) new DRepresentationQuery(dRepresentationDescriptor.getRepresentation()).getAnnotation(CustomDataConstants.GMF_DIAGRAMS).iterator().next().getData();
+        assertEquals("GMF Diagram is no more able to retrieve its DDiagram, check the migration effect.", dRepresentationDescriptor.getRepresentation(), gmfDiag.getElement());
+        assertFalse(getErrorLoggersMessage(), doesAnErrorOccurs());
+    }
+
+    @Override
+    protected ICommandFactory getCommandFactory() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+}
diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/modelers/ecore/EntitiesDiagramStyleCustomizationTests.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/modelers/ecore/EntitiesDiagramStyleCustomizationTests.java
index f5e907c2f0..0455edaee9 100644
--- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/modelers/ecore/EntitiesDiagramStyleCustomizationTests.java
+++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/modelers/ecore/EntitiesDiagramStyleCustomizationTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2018 THALES GLOBAL SERVICES.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -24,6 +24,7 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.sirius.business.api.dialect.DialectManager;
 import org.eclipse.sirius.business.api.repair.SiriusRepairProcess;
 import org.eclipse.sirius.business.api.session.SessionManager;
+import org.eclipse.sirius.common.tools.api.util.EqualityHelper;
 import org.eclipse.sirius.diagram.ContainerStyle;
 import org.eclipse.sirius.diagram.DDiagram;
 import org.eclipse.sirius.diagram.DNodeList;
@@ -82,14 +83,16 @@ public class EntitiesDiagramStyleCustomizationTests extends AbstractEcoreSynchro
                 retrievedNodeList.getOwnedStyle().getCustomFeatures());
         assertTrue("we should have our customized WorkspaceImage style and not the original one", EcoreUtil.equals(customizedWorkspaceImageStyle, retrievedNodeList.getOwnedStyle()));
 
-        Command decustomizeStyleCmd = RemoveCommand.create(domain, retrievedNodeList.getOwnedStyle(), ViewpointPackage.Literals.CUSTOMIZABLE__CUSTOM_FEATURES, retrievedNodeList.getOwnedStyle()
-                .getCustomFeatures());
+        Command decustomizeStyleCmd = RemoveCommand.create(domain, retrievedNodeList.getOwnedStyle(), ViewpointPackage.Literals.CUSTOMIZABLE__CUSTOM_FEATURES,
+                retrievedNodeList.getOwnedStyle().getCustomFeatures());
         domain.getCommandStack().execute(decustomizeStyleCmd);
 
         getRefreshedDiagram();
         final DNodeList reinited = (DNodeList) getDiagramElementsFromLabel(sync, "EClass").get(0);
         assertFalse("we should have the original and not the custom as we removed the customization marker", EcoreUtil.equals(customizedWorkspaceImageStyle, reinited.getOwnedStyle()));
-        assertTrue("we should have the original style", EcoreUtil.equals(originalStyle, reinited.getOwnedStyle()));
+        // TODO: This change seems strange and let me thing that there will be another problem of code in Sirius or
+        // other that uses EcoreUtil.equals.
+        assertTrue("we should have the original style", new EqualityHelper().equals(originalStyle, reinited.getOwnedStyle()));
     }
 
     public void testCustomStyleKeepingDuringRepair() throws Exception {
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/BackgroundColorFigureUpdateTests.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/BackgroundColorFigureUpdateTests.java
index e35f74d979..a0a33a99ff 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/BackgroundColorFigureUpdateTests.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/BackgroundColorFigureUpdateTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2018 THALES GLOBAL SERVICES.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -13,10 +13,10 @@ package org.eclipse.sirius.tests.swtbot;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.eclipse.emf.ecore.util.EcoreUtil.EqualityHelper;
 import org.eclipse.gef.EditPart;
 import org.eclipse.gef.GraphicalEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.actions.internal.l10n.DiagramUIActionsMessages;
+import org.eclipse.sirius.common.tools.api.util.EqualityHelper;
 import org.eclipse.sirius.diagram.DDiagram;
 import org.eclipse.sirius.diagram.ui.internal.edit.parts.DNode2EditPart;
 import org.eclipse.sirius.diagram.ui.internal.edit.parts.DNode3EditPart;
@@ -31,8 +31,7 @@ import org.eclipse.swt.graphics.Color;
 import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefEditPart;
 
 /**
- * Test change background color for Container and node and verify that the color
- * correspond to GMF Color.
+ * Test change background color for Container and node and verify that the color correspond to GMF Color.
  * 
  * See VP-3427.
  * 
@@ -156,51 +155,48 @@ public class BackgroundColorFigureUpdateTests extends AbstractSiriusSwtBotGefTes
     }
 
     /**
-     * Test selected color in contextual Menu correspond to color applied to
-     * figure. In this case figure correspond to 'Container' with 'Flat
-     * Container Style'.
+     * Test selected color in contextual Menu correspond to color applied to figure. In this case figure correspond to
+     * 'Container' with 'Flat Container Style'.
      */
     public void testColorInContextualMenuFromFlatContainerStyle() {
         changeColorFigureFromContextualMenu(NODE_CONTAINER, DNodeContainerEditPart.class);
     }
 
     /**
-     * Test selected color in contextual Menu correspond to color applied to
-     * figure. In this case figure correspond to 'Container' with 'Flat
-     * Container Style'.
+     * Test selected color in contextual Menu correspond to color applied to figure. In this case figure correspond to
+     * 'Container' with 'Flat Container Style'.
      */
     public void testColorInContextualMenuFromShapeContainerStyle() {
         changeColorFigureFromContextualMenu(NODE_CONTAINER2, DNodeContainerEditPart.class);
     }
 
     /**
-     * Test selected color in contextual Menu correspond to color applied to
-     * figure. In this case figure correspond to 'Node' with 'Square Style'.
+     * Test selected color in contextual Menu correspond to color applied to figure. In this case figure correspond to
+     * 'Node' with 'Square Style'.
      */
     public void testColorInContextualMenuFromSquareNodeStyle() {
         changeColorFigureFromContextualMenu(NODE, DNode3EditPart.class);
     }
 
     /**
-     * Test selected color in contextual Menu correspond to color applied to
-     * figure. In this case figure correspond to 'Node' with 'Custom Style'.
+     * Test selected color in contextual Menu correspond to color applied to figure. In this case figure correspond to
+     * 'Node' with 'Custom Style'.
      */
     public void testColorInContextualMenuFromCustomNodeStyle() {
         changeColorFigureFromContextualMenu(NODE2, DNode3EditPart.class);
     }
 
     /**
-     * Test selected color in contextual Menu correspond to color applied to
-     * figure. In this case figure correspond to 'Node' with 'Dot Style'.
+     * Test selected color in contextual Menu correspond to color applied to figure. In this case figure correspond to
+     * 'Node' with 'Dot Style'.
      */
     public void testColorInContextualMenuFromDotNodeStyle() {
         changeColorFigureFromContextualMenu(NODE3, DNode3EditPart.class);
     }
 
     /**
-     * Test selected color in contextual Menu correspond to color applied to
-     * figure. In this case figure correspond to 'BorderedNode' with 'Square
-     * Style'.
+     * Test selected color in contextual Menu correspond to color applied to figure. In this case figure correspond to
+     * 'BorderedNode' with 'Square Style'.
      */
     public void testColorInContextualMenuFromSquareBorderedNodeStyle() {
         changeColorFigureFromContextualMenu(BORDERED_NODE, DNode2EditPart.class);
diff --git a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/provider/DTreeElementSynchronizerItemProvider.java b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/provider/DTreeElementSynchronizerItemProvider.java
index 061f55dfce..854dba049b 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/provider/DTreeElementSynchronizerItemProvider.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/provider/DTreeElementSynchronizerItemProvider.java
@@ -16,14 +16,10 @@ 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.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+import org.eclipse.sirius.tree.DTreeElementSynchronizer;
 import org.eclipse.sirius.tree.ui.provider.TreeUIPlugin;
+import org.eclipse.sirius.viewpoint.provider.IdentifiedElementItemProvider;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.sirius.tree.DTreeElementSynchronizer} object. <!--
@@ -31,8 +27,7 @@ import org.eclipse.sirius.tree.ui.provider.TreeUIPlugin;
  *
  * @generated
  */
-public class DTreeElementSynchronizerItemProvider extends ItemProviderAdapter
-        implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class DTreeElementSynchronizerItemProvider extends IdentifiedElementItemProvider {
     /**
      * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -73,7 +68,9 @@ public class DTreeElementSynchronizerItemProvider extends ItemProviderAdapter
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_DTreeElementSynchronizer_type"); //$NON-NLS-1$
+        String label = ((DTreeElementSynchronizer) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_DTreeElementSynchronizer_type") : //$NON-NLS-1$
+                getString("_UI_DTreeElementSynchronizer_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/provider/DTreeItemContainerItemProvider.java b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/provider/DTreeItemContainerItemProvider.java
index aaf6da8ae8..49db5f8a8f 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/provider/DTreeItemContainerItemProvider.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/provider/DTreeItemContainerItemProvider.java
@@ -92,7 +92,9 @@ public class DTreeItemContainerItemProvider extends DSemanticDecoratorItemProvid
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_DTreeItemContainer_type"); //$NON-NLS-1$
+        String label = ((DTreeItemContainer) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_DTreeItemContainer_type") : //$NON-NLS-1$
+                getString("_UI_DTreeItemContainer_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/provider/TreeItemStyleItemProvider.java b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/provider/TreeItemStyleItemProvider.java
index 2655d3b46e..2e0bd5742b 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/provider/TreeItemStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/provider/TreeItemStyleItemProvider.java
@@ -164,8 +164,9 @@ public class TreeItemStyleItemProvider extends StyleItemProvider {
      */
     @Override
     public String getText(Object object) {
-        TreeItemStyle treeItemStyle = (TreeItemStyle) object;
-        return getString("_UI_TreeItemStyle_type") + " " + treeItemStyle.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
+        String label = ((TreeItemStyle) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_TreeItemStyle_type") : //$NON-NLS-1$
+                getString("_UI_TreeItemStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.tree/model/tree.ecore b/plugins/org.eclipse.sirius.tree/model/tree.ecore
index 9105ee6e60..4b7007034e 100644
--- a/plugins/org.eclipse.sirius.tree/model/tree.ecore
+++ b/plugins/org.eclipse.sirius.tree/model/tree.ecore
@@ -34,7 +34,7 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="backgroundColor" eType="ecore:EDataType ../../org.eclipse.sirius/model/viewpoint.ecore#//RGBValues"
         defaultValueLiteral="255,255,255"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DTreeElementSynchronizer">
+  <eClassifiers xsi:type="ecore:EClass" name="DTreeElementSynchronizer" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//IdentifiedElement">
     <eOperations name="refresh">
       <eParameters name="DTreeItem" lowerBound="1" eType="#//DTreeItem"/>
     </eOperations>
diff --git a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/DTreeElementSynchronizer.java b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/DTreeElementSynchronizer.java
index 37eab4361b..2eabb2adcc 100644
--- a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/DTreeElementSynchronizer.java
+++ b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/DTreeElementSynchronizer.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.sirius.tree;
 
-import org.eclipse.emf.ecore.EObject;
+import org.eclipse.sirius.viewpoint.IdentifiedElement;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object ' <em><b>DTree Element Synchronizer</b></em>'. <!--
@@ -21,7 +21,7 @@ import org.eclipse.emf.ecore.EObject;
  * @model
  * @generated
  */
-public interface DTreeElementSynchronizer extends EObject {
+public interface DTreeElementSynchronizer extends IdentifiedElement {
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
diff --git a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/TreePackage.java b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/TreePackage.java
index 0f5ec0535b..856700c375 100644
--- a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/TreePackage.java
+++ b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/TreePackage.java
@@ -80,12 +80,12 @@ public interface TreePackage extends EPackage {
     int DTREE = 0;
 
     /**
-     * The feature id for the '<em><b>Documentation</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
      * @ordered
      */
-    int DTREE__DOCUMENTATION = ViewpointPackage.DREPRESENTATION__DOCUMENTATION;
+    int DTREE__UID = ViewpointPackage.DREPRESENTATION__UID;
 
     /**
      * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list. <!-- begin-user-doc --> <!--
@@ -97,6 +97,14 @@ public interface TreePackage extends EPackage {
     int DTREE__EANNOTATIONS = ViewpointPackage.DREPRESENTATION__EANNOTATIONS;
 
     /**
+     * The feature id for the '<em><b>Documentation</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DTREE__DOCUMENTATION = ViewpointPackage.DREPRESENTATION__DOCUMENTATION;
+
+    /**
      * The feature id for the '<em><b>Owned Representation Elements</b></em>' reference list. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      *
@@ -141,14 +149,6 @@ public interface TreePackage extends EPackage {
     int DTREE__UI_STATE = ViewpointPackage.DREPRESENTATION__UI_STATE;
 
     /**
-     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int DTREE__UID = ViewpointPackage.DREPRESENTATION__UID;
-
-    /**
      * The feature id for the '<em><b>Target</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
@@ -201,6 +201,14 @@ public interface TreePackage extends EPackage {
     int DTREE_ELEMENT = 1;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DTREE_ELEMENT__UID = ViewpointPackage.DREPRESENTATION_ELEMENT__UID;
+
+    /**
      * The feature id for the '<em><b>Target</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
@@ -244,6 +252,14 @@ public interface TreePackage extends EPackage {
     int DTREE_ELEMENT_FEATURE_COUNT = ViewpointPackage.DREPRESENTATION_ELEMENT_FEATURE_COUNT + 1;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DTREE_ITEM_CONTAINER__UID = ViewpointPackage.DSEMANTIC_DECORATOR__UID;
+
+    /**
      * The feature id for the '<em><b>Target</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
@@ -280,6 +296,14 @@ public interface TreePackage extends EPackage {
     int DTREE_ITEM = 3;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DTREE_ITEM__UID = TreePackage.DTREE_ITEM_CONTAINER__UID;
+
+    /**
      * The feature id for the '<em><b>Target</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
@@ -392,6 +416,14 @@ public interface TreePackage extends EPackage {
     int TREE_ITEM_STYLE = 4;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int TREE_ITEM_STYLE__UID = ViewpointPackage.STYLE__UID;
+
+    /**
      * The feature id for the '<em><b>Custom Features</b></em>' attribute list. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      *
@@ -486,13 +518,21 @@ public interface TreePackage extends EPackage {
     int DTREE_ELEMENT_SYNCHRONIZER = 5;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DTREE_ELEMENT_SYNCHRONIZER__UID = ViewpointPackage.IDENTIFIED_ELEMENT__UID;
+
+    /**
      * The number of structural features of the '<em>DTree Element Synchronizer</em>' class. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      *
      * @generated
      * @ordered
      */
-    int DTREE_ELEMENT_SYNCHRONIZER_FEATURE_COUNT = 0;
+    int DTREE_ELEMENT_SYNCHRONIZER_FEATURE_COUNT = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 0;
 
     /**
      * Returns the meta object for class '{@link org.eclipse.sirius.tree.DTreeItemContainer <em>DTree Item
diff --git a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/impl/DTreeElementSynchronizerImpl.java b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/impl/DTreeElementSynchronizerImpl.java
index 8d6763a4e3..ee3e6f9dda 100644
--- a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/impl/DTreeElementSynchronizerImpl.java
+++ b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/impl/DTreeElementSynchronizerImpl.java
@@ -11,10 +11,10 @@
 package org.eclipse.sirius.tree.impl;
 
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.sirius.tree.DTreeElementSynchronizer;
 import org.eclipse.sirius.tree.DTreeItem;
 import org.eclipse.sirius.tree.TreePackage;
+import org.eclipse.sirius.viewpoint.impl.IdentifiedElementImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>DTree Element Synchronizer</b></em>'. <!--
@@ -22,7 +22,7 @@ import org.eclipse.sirius.tree.TreePackage;
  *
  * @generated
  */
-public class DTreeElementSynchronizerImpl extends MinimalEObjectImpl.Container implements DTreeElementSynchronizer {
+public class DTreeElementSynchronizerImpl extends IdentifiedElementImpl implements DTreeElementSynchronizer {
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
diff --git a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/impl/TreePackageImpl.java b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/impl/TreePackageImpl.java
index e9ace598a2..d50920cd0a 100644
--- a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/impl/TreePackageImpl.java
+++ b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/impl/TreePackageImpl.java
@@ -453,6 +453,7 @@ public class TreePackageImpl extends EPackageImpl implements TreePackage {
         dTreeItemEClass.getESuperTypes().add(this.getDTreeElement());
         treeItemStyleEClass.getESuperTypes().add(theViewpointPackage.getStyle());
         treeItemStyleEClass.getESuperTypes().add(theViewpointPackage.getLabelStyle());
+        dTreeElementSynchronizerEClass.getESuperTypes().add(theViewpointPackage.getIdentifiedElement());
 
         // Initialize classes and features; add operations and parameters
         initEClass(dTreeEClass, DTree.class, "DTree", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/util/TreeAdapterFactory.java b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/util/TreeAdapterFactory.java
index d8adf77c75..32904c0ea8 100644
--- a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/util/TreeAdapterFactory.java
+++ b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/util/TreeAdapterFactory.java
@@ -29,6 +29,7 @@ import org.eclipse.sirius.viewpoint.DRepresentation;
 import org.eclipse.sirius.viewpoint.DRepresentationElement;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
 import org.eclipse.sirius.viewpoint.DStylizable;
+import org.eclipse.sirius.viewpoint.IdentifiedElement;
 import org.eclipse.sirius.viewpoint.LabelStyle;
 import org.eclipse.sirius.viewpoint.Style;
 import org.eclipse.sirius.viewpoint.description.DModelElement;
@@ -116,6 +117,16 @@ public class TreeAdapterFactory extends AdapterFactoryImpl {
         }
 
         @Override
+        public Adapter caseIdentifiedElement(IdentifiedElement object) {
+            return createIdentifiedElementAdapter();
+        }
+
+        @Override
+        public Adapter caseDModelElement(DModelElement object) {
+            return createDModelElementAdapter();
+        }
+
+        @Override
         public Adapter caseDocumentedElement(DocumentedElement object) {
             return createDocumentedElementAdapter();
         }
@@ -126,11 +137,6 @@ public class TreeAdapterFactory extends AdapterFactoryImpl {
         }
 
         @Override
-        public Adapter caseDModelElement(DModelElement object) {
-            return createDModelElementAdapter();
-        }
-
-        @Override
         public Adapter caseDRepresentation(DRepresentation object) {
             return createDRepresentationAdapter();
         }
@@ -274,6 +280,20 @@ public class TreeAdapterFactory extends AdapterFactoryImpl {
     }
 
     /**
+     * Creates a new adapter for an object of class '{@link org.eclipse.sirius.viewpoint.IdentifiedElement
+     * <em>Identified Element</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+     * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+     * end-user-doc -->
+     *
+     * @return the new adapter.
+     * @see org.eclipse.sirius.viewpoint.IdentifiedElement
+     * @generated
+     */
+    public Adapter createIdentifiedElementAdapter() {
+        return null;
+    }
+
+    /**
      * Creates a new adapter for an object of class '{@link org.eclipse.sirius.viewpoint.description.DocumentedElement
      * <em>Documented Element</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
      * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
diff --git a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/util/TreeSwitch.java b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/util/TreeSwitch.java
index d94321e327..8cbc1ee9fd 100644
--- a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/util/TreeSwitch.java
+++ b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/util/TreeSwitch.java
@@ -29,6 +29,7 @@ import org.eclipse.sirius.viewpoint.DRepresentation;
 import org.eclipse.sirius.viewpoint.DRepresentationElement;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
 import org.eclipse.sirius.viewpoint.DStylizable;
+import org.eclipse.sirius.viewpoint.IdentifiedElement;
 import org.eclipse.sirius.viewpoint.LabelStyle;
 import org.eclipse.sirius.viewpoint.Style;
 import org.eclipse.sirius.viewpoint.description.DModelElement;
@@ -108,16 +109,19 @@ public class TreeSwitch<T> {
                 result = caseDTreeItemContainer(dTree);
             }
             if (result == null) {
+                result = caseDModelElement(dTree);
+            }
+            if (result == null) {
                 result = caseDocumentedElement(dTree);
             }
             if (result == null) {
                 result = caseDRefreshable(dTree);
             }
             if (result == null) {
-                result = caseDModelElement(dTree);
+                result = caseDSemanticDecorator(dTree);
             }
             if (result == null) {
-                result = caseDSemanticDecorator(dTree);
+                result = caseIdentifiedElement(dTree);
             }
             if (result == null) {
                 result = defaultCase(theEObject);
@@ -143,6 +147,9 @@ public class TreeSwitch<T> {
                 result = caseDSemanticDecorator(dTreeElement);
             }
             if (result == null) {
+                result = caseIdentifiedElement(dTreeElement);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -154,6 +161,9 @@ public class TreeSwitch<T> {
                 result = caseDSemanticDecorator(dTreeItemContainer);
             }
             if (result == null) {
+                result = caseIdentifiedElement(dTreeItemContainer);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -174,6 +184,9 @@ public class TreeSwitch<T> {
                 result = caseDSemanticDecorator(dTreeItem);
             }
             if (result == null) {
+                result = caseIdentifiedElement(dTreeItem);
+            }
+            if (result == null) {
                 result = caseDMappingBased(dTreeItem);
             }
             if (result == null) {
@@ -203,6 +216,9 @@ public class TreeSwitch<T> {
                 result = caseBasicLabelStyle(treeItemStyle);
             }
             if (result == null) {
+                result = caseIdentifiedElement(treeItemStyle);
+            }
+            if (result == null) {
                 result = caseCustomizable(treeItemStyle);
             }
             if (result == null) {
@@ -214,6 +230,9 @@ public class TreeSwitch<T> {
             DTreeElementSynchronizer dTreeElementSynchronizer = (DTreeElementSynchronizer) theEObject;
             T result = caseDTreeElementSynchronizer(dTreeElementSynchronizer);
             if (result == null) {
+                result = caseIdentifiedElement(dTreeElementSynchronizer);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -310,6 +329,21 @@ public class TreeSwitch<T> {
     }
 
     /**
+     * Returns the result of interpreting the object as an instance of '<em>Identified Element</em>'. <!--
+     * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
+     * end-user-doc -->
+     *
+     * @param object
+     *            the target of the switch.
+     * @return the result of interpreting the object as an instance of '<em>Identified Element</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseIdentifiedElement(IdentifiedElement object) {
+        return null;
+    }
+
+    /**
      * Returns the result of interpreting the object as an instance of '<em>Documented Element</em>'. <!--
      * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
      * end-user-doc -->
diff --git a/plugins/org.eclipse.sirius.ui/plugin.properties b/plugins/org.eclipse.sirius.ui/plugin.properties
index f493da11f4..9a93f45ccd 100644
--- a/plugins/org.eclipse.sirius.ui/plugin.properties
+++ b/plugins/org.eclipse.sirius.ui/plugin.properties
@@ -1510,3 +1510,4 @@ _UI_GroupMenu_locationURI_feature = Location URI
 _UI_GroupMenu_locationURI_description = A <code>URI</code> specification that defines the insertion point at which the group will be added.
 _UI_GroupMenu_popupMenus_feature = Popup Menu
 _UI_GroupMenu_itemDescriptions_feature = Item
+_UI_IdentifiedElement_uid_feature = Uid
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/BasicLabelStyleItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/BasicLabelStyleItemProvider.java
index b958781513..816775234a 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/BasicLabelStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/BasicLabelStyleItemProvider.java
@@ -135,8 +135,9 @@ public class BasicLabelStyleItemProvider extends CustomizableItemProvider {
      */
     @Override
     public String getText(Object object) {
-        BasicLabelStyle basicLabelStyle = (BasicLabelStyle) object;
-        return getString("_UI_BasicLabelStyle_type") + " " + basicLabelStyle.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
+        String label = ((BasicLabelStyle) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_BasicLabelStyle_type") : //$NON-NLS-1$
+                getString("_UI_BasicLabelStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/CustomizableItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/CustomizableItemProvider.java
index fec7cf23e2..3099ef299d 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/CustomizableItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/CustomizableItemProvider.java
@@ -16,16 +16,10 @@ 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.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.sirius.viewpoint.Customizable;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
 
 /**
@@ -34,8 +28,7 @@ import org.eclipse.sirius.viewpoint.ViewpointPackage;
  *
  * @generated
  */
-public class CustomizableItemProvider extends ItemProviderAdapter
-        implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class CustomizableItemProvider extends IdentifiedElementItemProvider {
     /**
      * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -79,7 +72,9 @@ public class CustomizableItemProvider extends ItemProviderAdapter
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_Customizable_type"); //$NON-NLS-1$
+        String label = ((Customizable) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_Customizable_type") : //$NON-NLS-1$
+                getString("_UI_Customizable_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -106,14 +101,4 @@ public class CustomizableItemProvider extends ItemProviderAdapter
         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 SiriusEditPlugin.INSTANCE;
-    }
-
 }
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DAnalysisCustomDataItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DAnalysisCustomDataItemProvider.java
index 58479e0e9d..ef31e7802c 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DAnalysisCustomDataItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DAnalysisCustomDataItemProvider.java
@@ -16,18 +16,11 @@ 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.ecore.EcoreFactory;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-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.sirius.viewpoint.DAnalysisCustomData;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
@@ -38,8 +31,7 @@ import org.eclipse.sirius.viewpoint.ViewpointPackage;
  *
  * @generated
  */
-public class DAnalysisCustomDataItemProvider extends ItemProviderAdapter
-        implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class DAnalysisCustomDataItemProvider extends IdentifiedElementItemProvider {
     /**
      * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -123,7 +115,7 @@ public class DAnalysisCustomDataItemProvider extends ItemProviderAdapter
      */
     @Override
     public String getText(Object object) {
-        String label = ((DAnalysisCustomData) object).getKey();
+        String label = ((DAnalysisCustomData) object).getUid();
         return label == null || label.length() == 0 ? getString("_UI_DAnalysisCustomData_type") : //$NON-NLS-1$
                 getString("_UI_DAnalysisCustomData_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
@@ -163,14 +155,4 @@ public class DAnalysisCustomDataItemProvider extends ItemProviderAdapter
         newChildDescriptors.add(createChildParameter(ViewpointPackage.Literals.DANALYSIS_CUSTOM_DATA__DATA, EcoreFactory.eINSTANCE.createEObject()));
     }
 
-    /**
-     * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public ResourceLocator getResourceLocator() {
-        return SiriusEditPlugin.INSTANCE;
-    }
-
 }
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DAnalysisItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DAnalysisItemProvider.java
index fa30f47937..d633a2ac43 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DAnalysisItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DAnalysisItemProvider.java
@@ -16,17 +16,10 @@ 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.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.sirius.viewpoint.DAnalysis;
 import org.eclipse.sirius.viewpoint.ViewpointFactory;
@@ -39,8 +32,7 @@ import org.eclipse.sirius.viewpoint.description.DescriptionFactory;
  *
  * @generated
  */
-public class DAnalysisItemProvider extends ItemProviderAdapter
-        implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class DAnalysisItemProvider extends IdentifiedElementItemProvider {
     /**
      * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -177,7 +169,7 @@ public class DAnalysisItemProvider extends ItemProviderAdapter
      */
     @Override
     public String getText(Object object) {
-        String label = ((DAnalysis) object).getVersion();
+        String label = ((DAnalysis) object).getUid();
         return label == null || label.length() == 0 ? getString("_UI_DAnalysis_type") : //$NON-NLS-1$
                 getString("_UI_DAnalysis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
@@ -222,14 +214,4 @@ public class DAnalysisItemProvider extends ItemProviderAdapter
         newChildDescriptors.add(createChildParameter(ViewpointPackage.Literals.DANALYSIS__OWNED_VIEWS, ViewpointFactory.eINSTANCE.createDView()));
     }
 
-    /**
-     * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public ResourceLocator getResourceLocator() {
-        return SiriusEditPlugin.INSTANCE;
-    }
-
 }
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DFeatureExtensionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DFeatureExtensionItemProvider.java
index 02fbff5fae..38c8aee0be 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DFeatureExtensionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DFeatureExtensionItemProvider.java
@@ -16,15 +16,9 @@ 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.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+import org.eclipse.sirius.viewpoint.DFeatureExtension;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
 
 /**
@@ -33,8 +27,7 @@ import org.eclipse.sirius.viewpoint.ViewpointPackage;
  *
  * @generated
  */
-public class DFeatureExtensionItemProvider extends ItemProviderAdapter
-        implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class DFeatureExtensionItemProvider extends IdentifiedElementItemProvider {
     /**
      * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -78,7 +71,9 @@ public class DFeatureExtensionItemProvider extends ItemProviderAdapter
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_DFeatureExtension_type"); //$NON-NLS-1$
+        String label = ((DFeatureExtension) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_DFeatureExtension_type") : //$NON-NLS-1$
+                getString("_UI_DFeatureExtension_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -105,14 +100,4 @@ public class DFeatureExtensionItemProvider extends ItemProviderAdapter
         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 SiriusEditPlugin.INSTANCE;
-    }
-
 }
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DFileItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DFileItemProvider.java
index 21f7576ad4..13acdb76b1 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DFileItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DFileItemProvider.java
@@ -16,16 +16,9 @@ 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.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.sirius.viewpoint.DFile;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
@@ -36,7 +29,7 @@ import org.eclipse.sirius.viewpoint.ViewpointPackage;
  *
  * @generated
  */
-public class DFileItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class DFileItemProvider extends IdentifiedElementItemProvider {
     /**
      * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -137,14 +130,4 @@ public class DFileItemProvider extends ItemProviderAdapter implements IEditingDo
         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 SiriusEditPlugin.INSTANCE;
-    }
-
 }
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DRepresentationDescriptorItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DRepresentationDescriptorItemProvider.java
index 1f7afa3624..778a1c90c2 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DRepresentationDescriptorItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DRepresentationDescriptorItemProvider.java
@@ -16,8 +16,8 @@ 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.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
@@ -25,8 +25,9 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.sirius.viewpoint.DRepresentationDescriptor;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
+import org.eclipse.sirius.viewpoint.description.DescriptionFactory;
+import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
 import org.eclipse.sirius.viewpoint.description.RepresentationDescription;
-import org.eclipse.sirius.viewpoint.description.provider.DModelElementItemProvider;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.sirius.viewpoint.DRepresentationDescriptor} object. <!--
@@ -34,7 +35,7 @@ import org.eclipse.sirius.viewpoint.description.provider.DModelElementItemProvid
  *
  * @generated
  */
-public class DRepresentationDescriptorItemProvider extends DModelElementItemProvider {
+public class DRepresentationDescriptorItemProvider extends IdentifiedElementItemProvider {
     /**
      * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -100,6 +101,36 @@ public class DRepresentationDescriptorItemProvider extends DModelElementItemProv
     }
 
     /**
+     * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+     * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+     * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+        if (childrenFeatures == null) {
+            super.getChildrenFeatures(object);
+            childrenFeatures.add(DescriptionPackage.Literals.DMODEL_ELEMENT__EANNOTATIONS);
+        }
+        return childrenFeatures;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected EStructuralFeature getChildFeature(Object object, Object child) {
+        // Check the type of the specified child object and return the proper feature to use for
+        // adding (see {@link AddCommand}) it as a child.
+
+        return super.getChildFeature(object, child);
+    }
+
+    /**
      * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
@@ -188,6 +219,9 @@ public class DRepresentationDescriptorItemProvider extends DModelElementItemProv
         case ViewpointPackage.DREPRESENTATION_DESCRIPTOR__REP_PATH:
             fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
             return;
+        case ViewpointPackage.DREPRESENTATION_DESCRIPTOR__EANNOTATIONS:
+            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+            return;
         }
         super.notifyChanged(notification);
     }
@@ -201,16 +235,8 @@ public class DRepresentationDescriptorItemProvider extends DModelElementItemProv
     @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 SiriusEditPlugin.INSTANCE;
+        newChildDescriptors.add(createChildParameter(DescriptionPackage.Literals.DMODEL_ELEMENT__EANNOTATIONS, DescriptionFactory.eINSTANCE.createDAnnotation()));
     }
 
 }
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DRepresentationElementItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DRepresentationElementItemProvider.java
index b98028f100..31d616234b 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DRepresentationElementItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DRepresentationElementItemProvider.java
@@ -16,16 +16,9 @@ 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.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.sirius.viewpoint.DRepresentationElement;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
@@ -36,8 +29,7 @@ import org.eclipse.sirius.viewpoint.ViewpointPackage;
  *
  * @generated
  */
-public class DRepresentationElementItemProvider extends ItemProviderAdapter
-        implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class DRepresentationElementItemProvider extends IdentifiedElementItemProvider {
     /**
      * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -142,14 +134,4 @@ public class DRepresentationElementItemProvider extends ItemProviderAdapter
         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 SiriusEditPlugin.INSTANCE;
-    }
-
 }
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DRepresentationItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DRepresentationItemProvider.java
index b5d696ebd6..b55e64eb65 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DRepresentationItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DRepresentationItemProvider.java
@@ -16,7 +16,6 @@ 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.IItemPropertyDescriptor;
@@ -27,7 +26,6 @@ import org.eclipse.sirius.viewpoint.ViewpointFactory;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
 import org.eclipse.sirius.viewpoint.description.DescriptionFactory;
 import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
-import org.eclipse.sirius.viewpoint.description.provider.DocumentedElementItemProvider;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.sirius.viewpoint.DRepresentation} object. <!--
@@ -35,7 +33,7 @@ import org.eclipse.sirius.viewpoint.description.provider.DocumentedElementItemPr
  *
  * @generated
  */
-public class DRepresentationItemProvider extends DocumentedElementItemProvider {
+public class DRepresentationItemProvider extends IdentifiedElementItemProvider {
     /**
      * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -55,15 +53,28 @@ public class DRepresentationItemProvider extends DocumentedElementItemProvider {
         if (itemPropertyDescriptors == null) {
             super.getPropertyDescriptors(object);
 
+            addDocumentationPropertyDescriptor(object);
             addOwnedRepresentationElementsPropertyDescriptor(object);
             addRepresentationElementsPropertyDescriptor(object);
             addNamePropertyDescriptor(object);
-            addUidPropertyDescriptor(object);
         }
         return itemPropertyDescriptors;
     }
 
     /**
+     * This adds a property descriptor for the Documentation feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected void addDocumentationPropertyDescriptor(Object object) {
+        itemPropertyDescriptors
+                .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DocumentedElement_documentation_feature"), //$NON-NLS-1$
+                        getString("_UI_DocumentedElement_documentation_description"), //$NON-NLS-1$
+                        DescriptionPackage.Literals.DOCUMENTED_ELEMENT__DOCUMENTATION, true, true, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_DocumentationPropertyCategory"), //$NON-NLS-1$
+                        null));
+    }
+
+    /**
      * This adds a property descriptor for the Owned Representation Elements feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      *
@@ -102,18 +113,6 @@ public class DRepresentationItemProvider extends DocumentedElementItemProvider {
     }
 
     /**
-     * This adds a property descriptor for the Uid feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    protected void addUidPropertyDescriptor(Object object) {
-        itemPropertyDescriptors
-                .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DRepresentation_uid_feature"), //$NON-NLS-1$
-                        getString("_UI_PropertyDescriptor_description", "_UI_DRepresentation_uid_feature", "_UI_DRepresentation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-                        ViewpointPackage.Literals.DREPRESENTATION__UID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-    }
-
-    /**
      * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
      * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
      * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
@@ -169,8 +168,8 @@ public class DRepresentationItemProvider extends DocumentedElementItemProvider {
         updateChildren(notification);
 
         switch (notification.getFeatureID(DRepresentation.class)) {
+        case ViewpointPackage.DREPRESENTATION__DOCUMENTATION:
         case ViewpointPackage.DREPRESENTATION__NAME:
-        case ViewpointPackage.DREPRESENTATION__UID:
             fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
             return;
         case ViewpointPackage.DREPRESENTATION__EANNOTATIONS:
@@ -199,14 +198,4 @@ public class DRepresentationItemProvider extends DocumentedElementItemProvider {
         newChildDescriptors.add(createChildParameter(ViewpointPackage.Literals.DREPRESENTATION__UI_STATE, ViewpointFactory.eINSTANCE.createUIState()));
     }
 
-    /**
-     * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public ResourceLocator getResourceLocator() {
-        return SiriusEditPlugin.INSTANCE;
-    }
-
 }
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DResourceContainerItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DResourceContainerItemProvider.java
index 7af08f5a9f..b4f9dbf30e 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DResourceContainerItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DResourceContainerItemProvider.java
@@ -16,17 +16,10 @@ 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.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.sirius.viewpoint.DResourceContainer;
 import org.eclipse.sirius.viewpoint.ViewpointFactory;
@@ -38,8 +31,7 @@ import org.eclipse.sirius.viewpoint.ViewpointPackage;
  *
  * @generated
  */
-public class DResourceContainerItemProvider extends ItemProviderAdapter
-        implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class DResourceContainerItemProvider extends IdentifiedElementItemProvider {
     /**
      * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -183,14 +175,4 @@ public class DResourceContainerItemProvider extends ItemProviderAdapter
         newChildDescriptors.add(createChildParameter(ViewpointPackage.Literals.DRESOURCE_CONTAINER__MEMBERS, ViewpointFactory.eINSTANCE.createDModel()));
     }
 
-    /**
-     * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public ResourceLocator getResourceLocator() {
-        return SiriusEditPlugin.INSTANCE;
-    }
-
 }
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DSemanticDecoratorItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DSemanticDecoratorItemProvider.java
index 8549e601c7..a7775b8c4a 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DSemanticDecoratorItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DSemanticDecoratorItemProvider.java
@@ -16,15 +16,9 @@ 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.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+import org.eclipse.sirius.viewpoint.DSemanticDecorator;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
 
 /**
@@ -33,8 +27,7 @@ import org.eclipse.sirius.viewpoint.ViewpointPackage;
  *
  * @generated
  */
-public class DSemanticDecoratorItemProvider extends ItemProviderAdapter
-        implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class DSemanticDecoratorItemProvider extends IdentifiedElementItemProvider {
     /**
      * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -78,7 +71,9 @@ public class DSemanticDecoratorItemProvider extends ItemProviderAdapter
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_DSemanticDecorator_type"); //$NON-NLS-1$
+        String label = ((DSemanticDecorator) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_DSemanticDecorator_type") : //$NON-NLS-1$
+                getString("_UI_DSemanticDecorator_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -105,14 +100,4 @@ public class DSemanticDecoratorItemProvider extends ItemProviderAdapter
         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 SiriusEditPlugin.INSTANCE;
-    }
-
 }
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DViewItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DViewItemProvider.java
index da4dcad427..02ca2249c5 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DViewItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DViewItemProvider.java
@@ -16,16 +16,9 @@ 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.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.sirius.viewpoint.DView;
 import org.eclipse.sirius.viewpoint.ViewpointFactory;
@@ -37,7 +30,7 @@ import org.eclipse.sirius.viewpoint.ViewpointPackage;
  *
  * @generated
  */
-public class DViewItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class DViewItemProvider extends IdentifiedElementItemProvider {
     /**
      * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -133,7 +126,9 @@ public class DViewItemProvider extends ItemProviderAdapter implements IEditingDo
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_DView_type"); //$NON-NLS-1$
+        String label = ((DView) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_DView_type") : //$NON-NLS-1$
+                getString("_UI_DView_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -171,14 +166,4 @@ public class DViewItemProvider extends ItemProviderAdapter implements IEditingDo
         newChildDescriptors.add(createChildParameter(ViewpointPackage.Literals.DVIEW__OWNED_EXTENSIONS, ViewpointFactory.eINSTANCE.createMetaModelExtension()));
     }
 
-    /**
-     * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public ResourceLocator getResourceLocator() {
-        return SiriusEditPlugin.INSTANCE;
-    }
-
 }
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DecorationItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DecorationItemProvider.java
index 63855527a4..0c6571ab51 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DecorationItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DecorationItemProvider.java
@@ -16,15 +16,9 @@ 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.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+import org.eclipse.sirius.viewpoint.Decoration;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
 
 /**
@@ -33,8 +27,7 @@ import org.eclipse.sirius.viewpoint.ViewpointPackage;
  *
  * @generated
  */
-public class DecorationItemProvider extends ItemProviderAdapter
-        implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class DecorationItemProvider extends IdentifiedElementItemProvider {
     /**
      * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -88,7 +81,9 @@ public class DecorationItemProvider extends ItemProviderAdapter
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_Decoration_type"); //$NON-NLS-1$
+        String label = ((Decoration) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_Decoration_type") : //$NON-NLS-1$
+                getString("_UI_Decoration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -115,14 +110,4 @@ public class DecorationItemProvider extends ItemProviderAdapter
         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 SiriusEditPlugin.INSTANCE;
-    }
-
 }
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/IdentifiedElementItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/IdentifiedElementItemProvider.java
new file mode 100644
index 0000000000..1ac5685c7a
--- /dev/null
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/IdentifiedElementItemProvider.java
@@ -0,0 +1,129 @@
+/**
+ * Copyright (c) 2007, 2017 THALES GLOBAL SERVICES.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.viewpoint.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.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.sirius.viewpoint.IdentifiedElement;
+import org.eclipse.sirius.viewpoint.ViewpointPackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.sirius.viewpoint.IdentifiedElement} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class IdentifiedElementItemProvider 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 IdentifiedElementItemProvider(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);
+
+            addUidPropertyDescriptor(object);
+        }
+        return itemPropertyDescriptors;
+    }
+
+    /**
+     * This adds a property descriptor for the Uid feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected void addUidPropertyDescriptor(Object object) {
+        itemPropertyDescriptors
+                .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_IdentifiedElement_uid_feature"), //$NON-NLS-1$
+                        getString("_UI_PropertyDescriptor_description", "_UI_IdentifiedElement_uid_feature", "_UI_IdentifiedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                        ViewpointPackage.Literals.IDENTIFIED_ELEMENT__UID, false, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    }
+
+    /**
+     * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public String getText(Object object) {
+        String label = ((IdentifiedElement) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_IdentifiedElement_type") : //$NON-NLS-1$
+                getString("_UI_IdentifiedElement_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+    }
+
+    /**
+     * 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(IdentifiedElement.class)) {
+        case ViewpointPackage.IDENTIFIED_ELEMENT__UID:
+            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 SiriusEditPlugin.INSTANCE;
+    }
+
+}
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/LabelStyleItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/LabelStyleItemProvider.java
index bbacefebdf..0250a1d25b 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/LabelStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/LabelStyleItemProvider.java
@@ -84,8 +84,9 @@ public class LabelStyleItemProvider extends BasicLabelStyleItemProvider {
      */
     @Override
     public String getText(Object object) {
-        LabelStyle labelStyle = (LabelStyle) object;
-        return getString("_UI_LabelStyle_type") + " " + labelStyle.getLabelSize(); //$NON-NLS-1$ //$NON-NLS-2$
+        String label = ((LabelStyle) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_LabelStyle_type") : //$NON-NLS-1$
+                getString("_UI_LabelStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/MetaModelExtensionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/MetaModelExtensionItemProvider.java
index 86075ac70c..f46a036dbd 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/MetaModelExtensionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/MetaModelExtensionItemProvider.java
@@ -16,15 +16,9 @@ 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.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+import org.eclipse.sirius.viewpoint.MetaModelExtension;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
 
 /**
@@ -33,8 +27,7 @@ import org.eclipse.sirius.viewpoint.ViewpointPackage;
  *
  * @generated
  */
-public class MetaModelExtensionItemProvider extends ItemProviderAdapter
-        implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class MetaModelExtensionItemProvider extends IdentifiedElementItemProvider {
     /**
      * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -88,7 +81,9 @@ public class MetaModelExtensionItemProvider extends ItemProviderAdapter
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_MetaModelExtension_type"); //$NON-NLS-1$
+        String label = ((MetaModelExtension) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_MetaModelExtension_type") : //$NON-NLS-1$
+                getString("_UI_MetaModelExtension_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -115,14 +110,4 @@ public class MetaModelExtensionItemProvider extends ItemProviderAdapter
         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 SiriusEditPlugin.INSTANCE;
-    }
-
 }
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/StyleItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/StyleItemProvider.java
index 85057321e8..0df1b832a0 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/StyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/StyleItemProvider.java
@@ -16,16 +16,10 @@ 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.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.sirius.viewpoint.Style;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
 
 /**
@@ -34,7 +28,7 @@ import org.eclipse.sirius.viewpoint.ViewpointPackage;
  *
  * @generated
  */
-public class StyleItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class StyleItemProvider extends IdentifiedElementItemProvider {
     /**
      * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -90,7 +84,9 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_Style_type"); //$NON-NLS-1$
+        String label = ((Style) object).getUid();
+        return label == null || label.length() == 0 ? getString("_UI_Style_type") : //$NON-NLS-1$
+                getString("_UI_Style_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -117,14 +113,4 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
         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 SiriusEditPlugin.INSTANCE;
-    }
-
 }
diff --git a/plugins/org.eclipse.sirius/model/viewpoint.ecore b/plugins/org.eclipse.sirius/model/viewpoint.ecore
index 22f51a278b..67eeb4eb07 100644
--- a/plugins/org.eclipse.sirius/model/viewpoint.ecore
+++ b/plugins/org.eclipse.sirius/model/viewpoint.ecore
@@ -5,7 +5,11 @@
     <details key="deprecated" value="Anything tagged as deprecated will disappear quite soon.&#xA;&#xA;"/>
     <details key="to be renamed" value="Anything tagged &quot;to be renamed&quot; will be renamed, at least in the UI&#xA;"/>
   </eAnnotations>
-  <eClassifiers xsi:type="ecore:EClass" name="DAnalysis">
+  <eClassifiers xsi:type="ecore:EClass" name="IdentifiedElement" abstract="true">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="uid" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"
+        iD="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="DAnalysis" eSuperTypes="#//IdentifiedElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="referencedAnalysis" upperBound="-1"
         eType="#//DAnalysis"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="semanticResources" upperBound="-1"
@@ -23,7 +27,7 @@
         upperBound="-1" eType="#//DFeatureExtension" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DFeatureExtension" abstract="true">
+  <eClassifiers xsi:type="ecore:EClass" name="DFeatureExtension" abstract="true" eSuperTypes="#//IdentifiedElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="description" lowerBound="1"
         eType="#//description/FeatureExtensionDescription"/>
   </eClassifiers>
@@ -52,7 +56,8 @@
       </eAnnotations>
     </eOperations>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DSemanticDecorator" abstract="true">
+  <eClassifiers xsi:type="ecore:EClass" name="DSemanticDecorator" abstract="true"
+      eSuperTypes="#//IdentifiedElement">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="An element that has a link to the semantic model."/>
     </eAnnotations>
@@ -63,7 +68,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DRepresentationDescriptor" eSuperTypes="#//description/DModelElement">
+  <eClassifiers xsi:type="ecore:EClass" name="DRepresentationDescriptor" eSuperTypes="#//IdentifiedElement #//description/DModelElement">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"
         defaultValueLiteral="">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
@@ -91,7 +96,7 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="repPath" lowerBound="1"
         eType="#//ResourceDescriptor"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DRepresentation" abstract="true" eSuperTypes="#//description/DocumentedElement #//DRefreshable #//description/DModelElement">
+  <eClassifiers xsi:type="ecore:EClass" name="DRepresentation" abstract="true" eSuperTypes="#//IdentifiedElement #//description/DModelElement #//description/DocumentedElement #//DRefreshable">
     <eStructuralFeatures xsi:type="ecore:EReference" name="ownedRepresentationElements"
         upperBound="-1" eType="#//DRepresentationElement" changeable="false" volatile="true"
         transient="true" derived="true">
@@ -116,10 +121,9 @@
         upperBound="-1" eType="#//description/AnnotationEntry" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="uiState" eType="#//UIState"
         transient="true" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="uid" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="DRepresentationElement" abstract="true"
-      eSuperTypes="#//DMappingBased #//DStylizable #//DRefreshable #//DSemanticDecorator">
+      eSuperTypes="#//IdentifiedElement #//DMappingBased #//DStylizable #//DRefreshable #//DSemanticDecorator">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"
         defaultValueLiteral="">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
@@ -133,7 +137,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DView" eSuperTypes="#//DRefreshable">
+  <eClassifiers xsi:type="ecore:EClass" name="DView" eSuperTypes="#//IdentifiedElement #//DRefreshable">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="An view is the root element"/>
     </eAnnotations>
@@ -159,7 +163,7 @@
         eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"
         changeable="false" volatile="true" transient="true" derived="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MetaModelExtension">
+  <eClassifiers xsi:type="ecore:EClass" name="MetaModelExtension" eSuperTypes="#//IdentifiedElement">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Represent a Meta Model extension.&#xD;&#xA;A meta model extension adds types, attributes and references into an existing meta model"/>
     </eAnnotations>
@@ -170,7 +174,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Decoration">
+  <eClassifiers xsi:type="ecore:EClass" name="Decoration" eSuperTypes="#//IdentifiedElement">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Represent a decoration of a diagram element with a specific icon, based on its relationships with MetaElements of the MetaModel.&#xD;&#xA;"/>
     </eAnnotations>
@@ -181,7 +185,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DAnalysisCustomData">
+  <eClassifiers xsi:type="ecore:EClass" name="DAnalysisCustomData" eSuperTypes="#//IdentifiedElement">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="data" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"
         containment="true"/>
@@ -201,7 +205,7 @@
     <eLiterals name="underline" value="2"/>
     <eLiterals name="strike_through" value="3"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Style" abstract="true" eSuperTypes="#//DRefreshable #//Customizable">
+  <eClassifiers xsi:type="ecore:EClass" name="Style" abstract="true" eSuperTypes="#//IdentifiedElement #//DRefreshable #//Customizable">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="The super class of all styles."/>
     </eAnnotations>
@@ -240,8 +244,8 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="path" lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DFile" eSuperTypes="#//DResource"/>
-  <eClassifiers xsi:type="ecore:EClass" name="DResourceContainer" eSuperTypes="#//DResource">
+  <eClassifiers xsi:type="ecore:EClass" name="DFile" eSuperTypes="#//IdentifiedElement #//DResource"/>
+  <eClassifiers xsi:type="ecore:EClass" name="DResourceContainer" eSuperTypes="#//IdentifiedElement #//DResource">
     <eStructuralFeatures xsi:type="ecore:EReference" name="members" upperBound="-1"
         eType="#//DResource" containment="true"/>
   </eClassifiers>
@@ -279,7 +283,7 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="labelColor" eType="#//RGBValues"
         defaultValueLiteral="0,0,0"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Customizable" abstract="true">
+  <eClassifiers xsi:type="ecore:EClass" name="Customizable" abstract="true" eSuperTypes="#//IdentifiedElement">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="customFeatures" upperBound="-1"
         eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
   </eClassifiers>
diff --git a/plugins/org.eclipse.sirius/model/viewpoint.genmodel b/plugins/org.eclipse.sirius/model/viewpoint.genmodel
index c330430791..f1968cba7f 100644
--- a/plugins/org.eclipse.sirius/model/viewpoint.genmodel
+++ b/plugins/org.eclipse.sirius/model/viewpoint.genmodel
@@ -29,6 +29,9 @@
     </genEnums>
     <genDataTypes ecoreDataType="viewpoint.ecore#//RGBValues"/>
     <genDataTypes ecoreDataType="viewpoint.ecore#//ResourceDescriptor"/>
+    <genClasses image="false" ecoreClass="viewpoint.ecore#//IdentifiedElement">
+      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute viewpoint.ecore#//IdentifiedElement/uid"/>
+    </genClasses>
     <genClasses ecoreClass="viewpoint.ecore#//DAnalysis">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference viewpoint.ecore#//DAnalysis/referencedAnalysis"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute viewpoint.ecore#//DAnalysis/semanticResources"/>
@@ -67,7 +70,6 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute viewpoint.ecore#//DRepresentation/name"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference viewpoint.ecore#//DRepresentation/ownedAnnotationEntries"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference viewpoint.ecore#//DRepresentation/uiState"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute viewpoint.ecore#//DRepresentation/uid"/>
     </genClasses>
     <genClasses image="false" ecoreClass="viewpoint.ecore#//DRepresentationElement">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute viewpoint.ecore#//DRepresentationElement/name"/>
diff --git a/plugins/org.eclipse.sirius/plugin.properties b/plugins/org.eclipse.sirius/plugin.properties
index 4f4506404c..1a0be97091 100644
--- a/plugins/org.eclipse.sirius/plugin.properties
+++ b/plugins/org.eclipse.sirius/plugin.properties
@@ -92,6 +92,7 @@ AbstractSiriusMigrationService_contributionInstantiationErrorMsg = Cannot instan
 AbstractVersionSAXParser_getVersionMsg = Get version number of representations file
 AbstractVersionSAXParser_stopParsingMsg = All needed informations have been reached. Stop the parsing.
 AddSemanticResourceCommand_label = Add Model
+AirDResourceImpl_nullUid = IdentifiedElement.uid should not be null
 AnalysisResourceReloadedCommand_label = Reload {0} file
 AttachSemanticResourcesJob_name = Attach semantic resources
 ChangeContextTask_label = change the context
@@ -345,6 +346,7 @@ SiriusTasksKey_changeSWTTableLineVisibleSate = Change the visible state of a lin
 SiriusTasksKey_openTree = Open tree
 SiriusUncontrolCommand_label = Uncontrol resource
 SiriusUncontrolCommand_resourceDeletionFailedMsg = Resource deletion failed
+TechnicalUidMigrationParticipant_message = Migration done on {0} for "xmi:id to uid serialization conversion" (the result of this migration will be saved on the next session save): \n - the new "uid" attributes of Sirius model elements have been initialized from the values of the previously used "xmi:id".\n - the "uid" of DDiagram/DTable/DTree are kept and now used as their URI fragment. For exemple the "element" attribute of GMF Notation Diagram now corresponds to the uid of the referenced DDiagram instead its previous "xmi:id".
 UnexecutableTask_label = unexecutable task
 UnsetTask_nullOperationErrorMsg = unsetOp is null
 UnsetTask_label = unset the value
diff --git a/plugins/org.eclipse.sirius/plugin.xml b/plugins/org.eclipse.sirius/plugin.xml
index a4e2016eaf..acdb32d8d3 100644
--- a/plugins/org.eclipse.sirius/plugin.xml
+++ b/plugins/org.eclipse.sirius/plugin.xml
@@ -422,6 +422,10 @@
             class="org.eclipse.sirius.business.internal.migration.EmptyMigrationForPropertyViewMigrationParticipant"
             kind="VSM">
       </participant>
+      <participant
+            class="org.eclipse.sirius.business.internal.migration.TechnicalUidMigrationParticipant"
+            kind="RepresentationsFile">
+      </participant>
    </extension>
 
    <extension point="org.eclipse.emf.ecore.extension_parser">
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/Customizable.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/Customizable.java
index 4a136b89c7..6206c6932e 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/Customizable.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/Customizable.java
@@ -12,7 +12,6 @@
 package org.eclipse.sirius.viewpoint;
 
 import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Customizable</b></em>'. <!-- end-user-doc -->
@@ -28,7 +27,7 @@ import org.eclipse.emf.ecore.EObject;
  * @model abstract="true"
  * @generated
  */
-public interface Customizable extends EObject {
+public interface Customizable extends IdentifiedElement {
     /**
      * Returns the value of the '<em><b>Custom Features</b></em>' attribute list. The list contents are of type
      * {@link java.lang.String}. <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DAnalysis.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DAnalysis.java
index b0ef3d8d98..d26e72913e 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DAnalysis.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DAnalysis.java
@@ -37,7 +37,7 @@ import org.eclipse.sirius.viewpoint.description.DAnnotationEntry;
  * @model
  * @generated
  */
-public interface DAnalysis extends EObject {
+public interface DAnalysis extends IdentifiedElement {
     /**
      * Returns the value of the '<em><b>Referenced Analysis</b></em>' reference list. The list contents are of type
      * {@link org.eclipse.sirius.viewpoint.DAnalysis}. <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DAnalysisCustomData.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DAnalysisCustomData.java
index 36c310e47c..78710a43ee 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DAnalysisCustomData.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DAnalysisCustomData.java
@@ -29,7 +29,7 @@ import org.eclipse.emf.ecore.EObject;
  * @model
  * @generated
  */
-public interface DAnalysisCustomData extends EObject {
+public interface DAnalysisCustomData extends IdentifiedElement {
     /**
      * Returns the value of the '<em><b>Key</b></em>' attribute. <!-- begin-user-doc -->
      * <p>
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DFeatureExtension.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DFeatureExtension.java
index 895a81bb32..ac48e256fa 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DFeatureExtension.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DFeatureExtension.java
@@ -11,7 +11,6 @@
  */
 package org.eclipse.sirius.viewpoint;
 
-import org.eclipse.emf.ecore.EObject;
 import org.eclipse.sirius.viewpoint.description.FeatureExtensionDescription;
 
 /**
@@ -29,7 +28,7 @@ import org.eclipse.sirius.viewpoint.description.FeatureExtensionDescription;
  * @model abstract="true"
  * @generated
  */
-public interface DFeatureExtension extends EObject {
+public interface DFeatureExtension extends IdentifiedElement {
     /**
      * Returns the value of the '<em><b>Description</b></em>' reference. <!-- begin-user-doc -->
      * <p>
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DFile.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DFile.java
index 1f4d7209e7..06817160a7 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DFile.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DFile.java
@@ -19,5 +19,5 @@ package org.eclipse.sirius.viewpoint;
  * @model
  * @generated
  */
-public interface DFile extends DResource {
+public interface DFile extends IdentifiedElement, DResource {
 } // DFile
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DRepresentation.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DRepresentation.java
index c66e95e523..ead4793cf9 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DRepresentation.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DRepresentation.java
@@ -38,7 +38,7 @@ import org.eclipse.sirius.viewpoint.description.DocumentedElement;
  * @model abstract="true"
  * @generated
  */
-public interface DRepresentation extends DocumentedElement, DRefreshable, DModelElement {
+public interface DRepresentation extends IdentifiedElement, DModelElement, DocumentedElement, DRefreshable {
     /**
      * Returns the value of the '<em><b>Owned Representation Elements</b></em>' reference list. The list contents are of
      * type {@link org.eclipse.sirius.viewpoint.DRepresentationElement}. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -130,30 +130,4 @@ public interface DRepresentation extends DocumentedElement, DRefreshable, DModel
      */
     void setUiState(UIState value);
 
-    /**
-     * Returns the value of the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Uid</em>' attribute isn't clear, there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     *
-     * @return the value of the '<em>Uid</em>' attribute.
-     * @see #setUid(String)
-     * @see org.eclipse.sirius.viewpoint.ViewpointPackage#getDRepresentation_Uid()
-     * @model
-     * @generated
-     */
-    String getUid();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.sirius.viewpoint.DRepresentation#getUid <em>Uid</em>}' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @param value
-     *            the new value of the '<em>Uid</em>' attribute.
-     * @see #getUid()
-     * @generated
-     */
-    void setUid(String value);
-
 } // DRepresentation
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DRepresentationDescriptor.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DRepresentationDescriptor.java
index 962a777f01..ce6bdc13ba 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DRepresentationDescriptor.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DRepresentationDescriptor.java
@@ -39,7 +39,7 @@ import org.eclipse.sirius.viewpoint.description.RepresentationDescription;
  * @model
  * @generated
  */
-public interface DRepresentationDescriptor extends DModelElement {
+public interface DRepresentationDescriptor extends IdentifiedElement, DModelElement {
     /**
      * Returns the value of the '<em><b>Name</b></em>' attribute. The default value is <code>""</code>. <!--
      * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> The name of the representation. <!--
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DRepresentationElement.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DRepresentationElement.java
index 8899c0aab6..d030f6b5ca 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DRepresentationElement.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DRepresentationElement.java
@@ -30,7 +30,7 @@ import org.eclipse.emf.ecore.EObject;
  * @model abstract="true"
  * @generated
  */
-public interface DRepresentationElement extends DMappingBased, DStylizable, DRefreshable, DSemanticDecorator {
+public interface DRepresentationElement extends IdentifiedElement, DMappingBased, DStylizable, DRefreshable, DSemanticDecorator {
     /**
      * Returns the value of the '<em><b>Name</b></em>' attribute. The default value is <code>""</code>. <!--
      * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> The name of the element. It is the name that is
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DResourceContainer.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DResourceContainer.java
index bd516ba751..f42b30f3f3 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DResourceContainer.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DResourceContainer.java
@@ -28,7 +28,7 @@ import org.eclipse.emf.common.util.EList;
  * @model
  * @generated
  */
-public interface DResourceContainer extends DResource {
+public interface DResourceContainer extends IdentifiedElement, DResource {
     /**
      * Returns the value of the '<em><b>Members</b></em>' containment reference list. The list contents are of type
      * {@link org.eclipse.sirius.viewpoint.DResource}. <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DSemanticDecorator.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DSemanticDecorator.java
index bccd12e0dd..8c333310bf 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DSemanticDecorator.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DSemanticDecorator.java
@@ -30,7 +30,7 @@ import org.eclipse.emf.ecore.EObject;
  * @model abstract="true"
  * @generated
  */
-public interface DSemanticDecorator extends EObject {
+public interface DSemanticDecorator extends IdentifiedElement {
     /**
      * Returns the value of the '<em><b>Target</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
      * begin-model-doc --> The referenced EObject. <!-- end-model-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DView.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DView.java
index 6365cf87c5..f8cfc731c8 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DView.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/DView.java
@@ -35,7 +35,7 @@ import org.eclipse.sirius.viewpoint.description.Viewpoint;
  * @model
  * @generated
  */
-public interface DView extends DRefreshable {
+public interface DView extends IdentifiedElement, DRefreshable {
     /**
      * Returns the value of the '<em><b>Viewpoint</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
      * <!-- begin-model-doc --> The viewpoint that is used for this view <!-- end-model-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/Decoration.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/Decoration.java
index f53a1374ff..a072b8a6a5 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/Decoration.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/Decoration.java
@@ -11,7 +11,6 @@
  */
 package org.eclipse.sirius.viewpoint;
 
-import org.eclipse.emf.ecore.EObject;
 import org.eclipse.sirius.viewpoint.description.DecorationDescription;
 
 /**
@@ -33,7 +32,7 @@ import org.eclipse.sirius.viewpoint.description.DecorationDescription;
  * @model
  * @generated
  */
-public interface Decoration extends EObject {
+public interface Decoration extends IdentifiedElement {
     /**
      * Returns the value of the '<em><b>Description</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
      * <!-- begin-model-doc --> The referenced DecorationDescription. <!-- end-model-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/IdentifiedElement.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/IdentifiedElement.java
new file mode 100644
index 0000000000..82bd963fde
--- /dev/null
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/IdentifiedElement.java
@@ -0,0 +1,58 @@
+/**
+ * Copyright (c) 2007, 2017 THALES GLOBAL SERVICES.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.viewpoint;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Identified Element</b></em>'. <!-- end-user-doc
+ * -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.sirius.viewpoint.IdentifiedElement#getUid <em>Uid</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.sirius.viewpoint.ViewpointPackage#getIdentifiedElement()
+ * @model abstract="true"
+ * @generated
+ */
+public interface IdentifiedElement extends EObject {
+    /**
+     * Returns the value of the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Uid</em>' attribute isn't clear, there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     *
+     * @return the value of the '<em>Uid</em>' attribute.
+     * @see #setUid(String)
+     * @see org.eclipse.sirius.viewpoint.ViewpointPackage#getIdentifiedElement_Uid()
+     * @model id="true"
+     * @generated
+     */
+    String getUid();
+
+    /**
+     * Sets the value of the '{@link org.eclipse.sirius.viewpoint.IdentifiedElement#getUid <em>Uid</em>}' attribute.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @param value
+     *            the new value of the '<em>Uid</em>' attribute.
+     * @see #getUid()
+     * @generated
+     */
+    void setUid(String value);
+
+} // IdentifiedElement
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/MetaModelExtension.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/MetaModelExtension.java
index 04aa6736b6..906cb51598 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/MetaModelExtension.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/MetaModelExtension.java
@@ -31,7 +31,7 @@ import org.eclipse.emf.ecore.EObject;
  * @model
  * @generated
  */
-public interface MetaModelExtension extends EObject {
+public interface MetaModelExtension extends IdentifiedElement {
     /**
      * Returns the value of the '<em><b>Extension Group</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc
      * --> <!-- begin-model-doc --> The referenced meta model extension. It should be an instance of ExtensionGroup.
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/Style.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/Style.java
index 419194b435..ce37f7e6b9 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/Style.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/Style.java
@@ -29,7 +29,7 @@ import org.eclipse.sirius.viewpoint.description.style.StyleDescription;
  * @model abstract="true"
  * @generated
  */
-public interface Style extends DRefreshable, Customizable {
+public interface Style extends IdentifiedElement, DRefreshable, Customizable {
     /**
      * Returns the value of the '<em><b>Description</b></em>' reference. <!-- begin-user-doc -->
      * <p>
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/ViewpointPackage.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/ViewpointPackage.java
index 046e804425..72bd71840a 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/ViewpointPackage.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/ViewpointPackage.java
@@ -17,7 +17,6 @@ import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
-import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
 
 /**
  * <!-- begin-user-doc --> The <b>Package</b> for the model. It contains accessors for the meta objects to represent
@@ -64,6 +63,33 @@ public interface ViewpointPackage extends EPackage {
     ViewpointPackage eINSTANCE = org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl.init();
 
     /**
+     * The meta object id for the '{@link org.eclipse.sirius.viewpoint.impl.IdentifiedElementImpl <em>Identified
+     * Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @see org.eclipse.sirius.viewpoint.impl.IdentifiedElementImpl
+     * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getIdentifiedElement()
+     * @generated
+     */
+    int IDENTIFIED_ELEMENT = 0;
+
+    /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int IDENTIFIED_ELEMENT__UID = 0;
+
+    /**
+     * The number of structural features of the '<em>Identified Element</em>' class. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int IDENTIFIED_ELEMENT_FEATURE_COUNT = 1;
+
+    /**
      * The meta object id for the '{@link org.eclipse.sirius.viewpoint.impl.DAnalysisImpl <em>DAnalysis</em>}' class.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -71,7 +97,15 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getDAnalysis()
      * @generated
      */
-    int DANALYSIS = 0;
+    int DANALYSIS = 1;
+
+    /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DANALYSIS__UID = ViewpointPackage.IDENTIFIED_ELEMENT__UID;
 
     /**
      * The feature id for the '<em><b>Referenced Analysis</b></em>' reference list. <!-- begin-user-doc --> <!--
@@ -80,7 +114,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DANALYSIS__REFERENCED_ANALYSIS = 0;
+    int DANALYSIS__REFERENCED_ANALYSIS = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 0;
 
     /**
      * The feature id for the '<em><b>Semantic Resources</b></em>' attribute list. <!-- begin-user-doc --> <!--
@@ -89,7 +123,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DANALYSIS__SEMANTIC_RESOURCES = 1;
+    int DANALYSIS__SEMANTIC_RESOURCES = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 1;
 
     /**
      * The feature id for the '<em><b>Models</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -97,7 +131,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DANALYSIS__MODELS = 2;
+    int DANALYSIS__MODELS = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 2;
 
     /**
      * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list. <!-- begin-user-doc --> <!--
@@ -106,7 +140,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DANALYSIS__EANNOTATIONS = 3;
+    int DANALYSIS__EANNOTATIONS = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 3;
 
     /**
      * The feature id for the '<em><b>Owned Views</b></em>' containment reference list. <!-- begin-user-doc --> <!--
@@ -115,7 +149,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DANALYSIS__OWNED_VIEWS = 4;
+    int DANALYSIS__OWNED_VIEWS = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 4;
 
     /**
      * The feature id for the '<em><b>Selected Views</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc
@@ -124,7 +158,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DANALYSIS__SELECTED_VIEWS = 5;
+    int DANALYSIS__SELECTED_VIEWS = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 5;
 
     /**
      * The feature id for the '<em><b>Owned Feature Extensions</b></em>' containment reference list. <!-- begin-user-doc
@@ -133,7 +167,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DANALYSIS__OWNED_FEATURE_EXTENSIONS = 6;
+    int DANALYSIS__OWNED_FEATURE_EXTENSIONS = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 6;
 
     /**
      * The feature id for the '<em><b>Version</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -141,7 +175,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DANALYSIS__VERSION = 7;
+    int DANALYSIS__VERSION = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 7;
 
     /**
      * The number of structural features of the '<em>DAnalysis</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
@@ -150,7 +184,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DANALYSIS_FEATURE_COUNT = 8;
+    int DANALYSIS_FEATURE_COUNT = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 8;
 
     /**
      * The meta object id for the '{@link org.eclipse.sirius.viewpoint.impl.DFeatureExtensionImpl <em>DFeature
@@ -160,7 +194,15 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getDFeatureExtension()
      * @generated
      */
-    int DFEATURE_EXTENSION = 1;
+    int DFEATURE_EXTENSION = 2;
+
+    /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DFEATURE_EXTENSION__UID = ViewpointPackage.IDENTIFIED_ELEMENT__UID;
 
     /**
      * The feature id for the '<em><b>Description</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -168,7 +210,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DFEATURE_EXTENSION__DESCRIPTION = 0;
+    int DFEATURE_EXTENSION__DESCRIPTION = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 0;
 
     /**
      * The number of structural features of the '<em>DFeature Extension</em>' class. <!-- begin-user-doc --> <!--
@@ -177,7 +219,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DFEATURE_EXTENSION_FEATURE_COUNT = 1;
+    int DFEATURE_EXTENSION_FEATURE_COUNT = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 1;
 
     /**
      * The meta object id for the '{@link org.eclipse.sirius.viewpoint.DStylizable <em>DStylizable</em>}' class. <!--
@@ -187,7 +229,7 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getDStylizable()
      * @generated
      */
-    int DSTYLIZABLE = 2;
+    int DSTYLIZABLE = 3;
 
     /**
      * The number of structural features of the '<em>DStylizable</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
@@ -206,7 +248,7 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getDRefreshable()
      * @generated
      */
-    int DREFRESHABLE = 3;
+    int DREFRESHABLE = 4;
 
     /**
      * The number of structural features of the '<em>DRefreshable</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
@@ -225,7 +267,7 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getDMappingBased()
      * @generated
      */
-    int DMAPPING_BASED = 4;
+    int DMAPPING_BASED = 5;
 
     /**
      * The number of structural features of the '<em>DMapping Based</em>' class. <!-- begin-user-doc --> <!--
@@ -244,7 +286,7 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getDView()
      * @generated
      */
-    int DVIEW = 9;
+    int DVIEW = 10;
 
     /**
      * The meta object id for the '{@link org.eclipse.sirius.viewpoint.impl.DSemanticDecoratorImpl <em>DSemantic
@@ -254,7 +296,15 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getDSemanticDecorator()
      * @generated
      */
-    int DSEMANTIC_DECORATOR = 5;
+    int DSEMANTIC_DECORATOR = 6;
+
+    /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DSEMANTIC_DECORATOR__UID = ViewpointPackage.IDENTIFIED_ELEMENT__UID;
 
     /**
      * The feature id for the '<em><b>Target</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -262,7 +312,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DSEMANTIC_DECORATOR__TARGET = 0;
+    int DSEMANTIC_DECORATOR__TARGET = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 0;
 
     /**
      * The number of structural features of the '<em>DSemantic Decorator</em>' class. <!-- begin-user-doc --> <!--
@@ -271,7 +321,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DSEMANTIC_DECORATOR_FEATURE_COUNT = 1;
+    int DSEMANTIC_DECORATOR_FEATURE_COUNT = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 1;
 
     /**
      * The meta object id for the '{@link org.eclipse.sirius.viewpoint.impl.DRepresentationDescriptorImpl
@@ -281,7 +331,15 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getDRepresentationDescriptor()
      * @generated
      */
-    int DREPRESENTATION_DESCRIPTOR = 6;
+    int DREPRESENTATION_DESCRIPTOR = 7;
+
+    /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DREPRESENTATION_DESCRIPTOR__UID = ViewpointPackage.IDENTIFIED_ELEMENT__UID;
 
     /**
      * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list. <!-- begin-user-doc --> <!--
@@ -290,7 +348,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DREPRESENTATION_DESCRIPTOR__EANNOTATIONS = DescriptionPackage.DMODEL_ELEMENT__EANNOTATIONS;
+    int DREPRESENTATION_DESCRIPTOR__EANNOTATIONS = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 0;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -298,7 +356,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DREPRESENTATION_DESCRIPTOR__NAME = DescriptionPackage.DMODEL_ELEMENT_FEATURE_COUNT + 0;
+    int DREPRESENTATION_DESCRIPTOR__NAME = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 1;
 
     /**
      * The feature id for the '<em><b>Description</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -306,7 +364,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DREPRESENTATION_DESCRIPTOR__DESCRIPTION = DescriptionPackage.DMODEL_ELEMENT_FEATURE_COUNT + 1;
+    int DREPRESENTATION_DESCRIPTOR__DESCRIPTION = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 2;
 
     /**
      * The feature id for the '<em><b>Target</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -314,7 +372,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DREPRESENTATION_DESCRIPTOR__TARGET = DescriptionPackage.DMODEL_ELEMENT_FEATURE_COUNT + 2;
+    int DREPRESENTATION_DESCRIPTOR__TARGET = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 3;
 
     /**
      * The feature id for the '<em><b>Representation</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -322,7 +380,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DREPRESENTATION_DESCRIPTOR__REPRESENTATION = DescriptionPackage.DMODEL_ELEMENT_FEATURE_COUNT + 3;
+    int DREPRESENTATION_DESCRIPTOR__REPRESENTATION = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 4;
 
     /**
      * The feature id for the '<em><b>Rep Path</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -330,7 +388,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DREPRESENTATION_DESCRIPTOR__REP_PATH = DescriptionPackage.DMODEL_ELEMENT_FEATURE_COUNT + 4;
+    int DREPRESENTATION_DESCRIPTOR__REP_PATH = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 5;
 
     /**
      * The number of structural features of the '<em>DRepresentation Descriptor</em>' class. <!-- begin-user-doc -->
@@ -339,7 +397,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DREPRESENTATION_DESCRIPTOR_FEATURE_COUNT = DescriptionPackage.DMODEL_ELEMENT_FEATURE_COUNT + 5;
+    int DREPRESENTATION_DESCRIPTOR_FEATURE_COUNT = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 6;
 
     /**
      * The meta object id for the '{@link org.eclipse.sirius.viewpoint.impl.DRepresentationImpl
@@ -349,15 +407,15 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getDRepresentation()
      * @generated
      */
-    int DREPRESENTATION = 7;
+    int DREPRESENTATION = 8;
 
     /**
-     * The feature id for the '<em><b>Documentation</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
      * @ordered
      */
-    int DREPRESENTATION__DOCUMENTATION = DescriptionPackage.DOCUMENTED_ELEMENT__DOCUMENTATION;
+    int DREPRESENTATION__UID = ViewpointPackage.IDENTIFIED_ELEMENT__UID;
 
     /**
      * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list. <!-- begin-user-doc --> <!--
@@ -366,7 +424,15 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DREPRESENTATION__EANNOTATIONS = DescriptionPackage.DOCUMENTED_ELEMENT_FEATURE_COUNT + 0;
+    int DREPRESENTATION__EANNOTATIONS = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 0;
+
+    /**
+     * The feature id for the '<em><b>Documentation</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DREPRESENTATION__DOCUMENTATION = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 1;
 
     /**
      * The feature id for the '<em><b>Owned Representation Elements</b></em>' reference list. <!-- begin-user-doc -->
@@ -375,7 +441,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DREPRESENTATION__OWNED_REPRESENTATION_ELEMENTS = DescriptionPackage.DOCUMENTED_ELEMENT_FEATURE_COUNT + 1;
+    int DREPRESENTATION__OWNED_REPRESENTATION_ELEMENTS = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 2;
 
     /**
      * The feature id for the '<em><b>Representation Elements</b></em>' reference list. <!-- begin-user-doc --> <!--
@@ -384,7 +450,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DREPRESENTATION__REPRESENTATION_ELEMENTS = DescriptionPackage.DOCUMENTED_ELEMENT_FEATURE_COUNT + 2;
+    int DREPRESENTATION__REPRESENTATION_ELEMENTS = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 3;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -392,7 +458,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DREPRESENTATION__NAME = DescriptionPackage.DOCUMENTED_ELEMENT_FEATURE_COUNT + 3;
+    int DREPRESENTATION__NAME = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 4;
 
     /**
      * The feature id for the '<em><b>Owned Annotation Entries</b></em>' containment reference list. <!-- begin-user-doc
@@ -401,7 +467,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DREPRESENTATION__OWNED_ANNOTATION_ENTRIES = DescriptionPackage.DOCUMENTED_ELEMENT_FEATURE_COUNT + 4;
+    int DREPRESENTATION__OWNED_ANNOTATION_ENTRIES = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 5;
 
     /**
      * The feature id for the '<em><b>Ui State</b></em>' containment reference. <!-- begin-user-doc --> <!--
@@ -410,15 +476,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DREPRESENTATION__UI_STATE = DescriptionPackage.DOCUMENTED_ELEMENT_FEATURE_COUNT + 5;
-
-    /**
-     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int DREPRESENTATION__UID = DescriptionPackage.DOCUMENTED_ELEMENT_FEATURE_COUNT + 6;
+    int DREPRESENTATION__UI_STATE = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 6;
 
     /**
      * The number of structural features of the '<em>DRepresentation</em>' class. <!-- begin-user-doc --> <!--
@@ -427,7 +485,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DREPRESENTATION_FEATURE_COUNT = DescriptionPackage.DOCUMENTED_ELEMENT_FEATURE_COUNT + 7;
+    int DREPRESENTATION_FEATURE_COUNT = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 7;
 
     /**
      * The meta object id for the '{@link org.eclipse.sirius.viewpoint.impl.DRepresentationElementImpl
@@ -437,7 +495,15 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getDRepresentationElement()
      * @generated
      */
-    int DREPRESENTATION_ELEMENT = 8;
+    int DREPRESENTATION_ELEMENT = 9;
+
+    /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DREPRESENTATION_ELEMENT__UID = ViewpointPackage.IDENTIFIED_ELEMENT__UID;
 
     /**
      * The feature id for the '<em><b>Target</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -445,7 +511,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DREPRESENTATION_ELEMENT__TARGET = ViewpointPackage.DMAPPING_BASED_FEATURE_COUNT + 0;
+    int DREPRESENTATION_ELEMENT__TARGET = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 0;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -453,7 +519,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DREPRESENTATION_ELEMENT__NAME = ViewpointPackage.DMAPPING_BASED_FEATURE_COUNT + 1;
+    int DREPRESENTATION_ELEMENT__NAME = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 1;
 
     /**
      * The feature id for the '<em><b>Semantic Elements</b></em>' reference list. <!-- begin-user-doc --> <!--
@@ -462,7 +528,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DREPRESENTATION_ELEMENT__SEMANTIC_ELEMENTS = ViewpointPackage.DMAPPING_BASED_FEATURE_COUNT + 2;
+    int DREPRESENTATION_ELEMENT__SEMANTIC_ELEMENTS = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 2;
 
     /**
      * The number of structural features of the '<em>DRepresentation Element</em>' class. <!-- begin-user-doc --> <!--
@@ -471,7 +537,15 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DREPRESENTATION_ELEMENT_FEATURE_COUNT = ViewpointPackage.DMAPPING_BASED_FEATURE_COUNT + 3;
+    int DREPRESENTATION_ELEMENT_FEATURE_COUNT = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 3;
+
+    /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DVIEW__UID = ViewpointPackage.IDENTIFIED_ELEMENT__UID;
 
     /**
      * The feature id for the '<em><b>Viewpoint</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -479,7 +553,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DVIEW__VIEWPOINT = ViewpointPackage.DREFRESHABLE_FEATURE_COUNT + 0;
+    int DVIEW__VIEWPOINT = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 0;
 
     /**
      * The feature id for the '<em><b>Owned Representation Descriptors</b></em>' containment reference list. <!--
@@ -488,7 +562,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DVIEW__OWNED_REPRESENTATION_DESCRIPTORS = ViewpointPackage.DREFRESHABLE_FEATURE_COUNT + 1;
+    int DVIEW__OWNED_REPRESENTATION_DESCRIPTORS = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 1;
 
     /**
      * The feature id for the '<em><b>Owned Extensions</b></em>' containment reference. <!-- begin-user-doc --> <!--
@@ -497,7 +571,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DVIEW__OWNED_EXTENSIONS = ViewpointPackage.DREFRESHABLE_FEATURE_COUNT + 2;
+    int DVIEW__OWNED_EXTENSIONS = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 2;
 
     /**
      * The feature id for the '<em><b>Models</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -505,7 +579,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DVIEW__MODELS = ViewpointPackage.DREFRESHABLE_FEATURE_COUNT + 3;
+    int DVIEW__MODELS = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 3;
 
     /**
      * The number of structural features of the '<em>DView</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -513,7 +587,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DVIEW_FEATURE_COUNT = ViewpointPackage.DREFRESHABLE_FEATURE_COUNT + 4;
+    int DVIEW_FEATURE_COUNT = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 4;
 
     /**
      * The meta object id for the '{@link org.eclipse.sirius.viewpoint.impl.MetaModelExtensionImpl <em>Meta Model
@@ -523,7 +597,15 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getMetaModelExtension()
      * @generated
      */
-    int META_MODEL_EXTENSION = 10;
+    int META_MODEL_EXTENSION = 11;
+
+    /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int META_MODEL_EXTENSION__UID = ViewpointPackage.IDENTIFIED_ELEMENT__UID;
 
     /**
      * The feature id for the '<em><b>Extension Group</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -531,7 +613,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int META_MODEL_EXTENSION__EXTENSION_GROUP = 0;
+    int META_MODEL_EXTENSION__EXTENSION_GROUP = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 0;
 
     /**
      * The number of structural features of the '<em>Meta Model Extension</em>' class. <!-- begin-user-doc --> <!--
@@ -540,7 +622,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int META_MODEL_EXTENSION_FEATURE_COUNT = 1;
+    int META_MODEL_EXTENSION_FEATURE_COUNT = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 1;
 
     /**
      * The meta object id for the '{@link org.eclipse.sirius.viewpoint.impl.DecorationImpl <em>Decoration</em>}' class.
@@ -550,7 +632,15 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getDecoration()
      * @generated
      */
-    int DECORATION = 11;
+    int DECORATION = 12;
+
+    /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DECORATION__UID = ViewpointPackage.IDENTIFIED_ELEMENT__UID;
 
     /**
      * The feature id for the '<em><b>Description</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -558,7 +648,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DECORATION__DESCRIPTION = 0;
+    int DECORATION__DESCRIPTION = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 0;
 
     /**
      * The number of structural features of the '<em>Decoration</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
@@ -567,7 +657,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DECORATION_FEATURE_COUNT = 1;
+    int DECORATION_FEATURE_COUNT = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 1;
 
     /**
      * The meta object id for the '{@link org.eclipse.sirius.viewpoint.impl.DAnalysisCustomDataImpl <em>DAnalysis Custom
@@ -577,7 +667,15 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getDAnalysisCustomData()
      * @generated
      */
-    int DANALYSIS_CUSTOM_DATA = 12;
+    int DANALYSIS_CUSTOM_DATA = 13;
+
+    /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DANALYSIS_CUSTOM_DATA__UID = ViewpointPackage.IDENTIFIED_ELEMENT__UID;
 
     /**
      * The feature id for the '<em><b>Key</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -585,7 +683,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DANALYSIS_CUSTOM_DATA__KEY = 0;
+    int DANALYSIS_CUSTOM_DATA__KEY = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 0;
 
     /**
      * The feature id for the '<em><b>Data</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc
@@ -594,7 +692,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DANALYSIS_CUSTOM_DATA__DATA = 1;
+    int DANALYSIS_CUSTOM_DATA__DATA = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 1;
 
     /**
      * The number of structural features of the '<em>DAnalysis Custom Data</em>' class. <!-- begin-user-doc --> <!--
@@ -603,7 +701,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DANALYSIS_CUSTOM_DATA_FEATURE_COUNT = 2;
+    int DANALYSIS_CUSTOM_DATA_FEATURE_COUNT = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 2;
 
     /**
      * The meta object id for the '{@link org.eclipse.sirius.viewpoint.impl.CustomizableImpl <em>Customizable</em>}'
@@ -613,7 +711,15 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getCustomizable()
      * @generated
      */
-    int CUSTOMIZABLE = 24;
+    int CUSTOMIZABLE = 25;
+
+    /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int CUSTOMIZABLE__UID = ViewpointPackage.IDENTIFIED_ELEMENT__UID;
 
     /**
      * The feature id for the '<em><b>Custom Features</b></em>' attribute list. <!-- begin-user-doc --> <!--
@@ -622,7 +728,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int CUSTOMIZABLE__CUSTOM_FEATURES = 0;
+    int CUSTOMIZABLE__CUSTOM_FEATURES = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 0;
 
     /**
      * The number of structural features of the '<em>Customizable</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
@@ -631,7 +737,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int CUSTOMIZABLE_FEATURE_COUNT = 1;
+    int CUSTOMIZABLE_FEATURE_COUNT = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 1;
 
     /**
      * The meta object id for the '{@link org.eclipse.sirius.viewpoint.impl.BasicLabelStyleImpl <em>Basic Label
@@ -641,7 +747,15 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getBasicLabelStyle()
      * @generated
      */
-    int BASIC_LABEL_STYLE = 23;
+    int BASIC_LABEL_STYLE = 24;
+
+    /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int BASIC_LABEL_STYLE__UID = ViewpointPackage.CUSTOMIZABLE__UID;
 
     /**
      * The feature id for the '<em><b>Custom Features</b></em>' attribute list. <!-- begin-user-doc --> <!--
@@ -710,7 +824,15 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getLabelStyle()
      * @generated
      */
-    int LABEL_STYLE = 13;
+    int LABEL_STYLE = 14;
+
+    /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int LABEL_STYLE__UID = ViewpointPackage.BASIC_LABEL_STYLE__UID;
 
     /**
      * The feature id for the '<em><b>Custom Features</b></em>' attribute list. <!-- begin-user-doc --> <!--
@@ -787,7 +909,15 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getStyle()
      * @generated
      */
-    int STYLE = 14;
+    int STYLE = 15;
+
+    /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int STYLE__UID = ViewpointPackage.IDENTIFIED_ELEMENT__UID;
 
     /**
      * The feature id for the '<em><b>Custom Features</b></em>' attribute list. <!-- begin-user-doc --> <!--
@@ -796,7 +926,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int STYLE__CUSTOM_FEATURES = ViewpointPackage.DREFRESHABLE_FEATURE_COUNT + 0;
+    int STYLE__CUSTOM_FEATURES = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 0;
 
     /**
      * The feature id for the '<em><b>Description</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -804,7 +934,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int STYLE__DESCRIPTION = ViewpointPackage.DREFRESHABLE_FEATURE_COUNT + 1;
+    int STYLE__DESCRIPTION = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 1;
 
     /**
      * The number of structural features of the '<em>Style</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -812,7 +942,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int STYLE_FEATURE_COUNT = ViewpointPackage.DREFRESHABLE_FEATURE_COUNT + 2;
+    int STYLE_FEATURE_COUNT = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 2;
 
     /**
      * The meta object id for the '<em>RGB Values</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -821,7 +951,7 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getRGBValues()
      * @generated
      */
-    int RGB_VALUES = 29;
+    int RGB_VALUES = 30;
 
     /**
      * The meta object id for the '<em>Resource Descriptor</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc
@@ -831,7 +961,28 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getResourceDescriptor()
      * @generated
      */
-    int RESOURCE_DESCRIPTOR = 30;
+    int RESOURCE_DESCRIPTOR = 31;
+
+    /**
+     * Returns the meta object for class '{@link org.eclipse.sirius.viewpoint.IdentifiedElement <em>Identified
+     * Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @return the meta object for class '<em>Identified Element</em>'.
+     * @see org.eclipse.sirius.viewpoint.IdentifiedElement
+     * @generated
+     */
+    EClass getIdentifiedElement();
+
+    /**
+     * Returns the meta object for the attribute '{@link org.eclipse.sirius.viewpoint.IdentifiedElement#getUid
+     * <em>Uid</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @return the meta object for the attribute '<em>Uid</em>'.
+     * @see org.eclipse.sirius.viewpoint.IdentifiedElement#getUid()
+     * @see #getIdentifiedElement()
+     * @generated
+     */
+    EAttribute getIdentifiedElement_Uid();
 
     /**
      * The meta object id for the '{@link org.eclipse.sirius.viewpoint.impl.DAnalysisSessionEObjectImpl <em>DAnalysis
@@ -841,7 +992,7 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getDAnalysisSessionEObject()
      * @generated
      */
-    int DANALYSIS_SESSION_EOBJECT = 15;
+    int DANALYSIS_SESSION_EOBJECT = 16;
 
     /**
      * The feature id for the '<em><b>Open</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -911,7 +1062,7 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getSessionManagerEObject()
      * @generated
      */
-    int SESSION_MANAGER_EOBJECT = 16;
+    int SESSION_MANAGER_EOBJECT = 17;
 
     /**
      * The feature id for the '<em><b>Owned Sessions</b></em>' containment reference list. <!-- begin-user-doc --> <!--
@@ -939,7 +1090,7 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getDResource()
      * @generated
      */
-    int DRESOURCE = 17;
+    int DRESOURCE = 18;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -974,7 +1125,15 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getDFile()
      * @generated
      */
-    int DFILE = 18;
+    int DFILE = 19;
+
+    /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DFILE__UID = ViewpointPackage.IDENTIFIED_ELEMENT__UID;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -982,7 +1141,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DFILE__NAME = ViewpointPackage.DRESOURCE__NAME;
+    int DFILE__NAME = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 0;
 
     /**
      * The feature id for the '<em><b>Path</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -990,7 +1149,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DFILE__PATH = ViewpointPackage.DRESOURCE__PATH;
+    int DFILE__PATH = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 1;
 
     /**
      * The number of structural features of the '<em>DFile</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -998,7 +1157,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DFILE_FEATURE_COUNT = ViewpointPackage.DRESOURCE_FEATURE_COUNT + 0;
+    int DFILE_FEATURE_COUNT = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 2;
 
     /**
      * The meta object id for the '{@link org.eclipse.sirius.viewpoint.impl.DResourceContainerImpl <em>DResource
@@ -1008,7 +1167,15 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getDResourceContainer()
      * @generated
      */
-    int DRESOURCE_CONTAINER = 19;
+    int DRESOURCE_CONTAINER = 20;
+
+    /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DRESOURCE_CONTAINER__UID = ViewpointPackage.IDENTIFIED_ELEMENT__UID;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -1016,7 +1183,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DRESOURCE_CONTAINER__NAME = ViewpointPackage.DRESOURCE__NAME;
+    int DRESOURCE_CONTAINER__NAME = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 0;
 
     /**
      * The feature id for the '<em><b>Path</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -1024,7 +1191,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DRESOURCE_CONTAINER__PATH = ViewpointPackage.DRESOURCE__PATH;
+    int DRESOURCE_CONTAINER__PATH = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 1;
 
     /**
      * The feature id for the '<em><b>Members</b></em>' containment reference list. <!-- begin-user-doc --> <!--
@@ -1033,7 +1200,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DRESOURCE_CONTAINER__MEMBERS = ViewpointPackage.DRESOURCE_FEATURE_COUNT + 0;
+    int DRESOURCE_CONTAINER__MEMBERS = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 2;
 
     /**
      * The number of structural features of the '<em>DResource Container</em>' class. <!-- begin-user-doc --> <!--
@@ -1042,7 +1209,7 @@ public interface ViewpointPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DRESOURCE_CONTAINER_FEATURE_COUNT = ViewpointPackage.DRESOURCE_FEATURE_COUNT + 1;
+    int DRESOURCE_CONTAINER_FEATURE_COUNT = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 3;
 
     /**
      * The meta object id for the '{@link org.eclipse.sirius.viewpoint.impl.DProjectImpl <em>DProject</em>}' class. <!--
@@ -1052,7 +1219,15 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getDProject()
      * @generated
      */
-    int DPROJECT = 20;
+    int DPROJECT = 21;
+
+    /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DPROJECT__UID = ViewpointPackage.DRESOURCE_CONTAINER__UID;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -1095,7 +1270,15 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getDFolder()
      * @generated
      */
-    int DFOLDER = 21;
+    int DFOLDER = 22;
+
+    /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DFOLDER__UID = ViewpointPackage.DRESOURCE_CONTAINER__UID;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -1138,7 +1321,15 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getDModel()
      * @generated
      */
-    int DMODEL = 22;
+    int DMODEL = 23;
+
+    /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DMODEL__UID = ViewpointPackage.DFILE__UID;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -1172,7 +1363,7 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getUIState()
      * @generated
      */
-    int UI_STATE = 25;
+    int UI_STATE = 26;
 
     /**
      * The feature id for the '<em><b>Inverse Selection Order</b></em>' attribute. <!-- begin-user-doc --> <!--
@@ -1217,7 +1408,7 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getFontFormat()
      * @generated
      */
-    int FONT_FORMAT = 26;
+    int FONT_FORMAT = 27;
 
     /**
      * The meta object id for the '{@link org.eclipse.sirius.viewpoint.LabelAlignment <em>Label Alignment</em>}' enum.
@@ -1227,7 +1418,7 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getLabelAlignment()
      * @generated
      */
-    int LABEL_ALIGNMENT = 27;
+    int LABEL_ALIGNMENT = 28;
 
     /**
      * The meta object id for the '{@link org.eclipse.sirius.viewpoint.SyncStatus <em>Sync Status</em>}' enum. <!--
@@ -1237,7 +1428,7 @@ public interface ViewpointPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getSyncStatus()
      * @generated
      */
-    int SYNC_STATUS = 28;
+    int SYNC_STATUS = 29;
 
     /**
      * Returns the meta object for class ' {@link org.eclipse.sirius.viewpoint.DAnalysis <em>DAnalysis</em>}'. <!--
@@ -1553,17 +1744,6 @@ public interface ViewpointPackage extends EPackage {
     EReference getDRepresentation_UiState();
 
     /**
-     * Returns the meta object for the attribute '{@link org.eclipse.sirius.viewpoint.DRepresentation#getUid
-     * <em>Uid</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @return the meta object for the attribute '<em>Uid</em>'.
-     * @see org.eclipse.sirius.viewpoint.DRepresentation#getUid()
-     * @see #getDRepresentation()
-     * @generated
-     */
-    EAttribute getDRepresentation_Uid();
-
-    /**
      * Returns the meta object for class '{@link org.eclipse.sirius.viewpoint.DRepresentationElement <em>DRepresentation
      * Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -2171,6 +2351,24 @@ public interface ViewpointPackage extends EPackage {
      */
     interface Literals {
         /**
+         * The meta object literal for the '{@link org.eclipse.sirius.viewpoint.impl.IdentifiedElementImpl
+         * <em>Identified Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+         *
+         * @see org.eclipse.sirius.viewpoint.impl.IdentifiedElementImpl
+         * @see org.eclipse.sirius.viewpoint.impl.ViewpointPackageImpl#getIdentifiedElement()
+         * @generated
+         */
+        EClass IDENTIFIED_ELEMENT = ViewpointPackage.eINSTANCE.getIdentifiedElement();
+
+        /**
+         * The meta object literal for the '<em><b>Uid</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         *
+         * @generated
+         */
+        EAttribute IDENTIFIED_ELEMENT__UID = ViewpointPackage.eINSTANCE.getIdentifiedElement_Uid();
+
+        /**
          * The meta object literal for the '{@link org.eclipse.sirius.viewpoint.impl.DAnalysisImpl <em>DAnalysis</em>}'
          * class. <!-- begin-user-doc --> <!-- end-user-doc -->
          *
@@ -2411,14 +2609,6 @@ public interface ViewpointPackage extends EPackage {
         EReference DREPRESENTATION__UI_STATE = ViewpointPackage.eINSTANCE.getDRepresentation_UiState();
 
         /**
-         * The meta object literal for the '<em><b>Uid</b></em>' attribute feature. <!-- begin-user-doc --> <!--
-         * end-user-doc -->
-         *
-         * @generated
-         */
-        EAttribute DREPRESENTATION__UID = ViewpointPackage.eINSTANCE.getDRepresentation_Uid();
-
-        /**
          * The meta object literal for the '{@link org.eclipse.sirius.viewpoint.impl.DRepresentationElementImpl
          * <em>DRepresentation Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
          *
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/CustomizableImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/CustomizableImpl.java
index 46d1f739a5..8f3bdeb7f5 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/CustomizableImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/CustomizableImpl.java
@@ -15,7 +15,6 @@ import java.util.Collection;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
 import org.eclipse.sirius.viewpoint.Customizable;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
@@ -31,7 +30,7 @@ import org.eclipse.sirius.viewpoint.ViewpointPackage;
  *
  * @generated
  */
-public abstract class CustomizableImpl extends MinimalEObjectImpl.Container implements Customizable {
+public abstract class CustomizableImpl extends IdentifiedElementImpl implements Customizable {
     /**
      * The cached value of the '{@link #getCustomFeatures() <em>Custom Features</em>}' attribute list. <!--
      * begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DAnalysisCustomDataImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DAnalysisCustomDataImpl.java
index 29138221e5..b00684ed38 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DAnalysisCustomDataImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DAnalysisCustomDataImpl.java
@@ -17,7 +17,6 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.sirius.viewpoint.DAnalysisCustomData;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
 
@@ -34,7 +33,7 @@ import org.eclipse.sirius.viewpoint.ViewpointPackage;
  *
  * @generated
  */
-public class DAnalysisCustomDataImpl extends MinimalEObjectImpl.Container implements DAnalysisCustomData {
+public class DAnalysisCustomDataImpl extends IdentifiedElementImpl implements DAnalysisCustomData {
     /**
      * The default value of the '{@link #getKey() <em>Key</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DAnalysisImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DAnalysisImpl.java
index 8bf5882841..9829d62315 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DAnalysisImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DAnalysisImpl.java
@@ -21,7 +21,6 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
@@ -57,7 +56,7 @@ import org.eclipse.sirius.viewpoint.description.DAnnotationEntry;
  *
  * @generated
  */
-public class DAnalysisImpl extends MinimalEObjectImpl.Container implements DAnalysis {
+public class DAnalysisImpl extends IdentifiedElementImpl implements DAnalysis {
     /**
      * The cached value of the '{@link #getReferencedAnalysis() <em>Referenced Analysis</em>}' reference list. <!--
      * begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DFeatureExtensionImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DFeatureExtensionImpl.java
index c3eecb743f..abb7a952b2 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DFeatureExtensionImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DFeatureExtensionImpl.java
@@ -15,7 +15,6 @@ import org.eclipse.emf.common.notify.Notification;
 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.sirius.viewpoint.DFeatureExtension;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
 import org.eclipse.sirius.viewpoint.description.FeatureExtensionDescription;
@@ -32,7 +31,7 @@ import org.eclipse.sirius.viewpoint.description.FeatureExtensionDescription;
  *
  * @generated
  */
-public abstract class DFeatureExtensionImpl extends MinimalEObjectImpl.Container implements DFeatureExtension {
+public abstract class DFeatureExtensionImpl extends IdentifiedElementImpl implements DFeatureExtension {
     /**
      * The cached value of the '{@link #getDescription() <em>Description</em>}' reference. <!-- begin-user-doc --> <!--
      * end-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DFileImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DFileImpl.java
index 986b66368e..85334290d4 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DFileImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DFileImpl.java
@@ -14,8 +14,8 @@ package org.eclipse.sirius.viewpoint.impl;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.sirius.viewpoint.DFile;
+import org.eclipse.sirius.viewpoint.DResource;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
 
 /**
@@ -30,7 +30,7 @@ import org.eclipse.sirius.viewpoint.ViewpointPackage;
  *
  * @generated
  */
-public class DFileImpl extends MinimalEObjectImpl.Container implements DFile {
+public class DFileImpl extends IdentifiedElementImpl implements DFile {
     /**
      * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -212,6 +212,46 @@ public class DFileImpl extends MinimalEObjectImpl.Container implements DFile {
      * @generated
      */
     @Override
+    public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+        if (baseClass == DResource.class) {
+            switch (derivedFeatureID) {
+            case ViewpointPackage.DFILE__NAME:
+                return ViewpointPackage.DRESOURCE__NAME;
+            case ViewpointPackage.DFILE__PATH:
+                return ViewpointPackage.DRESOURCE__PATH;
+            default:
+                return -1;
+            }
+        }
+        return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+        if (baseClass == DResource.class) {
+            switch (baseFeatureID) {
+            case ViewpointPackage.DRESOURCE__NAME:
+                return ViewpointPackage.DFILE__NAME;
+            case ViewpointPackage.DRESOURCE__PATH:
+                return ViewpointPackage.DFILE__PATH;
+            default:
+                return -1;
+            }
+        }
+        return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
     public String toString() {
         if (eIsProxy()) {
             return super.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DRepresentationDescriptorImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DRepresentationDescriptorImpl.java
index b976997f47..5325d31360 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DRepresentationDescriptorImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DRepresentationDescriptorImpl.java
@@ -11,20 +11,27 @@
  */
 package org.eclipse.sirius.viewpoint.impl;
 
+import java.util.Collection;
 import java.util.Optional;
 
 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.EObject;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.sirius.business.api.resource.ResourceDescriptor;
 import org.eclipse.sirius.business.internal.representation.DRepresentationDescriptorToDRepresentationLinkManager;
 import org.eclipse.sirius.viewpoint.DRepresentation;
 import org.eclipse.sirius.viewpoint.DRepresentationDescriptor;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
+import org.eclipse.sirius.viewpoint.description.DAnnotation;
+import org.eclipse.sirius.viewpoint.description.DModelElement;
+import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
 import org.eclipse.sirius.viewpoint.description.RepresentationDescription;
-import org.eclipse.sirius.viewpoint.description.impl.DModelElementImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>DRepresentation Descriptor</b></em>'. <!--
@@ -33,6 +40,8 @@ import org.eclipse.sirius.viewpoint.description.impl.DModelElementImpl;
  * The following features are implemented:
  * </p>
  * <ul>
+ * <li>{@link org.eclipse.sirius.viewpoint.impl.DRepresentationDescriptorImpl#getEAnnotations
+ * <em>EAnnotations</em>}</li>
  * <li>{@link org.eclipse.sirius.viewpoint.impl.DRepresentationDescriptorImpl#getName <em>Name</em>}</li>
  * <li>{@link org.eclipse.sirius.viewpoint.impl.DRepresentationDescriptorImpl#getDescription <em>Description</em>}</li>
  * <li>{@link org.eclipse.sirius.viewpoint.impl.DRepresentationDescriptorImpl#getTarget <em>Target</em>}</li>
@@ -43,7 +52,17 @@ import org.eclipse.sirius.viewpoint.description.impl.DModelElementImpl;
  *
  * @generated
  */
-public class DRepresentationDescriptorImpl extends DModelElementImpl implements DRepresentationDescriptor {
+public class DRepresentationDescriptorImpl extends IdentifiedElementImpl implements DRepresentationDescriptor {
+    /**
+     * The cached value of the '{@link #getEAnnotations() <em>EAnnotations</em>}' containment reference list. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @see #getEAnnotations()
+     * @generated
+     * @ordered
+     */
+    protected EList<DAnnotation> eAnnotations;
+
     /**
      * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -129,6 +148,19 @@ public class DRepresentationDescriptorImpl extends DModelElementImpl implements
      * @generated
      */
     @Override
+    public EList<DAnnotation> getEAnnotations() {
+        if (eAnnotations == null) {
+            eAnnotations = new EObjectContainmentEList<DAnnotation>(DAnnotation.class, this, ViewpointPackage.DREPRESENTATION_DESCRIPTOR__EANNOTATIONS);
+        }
+        return eAnnotations;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
     public String getName() {
         return name;
     }
@@ -298,8 +330,36 @@ public class DRepresentationDescriptorImpl extends DModelElementImpl implements
      * @generated
      */
     @Override
+    public DAnnotation getDAnnotation(String source) {
+        // TODO: implement this method
+        // Ensure that you remove @generated or mark it @generated NOT
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+        switch (featureID) {
+        case ViewpointPackage.DREPRESENTATION_DESCRIPTOR__EANNOTATIONS:
+            return ((InternalEList<?>) getEAnnotations()).basicRemove(otherEnd, msgs);
+        }
+        return super.eInverseRemove(otherEnd, featureID, msgs);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
+        case ViewpointPackage.DREPRESENTATION_DESCRIPTOR__EANNOTATIONS:
+            return getEAnnotations();
         case ViewpointPackage.DREPRESENTATION_DESCRIPTOR__NAME:
             return getName();
         case ViewpointPackage.DREPRESENTATION_DESCRIPTOR__DESCRIPTION:
@@ -328,9 +388,14 @@ public class DRepresentationDescriptorImpl extends DModelElementImpl implements
      *
      * @generated
      */
+    @SuppressWarnings("unchecked")
     @Override
     public void eSet(int featureID, Object newValue) {
         switch (featureID) {
+        case ViewpointPackage.DREPRESENTATION_DESCRIPTOR__EANNOTATIONS:
+            getEAnnotations().clear();
+            getEAnnotations().addAll((Collection<? extends DAnnotation>) newValue);
+            return;
         case ViewpointPackage.DREPRESENTATION_DESCRIPTOR__NAME:
             setName((String) newValue);
             return;
@@ -358,6 +423,9 @@ public class DRepresentationDescriptorImpl extends DModelElementImpl implements
     @Override
     public void eUnset(int featureID) {
         switch (featureID) {
+        case ViewpointPackage.DREPRESENTATION_DESCRIPTOR__EANNOTATIONS:
+            getEAnnotations().clear();
+            return;
         case ViewpointPackage.DREPRESENTATION_DESCRIPTOR__NAME:
             setName(DRepresentationDescriptorImpl.NAME_EDEFAULT);
             return;
@@ -385,6 +453,8 @@ public class DRepresentationDescriptorImpl extends DModelElementImpl implements
     @Override
     public boolean eIsSet(int featureID) {
         switch (featureID) {
+        case ViewpointPackage.DREPRESENTATION_DESCRIPTOR__EANNOTATIONS:
+            return eAnnotations != null && !eAnnotations.isEmpty();
         case ViewpointPackage.DREPRESENTATION_DESCRIPTOR__NAME:
             return DRepresentationDescriptorImpl.NAME_EDEFAULT == null ? name != null : !DRepresentationDescriptorImpl.NAME_EDEFAULT.equals(name);
         case ViewpointPackage.DREPRESENTATION_DESCRIPTOR__DESCRIPTION:
@@ -405,6 +475,42 @@ public class DRepresentationDescriptorImpl extends DModelElementImpl implements
      * @generated
      */
     @Override
+    public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+        if (baseClass == DModelElement.class) {
+            switch (derivedFeatureID) {
+            case ViewpointPackage.DREPRESENTATION_DESCRIPTOR__EANNOTATIONS:
+                return DescriptionPackage.DMODEL_ELEMENT__EANNOTATIONS;
+            default:
+                return -1;
+            }
+        }
+        return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+        if (baseClass == DModelElement.class) {
+            switch (baseFeatureID) {
+            case DescriptionPackage.DMODEL_ELEMENT__EANNOTATIONS:
+                return ViewpointPackage.DREPRESENTATION_DESCRIPTOR__EANNOTATIONS;
+            default:
+                return -1;
+            }
+        }
+        return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
     public String toString() {
         if (eIsProxy()) {
             return super.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DRepresentationElementImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DRepresentationElementImpl.java
index d5307ba130..e4988d1a0d 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DRepresentationElementImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DRepresentationElementImpl.java
@@ -19,8 +19,8 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+import org.eclipse.sirius.viewpoint.DMappingBased;
 import org.eclipse.sirius.viewpoint.DRefreshable;
 import org.eclipse.sirius.viewpoint.DRepresentationElement;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
@@ -44,7 +44,7 @@ import org.eclipse.sirius.viewpoint.description.RepresentationElementMapping;
  *
  * @generated
  */
-public abstract class DRepresentationElementImpl extends MinimalEObjectImpl.Container implements DRepresentationElement {
+public abstract class DRepresentationElementImpl extends IdentifiedElementImpl implements DRepresentationElement {
     /**
      * The cached value of the '{@link #getTarget() <em>Target</em>}' reference. <!-- begin-user-doc --> <!--
      * end-user-doc -->
@@ -297,6 +297,12 @@ public abstract class DRepresentationElementImpl extends MinimalEObjectImpl.Cont
      */
     @Override
     public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+        if (baseClass == DMappingBased.class) {
+            switch (derivedFeatureID) {
+            default:
+                return -1;
+            }
+        }
         if (baseClass == DStylizable.class) {
             switch (derivedFeatureID) {
             default:
@@ -327,6 +333,12 @@ public abstract class DRepresentationElementImpl extends MinimalEObjectImpl.Cont
      */
     @Override
     public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+        if (baseClass == DMappingBased.class) {
+            switch (baseFeatureID) {
+            default:
+                return -1;
+            }
+        }
         if (baseClass == DStylizable.class) {
             switch (baseFeatureID) {
             default:
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DRepresentationImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DRepresentationImpl.java
index 3d7adeb992..1efda45be0 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DRepresentationImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DRepresentationImpl.java
@@ -20,7 +20,6 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.sirius.viewpoint.DRefreshable;
 import org.eclipse.sirius.viewpoint.DRepresentation;
@@ -32,7 +31,7 @@ import org.eclipse.sirius.viewpoint.description.AnnotationEntry;
 import org.eclipse.sirius.viewpoint.description.DAnnotation;
 import org.eclipse.sirius.viewpoint.description.DModelElement;
 import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
-import org.eclipse.sirius.viewpoint.description.impl.DocumentedElementImpl;
+import org.eclipse.sirius.viewpoint.description.DocumentedElement;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>DRepresentation</b></em>'. <!-- end-user-doc
@@ -54,9 +53,9 @@ import org.eclipse.sirius.viewpoint.description.impl.DocumentedElementImpl;
  *
  * @generated
  */
-public abstract class DRepresentationImpl extends DocumentedElementImpl implements DRepresentation {
+public abstract class DRepresentationImpl extends IdentifiedElementImpl implements DRepresentation {
     /**
-     * The cached value of the '{@link #getEAnnotations() <em>EAnnotations</em>} ' containment reference list. <!--
+     * The cached value of the '{@link #getEAnnotations() <em>EAnnotations</em>}' containment reference list. <!--
      * begin-user-doc --> <!-- end-user-doc -->
      *
      * @see #getEAnnotations()
@@ -66,6 +65,26 @@ public abstract class DRepresentationImpl extends DocumentedElementImpl implemen
     protected EList<DAnnotation> eAnnotations;
 
     /**
+     * The default value of the '{@link #getDocumentation() <em>Documentation</em>}' attribute. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     *
+     * @see #getDocumentation()
+     * @generated
+     * @ordered
+     */
+    protected static final String DOCUMENTATION_EDEFAULT = ""; //$NON-NLS-1$
+
+    /**
+     * The cached value of the '{@link #getDocumentation() <em>Documentation</em>}' attribute. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     *
+     * @see #getDocumentation()
+     * @generated
+     * @ordered
+     */
+    protected String documentation = DRepresentationImpl.DOCUMENTATION_EDEFAULT;
+
+    /**
      * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
      *
@@ -106,25 +125,6 @@ public abstract class DRepresentationImpl extends DocumentedElementImpl implemen
     protected UIState uiState;
 
     /**
-     * The default value of the '{@link #getUid() <em>Uid</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
-     *
-     * @see #getUid()
-     * @generated
-     * @ordered
-     */
-    protected static final String UID_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getUid() <em>Uid</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @see #getUid()
-     * @generated
-     * @ordered
-     */
-    protected String uid = DRepresentationImpl.UID_EDEFAULT;
-
-    /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated NOT
@@ -132,7 +132,6 @@ public abstract class DRepresentationImpl extends DocumentedElementImpl implemen
     protected DRepresentationImpl() {
         super();
         setUiState(ViewpointFactory.eINSTANCE.createUIState());
-        setUid(EcoreUtil.generateUUID());
     }
 
     /**
@@ -164,6 +163,30 @@ public abstract class DRepresentationImpl extends DocumentedElementImpl implemen
      * @generated
      */
     @Override
+    public String getDocumentation() {
+        return documentation;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void setDocumentation(String newDocumentation) {
+        String oldDocumentation = documentation;
+        documentation = newDocumentation;
+        if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, ViewpointPackage.DREPRESENTATION__DOCUMENTATION, oldDocumentation, documentation));
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
     public EList<DRepresentationElement> getOwnedRepresentationElements() {
         // TODO: implement this method to return the 'Owned Representation Elements' reference list
         // Ensure that you remove @generated or mark it @generated NOT
@@ -284,30 +307,6 @@ public abstract class DRepresentationImpl extends DocumentedElementImpl implemen
      * @generated
      */
     @Override
-    public String getUid() {
-        return uid;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public void setUid(String newUid) {
-        String oldUid = uid;
-        uid = newUid;
-        if (eNotificationRequired()) {
-            eNotify(new ENotificationImpl(this, Notification.SET, ViewpointPackage.DREPRESENTATION__UID, oldUid, uid));
-        }
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
     public DAnnotation getDAnnotation(String source) {
         // TODO: implement this method
         // Ensure that you remove @generated or mark it @generated NOT
@@ -342,6 +341,8 @@ public abstract class DRepresentationImpl extends DocumentedElementImpl implemen
         switch (featureID) {
         case ViewpointPackage.DREPRESENTATION__EANNOTATIONS:
             return getEAnnotations();
+        case ViewpointPackage.DREPRESENTATION__DOCUMENTATION:
+            return getDocumentation();
         case ViewpointPackage.DREPRESENTATION__OWNED_REPRESENTATION_ELEMENTS:
             return getOwnedRepresentationElements();
         case ViewpointPackage.DREPRESENTATION__REPRESENTATION_ELEMENTS:
@@ -352,8 +353,6 @@ public abstract class DRepresentationImpl extends DocumentedElementImpl implemen
             return getOwnedAnnotationEntries();
         case ViewpointPackage.DREPRESENTATION__UI_STATE:
             return getUiState();
-        case ViewpointPackage.DREPRESENTATION__UID:
-            return getUid();
         }
         return super.eGet(featureID, resolve, coreType);
     }
@@ -371,6 +370,9 @@ public abstract class DRepresentationImpl extends DocumentedElementImpl implemen
             getEAnnotations().clear();
             getEAnnotations().addAll((Collection<? extends DAnnotation>) newValue);
             return;
+        case ViewpointPackage.DREPRESENTATION__DOCUMENTATION:
+            setDocumentation((String) newValue);
+            return;
         case ViewpointPackage.DREPRESENTATION__NAME:
             setName((String) newValue);
             return;
@@ -381,9 +383,6 @@ public abstract class DRepresentationImpl extends DocumentedElementImpl implemen
         case ViewpointPackage.DREPRESENTATION__UI_STATE:
             setUiState((UIState) newValue);
             return;
-        case ViewpointPackage.DREPRESENTATION__UID:
-            setUid((String) newValue);
-            return;
         }
         super.eSet(featureID, newValue);
     }
@@ -399,6 +398,9 @@ public abstract class DRepresentationImpl extends DocumentedElementImpl implemen
         case ViewpointPackage.DREPRESENTATION__EANNOTATIONS:
             getEAnnotations().clear();
             return;
+        case ViewpointPackage.DREPRESENTATION__DOCUMENTATION:
+            setDocumentation(DRepresentationImpl.DOCUMENTATION_EDEFAULT);
+            return;
         case ViewpointPackage.DREPRESENTATION__NAME:
             setName(DRepresentationImpl.NAME_EDEFAULT);
             return;
@@ -408,9 +410,6 @@ public abstract class DRepresentationImpl extends DocumentedElementImpl implemen
         case ViewpointPackage.DREPRESENTATION__UI_STATE:
             setUiState((UIState) null);
             return;
-        case ViewpointPackage.DREPRESENTATION__UID:
-            setUid(DRepresentationImpl.UID_EDEFAULT);
-            return;
         }
         super.eUnset(featureID);
     }
@@ -425,6 +424,8 @@ public abstract class DRepresentationImpl extends DocumentedElementImpl implemen
         switch (featureID) {
         case ViewpointPackage.DREPRESENTATION__EANNOTATIONS:
             return eAnnotations != null && !eAnnotations.isEmpty();
+        case ViewpointPackage.DREPRESENTATION__DOCUMENTATION:
+            return DRepresentationImpl.DOCUMENTATION_EDEFAULT == null ? documentation != null : !DRepresentationImpl.DOCUMENTATION_EDEFAULT.equals(documentation);
         case ViewpointPackage.DREPRESENTATION__OWNED_REPRESENTATION_ELEMENTS:
             return !getOwnedRepresentationElements().isEmpty();
         case ViewpointPackage.DREPRESENTATION__REPRESENTATION_ELEMENTS:
@@ -435,8 +436,6 @@ public abstract class DRepresentationImpl extends DocumentedElementImpl implemen
             return ownedAnnotationEntries != null && !ownedAnnotationEntries.isEmpty();
         case ViewpointPackage.DREPRESENTATION__UI_STATE:
             return uiState != null;
-        case ViewpointPackage.DREPRESENTATION__UID:
-            return DRepresentationImpl.UID_EDEFAULT == null ? uid != null : !DRepresentationImpl.UID_EDEFAULT.equals(uid);
         }
         return super.eIsSet(featureID);
     }
@@ -448,16 +447,24 @@ public abstract class DRepresentationImpl extends DocumentedElementImpl implemen
      */
     @Override
     public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-        if (baseClass == DRefreshable.class) {
+        if (baseClass == DModelElement.class) {
+            switch (derivedFeatureID) {
+            case ViewpointPackage.DREPRESENTATION__EANNOTATIONS:
+                return DescriptionPackage.DMODEL_ELEMENT__EANNOTATIONS;
+            default:
+                return -1;
+            }
+        }
+        if (baseClass == DocumentedElement.class) {
             switch (derivedFeatureID) {
+            case ViewpointPackage.DREPRESENTATION__DOCUMENTATION:
+                return DescriptionPackage.DOCUMENTED_ELEMENT__DOCUMENTATION;
             default:
                 return -1;
             }
         }
-        if (baseClass == DModelElement.class) {
+        if (baseClass == DRefreshable.class) {
             switch (derivedFeatureID) {
-            case ViewpointPackage.DREPRESENTATION__EANNOTATIONS:
-                return DescriptionPackage.DMODEL_ELEMENT__EANNOTATIONS;
             default:
                 return -1;
             }
@@ -472,16 +479,24 @@ public abstract class DRepresentationImpl extends DocumentedElementImpl implemen
      */
     @Override
     public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-        if (baseClass == DRefreshable.class) {
+        if (baseClass == DModelElement.class) {
             switch (baseFeatureID) {
+            case DescriptionPackage.DMODEL_ELEMENT__EANNOTATIONS:
+                return ViewpointPackage.DREPRESENTATION__EANNOTATIONS;
             default:
                 return -1;
             }
         }
-        if (baseClass == DModelElement.class) {
+        if (baseClass == DocumentedElement.class) {
+            switch (baseFeatureID) {
+            case DescriptionPackage.DOCUMENTED_ELEMENT__DOCUMENTATION:
+                return ViewpointPackage.DREPRESENTATION__DOCUMENTATION;
+            default:
+                return -1;
+            }
+        }
+        if (baseClass == DRefreshable.class) {
             switch (baseFeatureID) {
-            case DescriptionPackage.DMODEL_ELEMENT__EANNOTATIONS:
-                return ViewpointPackage.DREPRESENTATION__EANNOTATIONS;
             default:
                 return -1;
             }
@@ -501,10 +516,10 @@ public abstract class DRepresentationImpl extends DocumentedElementImpl implemen
         }
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: "); //$NON-NLS-1$
+        result.append(" (documentation: "); //$NON-NLS-1$
+        result.append(documentation);
+        result.append(", name: "); //$NON-NLS-1$
         result.append(name);
-        result.append(", uid: "); //$NON-NLS-1$
-        result.append(uid);
         result.append(')');
         return result.toString();
     }
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DResourceContainerImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DResourceContainerImpl.java
index 40c5d78542..aafe6f6c28 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DResourceContainerImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DResourceContainerImpl.java
@@ -19,7 +19,6 @@ 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.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.sirius.viewpoint.DResource;
@@ -40,7 +39,7 @@ import org.eclipse.sirius.viewpoint.ViewpointPackage;
  *
  * @generated
  */
-public class DResourceContainerImpl extends MinimalEObjectImpl.Container implements DResourceContainer {
+public class DResourceContainerImpl extends IdentifiedElementImpl implements DResourceContainer {
     /**
      * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -271,6 +270,46 @@ public class DResourceContainerImpl extends MinimalEObjectImpl.Container impleme
      * @generated
      */
     @Override
+    public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+        if (baseClass == DResource.class) {
+            switch (derivedFeatureID) {
+            case ViewpointPackage.DRESOURCE_CONTAINER__NAME:
+                return ViewpointPackage.DRESOURCE__NAME;
+            case ViewpointPackage.DRESOURCE_CONTAINER__PATH:
+                return ViewpointPackage.DRESOURCE__PATH;
+            default:
+                return -1;
+            }
+        }
+        return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+        if (baseClass == DResource.class) {
+            switch (baseFeatureID) {
+            case ViewpointPackage.DRESOURCE__NAME:
+                return ViewpointPackage.DRESOURCE_CONTAINER__NAME;
+            case ViewpointPackage.DRESOURCE__PATH:
+                return ViewpointPackage.DRESOURCE_CONTAINER__PATH;
+            default:
+                return -1;
+            }
+        }
+        return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
     public String toString() {
         if (eIsProxy()) {
             return super.toString();
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DSemanticDecoratorImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DSemanticDecoratorImpl.java
index 0076571329..2993a7fd5c 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DSemanticDecoratorImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DSemanticDecoratorImpl.java
@@ -16,7 +16,6 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
 
@@ -32,7 +31,7 @@ import org.eclipse.sirius.viewpoint.ViewpointPackage;
  *
  * @generated
  */
-public abstract class DSemanticDecoratorImpl extends MinimalEObjectImpl.Container implements DSemanticDecorator {
+public abstract class DSemanticDecoratorImpl extends IdentifiedElementImpl implements DSemanticDecorator {
     /**
      * The cached value of the '{@link #getTarget() <em>Target</em>}' reference. <!-- begin-user-doc --> <!--
      * end-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DViewImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DViewImpl.java
index 72e719dc80..3d2284b9a0 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DViewImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DViewImpl.java
@@ -20,7 +20,6 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.sirius.viewpoint.DRepresentationDescriptor;
@@ -44,7 +43,7 @@ import org.eclipse.sirius.viewpoint.description.Viewpoint;
  *
  * @generated
  */
-public class DViewImpl extends MinimalEObjectImpl.Container implements DView {
+public class DViewImpl extends IdentifiedElementImpl implements DView {
     /**
      * The cached value of the '{@link #getViewpoint() <em>Viewpoint</em>}' reference. <!-- begin-user-doc --> <!--
      * end-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DecorationImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DecorationImpl.java
index 64760141b7..d7d385a856 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DecorationImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/DecorationImpl.java
@@ -15,7 +15,6 @@ import org.eclipse.emf.common.notify.Notification;
 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.sirius.viewpoint.Decoration;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
 import org.eclipse.sirius.viewpoint.description.DecorationDescription;
@@ -31,7 +30,7 @@ import org.eclipse.sirius.viewpoint.description.DecorationDescription;
  *
  * @generated
  */
-public class DecorationImpl extends MinimalEObjectImpl.Container implements Decoration {
+public class DecorationImpl extends IdentifiedElementImpl implements Decoration {
     /**
      * The cached value of the '{@link #getDescription() <em>Description</em>}' reference. <!-- begin-user-doc --> <!--
      * end-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/IdentifiedElementImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/IdentifiedElementImpl.java
new file mode 100644
index 0000000000..67aa0db27c
--- /dev/null
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/IdentifiedElementImpl.java
@@ -0,0 +1,174 @@
+/**
+ * Copyright (c) 2007, 2017 THALES GLOBAL SERVICES.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.viewpoint.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.sirius.viewpoint.IdentifiedElement;
+import org.eclipse.sirius.viewpoint.ViewpointPackage;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Identified Element</b></em>'. <!-- end-user-doc
+ * -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.sirius.viewpoint.impl.IdentifiedElementImpl#getUid <em>Uid</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class IdentifiedElementImpl extends MinimalEObjectImpl.Container implements IdentifiedElement {
+    /**
+     * The default value of the '{@link #getUid() <em>Uid</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @see #getUid()
+     * @generated
+     * @ordered
+     */
+    protected static final String UID_EDEFAULT = null;
+
+    /**
+     * The cached value of the '{@link #getUid() <em>Uid</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @see #getUid()
+     * @generated
+     * @ordered
+     */
+    protected String uid = IdentifiedElementImpl.UID_EDEFAULT;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated NOT
+     */
+    protected IdentifiedElementImpl() {
+        super();
+        setUid(EcoreUtil.generateUUID());
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected EClass eStaticClass() {
+        return ViewpointPackage.Literals.IDENTIFIED_ELEMENT;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public String getUid() {
+        return uid;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void setUid(String newUid) {
+        String oldUid = uid;
+        uid = newUid;
+        if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, ViewpointPackage.IDENTIFIED_ELEMENT__UID, oldUid, uid));
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+        switch (featureID) {
+        case ViewpointPackage.IDENTIFIED_ELEMENT__UID:
+            return getUid();
+        }
+        return super.eGet(featureID, resolve, coreType);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void eSet(int featureID, Object newValue) {
+        switch (featureID) {
+        case ViewpointPackage.IDENTIFIED_ELEMENT__UID:
+            setUid((String) newValue);
+            return;
+        }
+        super.eSet(featureID, newValue);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void eUnset(int featureID) {
+        switch (featureID) {
+        case ViewpointPackage.IDENTIFIED_ELEMENT__UID:
+            setUid(IdentifiedElementImpl.UID_EDEFAULT);
+            return;
+        }
+        super.eUnset(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public boolean eIsSet(int featureID) {
+        switch (featureID) {
+        case ViewpointPackage.IDENTIFIED_ELEMENT__UID:
+            return IdentifiedElementImpl.UID_EDEFAULT == null ? uid != null : !IdentifiedElementImpl.UID_EDEFAULT.equals(uid);
+        }
+        return super.eIsSet(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public String toString() {
+        if (eIsProxy()) {
+            return super.toString();
+        }
+
+        StringBuffer result = new StringBuffer(super.toString());
+        result.append(" (uid: "); //$NON-NLS-1$
+        result.append(uid);
+        result.append(')');
+        return result.toString();
+    }
+
+} // IdentifiedElementImpl
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/MetaModelExtensionImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/MetaModelExtensionImpl.java
index c493af0d38..04ff6a74a5 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/MetaModelExtensionImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/MetaModelExtensionImpl.java
@@ -16,7 +16,6 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.sirius.viewpoint.MetaModelExtension;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
 
@@ -32,7 +31,7 @@ import org.eclipse.sirius.viewpoint.ViewpointPackage;
  *
  * @generated
  */
-public class MetaModelExtensionImpl extends MinimalEObjectImpl.Container implements MetaModelExtension {
+public class MetaModelExtensionImpl extends IdentifiedElementImpl implements MetaModelExtension {
     /**
      * The cached value of the '{@link #getExtensionGroup() <em>Extension Group</em>}' reference. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/StyleImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/StyleImpl.java
index f22706cc45..2bcfc63a40 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/StyleImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/StyleImpl.java
@@ -18,9 +18,9 @@ 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.EDataTypeUniqueEList;
 import org.eclipse.sirius.viewpoint.Customizable;
+import org.eclipse.sirius.viewpoint.DRefreshable;
 import org.eclipse.sirius.viewpoint.Style;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
 import org.eclipse.sirius.viewpoint.description.style.StyleDescription;
@@ -37,7 +37,7 @@ import org.eclipse.sirius.viewpoint.description.style.StyleDescription;
  *
  * @generated
  */
-public abstract class StyleImpl extends MinimalEObjectImpl.Container implements Style {
+public abstract class StyleImpl extends IdentifiedElementImpl implements Style {
     /**
      * The cached value of the '{@link #getCustomFeatures() <em>Custom Features</em>}' attribute list. <!--
      * begin-user-doc --> <!-- end-user-doc -->
@@ -212,6 +212,12 @@ public abstract class StyleImpl extends MinimalEObjectImpl.Container implements
      */
     @Override
     public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+        if (baseClass == DRefreshable.class) {
+            switch (derivedFeatureID) {
+            default:
+                return -1;
+            }
+        }
         if (baseClass == Customizable.class) {
             switch (derivedFeatureID) {
             case ViewpointPackage.STYLE__CUSTOM_FEATURES:
@@ -230,6 +236,12 @@ public abstract class StyleImpl extends MinimalEObjectImpl.Container implements
      */
     @Override
     public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+        if (baseClass == DRefreshable.class) {
+            switch (baseFeatureID) {
+            default:
+                return -1;
+            }
+        }
         if (baseClass == Customizable.class) {
             switch (baseFeatureID) {
             case ViewpointPackage.CUSTOMIZABLE__CUSTOM_FEATURES:
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/ViewpointPackageImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/ViewpointPackageImpl.java
index bd4abde827..f5dfadc0b9 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/ViewpointPackageImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/impl/ViewpointPackageImpl.java
@@ -43,6 +43,7 @@ import org.eclipse.sirius.viewpoint.DStylizable;
 import org.eclipse.sirius.viewpoint.DView;
 import org.eclipse.sirius.viewpoint.Decoration;
 import org.eclipse.sirius.viewpoint.FontFormat;
+import org.eclipse.sirius.viewpoint.IdentifiedElement;
 import org.eclipse.sirius.viewpoint.LabelAlignment;
 import org.eclipse.sirius.viewpoint.LabelStyle;
 import org.eclipse.sirius.viewpoint.MetaModelExtension;
@@ -76,6 +77,13 @@ public class ViewpointPackageImpl extends EPackageImpl implements ViewpointPacka
      *
      * @generated
      */
+    private EClass identifiedElementEClass = null;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
     private EClass dAnalysisEClass = null;
 
     /**
@@ -387,6 +395,26 @@ public class ViewpointPackageImpl extends EPackageImpl implements ViewpointPacka
      * @generated
      */
     @Override
+    public EClass getIdentifiedElement() {
+        return identifiedElementEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EAttribute getIdentifiedElement_Uid() {
+        return (EAttribute) identifiedElementEClass.getEStructuralFeatures().get(0);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
     public EClass getDAnalysis() {
         return dAnalysisEClass;
     }
@@ -667,16 +695,6 @@ public class ViewpointPackageImpl extends EPackageImpl implements ViewpointPacka
      * @generated
      */
     @Override
-    public EAttribute getDRepresentation_Uid() {
-        return (EAttribute) dRepresentationEClass.getEStructuralFeatures().get(5);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
     public EClass getDRepresentationElement() {
         return dRepresentationElementEClass;
     }
@@ -1241,6 +1259,9 @@ public class ViewpointPackageImpl extends EPackageImpl implements ViewpointPacka
         isCreated = true;
 
         // Create classes and their features
+        identifiedElementEClass = createEClass(ViewpointPackage.IDENTIFIED_ELEMENT);
+        createEAttribute(identifiedElementEClass, ViewpointPackage.IDENTIFIED_ELEMENT__UID);
+
         dAnalysisEClass = createEClass(ViewpointPackage.DANALYSIS);
         createEReference(dAnalysisEClass, ViewpointPackage.DANALYSIS__REFERENCED_ANALYSIS);
         createEAttribute(dAnalysisEClass, ViewpointPackage.DANALYSIS__SEMANTIC_RESOURCES);
@@ -1276,7 +1297,6 @@ public class ViewpointPackageImpl extends EPackageImpl implements ViewpointPacka
         createEAttribute(dRepresentationEClass, ViewpointPackage.DREPRESENTATION__NAME);
         createEReference(dRepresentationEClass, ViewpointPackage.DREPRESENTATION__OWNED_ANNOTATION_ENTRIES);
         createEReference(dRepresentationEClass, ViewpointPackage.DREPRESENTATION__UI_STATE);
-        createEAttribute(dRepresentationEClass, ViewpointPackage.DREPRESENTATION__UID);
 
         dRepresentationElementEClass = createEClass(ViewpointPackage.DREPRESENTATION_ELEMENT);
         createEAttribute(dRepresentationElementEClass, ViewpointPackage.DREPRESENTATION_ELEMENT__NAME);
@@ -1392,26 +1412,44 @@ public class ViewpointPackageImpl extends EPackageImpl implements ViewpointPacka
         // Set bounds for type parameters
 
         // Add supertypes to classes
+        dAnalysisEClass.getESuperTypes().add(this.getIdentifiedElement());
+        dFeatureExtensionEClass.getESuperTypes().add(this.getIdentifiedElement());
+        dSemanticDecoratorEClass.getESuperTypes().add(this.getIdentifiedElement());
+        dRepresentationDescriptorEClass.getESuperTypes().add(this.getIdentifiedElement());
         dRepresentationDescriptorEClass.getESuperTypes().add(theDescriptionPackage.getDModelElement());
+        dRepresentationEClass.getESuperTypes().add(this.getIdentifiedElement());
+        dRepresentationEClass.getESuperTypes().add(theDescriptionPackage.getDModelElement());
         dRepresentationEClass.getESuperTypes().add(theDescriptionPackage.getDocumentedElement());
         dRepresentationEClass.getESuperTypes().add(this.getDRefreshable());
-        dRepresentationEClass.getESuperTypes().add(theDescriptionPackage.getDModelElement());
+        dRepresentationElementEClass.getESuperTypes().add(this.getIdentifiedElement());
         dRepresentationElementEClass.getESuperTypes().add(this.getDMappingBased());
         dRepresentationElementEClass.getESuperTypes().add(this.getDStylizable());
         dRepresentationElementEClass.getESuperTypes().add(this.getDRefreshable());
         dRepresentationElementEClass.getESuperTypes().add(this.getDSemanticDecorator());
+        dViewEClass.getESuperTypes().add(this.getIdentifiedElement());
         dViewEClass.getESuperTypes().add(this.getDRefreshable());
+        metaModelExtensionEClass.getESuperTypes().add(this.getIdentifiedElement());
+        decorationEClass.getESuperTypes().add(this.getIdentifiedElement());
+        dAnalysisCustomDataEClass.getESuperTypes().add(this.getIdentifiedElement());
         labelStyleEClass.getESuperTypes().add(this.getBasicLabelStyle());
+        styleEClass.getESuperTypes().add(this.getIdentifiedElement());
         styleEClass.getESuperTypes().add(this.getDRefreshable());
         styleEClass.getESuperTypes().add(this.getCustomizable());
+        dFileEClass.getESuperTypes().add(this.getIdentifiedElement());
         dFileEClass.getESuperTypes().add(this.getDResource());
+        dResourceContainerEClass.getESuperTypes().add(this.getIdentifiedElement());
         dResourceContainerEClass.getESuperTypes().add(this.getDResource());
         dProjectEClass.getESuperTypes().add(this.getDResourceContainer());
         dFolderEClass.getESuperTypes().add(this.getDResourceContainer());
         dModelEClass.getESuperTypes().add(this.getDFile());
         basicLabelStyleEClass.getESuperTypes().add(this.getCustomizable());
+        customizableEClass.getESuperTypes().add(this.getIdentifiedElement());
 
         // Initialize classes and features; add operations and parameters
+        initEClass(identifiedElementEClass, IdentifiedElement.class, "IdentifiedElement", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(getIdentifiedElement_Uid(), theEcorePackage.getEString(), "uid", null, 0, 1, IdentifiedElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, //$NON-NLS-1$
+                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+
         initEClass(dAnalysisEClass, DAnalysis.class, "DAnalysis", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
         initEReference(getDAnalysis_ReferencedAnalysis(), this.getDAnalysis(), null, "referencedAnalysis", null, 0, -1, DAnalysis.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, //$NON-NLS-1$
                 EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
@@ -1486,8 +1524,6 @@ public class ViewpointPackageImpl extends EPackageImpl implements ViewpointPacka
         initEReference(getDRepresentation_UiState(), this.getUIState(), null, "uiState", null, 0, 1, DRepresentation.class, EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, //$NON-NLS-1$
                 EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
                 EPackageImpl.IS_ORDERED);
-        initEAttribute(getDRepresentation_Uid(), ecorePackage.getEString(), "uid", null, 0, 1, DRepresentation.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, //$NON-NLS-1$
-                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
 
         initEClass(dRepresentationElementEClass, DRepresentationElement.class, "DRepresentationElement", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, //$NON-NLS-1$
                 EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/util/ViewpointAdapterFactory.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/util/ViewpointAdapterFactory.java
index 2ded9ec717..de8168e8da 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/util/ViewpointAdapterFactory.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/util/ViewpointAdapterFactory.java
@@ -36,6 +36,7 @@ import org.eclipse.sirius.viewpoint.DSemanticDecorator;
 import org.eclipse.sirius.viewpoint.DStylizable;
 import org.eclipse.sirius.viewpoint.DView;
 import org.eclipse.sirius.viewpoint.Decoration;
+import org.eclipse.sirius.viewpoint.IdentifiedElement;
 import org.eclipse.sirius.viewpoint.LabelStyle;
 import org.eclipse.sirius.viewpoint.MetaModelExtension;
 import org.eclipse.sirius.viewpoint.SessionManagerEObject;
@@ -97,6 +98,11 @@ public class ViewpointAdapterFactory extends AdapterFactoryImpl {
      */
     protected ViewpointSwitch<Adapter> modelSwitch = new ViewpointSwitch<Adapter>() {
         @Override
+        public Adapter caseIdentifiedElement(IdentifiedElement object) {
+            return createIdentifiedElementAdapter();
+        }
+
+        @Override
         public Adapter caseDAnalysis(DAnalysis object) {
             return createDAnalysisAdapter();
         }
@@ -256,6 +262,20 @@ public class ViewpointAdapterFactory extends AdapterFactoryImpl {
     }
 
     /**
+     * Creates a new adapter for an object of class '{@link org.eclipse.sirius.viewpoint.IdentifiedElement
+     * <em>Identified Element</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+     * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+     * end-user-doc -->
+     *
+     * @return the new adapter.
+     * @see org.eclipse.sirius.viewpoint.IdentifiedElement
+     * @generated
+     */
+    public Adapter createIdentifiedElementAdapter() {
+        return null;
+    }
+
+    /**
      * Creates a new adapter for an object of class '{@link org.eclipse.sirius.viewpoint.DAnalysis <em>DAnalysis</em>}'.
      * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful
      * to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/util/ViewpointSwitch.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/util/ViewpointSwitch.java
index 1f02dc0519..09c2786527 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/util/ViewpointSwitch.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/util/ViewpointSwitch.java
@@ -36,6 +36,7 @@ import org.eclipse.sirius.viewpoint.DSemanticDecorator;
 import org.eclipse.sirius.viewpoint.DStylizable;
 import org.eclipse.sirius.viewpoint.DView;
 import org.eclipse.sirius.viewpoint.Decoration;
+import org.eclipse.sirius.viewpoint.IdentifiedElement;
 import org.eclipse.sirius.viewpoint.LabelStyle;
 import org.eclipse.sirius.viewpoint.MetaModelExtension;
 import org.eclipse.sirius.viewpoint.SessionManagerEObject;
@@ -109,10 +110,21 @@ public class ViewpointSwitch<T> {
      */
     protected T doSwitch(int classifierID, EObject theEObject) {
         switch (classifierID) {
+        case ViewpointPackage.IDENTIFIED_ELEMENT: {
+            IdentifiedElement identifiedElement = (IdentifiedElement) theEObject;
+            T result = caseIdentifiedElement(identifiedElement);
+            if (result == null) {
+                result = defaultCase(theEObject);
+            }
+            return result;
+        }
         case ViewpointPackage.DANALYSIS: {
             DAnalysis dAnalysis = (DAnalysis) theEObject;
             T result = caseDAnalysis(dAnalysis);
             if (result == null) {
+                result = caseIdentifiedElement(dAnalysis);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -121,6 +133,9 @@ public class ViewpointSwitch<T> {
             DFeatureExtension dFeatureExtension = (DFeatureExtension) theEObject;
             T result = caseDFeatureExtension(dFeatureExtension);
             if (result == null) {
+                result = caseIdentifiedElement(dFeatureExtension);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -153,6 +168,9 @@ public class ViewpointSwitch<T> {
             DSemanticDecorator dSemanticDecorator = (DSemanticDecorator) theEObject;
             T result = caseDSemanticDecorator(dSemanticDecorator);
             if (result == null) {
+                result = caseIdentifiedElement(dSemanticDecorator);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -161,6 +179,9 @@ public class ViewpointSwitch<T> {
             DRepresentationDescriptor dRepresentationDescriptor = (DRepresentationDescriptor) theEObject;
             T result = caseDRepresentationDescriptor(dRepresentationDescriptor);
             if (result == null) {
+                result = caseIdentifiedElement(dRepresentationDescriptor);
+            }
+            if (result == null) {
                 result = caseDModelElement(dRepresentationDescriptor);
             }
             if (result == null) {
@@ -172,13 +193,16 @@ public class ViewpointSwitch<T> {
             DRepresentation dRepresentation = (DRepresentation) theEObject;
             T result = caseDRepresentation(dRepresentation);
             if (result == null) {
-                result = caseDocumentedElement(dRepresentation);
+                result = caseIdentifiedElement(dRepresentation);
             }
             if (result == null) {
-                result = caseDRefreshable(dRepresentation);
+                result = caseDModelElement(dRepresentation);
             }
             if (result == null) {
-                result = caseDModelElement(dRepresentation);
+                result = caseDocumentedElement(dRepresentation);
+            }
+            if (result == null) {
+                result = caseDRefreshable(dRepresentation);
             }
             if (result == null) {
                 result = defaultCase(theEObject);
@@ -201,6 +225,9 @@ public class ViewpointSwitch<T> {
                 result = caseDSemanticDecorator(dRepresentationElement);
             }
             if (result == null) {
+                result = caseIdentifiedElement(dRepresentationElement);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -209,6 +236,9 @@ public class ViewpointSwitch<T> {
             DView dView = (DView) theEObject;
             T result = caseDView(dView);
             if (result == null) {
+                result = caseIdentifiedElement(dView);
+            }
+            if (result == null) {
                 result = caseDRefreshable(dView);
             }
             if (result == null) {
@@ -220,6 +250,9 @@ public class ViewpointSwitch<T> {
             MetaModelExtension metaModelExtension = (MetaModelExtension) theEObject;
             T result = caseMetaModelExtension(metaModelExtension);
             if (result == null) {
+                result = caseIdentifiedElement(metaModelExtension);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -228,6 +261,9 @@ public class ViewpointSwitch<T> {
             Decoration decoration = (Decoration) theEObject;
             T result = caseDecoration(decoration);
             if (result == null) {
+                result = caseIdentifiedElement(decoration);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -236,6 +272,9 @@ public class ViewpointSwitch<T> {
             DAnalysisCustomData dAnalysisCustomData = (DAnalysisCustomData) theEObject;
             T result = caseDAnalysisCustomData(dAnalysisCustomData);
             if (result == null) {
+                result = caseIdentifiedElement(dAnalysisCustomData);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -250,6 +289,9 @@ public class ViewpointSwitch<T> {
                 result = caseCustomizable(labelStyle);
             }
             if (result == null) {
+                result = caseIdentifiedElement(labelStyle);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -264,6 +306,9 @@ public class ViewpointSwitch<T> {
                 result = caseCustomizable(style);
             }
             if (result == null) {
+                result = caseIdentifiedElement(style);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -296,6 +341,9 @@ public class ViewpointSwitch<T> {
             DFile dFile = (DFile) theEObject;
             T result = caseDFile(dFile);
             if (result == null) {
+                result = caseIdentifiedElement(dFile);
+            }
+            if (result == null) {
                 result = caseDResource(dFile);
             }
             if (result == null) {
@@ -307,6 +355,9 @@ public class ViewpointSwitch<T> {
             DResourceContainer dResourceContainer = (DResourceContainer) theEObject;
             T result = caseDResourceContainer(dResourceContainer);
             if (result == null) {
+                result = caseIdentifiedElement(dResourceContainer);
+            }
+            if (result == null) {
                 result = caseDResource(dResourceContainer);
             }
             if (result == null) {
@@ -321,6 +372,9 @@ public class ViewpointSwitch<T> {
                 result = caseDResourceContainer(dProject);
             }
             if (result == null) {
+                result = caseIdentifiedElement(dProject);
+            }
+            if (result == null) {
                 result = caseDResource(dProject);
             }
             if (result == null) {
@@ -335,6 +389,9 @@ public class ViewpointSwitch<T> {
                 result = caseDResourceContainer(dFolder);
             }
             if (result == null) {
+                result = caseIdentifiedElement(dFolder);
+            }
+            if (result == null) {
                 result = caseDResource(dFolder);
             }
             if (result == null) {
@@ -349,6 +406,9 @@ public class ViewpointSwitch<T> {
                 result = caseDFile(dModel);
             }
             if (result == null) {
+                result = caseIdentifiedElement(dModel);
+            }
+            if (result == null) {
                 result = caseDResource(dModel);
             }
             if (result == null) {
@@ -363,6 +423,9 @@ public class ViewpointSwitch<T> {
                 result = caseCustomizable(basicLabelStyle);
             }
             if (result == null) {
+                result = caseIdentifiedElement(basicLabelStyle);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -371,6 +434,9 @@ public class ViewpointSwitch<T> {
             Customizable customizable = (Customizable) theEObject;
             T result = caseCustomizable(customizable);
             if (result == null) {
+                result = caseIdentifiedElement(customizable);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -389,6 +455,21 @@ public class ViewpointSwitch<T> {
     }
 
     /**
+     * Returns the result of interpreting the object as an instance of '<em>Identified Element</em>'. <!--
+     * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
+     * end-user-doc -->
+     *
+     * @param object
+     *            the target of the switch.
+     * @return the result of interpreting the object as an instance of '<em>Identified Element</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseIdentifiedElement(IdentifiedElement object) {
+        return null;
+    }
+
+    /**
      * Returns the result of interpreting the object as an instance of '<em>DAnalysis</em>'. <!-- begin-user-doc -->
      * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
      *
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/TechnicalUidMigrationParticipant.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/TechnicalUidMigrationParticipant.java
new file mode 100644
index 0000000000..e25192580d
--- /dev/null
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/TechnicalUidMigrationParticipant.java
@@ -0,0 +1,71 @@
+/*******************************************************************************
+ * Copyright (c) 2018 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.business.internal.migration;
+
+import java.text.MessageFormat;
+
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.sirius.business.api.migration.AbstractRepresentationsFileMigrationParticipant;
+import org.eclipse.sirius.viewpoint.DRepresentation;
+import org.eclipse.sirius.viewpoint.DRepresentationDescriptor;
+import org.eclipse.sirius.viewpoint.IdentifiedElement;
+import org.eclipse.sirius.viewpoint.Messages;
+import org.eclipse.sirius.viewpoint.SiriusPlugin;
+import org.osgi.framework.Version;
+
+/**
+ * This migration participant will update IdentifiedElement.uid to be the same value than the xmiid.</br>
+ * DRepresentationDescriptor.repPath is updated consequently to the DRepresentation.uid change
+ * 
+ * @author <a href="mailto:laurent.fasani@obeo.fr">Laurent Fasani</a>
+ */
+public class TechnicalUidMigrationParticipant extends AbstractRepresentationsFileMigrationParticipant {
+
+    /**
+     * The VP version for which this migration is added.
+     */
+    public static final Version MIGRATION_VERSION = new Version("14.1.0.201808080808"); //$NON-NLS-1$
+
+    private boolean migrationOccured;
+
+    @Override
+    public Version getMigrationVersion() {
+        return MIGRATION_VERSION;
+    }
+
+    @Override
+    public void postLoad(XMLResource resource, String loadedVersion) {
+        if (Version.parseVersion(loadedVersion).compareTo(MIGRATION_VERSION) < 0) {
+            resource.getAllContents().forEachRemaining(eObject -> {
+                if (eObject instanceof IdentifiedElement) {
+                    IdentifiedElement idElem = (IdentifiedElement) eObject;
+                    String xmiid = resource.getID(eObject);
+                    idElem.setUid(xmiid);
+
+                    // Special case for DRepresentationDescriptor that must update the repPath
+                    if (eObject instanceof DRepresentationDescriptor) {
+                        DRepresentation rep = ((DRepresentationDescriptor) eObject).getRepresentation();
+                        if (rep != null) {
+                            rep.setUid(resource.getID(rep));
+                            ((DRepresentationDescriptor) eObject).updateRepresentation(rep);
+                        }
+                    }
+
+                }
+            });
+            if (migrationOccured) {
+                SiriusPlugin.getDefault().info(MessageFormat.format(Messages.TechnicalUidMigrationParticipant_message, resource.getURI().toPlatformString(true)), null);
+                migrationOccured = false;
+            }
+        }
+        super.postLoad(resource, loadedVersion);
+    }
+}
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/resource/AirDResourceImpl.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/resource/AirDResourceImpl.java
index b68ebeb08c..4a069f242f 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/resource/AirDResourceImpl.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/resource/AirDResourceImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2015 THALES GLOBAL SERVICES and others.
+ * Copyright (c) 2008, 2018 THALES GLOBAL SERVICES and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -33,6 +33,7 @@ import org.eclipse.sirius.business.internal.resource.parser.RepresentationsFileX
 import org.eclipse.sirius.common.tools.DslCommonPlugin;
 import org.eclipse.sirius.ext.base.Option;
 import org.eclipse.sirius.tools.api.profiler.SiriusTasksKey;
+import org.eclipse.sirius.viewpoint.IdentifiedElement;
 import org.osgi.framework.Version;
 
 /**
@@ -43,16 +44,14 @@ import org.osgi.framework.Version;
 public class AirDResourceImpl extends XMIResourceImpl implements DResource, AirdResource {
 
     /**
-     * Use this option to abort loading a resource immediately when an error
-     * occurs. The default is <code>Boolean.FALSE</code> unless set to
-     * <code>Boolean.TRUE</code> explicitly.
+     * Use this option to abort loading a resource immediately when an error occurs. The default is
+     * <code>Boolean.FALSE</code> unless set to <code>Boolean.TRUE</code> explicitly.
      */
     public static final String OPTION_ABORT_ON_ERROR = "ABORT_ON_ERROR"; //$NON-NLS-1$
 
     /**
-     * The number of current load in progress. Usefull for determine if the
-     * current load is the first one or is a load triggered by a resolve (for
-     * fragmented files for examples).
+     * The number of current load in progress. Usefull for determine if the current load is the first one or is a load
+     * triggered by a resolve (for fragmented files for examples).
      */
     private static ThreadLocal<Integer> nbLoadInProgress = new ThreadLocal<Integer>() {
         @Override
@@ -62,8 +61,8 @@ public class AirDResourceImpl extends XMIResourceImpl implements DResource, Aird
     };
 
     /**
-     * This constructor should be used only if the version is up to date. There
-     * is no automatic migration during the resolution of an object.
+     * This constructor should be used only if the version is up to date. There is no automatic migration during the
+     * resolution of an object.
      * 
      * @param uri
      *            the URI
@@ -79,7 +78,33 @@ public class AirDResourceImpl extends XMIResourceImpl implements DResource, Aird
 
     @Override
     protected boolean useIDAttributes() {
-        return false;
+        return true;
+    }
+
+    /**
+     * Allow to have the xmiid equal to the uid intrisic id.</br>
+     * 
+     * @see org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl#attachedHelper(org.eclipse.emf.ecore.EObject)
+     */
+    @Override
+    protected void attachedHelper(EObject eObject) {
+        if (eObject instanceof IdentifiedElement) {
+            IdentifiedElement idElem = (IdentifiedElement) eObject;
+            String uid = idElem.getUid();
+            String cachedId = getID(eObject);
+            if (uid == null) {
+                throw new NullPointerException(org.eclipse.sirius.viewpoint.Messages.AirDResourceImpl_nullUid); // $NON-NLS-1$
+            } else if (cachedId == null || !isLoading && !cachedId.equals(uid)) {
+                // Uid must be used as id for href, urifragment and other kind of internal/external reference,
+                // Update cache if it is not known or different.
+                // During load/migration we might still need the old id for idref resolution, the cache will be update
+                // in postLoad phase.
+                setID(eObject, uid);
+            }
+        }
+
+        // for other EObject such GMF's, they are identified with the xmiid
+        super.attachedHelper(eObject);
     }
 
     /**
@@ -106,11 +131,9 @@ public class AirDResourceImpl extends XMIResourceImpl implements DResource, Aird
     }
 
     /**
-     * Overridden to not have {@link XMIResourceImpl} set to true in this
-     * constructor because now it is
-     * {@link org.eclipse.sirius.business.internal.resource.ResourceModifiedFieldUpdater}
-     * which manage {@link org.eclipse.emf.ecore.resource.Resource#isModified()}
-     * .
+     * Overridden to not have {@link XMIResourceImpl} set to true in this constructor because now it is
+     * {@link org.eclipse.sirius.business.internal.resource.ResourceModifiedFieldUpdater} which manage
+     * {@link org.eclipse.emf.ecore.resource.Resource#isModified()} .
      * 
      * {@inheritDoc}
      */
@@ -141,8 +164,7 @@ public class AirDResourceImpl extends XMIResourceImpl implements DResource, Aird
     }
 
     /**
-     * Handle migration options and return an error diagnostic in case of
-     * migration version mismatch
+     * Handle migration options and return an error diagnostic in case of migration version mismatch
      */
     private Diagnostic handleMigrationOptions() {
         Diagnostic migrationMismatchDiagnostic = null;
@@ -204,8 +226,7 @@ public class AirDResourceImpl extends XMIResourceImpl implements DResource, Aird
     }
 
     /**
-     * Override to migrate fragment if necessary (when a reference has been
-     * renamed) before getting the EObject.
+     * Override to migrate fragment if necessary (when a reference has been renamed) before getting the EObject.
      * 
      * {@inheritDoc}
      */
@@ -237,8 +258,8 @@ public class AirDResourceImpl extends XMIResourceImpl implements DResource, Aird
         loadOptions.put(XMLResource.OPTION_EXTENDED_META_DATA, extendedMetaData);
         loadOptions.put(XMLResource.OPTION_RESOURCE_HANDLER, resourceHandler);
         /**
-         * This option is passed so that the resource can decide to adapt the
-         * load mechanism depending on the loaded version.
+         * This option is passed so that the resource can decide to adapt the load mechanism depending on the loaded
+         * version.
          */
         loadOptions.put(AbstractSiriusMigrationService.OPTION_RESOURCE_MIGRATION_LOADEDVERSION, loadedVersion);
 
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/resource/parser/RepresentationsFileXMIHelper.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/resource/parser/RepresentationsFileXMIHelper.java
index 323c40cb0e..bad1e38b36 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/resource/parser/RepresentationsFileXMIHelper.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/resource/parser/RepresentationsFileXMIHelper.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012, 2017 THALES GLOBAL SERVICES and others.
+ * Copyright (c) 2012, 2018 THALES GLOBAL SERVICES and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -24,6 +24,7 @@ import org.eclipse.emf.ecore.xmi.impl.XMIHelperImpl;
 import org.eclipse.sirius.business.api.resource.ResourceDescriptor;
 import org.eclipse.sirius.business.internal.migration.RepresentationsFileMigrationService;
 import org.eclipse.sirius.business.internal.migration.RepresentationsFileVersionSAXParser;
+import org.eclipse.sirius.viewpoint.IdentifiedElement;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
 import org.osgi.framework.Version;
 
@@ -140,4 +141,14 @@ public class RepresentationsFileXMIHelper extends XMIHelperImpl {
         }
         return super.createFromString(eFactory, eDataType, value);
     }
+
+    @Override
+    public String getID(EObject obj) {
+        if (obj instanceof IdentifiedElement && ((IdentifiedElement) obj).getUid() != null) {
+            // Do not serialize xmi:id for identified elements as their uuid attribute is used to reference them.
+            return null;
+        }
+        return super.getID(obj);
+    }
+
 }
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/viewpoint/Messages.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/viewpoint/Messages.java
index 04b34d535a..48660de7cd 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/viewpoint/Messages.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/viewpoint/Messages.java
@@ -76,6 +76,9 @@ public final class Messages {
     public static String AddSemanticResourceCommand_label;
 
     @TranslatableMessage
+    public static String AirDResourceImpl_nullUid;
+
+    @TranslatableMessage
     public static String AnalysisResourceReloadedCommand_label;
 
     @TranslatableMessage
@@ -829,6 +832,9 @@ public final class Messages {
     public static String SiriusUncontrolCommand_resourceDeletionFailedMsg;
 
     @TranslatableMessage
+    public static String TechnicalUidMigrationParticipant_message;
+
+    @TranslatableMessage
     public static String UnexecutableTask_label;
 
     @TranslatableMessage
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/viewpoint/SiriusPlugin.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/viewpoint/SiriusPlugin.java
index 7fa3e6499c..01107268ac 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/viewpoint/SiriusPlugin.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/viewpoint/SiriusPlugin.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2017 THALES GLOBAL SERVICES and others.
+ * Copyright (c) 2007, 2018 THALES GLOBAL SERVICES and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -248,16 +248,7 @@ public final class SiriusPlugin extends EMFPlugin {
          *            the exception (optional).
          */
         public void error(String message, final Throwable e) {
-            String messageToDisplay = message;
-            if (messageToDisplay == null && e != null) {
-                messageToDisplay = e.getMessage();
-            }
-            if (e instanceof CoreException) {
-                getLog().log(((CoreException) e).getStatus());
-            } else {
-                IStatus status = new Status(IStatus.ERROR, getDefault().getSymbolicName(), messageToDisplay, e);
-                getLog().log(status);
-            }
+            log(message, e, IStatus.ERROR);
         }
 
         /**
@@ -269,6 +260,22 @@ public final class SiriusPlugin extends EMFPlugin {
          *            the exception (optional).
          */
         public void warning(String message, final Exception e) {
+            log(message, e, IStatus.WARNING);
+        }
+
+        /**
+         * Logs an info in the error log.
+         * 
+         * @param message
+         *            the message to log (optional).
+         * @param e
+         *            the exception (optional).
+         */
+        public void info(String message, final Throwable e) {
+            log(message, e, IStatus.INFO);
+        }
+
+        private void log(String message, final Throwable e, int severity) {
             String messageToDisplay = message;
             if (messageToDisplay == null && e != null) {
                 messageToDisplay = e.getMessage();
@@ -276,7 +283,7 @@ public final class SiriusPlugin extends EMFPlugin {
             if (e instanceof CoreException) {
                 getLog().log(((CoreException) e).getStatus());
             } else {
-                final IStatus status = new Status(IStatus.WARNING, getDefault().getSymbolicName(), messageToDisplay, e);
+                IStatus status = new Status(severity, getDefault().getSymbolicName(), messageToDisplay, e);
                 getLog().log(status);
             }
         }