[486654] Generate code with MM changes

* generate MM for viewpoint, diagram, sequence, tree and table * generate VSM properties from OES.editor * deleted old class not existing anymore in sirius MM * make change to keep sirius plugin compiling Bug: 486654 Change-Id: Ic22e9852c224aa7fbd844adb9879b0d3656968b9 Signed-off-by: Laurent Fasani <laurent.fasani@obeo.fr>
author: Laurent Fasani 2015-12-17 14:40:49 +0000
committer: Laurent Fasani 2016-01-28 12:58:01 +0000
commit: 4b9a851c65dc3782693c9a11786c5d87844f6ae6 (patch)
tree: 3b99ddefafc754c4d605462106977523eb3fdde2
parent: 6710e636d2a6293d3e20a025962b627666fbe221 (diff)
download: org.eclipse.sirius-4b9a851c65dc3782693c9a11786c5d87844f6ae6.tar.gz
org.eclipse.sirius-4b9a851c65dc3782693c9a11786c5d87844f6ae6.tar.xz
org.eclipse.sirius-4b9a851c65dc3782693c9a11786c5d87844f6ae6.zip
197 files changed, 4662 insertions, 3009 deletions
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/CoveredLifelinesVariableItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/CoveredLifelinesVariableItemProvider.java
index d8ed272cd1..e014249878 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/CoveredLifelinesVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/CoveredLifelinesVariableItemProvider.java
@@ -18,7 +18,7 @@ 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.sequence.description.CoveredLifelinesVariable;
-import org.eclipse.sirius.viewpoint.description.tool.provider.AbstractVariableItemProvider;
+import org.eclipse.sirius.viewpoint.description.provider.AbstractVariableItemProvider;
 
 /**
  * This is the item provider adapter for a
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/MessageEndVariableItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/MessageEndVariableItemProvider.java
index 62552a8d3a..a2ee51e781 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/MessageEndVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/provider/MessageEndVariableItemProvider.java
@@ -18,7 +18,7 @@ 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.sequence.description.MessageEndVariable;
-import org.eclipse.sirius.viewpoint.description.tool.provider.AbstractVariableItemProvider;
+import org.eclipse.sirius.viewpoint.description.provider.AbstractVariableItemProvider;
 
 /**
  * This is the item provider adapter for a
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/business/api/diagramtype/SequenceDiagramTypeProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/business/api/diagramtype/SequenceDiagramTypeProvider.java
index f64aaa68e5..f80250f288 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/business/api/diagramtype/SequenceDiagramTypeProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/business/api/diagramtype/SequenceDiagramTypeProvider.java
@@ -69,7 +69,7 @@ import org.eclipse.sirius.diagram.ui.business.api.query.DDiagramGraphicalQuery;
 import org.eclipse.sirius.ext.base.Option;
 import org.eclipse.sirius.ext.base.Options;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
@@ -154,9 +154,10 @@ public class SequenceDiagramTypeProvider implements IDiagramDescriptionProvider
         result.add(new CommandParameter(null, org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.LAYER__NODE_MAPPINGS, DescriptionFactory.eINSTANCE.createEndOfLifeMapping()));
         result.add(new CommandParameter(null, org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.LAYER__NODE_MAPPINGS, DescriptionFactory.eINSTANCE.createObservationPointMapping()));
         // Containers
-        result.add(new CommandParameter(null, org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.LAYER__CONTAINER_MAPPINGS, DescriptionFactory.eINSTANCE.createInteractionUseMapping()));
-        result.add(new CommandParameter(null, org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.LAYER__CONTAINER_MAPPINGS, DescriptionFactory.eINSTANCE
-                .createCombinedFragmentMapping()));
+        result.add(
+                new CommandParameter(null, org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.LAYER__CONTAINER_MAPPINGS, DescriptionFactory.eINSTANCE.createInteractionUseMapping()));
+        result.add(
+                new CommandParameter(null, org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.LAYER__CONTAINER_MAPPINGS, DescriptionFactory.eINSTANCE.createCombinedFragmentMapping()));
         result.add(new CommandParameter(null, org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.LAYER__CONTAINER_MAPPINGS, DescriptionFactory.eINSTANCE.createOperandMapping()));
         // Edges
         result.add(new CommandParameter(null, org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.LAYER__EDGE_MAPPINGS, DescriptionFactory.eINSTANCE.createBasicMessageMapping()));
@@ -291,7 +292,7 @@ public class SequenceDiagramTypeProvider implements IDiagramDescriptionProvider
         for (EReference ref : sequenceDiagramTool.eClass().getEAllReferences()) {
             if (ref.isContainment() && ref.getEType() instanceof EClass) {
                 EClass k = (EClass) ref.getEType();
-                EClass variable = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.eINSTANCE.getAbstractVariable();
+                EClass variable = org.eclipse.sirius.viewpoint.description.DescriptionPackage.eINSTANCE.getAbstractVariable();
                 if (variable.isSuperTypeOf(k)) {
                     AbstractVariable var = (AbstractVariable) k.getEPackage().getEFactoryInstance().create(k);
                     EAnnotation annotation = ref.getEAnnotation("toolVariable"); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.diagram.sequence/META-INF/MANIFEST.MF
index 218ff45c41..c95f375bb6 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.diagram.sequence/META-INF/MANIFEST.MF
@@ -7,24 +7,24 @@ Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.sirius.diagram.sequence;version="2.1.0",
- org.eclipse.sirius.diagram.sequence.business.internal;x-internal:=true;version="2.0.4",
- org.eclipse.sirius.diagram.sequence.business.internal.color;x-internal:=true;version="2.0.4",
- org.eclipse.sirius.diagram.sequence.business.internal.elements;x-internal:=true;version="3.0.0",
- org.eclipse.sirius.diagram.sequence.business.internal.layout;x-internal:=true;version="2.0.4",
- org.eclipse.sirius.diagram.sequence.business.internal.layout.flag;x-internal:=true;version="2.0.4",
- org.eclipse.sirius.diagram.sequence.business.internal.layout.horizontal;x-internal:=true;version="2.0.4",
- org.eclipse.sirius.diagram.sequence.business.internal.layout.observation;x-internal:=true;version="2.0.4",
- org.eclipse.sirius.diagram.sequence.business.internal.layout.vertical;x-internal:=true;version="2.0.4",
- org.eclipse.sirius.diagram.sequence.business.internal.metamodel;x-internal:=true;version="3.1.0",
- org.eclipse.sirius.diagram.sequence.business.internal.metamodel.description;x-internal:=true;version="2.0.4",
- org.eclipse.sirius.diagram.sequence.business.internal.metamodel.description.tool;x-internal:=true;version="3.1.0",
- org.eclipse.sirius.diagram.sequence.business.internal.metamodel.ordering;x-internal:=true;version="3.0.0",
- org.eclipse.sirius.diagram.sequence.business.internal.operation;x-internal:=true;version="3.0.0",
- org.eclipse.sirius.diagram.sequence.business.internal.ordering;x-internal:=true;version="2.0.4",
- org.eclipse.sirius.diagram.sequence.business.internal.query;x-internal:=true;version="2.0.4",
- org.eclipse.sirius.diagram.sequence.business.internal.refresh;x-internal:=true;version="2.0.4",
- org.eclipse.sirius.diagram.sequence.business.internal.tool;x-internal:=true;version="2.0.4",
- org.eclipse.sirius.diagram.sequence.business.internal.util;x-internal:=true;version="2.0.4",
+ org.eclipse.sirius.diagram.sequence.business.internal;version="2.0.4";x-internal:=true,
+ org.eclipse.sirius.diagram.sequence.business.internal.color;version="2.0.4";x-internal:=true,
+ org.eclipse.sirius.diagram.sequence.business.internal.elements;version="3.0.0";x-internal:=true,
+ org.eclipse.sirius.diagram.sequence.business.internal.layout;version="2.0.4";x-internal:=true,
+ org.eclipse.sirius.diagram.sequence.business.internal.layout.flag;version="2.0.4";x-internal:=true,
+ org.eclipse.sirius.diagram.sequence.business.internal.layout.horizontal;version="2.0.4";x-internal:=true,
+ org.eclipse.sirius.diagram.sequence.business.internal.layout.observation;version="2.0.4";x-internal:=true,
+ org.eclipse.sirius.diagram.sequence.business.internal.layout.vertical;version="2.0.4";x-internal:=true,
+ org.eclipse.sirius.diagram.sequence.business.internal.metamodel;version="3.1.0";x-internal:=true,
+ org.eclipse.sirius.diagram.sequence.business.internal.metamodel.description;version="2.0.4";x-internal:=true,
+ org.eclipse.sirius.diagram.sequence.business.internal.metamodel.description.tool;version="3.1.0";x-internal:=true,
+ org.eclipse.sirius.diagram.sequence.business.internal.metamodel.ordering;version="3.0.0";x-internal:=true,
+ org.eclipse.sirius.diagram.sequence.business.internal.operation;version="3.0.0";x-internal:=true,
+ org.eclipse.sirius.diagram.sequence.business.internal.ordering;version="2.0.4";x-internal:=true,
+ org.eclipse.sirius.diagram.sequence.business.internal.query;version="2.0.4";x-internal:=true,
+ org.eclipse.sirius.diagram.sequence.business.internal.refresh;version="2.0.4";x-internal:=true,
+ org.eclipse.sirius.diagram.sequence.business.internal.tool;version="2.0.4";x-internal:=true,
+ org.eclipse.sirius.diagram.sequence.business.internal.util;version="2.0.4";x-internal:=true,
  org.eclipse.sirius.diagram.sequence.description;version="2.0.4",
  org.eclipse.sirius.diagram.sequence.description.impl;version="3.0.0",
  org.eclipse.sirius.diagram.sequence.description.tool;version="2.1.0",
@@ -32,15 +32,15 @@ Export-Package: org.eclipse.sirius.diagram.sequence;version="2.1.0",
  org.eclipse.sirius.diagram.sequence.description.tool.util;version="2.0.4",
  org.eclipse.sirius.diagram.sequence.description.util;version="2.0.4",
  org.eclipse.sirius.diagram.sequence.impl;version="2.0.4",
- org.eclipse.sirius.diagram.sequence.internal.tool.command.builders;x-internal:=true;version="2.1.0",
+ org.eclipse.sirius.diagram.sequence.internal.tool.command.builders;version="2.1.0";x-internal:=true,
  org.eclipse.sirius.diagram.sequence.ordering;version="2.0.4",
- org.eclipse.sirius.diagram.sequence.ordering.impl;x-internal:=true;version="3.0.0",
+ org.eclipse.sirius.diagram.sequence.ordering.impl;version="3.0.0";x-internal:=true,
  org.eclipse.sirius.diagram.sequence.ordering.util;version="2.0.4",
  org.eclipse.sirius.diagram.sequence.template;version="2.0.4",
  org.eclipse.sirius.diagram.sequence.template.impl;version="3.0.0",
  org.eclipse.sirius.diagram.sequence.template.util;version="2.0.4",
- org.eclipse.sirius.diagram.sequence.tool.internal.action.repair;x-internal:=true;version="2.0.4",
- org.eclipse.sirius.diagram.sequence.tool.internal.validation.description.constraints;x-internal:=true;version="3.1.0",
+ org.eclipse.sirius.diagram.sequence.tool.internal.action.repair;version="2.0.4";x-internal:=true,
+ org.eclipse.sirius.diagram.sequence.tool.internal.validation.description.constraints;version="3.1.0";x-internal:=true,
  org.eclipse.sirius.diagram.sequence.util;version="3.0.0"
 Require-Bundle: org.eclipse.sirius.common;bundle-version="2.0.0",
  org.eclipse.sirius.ecore.extender;bundle-version="2.0.0",
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/CoveredLifelinesVariable.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/CoveredLifelinesVariable.java
index 48f8d8f017..0bc33c1ec5 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/CoveredLifelinesVariable.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/CoveredLifelinesVariable.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.sirius.diagram.sequence.description;
 
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/DescriptionPackage.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/DescriptionPackage.java
index b890e4f5d8..70588efc77 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/DescriptionPackage.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/DescriptionPackage.java
@@ -13,7 +13,6 @@ package org.eclipse.sirius.diagram.sequence.description;
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
 
 /**
  * <!-- begin-user-doc --> The <b>Package</b> for the model. It contains
@@ -2721,7 +2720,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int MESSAGE_END_VARIABLE__NAME = ToolPackage.ABSTRACT_VARIABLE__NAME;
+    int MESSAGE_END_VARIABLE__NAME = org.eclipse.sirius.viewpoint.description.DescriptionPackage.ABSTRACT_VARIABLE__NAME;
 
     /**
      * The number of structural features of the '<em>Message End Variable</em>'
@@ -2730,7 +2729,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int MESSAGE_END_VARIABLE_FEATURE_COUNT = ToolPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
+    int MESSAGE_END_VARIABLE_FEATURE_COUNT = org.eclipse.sirius.viewpoint.description.DescriptionPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
 
     /**
      * The meta object id for the '
@@ -2751,7 +2750,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int COVERED_LIFELINES_VARIABLE__NAME = ToolPackage.ABSTRACT_VARIABLE__NAME;
+    int COVERED_LIFELINES_VARIABLE__NAME = org.eclipse.sirius.viewpoint.description.DescriptionPackage.ABSTRACT_VARIABLE__NAME;
 
     /**
      * The number of structural features of the '
@@ -2761,7 +2760,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int COVERED_LIFELINES_VARIABLE_FEATURE_COUNT = ToolPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
+    int COVERED_LIFELINES_VARIABLE_FEATURE_COUNT = org.eclipse.sirius.viewpoint.description.DescriptionPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
 
     /**
      * The meta object id for the '
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/MessageEndVariable.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/MessageEndVariable.java
index 2cbf003f09..120a8d92d6 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/MessageEndVariable.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/MessageEndVariable.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.sirius.diagram.sequence.description;
 
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/CoveredLifelinesVariableImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/CoveredLifelinesVariableImpl.java
index f475234146..8af3b6564e 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/CoveredLifelinesVariableImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/CoveredLifelinesVariableImpl.java
@@ -13,7 +13,7 @@ package org.eclipse.sirius.diagram.sequence.description.impl;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.sirius.diagram.sequence.description.CoveredLifelinesVariable;
 import org.eclipse.sirius.diagram.sequence.description.DescriptionPackage;
-import org.eclipse.sirius.viewpoint.description.tool.impl.AbstractVariableImpl;
+import org.eclipse.sirius.viewpoint.description.impl.AbstractVariableImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/DescriptionPackageImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/DescriptionPackageImpl.java
index c784afe564..a17fee5796 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/DescriptionPackageImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/DescriptionPackageImpl.java
@@ -662,8 +662,6 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
                 .getEPackage(org.eclipse.sirius.diagram.description.DescriptionPackage.eNS_URI);
         org.eclipse.sirius.viewpoint.description.DescriptionPackage theDescriptionPackage_2 = (org.eclipse.sirius.viewpoint.description.DescriptionPackage) EPackage.Registry.INSTANCE
                 .getEPackage(org.eclipse.sirius.viewpoint.description.DescriptionPackage.eNS_URI);
-        org.eclipse.sirius.viewpoint.description.tool.ToolPackage theToolPackage_1 = (org.eclipse.sirius.viewpoint.description.tool.ToolPackage) EPackage.Registry.INSTANCE
-                .getEPackage(org.eclipse.sirius.viewpoint.description.tool.ToolPackage.eNS_URI);
 
         // Add subpackages
         getESubpackages().add(theToolPackage);
@@ -687,8 +685,8 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
         returnMessageMappingEClass.getESuperTypes().add(this.getMessageMapping());
         creationMessageMappingEClass.getESuperTypes().add(this.getMessageMapping());
         destructionMessageMappingEClass.getESuperTypes().add(this.getMessageMapping());
-        messageEndVariableEClass.getESuperTypes().add(theToolPackage_1.getAbstractVariable());
-        coveredLifelinesVariableEClass.getESuperTypes().add(theToolPackage_1.getAbstractVariable());
+        messageEndVariableEClass.getESuperTypes().add(theDescriptionPackage_2.getAbstractVariable());
+        coveredLifelinesVariableEClass.getESuperTypes().add(theDescriptionPackage_2.getAbstractVariable());
         frameMappingEClass.getESuperTypes().add(theDescriptionPackage_1.getContainerMapping());
         frameMappingEClass.getESuperTypes().add(this.getDelimitedEventMapping());
         interactionUseMappingEClass.getESuperTypes().add(this.getFrameMapping());
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/MessageEndVariableImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/MessageEndVariableImpl.java
index 39c4151052..b88ad1c14c 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/MessageEndVariableImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/MessageEndVariableImpl.java
@@ -13,7 +13,7 @@ package org.eclipse.sirius.diagram.sequence.description.impl;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.sirius.diagram.sequence.description.DescriptionPackage;
 import org.eclipse.sirius.diagram.sequence.description.MessageEndVariable;
-import org.eclipse.sirius.viewpoint.description.tool.impl.AbstractVariableImpl;
+import org.eclipse.sirius.viewpoint.description.impl.AbstractVariableImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/util/DescriptionAdapterFactory.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/util/DescriptionAdapterFactory.java
index fbce73e98b..1860f416ea 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/util/DescriptionAdapterFactory.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/util/DescriptionAdapterFactory.java
@@ -42,13 +42,13 @@ import org.eclipse.sirius.diagram.sequence.description.OperandMapping;
 import org.eclipse.sirius.diagram.sequence.description.ReturnMessageMapping;
 import org.eclipse.sirius.diagram.sequence.description.SequenceDiagramDescription;
 import org.eclipse.sirius.diagram.sequence.description.StateMapping;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.DocumentedElement;
 import org.eclipse.sirius.viewpoint.description.EndUserDocumentedElement;
 import org.eclipse.sirius.viewpoint.description.IdentifiedElement;
 import org.eclipse.sirius.viewpoint.description.PasteTargetDescription;
 import org.eclipse.sirius.viewpoint.description.RepresentationDescription;
 import org.eclipse.sirius.viewpoint.description.RepresentationElementMapping;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
 
 /**
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides
@@ -809,14 +809,14 @@ public class DescriptionAdapterFactory extends AdapterFactoryImpl {
 
     /**
      * Creates a new adapter for an object of class '
-     * {@link org.eclipse.sirius.viewpoint.description.tool.AbstractVariable
+     * {@link org.eclipse.sirius.viewpoint.description.AbstractVariable
      * <em>Abstract Variable</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.description.tool.AbstractVariable
+     * @see org.eclipse.sirius.viewpoint.description.AbstractVariable
      * @generated
      */
     public Adapter createAbstractVariableAdapter() {
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/util/DescriptionSwitch.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/util/DescriptionSwitch.java
index 50e974f933..7d72a1adcf 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/util/DescriptionSwitch.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/util/DescriptionSwitch.java
@@ -42,13 +42,13 @@ import org.eclipse.sirius.diagram.sequence.description.OperandMapping;
 import org.eclipse.sirius.diagram.sequence.description.ReturnMessageMapping;
 import org.eclipse.sirius.diagram.sequence.description.SequenceDiagramDescription;
 import org.eclipse.sirius.diagram.sequence.description.StateMapping;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.DocumentedElement;
 import org.eclipse.sirius.viewpoint.description.EndUserDocumentedElement;
 import org.eclipse.sirius.viewpoint.description.IdentifiedElement;
 import org.eclipse.sirius.viewpoint.description.PasteTargetDescription;
 import org.eclipse.sirius.viewpoint.description.RepresentationDescription;
 import org.eclipse.sirius.viewpoint.description.RepresentationElementMapping;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
 
 /**
  * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/tool/ToolCommandBuilder.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/tool/ToolCommandBuilder.java
index 88b4000af9..4002b8eac9 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/tool/ToolCommandBuilder.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/tool/ToolCommandBuilder.java
@@ -66,7 +66,7 @@ import org.eclipse.sirius.tools.api.interpreter.InterpreterUtil;
 import org.eclipse.sirius.tools.internal.command.builders.CommandBuilder;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
 import org.eclipse.sirius.viewpoint.SiriusPlugin;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.tool.PaneBasedSelectionWizardDescription;
 import org.eclipse.sirius.viewpoint.description.tool.SelectionWizardDescription;
 import org.eclipse.sirius.viewpoint.description.tool.ToolDescription;
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/internal/tool/command/builders/ExecutionCreationCommandBuilder.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/internal/tool/command/builders/ExecutionCreationCommandBuilder.java
index 367b29bd28..d790cebea6 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/internal/tool/command/builders/ExecutionCreationCommandBuilder.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/internal/tool/command/builders/ExecutionCreationCommandBuilder.java
@@ -26,7 +26,7 @@ import org.eclipse.sirius.diagram.sequence.ordering.EventEnd;
 import org.eclipse.sirius.diagram.tools.internal.command.builders.NodeCreationCommandBuilder;
 import org.eclipse.sirius.tools.api.command.DCommand;
 import org.eclipse.sirius.tools.api.interpreter.InterpreterUtil;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 
 /**
  * Specific NodeCreationCommandBuilder for Execution.
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/internal/tool/command/builders/FrameCreationCommandBuilder.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/internal/tool/command/builders/FrameCreationCommandBuilder.java
index 3de2847209..47b4d6ca94 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/internal/tool/command/builders/FrameCreationCommandBuilder.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/internal/tool/command/builders/FrameCreationCommandBuilder.java
@@ -29,7 +29,7 @@ import org.eclipse.sirius.diagram.sequence.ordering.EventEnd;
 import org.eclipse.sirius.diagram.tools.internal.command.builders.ContainerCreationCommandBuilder;
 import org.eclipse.sirius.tools.api.command.DCommand;
 import org.eclipse.sirius.tools.api.interpreter.InterpreterUtil;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/internal/tool/command/builders/InstanceRoleCreationCommandBuilder.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/internal/tool/command/builders/InstanceRoleCreationCommandBuilder.java
index 00f371496d..b8cd400b88 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/internal/tool/command/builders/InstanceRoleCreationCommandBuilder.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/internal/tool/command/builders/InstanceRoleCreationCommandBuilder.java
@@ -24,7 +24,7 @@ import org.eclipse.sirius.diagram.sequence.description.tool.InstanceRoleCreation
 import org.eclipse.sirius.diagram.tools.internal.command.builders.NodeCreationCommandBuilder;
 import org.eclipse.sirius.tools.api.command.DCommand;
 import org.eclipse.sirius.tools.api.interpreter.InterpreterUtil;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 
 /**
  * Specific NodeCreationCommandBuilder for InstanceRole.
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/internal/tool/command/builders/MessageCreationCommandBuilder.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/internal/tool/command/builders/MessageCreationCommandBuilder.java
index 21de590ac1..ea147ea15c 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/internal/tool/command/builders/MessageCreationCommandBuilder.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/internal/tool/command/builders/MessageCreationCommandBuilder.java
@@ -32,7 +32,7 @@ import org.eclipse.sirius.ext.base.Options;
 import org.eclipse.sirius.tools.api.command.DCommand;
 import org.eclipse.sirius.tools.api.interpreter.InterpreterUtil;
 import org.eclipse.sirius.viewpoint.SiriusPlugin;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 
 /**
  * Specific EdgeCreationCommandBuilder for Message.
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/internal/tool/command/builders/ObservationPointCreationCommandBuilder.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/internal/tool/command/builders/ObservationPointCreationCommandBuilder.java
index 127ec8c683..d82ce85c5e 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/internal/tool/command/builders/ObservationPointCreationCommandBuilder.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/internal/tool/command/builders/ObservationPointCreationCommandBuilder.java
@@ -25,7 +25,7 @@ import org.eclipse.sirius.diagram.sequence.ordering.EventEnd;
 import org.eclipse.sirius.diagram.tools.internal.command.builders.NodeCreationCommandBuilder;
 import org.eclipse.sirius.tools.api.command.DCommand;
 import org.eclipse.sirius.tools.api.interpreter.InterpreterUtil;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 
 import com.google.common.base.Predicates;
 
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/internal/tool/command/builders/OperandCreationCommandBuilder.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/internal/tool/command/builders/OperandCreationCommandBuilder.java
index 994056d93d..d6be9d326b 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/internal/tool/command/builders/OperandCreationCommandBuilder.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/internal/tool/command/builders/OperandCreationCommandBuilder.java
@@ -25,7 +25,7 @@ import org.eclipse.sirius.diagram.sequence.ordering.EventEnd;
 import org.eclipse.sirius.diagram.tools.internal.command.builders.ContainerCreationCommandBuilder;
 import org.eclipse.sirius.tools.api.command.DCommand;
 import org.eclipse.sirius.tools.api.interpreter.InterpreterUtil;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 
 /**
  * Specific NodeCreationCommandBuilder for Operand.
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/internal/tool/command/builders/StateCreationCommandBuilder.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/internal/tool/command/builders/StateCreationCommandBuilder.java
index 8103f04f4d..faa41b48e9 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/internal/tool/command/builders/StateCreationCommandBuilder.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/internal/tool/command/builders/StateCreationCommandBuilder.java
@@ -25,7 +25,7 @@ import org.eclipse.sirius.diagram.sequence.ordering.EventEnd;
 import org.eclipse.sirius.diagram.tools.internal.command.builders.NodeCreationCommandBuilder;
 import org.eclipse.sirius.tools.api.command.DCommand;
 import org.eclipse.sirius.tools.api.interpreter.InterpreterUtil;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 
 /**
  * Specific NodeCreationCommandBuilder for State.
diff --git a/plugins/org.eclipse.sirius.diagram.ui/icons/full/obj16/EObjectVariableValue.gif b/plugins/org.eclipse.sirius.diagram.ui/icons/full/obj16/EObjectVariableValue.gif
new file mode 100644
index 0000000000..83afb9b3c9
--- /dev/null
+++ b/plugins/org.eclipse.sirius.diagram.ui/icons/full/obj16/EObjectVariableValue.gif
diff --git a/plugins/org.eclipse.sirius.diagram.ui/icons/full/obj16/TypedVariableValue.gif b/plugins/org.eclipse.sirius.diagram.ui/icons/full/obj16/TypedVariableValue.gif
new file mode 100644
index 0000000000..a26660ec28
--- /dev/null
+++ b/plugins/org.eclipse.sirius.diagram.ui/icons/full/obj16/TypedVariableValue.gif
diff --git a/plugins/org.eclipse.sirius.diagram.ui/icons/full/obj16/VariableValue.gif b/plugins/org.eclipse.sirius.diagram.ui/icons/full/obj16/VariableValue.gif
new file mode 100644
index 0000000000..10d222998a
--- /dev/null
+++ b/plugins/org.eclipse.sirius.diagram.ui/icons/full/obj16/VariableValue.gif
diff --git a/plugins/org.eclipse.sirius.diagram.ui/plugin.properties b/plugins/org.eclipse.sirius.diagram.ui/plugin.properties
index d9592e6e96..fb69b37d82 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/plugin.properties
+++ b/plugins/org.eclipse.sirius.diagram.ui/plugin.properties
@@ -1172,3 +1172,10 @@ WorkspacePathValidator_invalidPathDecorationDescriptionText = The specified path
 _UI_BundledImage_providedShapeID_feature = Provided Shape ID
 _UI_BundledImageShape_providedShape_literal = providedShape
 _UI_BundledImageDescription_providedShapeID_feature = Provided Shape ID
+_UI_VariableValue_type = Variable Value
+_UI_TypedVariableValue_type = Typed Variable Value
+_UI_EObjectVariableValue_type = EObject Variable Value
+_UI_TypedVariableValue_value_feature = Value
+_UI_EObjectVariableValue_modelElement_feature = Model Element
+_UI_TypedVariableValue_variableDefinition_feature = Variable Definition
+_UI_EObjectVariableValue_variableDefinition_feature = Variable Definition
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/repair/DiagramRepairParticipant.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/repair/DiagramRepairParticipant.java
index 3c7efa5b40..d178c5574c 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/repair/DiagramRepairParticipant.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/repair/DiagramRepairParticipant.java
@@ -39,7 +39,7 @@ import org.eclipse.sirius.diagram.DDiagram;
 import org.eclipse.sirius.diagram.DDiagramElement;
 import org.eclipse.sirius.diagram.DEdge;
 import org.eclipse.sirius.diagram.DSemanticDiagram;
-import org.eclipse.sirius.diagram.FilterVariableValue;
+import org.eclipse.sirius.diagram.VariableValue;
 import org.eclipse.sirius.diagram.business.api.helper.concern.ConcernService;
 import org.eclipse.sirius.diagram.business.api.helper.display.DisplayServiceManager;
 import org.eclipse.sirius.diagram.business.api.query.DiagramElementMappingQuery;
@@ -426,9 +426,9 @@ public class DiagramRepairParticipant implements IRepairParticipant {
         // remove the variable caches..
         if (diagram.getFilterVariableHistory() != null && diagram.getFilterVariableHistory().getOwnedValues() != null) {
             // diagram.getFilterVariableHistory().getOwnedValues().clear();
-            final Iterator<FilterVariableValue> filterVariablesIterator = diagram.getFilterVariableHistory().getOwnedValues().iterator();
+            final Iterator<VariableValue> filterVariablesIterator = diagram.getFilterVariableHistory().getOwnedValues().iterator();
             while (filterVariablesIterator.hasNext()) {
-                final FilterVariableValue filterVariable = filterVariablesIterator.next();
+                final VariableValue filterVariable = filterVariablesIterator.next();
                 if (filterVariable.eIsProxy() || filterVariable.eResource() == null) {
                     filterVariablesIterator.remove();
                 }
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/filter/FilterTools.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/filter/FilterTools.java
index 6cfb2a52fd..180dad5cc7 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/filter/FilterTools.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/filter/FilterTools.java
@@ -24,12 +24,15 @@ import org.eclipse.sirius.common.tools.api.interpreter.IInterpreterSiriusVariabl
 import org.eclipse.sirius.common.tools.api.util.TreeItemWrapper;
 import org.eclipse.sirius.diagram.DSemanticDiagram;
 import org.eclipse.sirius.diagram.DiagramFactory;
-import org.eclipse.sirius.diagram.FilterVariableValue;
-import org.eclipse.sirius.diagram.description.filter.FilterVariable;
+import org.eclipse.sirius.diagram.EObjectVariableValue;
+import org.eclipse.sirius.diagram.VariableValue;
 import org.eclipse.sirius.diagram.description.filter.VariableFilter;
 import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
 import org.eclipse.sirius.tools.api.command.ui.UICallBack;
 import org.eclipse.sirius.viewpoint.SiriusPlugin;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.InteractiveVariableDescription;
+import org.eclipse.sirius.viewpoint.description.tool.SelectModelElementVariable;
 import org.eclipse.sirius.viewpoint.provider.SiriusEditPlugin;
 
 /**
@@ -66,65 +69,73 @@ public final class FilterTools {
          * the viewpoint
          */
         if (diagram.getFilterVariableHistory() != null) {
-            final Iterator<FilterVariableValue> it = diagram.getFilterVariableHistory().getOwnedValues().iterator();
+            final Iterator<VariableValue> it = diagram.getFilterVariableHistory().getOwnedValues().iterator();
             while (it.hasNext()) {
-                final FilterVariableValue value = it.next();
-                if (value.getVariableDefinition() == null || value.getModelElement() == null || filter.getOwnedVariables().contains(value.getVariableDefinition())) {
-                    it.remove();
+                final VariableValue value = it.next();
+                if (value instanceof EObjectVariableValue) {
+                    EObjectVariableValue objVariableValue = (EObjectVariableValue) value;
+                    if (objVariableValue.getVariableDefinition() == null || objVariableValue.getModelElement() == null
+                            || filter.getOwnedVariables().contains(objVariableValue.getVariableDefinition())) {
+                        it.remove();
+                    }
                 }
             }
         }
         /*
          * Now lets add the new ones.
          */
-        final Iterator<FilterVariable> itVar = filter.getOwnedVariables().iterator();
+        final Iterator<InteractiveVariableDescription> itVar = filter.getOwnedVariables().iterator();
         while (itVar.hasNext()) {
-            final FilterVariable var = itVar.next();
-            final TreeItemWrapper input = new TreeItemWrapper(null, null);
-            FilterTools.computeInput(diagram, model, var, input);
+            final InteractiveVariableDescription currentVar = itVar.next();
+            if (currentVar instanceof SelectModelElementVariable) {
+                final SelectModelElementVariable var = (SelectModelElementVariable) currentVar;
+                final TreeItemWrapper input = new TreeItemWrapper(null, null);
+                FilterTools.computeInput(diagram, model, var, input);
 
-            if (!var.isMultiple()) {
-                final EObject modelElement = uiCallback.askForEObject(var.getMessage(), input, DiagramUIPlugin.getPlugin().getItemProvidersAdapterFactory());
+                if (!var.isMultiple()) {
+                    final EObject modelElement = uiCallback.askForEObject(var.getMessage(), input, DiagramUIPlugin.getPlugin().getItemProvidersAdapterFactory());
 
-                final FilterVariableValue newValue = DiagramFactory.eINSTANCE.createFilterVariableValue();
-                newValue.setModelElement(modelElement);
-                newValue.setVariableDefinition(var);
-                if (diagram.getFilterVariableHistory() != null) {
-                    diagram.getFilterVariableHistory().getOwnedValues().add(newValue);
-                }
-            } else {
-                EList<EObject> values = new BasicEList<EObject>();
-                final Collection<EObject> modelElements = uiCallback.askForEObjects(var.getMessage(), input, DiagramUIPlugin.getPlugin().getItemProvidersAdapterFactory());
-
-                values.addAll(modelElements);
-                EList<FilterVariableValue> variables = new BasicEList<FilterVariableValue>();
-                for (EObject modelElement : values) {
-                    FilterVariableValue newValue = DiagramFactory.eINSTANCE.createFilterVariableValue();
+                    final EObjectVariableValue newValue = DiagramFactory.eINSTANCE.createEObjectVariableValue();
                     newValue.setModelElement(modelElement);
                     newValue.setVariableDefinition(var);
-                    variables.add(newValue);
-                }
-                if (diagram.getFilterVariableHistory() != null) {
-                    diagram.getFilterVariableHistory().getOwnedValues().addAll(variables);
+                    if (diagram.getFilterVariableHistory() != null) {
+                        diagram.getFilterVariableHistory().getOwnedValues().add(newValue);
+                    }
+                } else {
+                    EList<EObject> values = new BasicEList<EObject>();
+                    final Collection<EObject> modelElements = uiCallback.askForEObjects(var.getMessage(), input, DiagramUIPlugin.getPlugin().getItemProvidersAdapterFactory());
+
+                    values.addAll(modelElements);
+                    EList<VariableValue> variables = new BasicEList<VariableValue>();
+                    for (EObject modelElement : values) {
+                        EObjectVariableValue newValue = DiagramFactory.eINSTANCE.createEObjectVariableValue();
+                        newValue.setModelElement(modelElement);
+                        newValue.setVariableDefinition(var);
+                        variables.add(newValue);
+                    }
+                    if (diagram.getFilterVariableHistory() != null) {
+                        diagram.getFilterVariableHistory().getOwnedValues().addAll(variables);
+                    }
                 }
             }
-
         }
         /*
          * Now changing the model structure in a Map
          */
         final Map<String, EObject> variables = new HashMap<String, EObject>();
         if (diagram.getFilterVariableHistory() != null) {
-            final Iterator<FilterVariableValue> it = diagram.getFilterVariableHistory().getOwnedValues().iterator();
+            final Iterator<VariableValue> it = diagram.getFilterVariableHistory().getOwnedValues().iterator();
             while (it.hasNext()) {
-                final FilterVariableValue value = it.next();
-                variables.put(value.getVariableDefinition().getName(), value.getModelElement());
+                final VariableValue value = it.next();
+                if (value instanceof EObjectVariableValue) {
+                    variables.put(((AbstractVariable) ((EObjectVariableValue) value).getVariableDefinition()).getName(), ((EObjectVariableValue) value).getModelElement());
+                }
             }
         }
         return variables;
     }
 
-    private static void computeInput(final DSemanticDiagram diagram, final EObject model, final FilterVariable var, final TreeItemWrapper input) {
+    private static void computeInput(final DSemanticDiagram diagram, final EObject model, final SelectModelElementVariable var, final TreeItemWrapper input) {
         final IInterpreter interpreter = SiriusPlugin.getDefault().getInterpreterRegistry().getInterpreter(model);
         if (var.getCandidatesExpression() != null) {
             interpreter.setVariable(IInterpreterSiriusVariables.DIAGRAM, diagram);
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/menu/OpenMenuContribution.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/menu/OpenMenuContribution.java
index 6208575a00..c855c5aaf3 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/menu/OpenMenuContribution.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/menu/OpenMenuContribution.java
@@ -53,7 +53,7 @@ import org.eclipse.sirius.viewpoint.DSemanticDecorator;
 import org.eclipse.sirius.viewpoint.SiriusPlugin;
 import org.eclipse.sirius.viewpoint.description.RepresentationDescription;
 import org.eclipse.sirius.viewpoint.description.Viewpoint;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.tool.RepresentationNavigationDescription;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
 import org.eclipse.ui.IActionBars;
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/FilterItemProviderAdapterFactory.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/FilterItemProviderAdapterFactory.java
index 4b42a1773e..8fde274043 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/FilterItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/FilterItemProviderAdapterFactory.java
@@ -157,31 +157,6 @@ public class FilterItemProviderAdapterFactory extends FilterAdapterFactory imple
     }
 
     /**
-     * This keeps track of the one adapter used for all
-     * {@link org.eclipse.sirius.diagram.description.filter.FilterVariable}
-     * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected FilterVariableItemProvider filterVariableItemProvider;
-
-    /**
-     * This creates an adapter for a
-     * {@link org.eclipse.sirius.diagram.description.filter.FilterVariable}.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public Adapter createFilterVariableAdapter() {
-        if (filterVariableItemProvider == null) {
-            filterVariableItemProvider = new FilterVariableItemProvider(this);
-        }
-
-        return filterVariableItemProvider;
-    }
-
-    /**
      * This returns the root adapter factory that contains this factory. <!--
      * begin-user-doc --> <!-- end-user-doc -->
      *
@@ -294,9 +269,6 @@ public class FilterItemProviderAdapterFactory extends FilterAdapterFactory imple
         if (variableFilterItemProvider != null) {
             variableFilterItemProvider.dispose();
         }
-        if (filterVariableItemProvider != null) {
-            filterVariableItemProvider.dispose();
-        }
     }
 
 }
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/FilterVariableItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/FilterVariableItemProvider.java
deleted file mode 100644
index 7a5aeada86..0000000000
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/FilterVariableItemProvider.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/**
- * Copyright (c) 2007, 2013 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.description.filter.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.diagram.description.filter.FilterPackage;
-import org.eclipse.sirius.diagram.description.filter.FilterVariable;
-import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
-import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
-
-/**
- * This is the item provider adapter for a
- * {@link org.eclipse.sirius.diagram.description.filter.FilterVariable} object.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class FilterVariableItemProvider 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 FilterVariableItemProvider(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);
-
-            addCandidatesExpressionPropertyDescriptor(object);
-            addMultiplePropertyDescriptor(object);
-            addTreePropertyDescriptor(object);
-            addRootExpressionPropertyDescriptor(object);
-            addChildrenExpressionPropertyDescriptor(object);
-            addMessagePropertyDescriptor(object);
-            addNamePropertyDescriptor(object);
-        }
-        return itemPropertyDescriptors;
-    }
-
-    /**
-     * This adds a property descriptor for the Candidates Expression feature.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addCandidatesExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SelectionDescription_candidatesExpression_feature"), //$NON-NLS-1$
-                getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_candidatesExpression_feature", "_UI_SelectionDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-                DescriptionPackage.Literals.SELECTION_DESCRIPTION__CANDIDATES_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
-                null));
-    }
-
-    /**
-     * This adds a property descriptor for the Multiple feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    protected void addMultiplePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SelectionDescription_multiple_feature"), //$NON-NLS-1$
-                getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_multiple_feature", "_UI_SelectionDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-                DescriptionPackage.Literals.SELECTION_DESCRIPTION__MULTIPLE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
-                null));
-    }
-
-    /**
-     * This adds a property descriptor for the Tree feature. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addTreePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SelectionDescription_tree_feature"), //$NON-NLS-1$
-                getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_tree_feature", "_UI_SelectionDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-                DescriptionPackage.Literals.SELECTION_DESCRIPTION__TREE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
-                null));
-    }
-
-    /**
-     * This adds a property descriptor for the Root Expression feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    protected void addRootExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SelectionDescription_rootExpression_feature"), //$NON-NLS-1$
-                getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_rootExpression_feature", "_UI_SelectionDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-                DescriptionPackage.Literals.SELECTION_DESCRIPTION__ROOT_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
-                null));
-    }
-
-    /**
-     * This adds a property descriptor for the Children Expression feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    protected void addChildrenExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SelectionDescription_childrenExpression_feature"), //$NON-NLS-1$
-                getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_childrenExpression_feature", "_UI_SelectionDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-                DescriptionPackage.Literals.SELECTION_DESCRIPTION__CHILDREN_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
-                null));
-    }
-
-    /**
-     * This adds a property descriptor for the Message feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    protected void addMessagePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_SelectionDescription_message_feature"), //$NON-NLS-1$
-                getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_message_feature", "_UI_SelectionDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-                DescriptionPackage.Literals.SELECTION_DESCRIPTION__MESSAGE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
-                null));
-    }
-
-    /**
-     * This adds a property descriptor for the Name feature. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addNamePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_FilterVariable_name_feature"), //$NON-NLS-1$
-                getString("_UI_PropertyDescriptor_description", "_UI_FilterVariable_name_feature", "_UI_FilterVariable_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-                FilterPackage.Literals.FILTER_VARIABLE__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
-                null));
-    }
-
-    /**
-     * This returns FilterVariable.gif. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/FilterVariable")); //$NON-NLS-1$
-    }
-
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public String getText(Object object) {
-        String label = ((FilterVariable) object).getName();
-        return label == null || label.length() == 0 ? getString("_UI_FilterVariable_type") : //$NON-NLS-1$
-            getString("_UI_FilterVariable_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(FilterVariable.class)) {
-        case FilterPackage.FILTER_VARIABLE__CANDIDATES_EXPRESSION:
-        case FilterPackage.FILTER_VARIABLE__MULTIPLE:
-        case FilterPackage.FILTER_VARIABLE__TREE:
-        case FilterPackage.FILTER_VARIABLE__ROOT_EXPRESSION:
-        case FilterPackage.FILTER_VARIABLE__CHILDREN_EXPRESSION:
-        case FilterPackage.FILTER_VARIABLE__MESSAGE:
-        case FilterPackage.FILTER_VARIABLE__NAME:
-            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 DiagramUIPlugin.INSTANCE;
-    }
-
-}
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/VariableFilterItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/VariableFilterItemProvider.java
index 12b6de7956..cedd2d1118 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/VariableFilterItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/VariableFilterItemProvider.java
@@ -21,10 +21,11 @@ import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.sirius.diagram.description.filter.FilterFactory;
 import org.eclipse.sirius.diagram.description.filter.FilterKind;
 import org.eclipse.sirius.diagram.description.filter.FilterPackage;
 import org.eclipse.sirius.diagram.description.filter.VariableFilter;
+import org.eclipse.sirius.viewpoint.description.DescriptionFactory;
+import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
 
 /**
  * This is the item provider adapter for a
@@ -166,7 +167,9 @@ public class VariableFilterItemProvider extends FilterItemProvider {
     protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
         super.collectNewChildDescriptors(newChildDescriptors, object);
 
-        newChildDescriptors.add(createChildParameter(FilterPackage.Literals.VARIABLE_FILTER__OWNED_VARIABLES, FilterFactory.eINSTANCE.createFilterVariable()));
+        newChildDescriptors.add(createChildParameter(FilterPackage.Literals.VARIABLE_FILTER__OWNED_VARIABLES, DescriptionFactory.eINSTANCE.createTypedVariable()));
+
+        newChildDescriptors.add(createChildParameter(FilterPackage.Literals.VARIABLE_FILTER__OWNED_VARIABLES, ToolFactory.eINSTANCE.createSelectModelElementVariable()));
     }
 
 }
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ElementDoubleClickVariableItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ElementDoubleClickVariableItemProvider.java
index c36b8089e5..0a1454f3b0 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ElementDoubleClickVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ElementDoubleClickVariableItemProvider.java
@@ -22,9 +22,10 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.sirius.diagram.description.tool.ElementDoubleClickVariable;
 import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
+import org.eclipse.sirius.viewpoint.description.DescriptionFactory;
+import org.eclipse.sirius.viewpoint.description.provider.AbstractVariableItemProvider;
 import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
-import org.eclipse.sirius.viewpoint.description.tool.provider.AbstractVariableItemProvider;
 
 /**
  * This is the item provider adapter for a
@@ -147,6 +148,8 @@ public class ElementDoubleClickVariableItemProvider extends AbstractVariableItem
     protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
         super.collectNewChildDescriptors(newChildDescriptors, object);
 
+        newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, DescriptionFactory.eINSTANCE.createTypedVariable()));
+
         newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, ToolFactory.eINSTANCE.createAcceleoVariable()));
 
         newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, ToolFactory.eINSTANCE.createSelectModelElementVariable()));
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/NodeCreationVariableItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/NodeCreationVariableItemProvider.java
index 56c8668484..848848266b 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/NodeCreationVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/NodeCreationVariableItemProvider.java
@@ -22,9 +22,10 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.sirius.diagram.description.tool.NodeCreationVariable;
 import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
+import org.eclipse.sirius.viewpoint.description.DescriptionFactory;
+import org.eclipse.sirius.viewpoint.description.provider.AbstractVariableItemProvider;
 import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
-import org.eclipse.sirius.viewpoint.description.tool.provider.AbstractVariableItemProvider;
 
 /**
  * This is the item provider adapter for a
@@ -147,6 +148,8 @@ public class NodeCreationVariableItemProvider extends AbstractVariableItemProvid
     protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
         super.collectNewChildDescriptors(newChildDescriptors, object);
 
+        newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, DescriptionFactory.eINSTANCE.createTypedVariable()));
+
         newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, ToolFactory.eINSTANCE.createAcceleoVariable()));
 
         newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, ToolFactory.eINSTANCE.createSelectModelElementVariable()));
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/SourceEdgeCreationVariableItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/SourceEdgeCreationVariableItemProvider.java
index 0ad5dd3a50..55cb470ed1 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/SourceEdgeCreationVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/SourceEdgeCreationVariableItemProvider.java
@@ -22,9 +22,10 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.sirius.diagram.description.tool.SourceEdgeCreationVariable;
 import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
+import org.eclipse.sirius.viewpoint.description.DescriptionFactory;
+import org.eclipse.sirius.viewpoint.description.provider.AbstractVariableItemProvider;
 import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
-import org.eclipse.sirius.viewpoint.description.tool.provider.AbstractVariableItemProvider;
 
 /**
  * This is the item provider adapter for a
@@ -147,6 +148,8 @@ public class SourceEdgeCreationVariableItemProvider extends AbstractVariableItem
     protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
         super.collectNewChildDescriptors(newChildDescriptors, object);
 
+        newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, DescriptionFactory.eINSTANCE.createTypedVariable()));
+
         newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, ToolFactory.eINSTANCE.createAcceleoVariable()));
 
         newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, ToolFactory.eINSTANCE.createSelectModelElementVariable()));
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/SourceEdgeViewCreationVariableItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/SourceEdgeViewCreationVariableItemProvider.java
index 9132ecb46b..ccffa62220 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/SourceEdgeViewCreationVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/SourceEdgeViewCreationVariableItemProvider.java
@@ -22,9 +22,10 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.sirius.diagram.description.tool.SourceEdgeViewCreationVariable;
 import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
+import org.eclipse.sirius.viewpoint.description.DescriptionFactory;
+import org.eclipse.sirius.viewpoint.description.provider.AbstractVariableItemProvider;
 import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
-import org.eclipse.sirius.viewpoint.description.tool.provider.AbstractVariableItemProvider;
 
 /**
  * This is the item provider adapter for a
@@ -147,6 +148,8 @@ public class SourceEdgeViewCreationVariableItemProvider extends AbstractVariable
     protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
         super.collectNewChildDescriptors(newChildDescriptors, object);
 
+        newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, DescriptionFactory.eINSTANCE.createTypedVariable()));
+
         newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, ToolFactory.eINSTANCE.createAcceleoVariable()));
 
         newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, ToolFactory.eINSTANCE.createSelectModelElementVariable()));
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/TargetEdgeCreationVariableItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/TargetEdgeCreationVariableItemProvider.java
index f0cca9fabf..1619202cff 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/TargetEdgeCreationVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/TargetEdgeCreationVariableItemProvider.java
@@ -22,9 +22,10 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.sirius.diagram.description.tool.TargetEdgeCreationVariable;
 import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
+import org.eclipse.sirius.viewpoint.description.DescriptionFactory;
+import org.eclipse.sirius.viewpoint.description.provider.AbstractVariableItemProvider;
 import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
-import org.eclipse.sirius.viewpoint.description.tool.provider.AbstractVariableItemProvider;
 
 /**
  * This is the item provider adapter for a
@@ -147,6 +148,8 @@ public class TargetEdgeCreationVariableItemProvider extends AbstractVariableItem
     protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
         super.collectNewChildDescriptors(newChildDescriptors, object);
 
+        newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, DescriptionFactory.eINSTANCE.createTypedVariable()));
+
         newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, ToolFactory.eINSTANCE.createAcceleoVariable()));
 
         newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, ToolFactory.eINSTANCE.createSelectModelElementVariable()));
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/TargetEdgeViewCreationVariableItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/TargetEdgeViewCreationVariableItemProvider.java
index 76f5c79dfd..11d320ccb0 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/TargetEdgeViewCreationVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/TargetEdgeViewCreationVariableItemProvider.java
@@ -22,9 +22,10 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.sirius.diagram.description.tool.TargetEdgeViewCreationVariable;
 import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
+import org.eclipse.sirius.viewpoint.description.DescriptionFactory;
+import org.eclipse.sirius.viewpoint.description.provider.AbstractVariableItemProvider;
 import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
-import org.eclipse.sirius.viewpoint.description.tool.provider.AbstractVariableItemProvider;
 
 /**
  * This is the item provider adapter for a
@@ -147,6 +148,8 @@ public class TargetEdgeViewCreationVariableItemProvider extends AbstractVariable
     protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
         super.collectNewChildDescriptors(newChildDescriptors, object);
 
+        newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, DescriptionFactory.eINSTANCE.createTypedVariable()));
+
         newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, ToolFactory.eINSTANCE.createAcceleoVariable()));
 
         newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, ToolFactory.eINSTANCE.createSelectModelElementVariable()));
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DiagramItemProviderAdapterFactory.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DiagramItemProviderAdapterFactory.java
index 20e45f60e9..55cd16dba4 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DiagramItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DiagramItemProviderAdapterFactory.java
@@ -775,31 +775,6 @@ public class DiagramItemProviderAdapterFactory extends DiagramAdapterFactory imp
 
     /**
      * This keeps track of the one adapter used for all
-     * {@link org.eclipse.sirius.diagram.FilterVariableValue} instances. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    protected FilterVariableValueItemProvider filterVariableValueItemProvider;
-
-    /**
-     * This creates an adapter for a
-     * {@link org.eclipse.sirius.diagram.FilterVariableValue}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public Adapter createFilterVariableValueAdapter() {
-        if (filterVariableValueItemProvider == null) {
-            filterVariableValueItemProvider = new FilterVariableValueItemProvider(this);
-        }
-
-        return filterVariableValueItemProvider;
-    }
-
-    /**
-     * This keeps track of the one adapter used for all
      * {@link org.eclipse.sirius.diagram.CollapseFilter} instances. <!--
      * begin-user-doc --> <!-- end-user-doc -->
      *
@@ -999,6 +974,56 @@ public class DiagramItemProviderAdapterFactory extends DiagramAdapterFactory imp
     }
 
     /**
+     * This keeps track of the one adapter used for all
+     * {@link org.eclipse.sirius.diagram.TypedVariableValue} instances. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected TypedVariableValueItemProvider typedVariableValueItemProvider;
+
+    /**
+     * This creates an adapter for a
+     * {@link org.eclipse.sirius.diagram.TypedVariableValue}. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Adapter createTypedVariableValueAdapter() {
+        if (typedVariableValueItemProvider == null) {
+            typedVariableValueItemProvider = new TypedVariableValueItemProvider(this);
+        }
+
+        return typedVariableValueItemProvider;
+    }
+
+    /**
+     * This keeps track of the one adapter used for all
+     * {@link org.eclipse.sirius.diagram.EObjectVariableValue} instances. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected EObjectVariableValueItemProvider eObjectVariableValueItemProvider;
+
+    /**
+     * This creates an adapter for a
+     * {@link org.eclipse.sirius.diagram.EObjectVariableValue}. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Adapter createEObjectVariableValueAdapter() {
+        if (eObjectVariableValueItemProvider == null) {
+            eObjectVariableValueItemProvider = new EObjectVariableValueItemProvider(this);
+        }
+
+        return eObjectVariableValueItemProvider;
+    }
+
+    /**
      * This returns the root adapter factory that contains this factory. <!--
      * begin-user-doc --> <!-- end-user-doc -->
      *
@@ -1186,9 +1211,6 @@ public class DiagramItemProviderAdapterFactory extends DiagramAdapterFactory imp
         if (filterVariableHistoryItemProvider != null) {
             filterVariableHistoryItemProvider.dispose();
         }
-        if (filterVariableValueItemProvider != null) {
-            filterVariableValueItemProvider.dispose();
-        }
         if (collapseFilterItemProvider != null) {
             collapseFilterItemProvider.dispose();
         }
@@ -1213,6 +1235,12 @@ public class DiagramItemProviderAdapterFactory extends DiagramAdapterFactory imp
         if (dragAndDropTargetItemProvider != null) {
             dragAndDropTargetItemProvider.dispose();
         }
+        if (typedVariableValueItemProvider != null) {
+            typedVariableValueItemProvider.dispose();
+        }
+        if (eObjectVariableValueItemProvider != null) {
+            eObjectVariableValueItemProvider.dispose();
+        }
     }
 
 }
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/FilterVariableValueItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/EObjectVariableValueItemProvider.java
index 04c0a94465..f9dd80982a 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/FilterVariableValueItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/EObjectVariableValueItemProvider.java
@@ -1,5 +1,5 @@
-/**
- * Copyright (c) 2007, 2013 THALES GLOBAL SERVICES.
+/*******************************************************************************
+ * Copyright (c) 2015 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
@@ -7,8 +7,7 @@
  *
  * Contributors:
  *    Obeo - initial API and implementation
- *
- */
+ *******************************************************************************/
 package org.eclipse.sirius.diagram.provider;
 
 import java.util.Collection;
@@ -16,34 +15,25 @@ 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.DiagramPackage;
-import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
 
 /**
  * This is the item provider adapter for a
- * {@link org.eclipse.sirius.diagram.FilterVariableValue} object. <!--
+ * {@link org.eclipse.sirius.diagram.EObjectVariableValue} object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
  *
  * @generated
  */
-public class FilterVariableValueItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-IItemPropertySource {
+public class EObjectVariableValueItemProvider extends VariableValueItemProvider {
     /**
      * This constructs an instance from a factory and a notifier. <!--
      * begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
      */
-    public FilterVariableValueItemProvider(AdapterFactory adapterFactory) {
+    public EObjectVariableValueItemProvider(AdapterFactory adapterFactory) {
         super(adapterFactory);
     }
 
@@ -72,9 +62,9 @@ IItemPropertySource {
      */
     protected void addVariableDefinitionPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_FilterVariableValue_variableDefinition_feature"), //$NON-NLS-1$
-                getString("_UI_PropertyDescriptor_description", "_UI_FilterVariableValue_variableDefinition_feature", "_UI_FilterVariableValue_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-                DiagramPackage.Literals.FILTER_VARIABLE_VALUE__VARIABLE_DEFINITION, true, false, true, null, null, null));
+                getString("_UI_EObjectVariableValue_variableDefinition_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_EObjectVariableValue_variableDefinition_feature", "_UI_EObjectVariableValue_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.EOBJECT_VARIABLE_VALUE__VARIABLE_DEFINITION, true, false, true, null, null, null));
     }
 
     /**
@@ -85,20 +75,20 @@ IItemPropertySource {
      */
     protected void addModelElementPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_FilterVariableValue_modelElement_feature"), //$NON-NLS-1$
-                getString("_UI_PropertyDescriptor_description", "_UI_FilterVariableValue_modelElement_feature", "_UI_FilterVariableValue_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-                DiagramPackage.Literals.FILTER_VARIABLE_VALUE__MODEL_ELEMENT, true, false, true, null, null, null));
+                getString("_UI_EObjectVariableValue_modelElement_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_EObjectVariableValue_modelElement_feature", "_UI_EObjectVariableValue_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.EOBJECT_VARIABLE_VALUE__MODEL_ELEMENT, true, false, true, null, null, null));
     }
 
     /**
-     * This returns FilterVariableValue.gif. <!-- begin-user-doc --> <!--
+     * This returns EObjectVariableValue.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      * 
      * @generated
      */
     @Override
     public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/FilterVariableValue")); //$NON-NLS-1$
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/EObjectVariableValue")); //$NON-NLS-1$
     }
 
     /**
@@ -109,7 +99,7 @@ IItemPropertySource {
      */
     @Override
     public String getText(Object object) {
-        return getString("_UI_FilterVariableValue_type"); //$NON-NLS-1$
+        return getString("_UI_EObjectVariableValue_type"); //$NON-NLS-1$
     }
 
     /**
@@ -138,15 +128,4 @@ IItemPropertySource {
         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/FilterVariableHistoryItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/FilterVariableHistoryItemProvider.java
index fdb543aef9..a6d58a43fd 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
@@ -151,7 +151,9 @@ IItemPropertySource {
     protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
         super.collectNewChildDescriptors(newChildDescriptors, object);
 
-        newChildDescriptors.add(createChildParameter(DiagramPackage.Literals.FILTER_VARIABLE_HISTORY__OWNED_VALUES, DiagramFactory.eINSTANCE.createFilterVariableValue()));
+        newChildDescriptors.add(createChildParameter(DiagramPackage.Literals.FILTER_VARIABLE_HISTORY__OWNED_VALUES, DiagramFactory.eINSTANCE.createTypedVariableValue()));
+
+        newChildDescriptors.add(createChildParameter(DiagramPackage.Literals.FILTER_VARIABLE_HISTORY__OWNED_VALUES, DiagramFactory.eINSTANCE.createEObjectVariableValue()));
     }
 
     /**
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
new file mode 100644
index 0000000000..1337f5b6ce
--- /dev/null
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/TypedVariableValueItemProvider.java
@@ -0,0 +1,142 @@
+/*******************************************************************************
+ * Copyright (c) 2015 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.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.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.sirius.diagram.DiagramPackage;
+import org.eclipse.sirius.diagram.TypedVariableValue;
+
+/**
+ * This is the item provider adapter for a
+ * {@link org.eclipse.sirius.diagram.TypedVariableValue} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class TypedVariableValueItemProvider extends VariableValueItemProvider {
+    /**
+     * This constructs an instance from a factory and a notifier. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    public TypedVariableValueItemProvider(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);
+
+            addVariableDefinitionPropertyDescriptor(object);
+            addValuePropertyDescriptor(object);
+        }
+        return itemPropertyDescriptors;
+    }
+
+    /**
+     * This adds a property descriptor for the Variable Definition feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected void addVariableDefinitionPropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_TypedVariableValue_variableDefinition_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_TypedVariableValue_variableDefinition_feature", "_UI_TypedVariableValue_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.TYPED_VARIABLE_VALUE__VARIABLE_DEFINITION, true, false, true, null, null, null));
+    }
+
+    /**
+     * This adds a property descriptor for the Value feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected void addValuePropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_TypedVariableValue_value_feature"), //$NON-NLS-1$
+                getString("_UI_PropertyDescriptor_description", "_UI_TypedVariableValue_value_feature", "_UI_TypedVariableValue_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                DiagramPackage.Literals.TYPED_VARIABLE_VALUE__VALUE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    }
+
+    /**
+     * This returns TypedVariableValue.gif. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public Object getImage(Object object) {
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TypedVariableValue")); //$NON-NLS-1$
+    }
+
+    /**
+     * This returns the label text for the adapted class. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public String getText(Object object) {
+        String label = ((TypedVariableValue) object).getValue();
+        return label == null || label.length() == 0 ? getString("_UI_TypedVariableValue_type") : //$NON-NLS-1$
+            getString("_UI_TypedVariableValue_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(TypedVariableValue.class)) {
+        case DiagramPackage.TYPED_VARIABLE_VALUE__VALUE:
+            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+            return;
+        }
+        super.notifyChanged(notification);
+    }
+
+    /**
+     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
+     * describing the children that can be created under this object. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+        super.collectNewChildDescriptors(newChildDescriptors, object);
+    }
+
+}
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
new file mode 100644
index 0000000000..64bce0054a
--- /dev/null
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/VariableValueItemProvider.java
@@ -0,0 +1,121 @@
+/*******************************************************************************
+ * Copyright (c) 2015 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.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.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;
+
+/**
+ * This is the item provider adapter for a
+ * {@link org.eclipse.sirius.diagram.VariableValue} object. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ * 
+ * @generated
+ */
+public class VariableValueItemProvider 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 VariableValueItemProvider(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 VariableValue.gif. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     */
+    @Override
+    public Object getImage(Object object) {
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/VariableValue")); //$NON-NLS-1$
+    }
+
+    /**
+     * This returns the label text for the adapted class. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public String getText(Object object) {
+        return getString("_UI_VariableValue_type"); //$NON-NLS-1$
+    }
+
+    /**
+     * 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/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/description/filter/spec/VariableFilterSpec.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/description/filter/spec/VariableFilterSpec.java
index 7e23a60740..5422345671 100644
--- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/description/filter/spec/VariableFilterSpec.java
+++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/description/filter/spec/VariableFilterSpec.java
@@ -20,11 +20,13 @@ import org.eclipse.sirius.common.tools.api.interpreter.EvaluationException;
 import org.eclipse.sirius.common.tools.api.interpreter.IInterpreter;
 import org.eclipse.sirius.diagram.DDiagram;
 import org.eclipse.sirius.diagram.DDiagramElement;
-import org.eclipse.sirius.diagram.FilterVariableValue;
+import org.eclipse.sirius.diagram.EObjectVariableValue;
+import org.eclipse.sirius.diagram.VariableValue;
 import org.eclipse.sirius.diagram.description.filter.FilterPackage;
 import org.eclipse.sirius.diagram.description.filter.impl.VariableFilterImpl;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
 import org.eclipse.sirius.viewpoint.SiriusPlugin;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
@@ -91,11 +93,13 @@ public class VariableFilterSpec extends VariableFilterImpl {
             variables = ArrayListMultimap.create();
 
             if (dDiagram.getFilterVariableHistory() != null) {
-                final Iterator<FilterVariableValue> it = dDiagram.getFilterVariableHistory().getOwnedValues().iterator();
+                final Iterator<VariableValue> it = dDiagram.getFilterVariableHistory().getOwnedValues().iterator();
                 while (it.hasNext()) {
-                    final FilterVariableValue value = it.next();
-                    if (getOwnedVariables().contains(value.getVariableDefinition())) {
-                        variables.put(value.getVariableDefinition().getName(), value.getModelElement());
+                    final VariableValue value = it.next();
+                    if (value instanceof EObjectVariableValue) {
+                        if (getOwnedVariables().contains(((EObjectVariableValue) value).getVariableDefinition())) {
+                            variables.put(((AbstractVariable) ((EObjectVariableValue) value).getVariableDefinition()).getName(), ((EObjectVariableValue) value).getModelElement());
+                        }
                     }
                 }
             }
diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/UndoRedoCapableEMFCommandFactory.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/UndoRedoCapableEMFCommandFactory.java
index c536951c72..406fb05730 100644
--- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/UndoRedoCapableEMFCommandFactory.java
+++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/UndoRedoCapableEMFCommandFactory.java
@@ -86,7 +86,7 @@ import org.eclipse.sirius.viewpoint.DRefreshable;
 import org.eclipse.sirius.viewpoint.DRepresentation;
 import org.eclipse.sirius.viewpoint.DRepresentationElement;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.tool.ExternalJavaAction;
 import org.eclipse.sirius.viewpoint.description.tool.OperationAction;
 import org.eclipse.sirius.viewpoint.description.tool.PaneBasedSelectionWizardDescription;
diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/ContainerCreationCommandBuilder.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/ContainerCreationCommandBuilder.java
index 215e4cbca7..ab9fd144fe 100644
--- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/ContainerCreationCommandBuilder.java
+++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/ContainerCreationCommandBuilder.java
@@ -32,7 +32,7 @@ import org.eclipse.sirius.tools.api.command.DCommand;
 import org.eclipse.sirius.tools.api.interpreter.InterpreterUtil;
 import org.eclipse.sirius.tools.internal.command.builders.ElementsToSelectTask;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 
 /**
  * .
diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/DeletionCommandBuilder.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/DeletionCommandBuilder.java
index c8b5bdd65c..8af9b6f05e 100644
--- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/DeletionCommandBuilder.java
+++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/DeletionCommandBuilder.java
@@ -49,7 +49,7 @@ import org.eclipse.sirius.tools.api.command.NoNullResourceCommand;
 import org.eclipse.sirius.tools.api.interpreter.InterpreterUtil;
 import org.eclipse.sirius.tools.internal.command.builders.ElementsToSelectTask;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
 
 import com.google.common.collect.Iterables;
diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/DoubleClickCommandBuilder.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/DoubleClickCommandBuilder.java
index 0d7c38308e..e9628d70f8 100644
--- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/DoubleClickCommandBuilder.java
+++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/DoubleClickCommandBuilder.java
@@ -27,7 +27,7 @@ import org.eclipse.sirius.ext.base.Option;
 import org.eclipse.sirius.tools.api.command.DCommand;
 import org.eclipse.sirius.tools.api.interpreter.InterpreterUtil;
 import org.eclipse.sirius.tools.internal.command.builders.ElementsToSelectTask;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 
 /**
  * A builder to execute operations in a Double Click tool.
diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/DragAndDropCommandBuilder.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/DragAndDropCommandBuilder.java
index b9aa9096c6..234a944d58 100644
--- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/DragAndDropCommandBuilder.java
+++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/DragAndDropCommandBuilder.java
@@ -48,7 +48,7 @@ import org.eclipse.sirius.viewpoint.DModel;
 import org.eclipse.sirius.viewpoint.DRepresentation;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
 import org.eclipse.sirius.viewpoint.SiriusPlugin;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 
 /**
  * .
diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/EdgeCreationCommandBuilder.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/EdgeCreationCommandBuilder.java
index dc5a5b4c00..703444d8bc 100644
--- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/EdgeCreationCommandBuilder.java
+++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/EdgeCreationCommandBuilder.java
@@ -36,9 +36,9 @@ import org.eclipse.sirius.tools.api.ui.resource.ISiriusMessages;
 import org.eclipse.sirius.tools.internal.command.builders.ElementsToSelectTask;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
 import org.eclipse.sirius.viewpoint.SiriusPlugin;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.tool.AcceleoVariable;
-import org.eclipse.sirius.viewpoint.description.tool.SubVariable;
+import org.eclipse.sirius.viewpoint.description.SubVariable;
 import org.eclipse.sirius.viewpoint.description.tool.VariableContainer;
 
 /**
diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/GenericToolCommandBuilder.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/GenericToolCommandBuilder.java
index 640e8763d3..7445c896e7 100644
--- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/GenericToolCommandBuilder.java
+++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/GenericToolCommandBuilder.java
@@ -27,7 +27,7 @@ import org.eclipse.sirius.tools.api.command.DCommand;
 import org.eclipse.sirius.tools.api.interpreter.InterpreterUtil;
 import org.eclipse.sirius.tools.internal.command.builders.ElementsToSelectTask;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.tool.ToolDescription;
 
 /**
diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/NodeCreationCommandBuilder.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/NodeCreationCommandBuilder.java
index ba0ad5129f..6f72770a40 100644
--- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/NodeCreationCommandBuilder.java
+++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/NodeCreationCommandBuilder.java
@@ -35,7 +35,7 @@ import org.eclipse.sirius.tools.api.command.DCommand;
 import org.eclipse.sirius.tools.api.interpreter.InterpreterUtil;
 import org.eclipse.sirius.tools.internal.command.builders.ElementsToSelectTask;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 
 /**
  * Command builder for node creation.
diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/PaneBasedSelectionWizardCommandBuilder.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/PaneBasedSelectionWizardCommandBuilder.java
index 7878684139..a28441fe94 100644
--- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/PaneBasedSelectionWizardCommandBuilder.java
+++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/PaneBasedSelectionWizardCommandBuilder.java
@@ -29,7 +29,7 @@ import org.eclipse.sirius.tools.api.command.DCommand;
 import org.eclipse.sirius.tools.api.interpreter.InterpreterUtil;
 import org.eclipse.sirius.tools.internal.command.builders.ElementsToSelectTask;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.tool.PaneBasedSelectionWizardDescription;
 
 /**
diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/PasteCommandBuilder.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/PasteCommandBuilder.java
index 676156c4d9..fa1b4ac0a8 100644
--- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/PasteCommandBuilder.java
+++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/PasteCommandBuilder.java
@@ -35,7 +35,7 @@ import org.eclipse.sirius.tools.internal.command.builders.ElementsToSelectTask;
 import org.eclipse.sirius.viewpoint.DRepresentation;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
 import org.eclipse.sirius.viewpoint.SiriusPlugin;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.tool.PasteDescription;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
 
diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/ReconnectionCommandBuilder.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/ReconnectionCommandBuilder.java
index b08dc06b24..f8578ee090 100644
--- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/ReconnectionCommandBuilder.java
+++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/ReconnectionCommandBuilder.java
@@ -46,9 +46,9 @@ import org.eclipse.sirius.tools.api.command.DCommand;
 import org.eclipse.sirius.tools.api.interpreter.InterpreterUtil;
 import org.eclipse.sirius.tools.internal.command.builders.ElementsToSelectTask;
 import org.eclipse.sirius.viewpoint.DRepresentation;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.tool.SetObject;
-import org.eclipse.sirius.viewpoint.description.tool.SubVariable;
+import org.eclipse.sirius.viewpoint.description.SubVariable;
 import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
 import org.eclipse.sirius.viewpoint.description.tool.impl.ElementSelectVariableImpl;
 
diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/SelectionWizardCommandBuilder.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/SelectionWizardCommandBuilder.java
index d89e5849af..7334727e76 100644
--- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/SelectionWizardCommandBuilder.java
+++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/SelectionWizardCommandBuilder.java
@@ -29,7 +29,7 @@ import org.eclipse.sirius.tools.api.command.DCommand;
 import org.eclipse.sirius.tools.api.interpreter.InterpreterUtil;
 import org.eclipse.sirius.tools.internal.command.builders.ElementsToSelectTask;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.tool.SelectionWizardDescription;
 
 /**
diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/validation/description/constraints/DiagramExistingExpressionVariablesConstraint.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/validation/description/constraints/DiagramExistingExpressionVariablesConstraint.java
index 91ef302f73..d8a0acc238 100644
--- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/validation/description/constraints/DiagramExistingExpressionVariablesConstraint.java
+++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/validation/description/constraints/DiagramExistingExpressionVariablesConstraint.java
@@ -44,7 +44,7 @@ import org.eclipse.sirius.tools.internal.validation.AbstractConstraint;
 import org.eclipse.sirius.viewpoint.description.ConditionalStyleDescription;
 import org.eclipse.sirius.viewpoint.description.style.StylePackage;
 import org.eclipse.sirius.viewpoint.description.tool.AbstractToolDescription;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.tool.CreateInstance;
 import org.eclipse.sirius.viewpoint.description.tool.DragSource;
 import org.eclipse.sirius.viewpoint.description.tool.EditMaskVariables;
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/DiagramFactory.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/DiagramFactory.java
index dd0b3a9726..3c70f96926 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/DiagramFactory.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/DiagramFactory.java
@@ -282,15 +282,6 @@ public interface DiagramFactory extends EFactory {
     FilterVariableHistory createFilterVariableHistory();
 
     /**
-     * Returns a new object of class '<em>Filter Variable Value</em>'. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @return a new object of class '<em>Filter Variable Value</em>'.
-     * @generated
-     */
-    FilterVariableValue createFilterVariableValue();
-
-    /**
      * Returns a new object of class '<em>Collapse Filter</em>'. <!--
      * begin-user-doc --> <!-- end-user-doc -->
      *
@@ -365,6 +356,24 @@ public interface DiagramFactory extends EFactory {
     DragAndDropTarget createDragAndDropTarget();
 
     /**
+     * Returns a new object of class '<em>Typed Variable Value</em>'. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @return a new object of class '<em>Typed Variable Value</em>'.
+     * @generated
+     */
+    TypedVariableValue createTypedVariableValue();
+
+    /**
+     * Returns a new object of class '<em>EObject Variable Value</em>'. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @return a new object of class '<em>EObject Variable Value</em>'.
+     * @generated
+     */
+    EObjectVariableValue createEObjectVariableValue();
+
+    /**
      * Returns the package supported by this factory. <!-- begin-user-doc -->
      * <!-- end-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 05df86d0d5..68b8b40a27 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
@@ -4739,45 +4739,6 @@ public interface DiagramPackage extends EPackage {
 
     /**
      * The meta object id for the '
-     * {@link org.eclipse.sirius.diagram.impl.FilterVariableValueImpl
-     * <em>Filter Variable Value</em>}' class. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @see org.eclipse.sirius.diagram.impl.FilterVariableValueImpl
-     * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getFilterVariableValue()
-     * @generated
-     */
-    int FILTER_VARIABLE_VALUE = 35;
-
-    /**
-     * The feature id for the '<em><b>Variable Definition</b></em>' reference.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     * @ordered
-     */
-    int FILTER_VARIABLE_VALUE__VARIABLE_DEFINITION = 0;
-
-    /**
-     * The feature id for the '<em><b>Model Element</b></em>' reference. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int FILTER_VARIABLE_VALUE__MODEL_ELEMENT = 1;
-
-    /**
-     * The number of structural features of the '<em>Filter Variable Value</em>'
-     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     * @ordered
-     */
-    int FILTER_VARIABLE_VALUE_FEATURE_COUNT = 2;
-
-    /**
-     * The meta object id for the '
      * {@link org.eclipse.sirius.diagram.impl.CollapseFilterImpl
      * <em>Collapse Filter</em>}' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
@@ -4786,7 +4747,7 @@ public interface DiagramPackage extends EPackage {
      * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getCollapseFilter()
      * @generated
      */
-    int COLLAPSE_FILTER = 36;
+    int COLLAPSE_FILTER = 35;
 
     /**
      * The feature id for the '<em><b>Width</b></em>' attribute. <!--
@@ -4825,7 +4786,7 @@ public interface DiagramPackage extends EPackage {
      * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getIndirectlyCollapseFilter()
      * @generated
      */
-    int INDIRECTLY_COLLAPSE_FILTER = 37;
+    int INDIRECTLY_COLLAPSE_FILTER = 36;
 
     /**
      * The feature id for the '<em><b>Width</b></em>' attribute. <!--
@@ -4865,7 +4826,7 @@ public interface DiagramPackage extends EPackage {
      * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getBeginLabelStyle()
      * @generated
      */
-    int BEGIN_LABEL_STYLE = 38;
+    int BEGIN_LABEL_STYLE = 37;
 
     /**
      * The feature id for the '<em><b>Custom Features</b></em>' attribute list.
@@ -4940,7 +4901,7 @@ public interface DiagramPackage extends EPackage {
      * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getCenterLabelStyle()
      * @generated
      */
-    int CENTER_LABEL_STYLE = 39;
+    int CENTER_LABEL_STYLE = 38;
 
     /**
      * The feature id for the '<em><b>Custom Features</b></em>' attribute list.
@@ -5015,7 +4976,7 @@ public interface DiagramPackage extends EPackage {
      * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getEndLabelStyle()
      * @generated
      */
-    int END_LABEL_STYLE = 40;
+    int END_LABEL_STYLE = 39;
 
     /**
      * The feature id for the '<em><b>Custom Features</b></em>' attribute list.
@@ -5090,7 +5051,7 @@ public interface DiagramPackage extends EPackage {
      * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getBracketEdgeStyle()
      * @generated
      */
-    int BRACKET_EDGE_STYLE = 41;
+    int BRACKET_EDGE_STYLE = 40;
 
     /**
      * The feature id for the '<em><b>Custom Features</b></em>' attribute list.
@@ -5228,7 +5189,7 @@ public interface DiagramPackage extends EPackage {
      * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getComputedStyleDescriptionRegistry()
      * @generated
      */
-    int COMPUTED_STYLE_DESCRIPTION_REGISTRY = 42;
+    int COMPUTED_STYLE_DESCRIPTION_REGISTRY = 41;
 
     /**
      * The feature id for the '<em><b>Computed Style Descriptions</b></em>'
@@ -5259,7 +5220,7 @@ public interface DiagramPackage extends EPackage {
      * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getDragAndDropTarget()
      * @generated
      */
-    int DRAG_AND_DROP_TARGET = 43;
+    int DRAG_AND_DROP_TARGET = 42;
 
     /**
      * The number of structural features of the '<em>Drag And Drop Target</em>'
@@ -5280,7 +5241,7 @@ public interface DiagramPackage extends EPackage {
      * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getHideLabelCapabilityStyle()
      * @generated
      */
-    int HIDE_LABEL_CAPABILITY_STYLE = 44;
+    int HIDE_LABEL_CAPABILITY_STYLE = 43;
 
     /**
      * The feature id for the '<em><b>Hide Label By Default</b></em>' attribute.
@@ -5303,6 +5264,105 @@ public interface DiagramPackage extends EPackage {
 
     /**
      * The meta object id for the '
+     * {@link org.eclipse.sirius.diagram.impl.VariableValueImpl
+     * <em>Variable Value</em>}' class. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @see org.eclipse.sirius.diagram.impl.VariableValueImpl
+     * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getVariableValue()
+     * @generated
+     */
+    int VARIABLE_VALUE = 44;
+
+    /**
+     * 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;
+
+    /**
+     * The meta object id for the '
+     * {@link org.eclipse.sirius.diagram.impl.TypedVariableValueImpl
+     * <em>Typed Variable Value</em>}' class. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @see org.eclipse.sirius.diagram.impl.TypedVariableValueImpl
+     * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getTypedVariableValue()
+     * @generated
+     */
+    int TYPED_VARIABLE_VALUE = 45;
+
+    /**
+     * The feature id for the '<em><b>Variable Definition</b></em>' reference.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     * @ordered
+     */
+    int TYPED_VARIABLE_VALUE__VARIABLE_DEFINITION = DiagramPackage.VARIABLE_VALUE_FEATURE_COUNT + 0;
+
+    /**
+     * The feature id for the '<em><b>Value</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int TYPED_VARIABLE_VALUE__VALUE = DiagramPackage.VARIABLE_VALUE_FEATURE_COUNT + 1;
+
+    /**
+     * The number of structural features of the '<em>Typed Variable Value</em>'
+     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     * @ordered
+     */
+    int TYPED_VARIABLE_VALUE_FEATURE_COUNT = DiagramPackage.VARIABLE_VALUE_FEATURE_COUNT + 2;
+
+    /**
+     * The meta object id for the '
+     * {@link org.eclipse.sirius.diagram.impl.EObjectVariableValueImpl
+     * <em>EObject Variable Value</em>}' class. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @see org.eclipse.sirius.diagram.impl.EObjectVariableValueImpl
+     * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getEObjectVariableValue()
+     * @generated
+     */
+    int EOBJECT_VARIABLE_VALUE = 46;
+
+    /**
+     * The feature id for the '<em><b>Variable Definition</b></em>' reference.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     * @ordered
+     */
+    int EOBJECT_VARIABLE_VALUE__VARIABLE_DEFINITION = DiagramPackage.VARIABLE_VALUE_FEATURE_COUNT + 0;
+
+    /**
+     * The feature id for the '<em><b>Model Element</b></em>' reference. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int EOBJECT_VARIABLE_VALUE__MODEL_ELEMENT = DiagramPackage.VARIABLE_VALUE_FEATURE_COUNT + 1;
+
+    /**
+     * The number of structural features of the '<em>EObject Variable Value</em>
+     * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     * @ordered
+     */
+    int EOBJECT_VARIABLE_VALUE_FEATURE_COUNT = DiagramPackage.VARIABLE_VALUE_FEATURE_COUNT + 2;
+
+    /**
+     * The meta object id for the '
      * {@link org.eclipse.sirius.diagram.ContainerLayout
      * <em>Container Layout</em>}' enum. <!-- begin-user-doc --> <!--
      * end-user-doc -->
@@ -5311,7 +5371,7 @@ public interface DiagramPackage extends EPackage {
      * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getContainerLayout()
      * @generated
      */
-    int CONTAINER_LAYOUT = 45;
+    int CONTAINER_LAYOUT = 47;
 
     /**
      * The meta object id for the '
@@ -5322,7 +5382,7 @@ public interface DiagramPackage extends EPackage {
      * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getLabelPosition()
      * @generated
      */
-    int LABEL_POSITION = 46;
+    int LABEL_POSITION = 48;
 
     /**
      * The meta object id for the '
@@ -5334,7 +5394,7 @@ public interface DiagramPackage extends EPackage {
      * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getContainerShape()
      * @generated
      */
-    int CONTAINER_SHAPE = 47;
+    int CONTAINER_SHAPE = 49;
 
     /**
      * The meta object id for the '
@@ -5346,7 +5406,7 @@ public interface DiagramPackage extends EPackage {
      * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getBackgroundStyle()
      * @generated
      */
-    int BACKGROUND_STYLE = 48;
+    int BACKGROUND_STYLE = 50;
 
     /**
      * The meta object id for the '
@@ -5358,7 +5418,7 @@ public interface DiagramPackage extends EPackage {
      * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getBundledImageShape()
      * @generated
      */
-    int BUNDLED_IMAGE_SHAPE = 49;
+    int BUNDLED_IMAGE_SHAPE = 51;
 
     /**
      * The meta object id for the '{@link org.eclipse.sirius.diagram.LineStyle
@@ -5368,7 +5428,7 @@ public interface DiagramPackage extends EPackage {
      * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getLineStyle()
      * @generated
      */
-    int LINE_STYLE = 50;
+    int LINE_STYLE = 52;
 
     /**
      * The meta object id for the '{@link org.eclipse.sirius.diagram.EdgeArrows
@@ -5379,7 +5439,7 @@ public interface DiagramPackage extends EPackage {
      * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getEdgeArrows()
      * @generated
      */
-    int EDGE_ARROWS = 51;
+    int EDGE_ARROWS = 53;
 
     /**
      * The meta object id for the '
@@ -5390,7 +5450,7 @@ public interface DiagramPackage extends EPackage {
      * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getEdgeRouting()
      * @generated
      */
-    int EDGE_ROUTING = 52;
+    int EDGE_ROUTING = 54;
 
     /**
      * The meta object id for the '
@@ -5401,7 +5461,7 @@ public interface DiagramPackage extends EPackage {
      * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getAlignmentKind()
      * @generated
      */
-    int ALIGNMENT_KIND = 53;
+    int ALIGNMENT_KIND = 55;
 
     /**
      * The meta object id for the '{@link org.eclipse.sirius.diagram.ResizeKind
@@ -5412,7 +5472,7 @@ public interface DiagramPackage extends EPackage {
      * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getResizeKind()
      * @generated
      */
-    int RESIZE_KIND = 54;
+    int RESIZE_KIND = 56;
 
     /**
      * The meta object id for the '
@@ -5424,7 +5484,7 @@ public interface DiagramPackage extends EPackage {
      * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getArrangeConstraint()
      * @generated
      */
-    int ARRANGE_CONSTRAINT = 55;
+    int ARRANGE_CONSTRAINT = 57;
 
     /**
      * Returns the meta object for class '
@@ -7303,43 +7363,6 @@ public interface DiagramPackage extends EPackage {
 
     /**
      * Returns the meta object for class '
-     * {@link org.eclipse.sirius.diagram.FilterVariableValue
-     * <em>Filter Variable Value</em>}'. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @return the meta object for class '<em>Filter Variable Value</em>'.
-     * @see org.eclipse.sirius.diagram.FilterVariableValue
-     * @generated
-     */
-    EClass getFilterVariableValue();
-
-    /**
-     * Returns the meta object for the reference '
-     * {@link org.eclipse.sirius.diagram.FilterVariableValue#getVariableDefinition
-     * <em>Variable Definition</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
-     *
-     * @return the meta object for the reference '<em>Variable Definition</em>'.
-     * @see org.eclipse.sirius.diagram.FilterVariableValue#getVariableDefinition()
-     * @see #getFilterVariableValue()
-     * @generated
-     */
-    EReference getFilterVariableValue_VariableDefinition();
-
-    /**
-     * Returns the meta object for the reference '
-     * {@link org.eclipse.sirius.diagram.FilterVariableValue#getModelElement
-     * <em>Model Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @return the meta object for the reference '<em>Model Element</em>'.
-     * @see org.eclipse.sirius.diagram.FilterVariableValue#getModelElement()
-     * @see #getFilterVariableValue()
-     * @generated
-     */
-    EReference getFilterVariableValue_ModelElement();
-
-    /**
-     * Returns the meta object for class '
      * {@link org.eclipse.sirius.diagram.CollapseFilter
      * <em>Collapse Filter</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
@@ -7498,6 +7521,91 @@ public interface DiagramPackage extends EPackage {
     EAttribute getHideLabelCapabilityStyle_HideLabelByDefault();
 
     /**
+     * Returns the meta object for class '
+     * {@link org.eclipse.sirius.diagram.VariableValue <em>Variable Value</em>}
+     * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @return the meta object for class '<em>Variable Value</em>'.
+     * @see org.eclipse.sirius.diagram.VariableValue
+     * @generated
+     */
+    EClass getVariableValue();
+
+    /**
+     * Returns the meta object for class '
+     * {@link org.eclipse.sirius.diagram.TypedVariableValue
+     * <em>Typed Variable Value</em>}'. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @return the meta object for class '<em>Typed Variable Value</em>'.
+     * @see org.eclipse.sirius.diagram.TypedVariableValue
+     * @generated
+     */
+    EClass getTypedVariableValue();
+
+    /**
+     * Returns the meta object for the reference '
+     * {@link org.eclipse.sirius.diagram.TypedVariableValue#getVariableDefinition
+     * <em>Variable Definition</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @return the meta object for the reference '<em>Variable Definition</em>'.
+     * @see org.eclipse.sirius.diagram.TypedVariableValue#getVariableDefinition()
+     * @see #getTypedVariableValue()
+     * @generated
+     */
+    EReference getTypedVariableValue_VariableDefinition();
+
+    /**
+     * Returns the meta object for the attribute '
+     * {@link org.eclipse.sirius.diagram.TypedVariableValue#getValue
+     * <em>Value</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @return the meta object for the attribute '<em>Value</em>'.
+     * @see org.eclipse.sirius.diagram.TypedVariableValue#getValue()
+     * @see #getTypedVariableValue()
+     * @generated
+     */
+    EAttribute getTypedVariableValue_Value();
+
+    /**
+     * Returns the meta object for class '
+     * {@link org.eclipse.sirius.diagram.EObjectVariableValue
+     * <em>EObject Variable Value</em>}'. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @return the meta object for class '<em>EObject Variable Value</em>'.
+     * @see org.eclipse.sirius.diagram.EObjectVariableValue
+     * @generated
+     */
+    EClass getEObjectVariableValue();
+
+    /**
+     * Returns the meta object for the reference '
+     * {@link org.eclipse.sirius.diagram.EObjectVariableValue#getVariableDefinition
+     * <em>Variable Definition</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @return the meta object for the reference '<em>Variable Definition</em>'.
+     * @see org.eclipse.sirius.diagram.EObjectVariableValue#getVariableDefinition()
+     * @see #getEObjectVariableValue()
+     * @generated
+     */
+    EReference getEObjectVariableValue_VariableDefinition();
+
+    /**
+     * Returns the meta object for the reference '
+     * {@link org.eclipse.sirius.diagram.EObjectVariableValue#getModelElement
+     * <em>Model Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @return the meta object for the reference '<em>Model Element</em>'.
+     * @see org.eclipse.sirius.diagram.EObjectVariableValue#getModelElement()
+     * @see #getEObjectVariableValue()
+     * @generated
+     */
+    EReference getEObjectVariableValue_ModelElement();
+
+    /**
      * Returns the meta object for enum '
      * {@link org.eclipse.sirius.diagram.ContainerLayout
      * <em>Container Layout</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
@@ -9017,34 +9125,6 @@ public interface DiagramPackage extends EPackage {
 
         /**
          * The meta object literal for the '
-         * {@link org.eclipse.sirius.diagram.impl.FilterVariableValueImpl
-         * <em>Filter Variable Value</em>}' class. <!-- begin-user-doc --> <!--
-         * end-user-doc -->
-         * 
-         * @see org.eclipse.sirius.diagram.impl.FilterVariableValueImpl
-         * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getFilterVariableValue()
-         * @generated
-         */
-        EClass FILTER_VARIABLE_VALUE = DiagramPackage.eINSTANCE.getFilterVariableValue();
-
-        /**
-         * The meta object literal for the '<em><b>Variable Definition</b></em>'
-         * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
-         * @generated
-         */
-        EReference FILTER_VARIABLE_VALUE__VARIABLE_DEFINITION = DiagramPackage.eINSTANCE.getFilterVariableValue_VariableDefinition();
-
-        /**
-         * The meta object literal for the '<em><b>Model Element</b></em>'
-         * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
-         * @generated
-         */
-        EReference FILTER_VARIABLE_VALUE__MODEL_ELEMENT = DiagramPackage.eINSTANCE.getFilterVariableValue_ModelElement();
-
-        /**
-         * The meta object literal for the '
          * {@link org.eclipse.sirius.diagram.impl.CollapseFilterImpl
          * <em>Collapse Filter</em>}' class. <!-- begin-user-doc --> <!--
          * end-user-doc -->
@@ -9187,6 +9267,74 @@ public interface DiagramPackage extends EPackage {
 
         /**
          * The meta object literal for the '
+         * {@link org.eclipse.sirius.diagram.impl.VariableValueImpl
+         * <em>Variable Value</em>}' class. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         * 
+         * @see org.eclipse.sirius.diagram.impl.VariableValueImpl
+         * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getVariableValue()
+         * @generated
+         */
+        EClass VARIABLE_VALUE = DiagramPackage.eINSTANCE.getVariableValue();
+
+        /**
+         * The meta object literal for the '
+         * {@link org.eclipse.sirius.diagram.impl.TypedVariableValueImpl
+         * <em>Typed Variable Value</em>}' class. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         * 
+         * @see org.eclipse.sirius.diagram.impl.TypedVariableValueImpl
+         * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getTypedVariableValue()
+         * @generated
+         */
+        EClass TYPED_VARIABLE_VALUE = DiagramPackage.eINSTANCE.getTypedVariableValue();
+
+        /**
+         * The meta object literal for the '<em><b>Variable Definition</b></em>'
+         * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
+         * @generated
+         */
+        EReference TYPED_VARIABLE_VALUE__VARIABLE_DEFINITION = DiagramPackage.eINSTANCE.getTypedVariableValue_VariableDefinition();
+
+        /**
+         * The meta object literal for the '<em><b>Value</b></em>' attribute
+         * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
+         * @generated
+         */
+        EAttribute TYPED_VARIABLE_VALUE__VALUE = DiagramPackage.eINSTANCE.getTypedVariableValue_Value();
+
+        /**
+         * The meta object literal for the '
+         * {@link org.eclipse.sirius.diagram.impl.EObjectVariableValueImpl
+         * <em>EObject Variable Value</em>}' class. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         * 
+         * @see org.eclipse.sirius.diagram.impl.EObjectVariableValueImpl
+         * @see org.eclipse.sirius.diagram.impl.DiagramPackageImpl#getEObjectVariableValue()
+         * @generated
+         */
+        EClass EOBJECT_VARIABLE_VALUE = DiagramPackage.eINSTANCE.getEObjectVariableValue();
+
+        /**
+         * The meta object literal for the '<em><b>Variable Definition</b></em>'
+         * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
+         * @generated
+         */
+        EReference EOBJECT_VARIABLE_VALUE__VARIABLE_DEFINITION = DiagramPackage.eINSTANCE.getEObjectVariableValue_VariableDefinition();
+
+        /**
+         * The meta object literal for the '<em><b>Model Element</b></em>'
+         * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
+         * @generated
+         */
+        EReference EOBJECT_VARIABLE_VALUE__MODEL_ELEMENT = DiagramPackage.eINSTANCE.getEObjectVariableValue_ModelElement();
+
+        /**
+         * The meta object literal for the '
          * {@link org.eclipse.sirius.diagram.ContainerLayout
          * <em>Container Layout</em>}' enum. <!-- begin-user-doc --> <!--
          * end-user-doc -->
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/FilterVariableValue.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/EObjectVariableValue.java
index f6d8cd6f6f..503015a9ee 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/FilterVariableValue.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/EObjectVariableValue.java
@@ -1,5 +1,5 @@
-/**
- * Copyright (c) 2007, 2013 THALES GLOBAL SERVICES.
+/*******************************************************************************
+ * Copyright (c) 2015 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
@@ -7,33 +7,32 @@
  *
  * Contributors:
  *    Obeo - initial API and implementation
- *
- */
+ *******************************************************************************/
 package org.eclipse.sirius.diagram;
 
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.sirius.diagram.description.filter.FilterVariable;
+import org.eclipse.sirius.viewpoint.description.tool.SelectModelElementVariable;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Filter Variable Value</b></em>'. <!-- end-user-doc -->
+ * <em><b>EObject Variable Value</b></em>'. <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
  * <ul>
  * <li>
- * {@link org.eclipse.sirius.diagram.FilterVariableValue#getVariableDefinition
+ * {@link org.eclipse.sirius.diagram.EObjectVariableValue#getVariableDefinition
  * <em>Variable Definition</em>}</li>
- * <li>{@link org.eclipse.sirius.diagram.FilterVariableValue#getModelElement
+ * <li>{@link org.eclipse.sirius.diagram.EObjectVariableValue#getModelElement
  * <em>Model Element</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.sirius.diagram.DiagramPackage#getFilterVariableValue()
+ * @see org.eclipse.sirius.diagram.DiagramPackage#getEObjectVariableValue()
  * @model
  * @generated
  */
-public interface FilterVariableValue extends EObject {
+public interface EObjectVariableValue extends VariableValue {
     /**
      * Returns the value of the '<em><b>Variable Definition</b></em>' reference.
      * <!-- begin-user-doc -->
@@ -44,16 +43,16 @@ public interface FilterVariableValue extends EObject {
      * <!-- end-user-doc -->
      * 
      * @return the value of the '<em>Variable Definition</em>' reference.
-     * @see #setVariableDefinition(FilterVariable)
-     * @see org.eclipse.sirius.diagram.DiagramPackage#getFilterVariableValue_VariableDefinition()
+     * @see #setVariableDefinition(SelectModelElementVariable)
+     * @see org.eclipse.sirius.diagram.DiagramPackage#getEObjectVariableValue_VariableDefinition()
      * @model required="true"
      * @generated
      */
-    FilterVariable getVariableDefinition();
+    SelectModelElementVariable getVariableDefinition();
 
     /**
      * Sets the value of the '
-     * {@link org.eclipse.sirius.diagram.FilterVariableValue#getVariableDefinition
+     * {@link org.eclipse.sirius.diagram.EObjectVariableValue#getVariableDefinition
      * <em>Variable Definition</em>}' reference. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      * 
@@ -62,7 +61,7 @@ public interface FilterVariableValue extends EObject {
      * @see #getVariableDefinition()
      * @generated
      */
-    void setVariableDefinition(FilterVariable value);
+    void setVariableDefinition(SelectModelElementVariable value);
 
     /**
      * Returns the value of the '<em><b>Model Element</b></em>' reference. <!--
@@ -75,7 +74,7 @@ public interface FilterVariableValue extends EObject {
      *
      * @return the value of the '<em>Model Element</em>' reference.
      * @see #setModelElement(EObject)
-     * @see org.eclipse.sirius.diagram.DiagramPackage#getFilterVariableValue_ModelElement()
+     * @see org.eclipse.sirius.diagram.DiagramPackage#getEObjectVariableValue_ModelElement()
      * @model required="true"
      * @generated
      */
@@ -83,7 +82,7 @@ public interface FilterVariableValue extends EObject {
 
     /**
      * Sets the value of the '
-     * {@link org.eclipse.sirius.diagram.FilterVariableValue#getModelElement
+     * {@link org.eclipse.sirius.diagram.EObjectVariableValue#getModelElement
      * <em>Model Element</em>}' reference. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      * 
@@ -94,4 +93,4 @@ public interface FilterVariableValue extends EObject {
      */
     void setModelElement(EObject value);
 
-} // FilterVariableValue
+} // EObjectVariableValue
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 c49460ba9b..4f2038e013 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
@@ -48,6 +48,6 @@ public interface FilterVariableHistory extends EObject {
      * @model containment="true" resolveProxies="true"
      * @generated
      */
-    EList<FilterVariableValue> getOwnedValues();
+    EList<VariableValue> getOwnedValues();
 
 } // FilterVariableHistory
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/TypedVariableValue.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/TypedVariableValue.java
new file mode 100644
index 0000000000..bbfdf44d48
--- /dev/null
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/TypedVariableValue.java
@@ -0,0 +1,94 @@
+/*******************************************************************************
+ * Copyright (c) 2015 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.diagram;
+
+import org.eclipse.sirius.viewpoint.description.TypedVariable;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Typed Variable Value</b></em>'. <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>
+ * {@link org.eclipse.sirius.diagram.TypedVariableValue#getVariableDefinition
+ * <em>Variable Definition</em>}</li>
+ * <li>{@link org.eclipse.sirius.diagram.TypedVariableValue#getValue <em>Value
+ * </em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.sirius.diagram.DiagramPackage#getTypedVariableValue()
+ * @model
+ * @generated
+ */
+public interface TypedVariableValue extends VariableValue {
+    /**
+     * Returns the value of the '<em><b>Variable Definition</b></em>' reference.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Variable Definition</em>' reference isn't
+     * clear, there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * 
+     * @return the value of the '<em>Variable Definition</em>' reference.
+     * @see #setVariableDefinition(TypedVariable)
+     * @see org.eclipse.sirius.diagram.DiagramPackage#getTypedVariableValue_VariableDefinition()
+     * @model required="true"
+     * @generated
+     */
+    TypedVariable getVariableDefinition();
+
+    /**
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.diagram.TypedVariableValue#getVariableDefinition
+     * <em>Variable Definition</em>}' reference. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @param value
+     *            the new value of the '<em>Variable Definition</em>' reference.
+     * @see #getVariableDefinition()
+     * @generated
+     */
+    void setVariableDefinition(TypedVariable value);
+
+    /**
+     * Returns the value of the '<em><b>Value</b></em>' attribute. <!--
+     * begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Value</em>' attribute isn't clear, there
+     * really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     *
+     * @return the value of the '<em>Value</em>' attribute.
+     * @see #setValue(String)
+     * @see org.eclipse.sirius.diagram.DiagramPackage#getTypedVariableValue_Value()
+     * @model
+     * @generated
+     */
+    String getValue();
+
+    /**
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.diagram.TypedVariableValue#getValue
+     * <em>Value</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @param value
+     *            the new value of the '<em>Value</em>' attribute.
+     * @see #getValue()
+     * @generated
+     */
+    void setValue(String value);
+
+} // TypedVariableValue
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
new file mode 100644
index 0000000000..7651861dea
--- /dev/null
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/VariableValue.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2015 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.diagram;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Variable Value</b></em>'. <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.sirius.diagram.DiagramPackage#getVariableValue()
+ * @model abstract="true"
+ * @generated
+ */
+public interface VariableValue extends EObject {
+
+} // VariableValue
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/FilterFactory.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/FilterFactory.java
index bb4ff4b560..5d5ffb10f4 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/FilterFactory.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/FilterFactory.java
@@ -57,15 +57,6 @@ public interface FilterFactory extends EFactory {
     VariableFilter createVariableFilter();
 
     /**
-     * Returns a new object of class '<em>Variable</em>'. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @return a new object of class '<em>Variable</em>'.
-     * @generated
-     */
-    FilterVariable createFilterVariable();
-
-    /**
      * Returns the package supported by this factory. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * 
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/FilterPackage.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/FilterPackage.java
index e65fbaab85..24d6191df5 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/FilterPackage.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/FilterPackage.java
@@ -305,89 +305,6 @@ public interface FilterPackage extends EPackage {
 
     /**
      * The meta object id for the '
-     * {@link org.eclipse.sirius.diagram.description.filter.impl.FilterVariableImpl
-     * <em>Variable</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.sirius.diagram.description.filter.impl.FilterVariableImpl
-     * @see org.eclipse.sirius.diagram.description.filter.impl.FilterPackageImpl#getFilterVariable()
-     * @generated
-     */
-    int FILTER_VARIABLE = 5;
-
-    /**
-     * The feature id for the '<em><b>Candidates Expression</b></em>' attribute.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     * @ordered
-     */
-    int FILTER_VARIABLE__CANDIDATES_EXPRESSION = DescriptionPackage.SELECTION_DESCRIPTION__CANDIDATES_EXPRESSION;
-
-    /**
-     * The feature id for the '<em><b>Multiple</b></em>' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int FILTER_VARIABLE__MULTIPLE = DescriptionPackage.SELECTION_DESCRIPTION__MULTIPLE;
-
-    /**
-     * The feature id for the '<em><b>Tree</b></em>' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int FILTER_VARIABLE__TREE = DescriptionPackage.SELECTION_DESCRIPTION__TREE;
-
-    /**
-     * The feature id for the '<em><b>Root Expression</b></em>' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int FILTER_VARIABLE__ROOT_EXPRESSION = DescriptionPackage.SELECTION_DESCRIPTION__ROOT_EXPRESSION;
-
-    /**
-     * The feature id for the '<em><b>Children Expression</b></em>' attribute.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     * @ordered
-     */
-    int FILTER_VARIABLE__CHILDREN_EXPRESSION = DescriptionPackage.SELECTION_DESCRIPTION__CHILDREN_EXPRESSION;
-
-    /**
-     * The feature id for the '<em><b>Message</b></em>' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int FILTER_VARIABLE__MESSAGE = DescriptionPackage.SELECTION_DESCRIPTION__MESSAGE;
-
-    /**
-     * The feature id for the '<em><b>Name</b></em>' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int FILTER_VARIABLE__NAME = DescriptionPackage.SELECTION_DESCRIPTION_FEATURE_COUNT + 0;
-
-    /**
-     * The number of structural features of the '<em>Variable</em>' class. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int FILTER_VARIABLE_FEATURE_COUNT = DescriptionPackage.SELECTION_DESCRIPTION_FEATURE_COUNT + 1;
-
-    /**
-     * The meta object id for the '
      * {@link org.eclipse.sirius.diagram.description.filter.FilterKind
      * <em>Kind</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
@@ -395,7 +312,7 @@ public interface FilterPackage extends EPackage {
      * @see org.eclipse.sirius.diagram.description.filter.impl.FilterPackageImpl#getFilterKind()
      * @generated
      */
-    int FILTER_KIND = 6;
+    int FILTER_KIND = 5;
 
     /**
      * Returns the meta object for class '
@@ -547,29 +464,6 @@ public interface FilterPackage extends EPackage {
     EAttribute getVariableFilter_SemanticConditionExpression();
 
     /**
-     * Returns the meta object for class '
-     * {@link org.eclipse.sirius.diagram.description.filter.FilterVariable
-     * <em>Variable</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @return the meta object for class '<em>Variable</em>'.
-     * @see org.eclipse.sirius.diagram.description.filter.FilterVariable
-     * @generated
-     */
-    EClass getFilterVariable();
-
-    /**
-     * Returns the meta object for the attribute '
-     * {@link org.eclipse.sirius.diagram.description.filter.FilterVariable#getName
-     * <em>Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @return the meta object for the attribute '<em>Name</em>'.
-     * @see org.eclipse.sirius.diagram.description.filter.FilterVariable#getName()
-     * @see #getFilterVariable()
-     * @generated
-     */
-    EAttribute getFilterVariable_Name();
-
-    /**
      * Returns the meta object for enum '
      * {@link org.eclipse.sirius.diagram.description.filter.FilterKind
      * <em>Kind</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -725,26 +619,6 @@ public interface FilterPackage extends EPackage {
 
         /**
          * The meta object literal for the '
-         * {@link org.eclipse.sirius.diagram.description.filter.impl.FilterVariableImpl
-         * <em>Variable</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc
-         * -->
-         *
-         * @see org.eclipse.sirius.diagram.description.filter.impl.FilterVariableImpl
-         * @see org.eclipse.sirius.diagram.description.filter.impl.FilterPackageImpl#getFilterVariable()
-         * @generated
-         */
-        EClass FILTER_VARIABLE = FilterPackage.eINSTANCE.getFilterVariable();
-
-        /**
-         * The meta object literal for the '<em><b>Name</b></em>' attribute
-         * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
-         * @generated
-         */
-        EAttribute FILTER_VARIABLE__NAME = FilterPackage.eINSTANCE.getFilterVariable_Name();
-
-        /**
-         * The meta object literal for the '
          * {@link org.eclipse.sirius.diagram.description.filter.FilterKind
          * <em>Kind</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc -->
          * 
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/FilterVariable.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/FilterVariable.java
deleted file mode 100644
index b71d759155..0000000000
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/FilterVariable.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * Copyright (c) 2007, 2013 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.description.filter;
-
-import org.eclipse.sirius.viewpoint.description.SelectionDescription;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Variable</b></em>'. <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>
- * {@link org.eclipse.sirius.diagram.description.filter.FilterVariable#getName
- * <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.sirius.diagram.description.filter.FilterPackage#getFilterVariable()
- * @model
- * @generated
- */
-public interface FilterVariable extends SelectionDescription {
-    /**
-     * Returns the value of the '<em><b>Name</b></em>' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> Name of
-     * the variable. <!-- end-model-doc -->
-     *
-     * @return the value of the '<em>Name</em>' attribute.
-     * @see #setName(String)
-     * @see org.eclipse.sirius.diagram.description.filter.FilterPackage#getFilterVariable_Name()
-     * @model required="true"
-     * @generated
-     */
-    String getName();
-
-    /**
-     * Sets the value of the '
-     * {@link org.eclipse.sirius.diagram.description.filter.FilterVariable#getName
-     * <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @param value
-     *            the new value of the '<em>Name</em>' attribute.
-     * @see #getName()
-     * @generated
-     */
-    void setName(String value);
-
-} // FilterVariable
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/VariableFilter.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/VariableFilter.java
index 66b5c6eccf..304c2fd629 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/VariableFilter.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/VariableFilter.java
@@ -14,6 +14,7 @@ package org.eclipse.sirius.diagram.description.filter;
 import java.util.Map;
 
 import org.eclipse.emf.common.util.EList;
+import org.eclipse.sirius.viewpoint.description.InteractiveVariableDescription;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '
@@ -44,8 +45,8 @@ public interface VariableFilter extends Filter {
     /**
      * Returns the value of the '<em><b>Owned Variables</b></em>' containment
      * reference list. The list contents are of type
-     * {@link org.eclipse.sirius.diagram.description.filter.FilterVariable}.
-     * <!-- begin-user-doc -->
+     * {@link org.eclipse.sirius.viewpoint.description.InteractiveVariableDescription}
+     * . <!-- begin-user-doc -->
      * <p>
      * If the meaning of the '<em>Owned Variables</em>' containment reference
      * list isn't clear, there really should be more of a description here...
@@ -58,7 +59,7 @@ public interface VariableFilter extends Filter {
      * @model containment="true" resolveProxies="true"
      * @generated
      */
-    EList<FilterVariable> getOwnedVariables();
+    EList<InteractiveVariableDescription> getOwnedVariables();
 
     /**
      * Returns the value of the '<em><b>Semantic Condition Expression</b></em>'
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/FilterFactoryImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/FilterFactoryImpl.java
index 9ad7db5d1f..abf39e5659 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/FilterFactoryImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/FilterFactoryImpl.java
@@ -24,7 +24,6 @@ import org.eclipse.sirius.diagram.description.filter.CompositeFilterDescription;
 import org.eclipse.sirius.diagram.description.filter.FilterFactory;
 import org.eclipse.sirius.diagram.description.filter.FilterKind;
 import org.eclipse.sirius.diagram.description.filter.FilterPackage;
-import org.eclipse.sirius.diagram.description.filter.FilterVariable;
 import org.eclipse.sirius.diagram.description.filter.MappingFilter;
 import org.eclipse.sirius.diagram.description.filter.VariableFilter;
 
@@ -77,8 +76,6 @@ public class FilterFactoryImpl extends EFactoryImpl implements FilterFactory {
             return createCompositeFilterDescription();
         case FilterPackage.VARIABLE_FILTER:
             return createVariableFilter();
-        case FilterPackage.FILTER_VARIABLE:
-            return createFilterVariable();
         default:
             throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
@@ -152,17 +149,6 @@ public class FilterFactoryImpl extends EFactoryImpl implements FilterFactory {
      * 
      * @generated
      */
-    @Override
-    public FilterVariable createFilterVariable() {
-        FilterVariableImpl filterVariable = new FilterVariableImpl();
-        return filterVariable;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
     public FilterKind createFilterKindFromString(EDataType eDataType, String initialValue) {
         FilterKind result = FilterKind.get(initialValue);
         if (result == null) {
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/FilterPackageImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/FilterPackageImpl.java
index 8473674ebc..8cd82d021d 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/FilterPackageImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/FilterPackageImpl.java
@@ -30,7 +30,6 @@ import org.eclipse.sirius.diagram.description.filter.FilterDescription;
 import org.eclipse.sirius.diagram.description.filter.FilterFactory;
 import org.eclipse.sirius.diagram.description.filter.FilterKind;
 import org.eclipse.sirius.diagram.description.filter.FilterPackage;
-import org.eclipse.sirius.diagram.description.filter.FilterVariable;
 import org.eclipse.sirius.diagram.description.filter.MappingFilter;
 import org.eclipse.sirius.diagram.description.filter.VariableFilter;
 import org.eclipse.sirius.diagram.description.impl.DescriptionPackageImpl;
@@ -88,13 +87,6 @@ public class FilterPackageImpl extends EPackageImpl implements FilterPackage {
      * 
      * @generated
      */
-    private EClass filterVariableEClass = null;
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
     private EEnum filterKindEEnum = null;
 
     /**
@@ -314,26 +306,6 @@ public class FilterPackageImpl extends EPackageImpl implements FilterPackage {
      * @generated
      */
     @Override
-    public EClass getFilterVariable() {
-        return filterVariableEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public EAttribute getFilterVariable_Name() {
-        return (EAttribute) filterVariableEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
     public EEnum getFilterKind() {
         return filterKindEEnum;
     }
@@ -386,9 +358,6 @@ public class FilterPackageImpl extends EPackageImpl implements FilterPackage {
         createEReference(variableFilterEClass, FilterPackage.VARIABLE_FILTER__OWNED_VARIABLES);
         createEAttribute(variableFilterEClass, FilterPackage.VARIABLE_FILTER__SEMANTIC_CONDITION_EXPRESSION);
 
-        filterVariableEClass = createEClass(FilterPackage.FILTER_VARIABLE);
-        createEAttribute(filterVariableEClass, FilterPackage.FILTER_VARIABLE__NAME);
-
         // Create enums
         filterKindEEnum = createEEnum(FilterPackage.FILTER_KIND);
     }
@@ -435,7 +404,6 @@ public class FilterPackageImpl extends EPackageImpl implements FilterPackage {
         mappingFilterEClass.getESuperTypes().add(this.getFilter());
         compositeFilterDescriptionEClass.getESuperTypes().add(this.getFilterDescription());
         variableFilterEClass.getESuperTypes().add(this.getFilter());
-        filterVariableEClass.getESuperTypes().add(theDescriptionPackage_1.getSelectionDescription());
 
         // Initialize classes and features; add operations and parameters
         initEClass(filterDescriptionEClass, FilterDescription.class, "FilterDescription", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
@@ -478,7 +446,7 @@ public class FilterPackageImpl extends EPackageImpl implements FilterPackage {
         initEClass(variableFilterEClass, VariableFilter.class, "VariableFilter", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
         initEReference(
                 getVariableFilter_OwnedVariables(),
-                this.getFilterVariable(),
+                theDescriptionPackage_1.getInteractiveVariableDescription(),
                 null,
                 "ownedVariables", null, 0, -1, VariableFilter.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         initEAttribute(
@@ -494,12 +462,6 @@ public class FilterPackageImpl extends EPackageImpl implements FilterPackage {
         g1.getETypeArguments().add(g2);
         addEParameter(op, g1, "variables", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
 
-        initEClass(filterVariableEClass, FilterVariable.class, "FilterVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-        initEAttribute(
-                getFilterVariable_Name(),
-                theEcorePackage.getEString(),
-                "name", null, 1, 1, FilterVariable.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-
         // Initialize enums and add enum literals
         initEEnum(filterKindEEnum, FilterKind.class, "FilterKind"); //$NON-NLS-1$
         addEEnumLiteral(filterKindEEnum, FilterKind.HIDE_LITERAL);
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/FilterVariableImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/FilterVariableImpl.java
deleted file mode 100644
index 5cd6212b6d..0000000000
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/FilterVariableImpl.java
+++ /dev/null
@@ -1,535 +0,0 @@
-/**
- * Copyright (c) 2007, 2013 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.description.filter.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.description.filter.FilterPackage;
-import org.eclipse.sirius.diagram.description.filter.FilterVariable;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Variable</b></em>'. <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>
- * {@link org.eclipse.sirius.diagram.description.filter.impl.FilterVariableImpl#getCandidatesExpression
- * <em>Candidates Expression</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.diagram.description.filter.impl.FilterVariableImpl#isMultiple
- * <em>Multiple</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.diagram.description.filter.impl.FilterVariableImpl#isTree
- * <em>Tree</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.diagram.description.filter.impl.FilterVariableImpl#getRootExpression
- * <em>Root Expression</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.diagram.description.filter.impl.FilterVariableImpl#getChildrenExpression
- * <em>Children Expression</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.diagram.description.filter.impl.FilterVariableImpl#getMessage
- * <em>Message</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.diagram.description.filter.impl.FilterVariableImpl#getName
- * <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FilterVariableImpl extends MinimalEObjectImpl.Container implements FilterVariable {
-    /**
-     * The default value of the '{@link #getCandidatesExpression()
-     * <em>Candidates Expression</em>}' attribute. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @see #getCandidatesExpression()
-     * @generated
-     * @ordered
-     */
-    protected static final String CANDIDATES_EXPRESSION_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getCandidatesExpression()
-     * <em>Candidates Expression</em>}' attribute. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @see #getCandidatesExpression()
-     * @generated
-     * @ordered
-     */
-    protected String candidatesExpression = FilterVariableImpl.CANDIDATES_EXPRESSION_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isMultiple() <em>Multiple</em>}'
-     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see #isMultiple()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean MULTIPLE_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isMultiple() <em>Multiple</em>}'
-     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see #isMultiple()
-     * @generated
-     * @ordered
-     */
-    protected boolean multiple = FilterVariableImpl.MULTIPLE_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isTree() <em>Tree</em>}' attribute.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see #isTree()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean TREE_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isTree() <em>Tree</em>}' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @see #isTree()
-     * @generated
-     * @ordered
-     */
-    protected boolean tree = FilterVariableImpl.TREE_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getRootExpression()
-     * <em>Root Expression</em>}' attribute. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @see #getRootExpression()
-     * @generated
-     * @ordered
-     */
-    protected static final String ROOT_EXPRESSION_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getRootExpression()
-     * <em>Root Expression</em>}' attribute. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @see #getRootExpression()
-     * @generated
-     * @ordered
-     */
-    protected String rootExpression = FilterVariableImpl.ROOT_EXPRESSION_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getChildrenExpression()
-     * <em>Children Expression</em>}' attribute. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @see #getChildrenExpression()
-     * @generated
-     * @ordered
-     */
-    protected static final String CHILDREN_EXPRESSION_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getChildrenExpression()
-     * <em>Children Expression</em>}' attribute. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @see #getChildrenExpression()
-     * @generated
-     * @ordered
-     */
-    protected String childrenExpression = FilterVariableImpl.CHILDREN_EXPRESSION_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getMessage() <em>Message</em>}'
-     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see #getMessage()
-     * @generated
-     * @ordered
-     */
-    protected static final String MESSAGE_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getMessage() <em>Message</em>}'
-     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see #getMessage()
-     * @generated
-     * @ordered
-     */
-    protected String message = FilterVariableImpl.MESSAGE_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see #getName()
-     * @generated
-     * @ordered
-     */
-    protected static final String NAME_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see #getName()
-     * @generated
-     * @ordered
-     */
-    protected String name = FilterVariableImpl.NAME_EDEFAULT;
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected FilterVariableImpl() {
-        super();
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    protected EClass eStaticClass() {
-        return FilterPackage.Literals.FILTER_VARIABLE;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public String getCandidatesExpression() {
-        return candidatesExpression;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public void setCandidatesExpression(String newCandidatesExpression) {
-        String oldCandidatesExpression = candidatesExpression;
-        candidatesExpression = newCandidatesExpression;
-        if (eNotificationRequired()) {
-            eNotify(new ENotificationImpl(this, Notification.SET, FilterPackage.FILTER_VARIABLE__CANDIDATES_EXPRESSION, oldCandidatesExpression, candidatesExpression));
-        }
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public boolean isMultiple() {
-        return multiple;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public void setMultiple(boolean newMultiple) {
-        boolean oldMultiple = multiple;
-        multiple = newMultiple;
-        if (eNotificationRequired()) {
-            eNotify(new ENotificationImpl(this, Notification.SET, FilterPackage.FILTER_VARIABLE__MULTIPLE, oldMultiple, multiple));
-        }
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public boolean isTree() {
-        return tree;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public void setTree(boolean newTree) {
-        boolean oldTree = tree;
-        tree = newTree;
-        if (eNotificationRequired()) {
-            eNotify(new ENotificationImpl(this, Notification.SET, FilterPackage.FILTER_VARIABLE__TREE, oldTree, tree));
-        }
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public String getRootExpression() {
-        return rootExpression;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public void setRootExpression(String newRootExpression) {
-        String oldRootExpression = rootExpression;
-        rootExpression = newRootExpression;
-        if (eNotificationRequired()) {
-            eNotify(new ENotificationImpl(this, Notification.SET, FilterPackage.FILTER_VARIABLE__ROOT_EXPRESSION, oldRootExpression, rootExpression));
-        }
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public String getChildrenExpression() {
-        return childrenExpression;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public void setChildrenExpression(String newChildrenExpression) {
-        String oldChildrenExpression = childrenExpression;
-        childrenExpression = newChildrenExpression;
-        if (eNotificationRequired()) {
-            eNotify(new ENotificationImpl(this, Notification.SET, FilterPackage.FILTER_VARIABLE__CHILDREN_EXPRESSION, oldChildrenExpression, childrenExpression));
-        }
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public String getMessage() {
-        return message;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public void setMessage(String newMessage) {
-        String oldMessage = message;
-        message = newMessage;
-        if (eNotificationRequired()) {
-            eNotify(new ENotificationImpl(this, Notification.SET, FilterPackage.FILTER_VARIABLE__MESSAGE, oldMessage, message));
-        }
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public void setName(String newName) {
-        String oldName = name;
-        name = newName;
-        if (eNotificationRequired()) {
-            eNotify(new ENotificationImpl(this, Notification.SET, FilterPackage.FILTER_VARIABLE__NAME, oldName, name));
-        }
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-        case FilterPackage.FILTER_VARIABLE__CANDIDATES_EXPRESSION:
-            return getCandidatesExpression();
-        case FilterPackage.FILTER_VARIABLE__MULTIPLE:
-            return isMultiple();
-        case FilterPackage.FILTER_VARIABLE__TREE:
-            return isTree();
-        case FilterPackage.FILTER_VARIABLE__ROOT_EXPRESSION:
-            return getRootExpression();
-        case FilterPackage.FILTER_VARIABLE__CHILDREN_EXPRESSION:
-            return getChildrenExpression();
-        case FilterPackage.FILTER_VARIABLE__MESSAGE:
-            return getMessage();
-        case FilterPackage.FILTER_VARIABLE__NAME:
-            return getName();
-        }
-        return super.eGet(featureID, resolve, coreType);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-        case FilterPackage.FILTER_VARIABLE__CANDIDATES_EXPRESSION:
-            setCandidatesExpression((String) newValue);
-            return;
-        case FilterPackage.FILTER_VARIABLE__MULTIPLE:
-            setMultiple((Boolean) newValue);
-            return;
-        case FilterPackage.FILTER_VARIABLE__TREE:
-            setTree((Boolean) newValue);
-            return;
-        case FilterPackage.FILTER_VARIABLE__ROOT_EXPRESSION:
-            setRootExpression((String) newValue);
-            return;
-        case FilterPackage.FILTER_VARIABLE__CHILDREN_EXPRESSION:
-            setChildrenExpression((String) newValue);
-            return;
-        case FilterPackage.FILTER_VARIABLE__MESSAGE:
-            setMessage((String) newValue);
-            return;
-        case FilterPackage.FILTER_VARIABLE__NAME:
-            setName((String) newValue);
-            return;
-        }
-        super.eSet(featureID, newValue);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public void eUnset(int featureID) {
-        switch (featureID) {
-        case FilterPackage.FILTER_VARIABLE__CANDIDATES_EXPRESSION:
-            setCandidatesExpression(FilterVariableImpl.CANDIDATES_EXPRESSION_EDEFAULT);
-            return;
-        case FilterPackage.FILTER_VARIABLE__MULTIPLE:
-            setMultiple(FilterVariableImpl.MULTIPLE_EDEFAULT);
-            return;
-        case FilterPackage.FILTER_VARIABLE__TREE:
-            setTree(FilterVariableImpl.TREE_EDEFAULT);
-            return;
-        case FilterPackage.FILTER_VARIABLE__ROOT_EXPRESSION:
-            setRootExpression(FilterVariableImpl.ROOT_EXPRESSION_EDEFAULT);
-            return;
-        case FilterPackage.FILTER_VARIABLE__CHILDREN_EXPRESSION:
-            setChildrenExpression(FilterVariableImpl.CHILDREN_EXPRESSION_EDEFAULT);
-            return;
-        case FilterPackage.FILTER_VARIABLE__MESSAGE:
-            setMessage(FilterVariableImpl.MESSAGE_EDEFAULT);
-            return;
-        case FilterPackage.FILTER_VARIABLE__NAME:
-            setName(FilterVariableImpl.NAME_EDEFAULT);
-            return;
-        }
-        super.eUnset(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-        case FilterPackage.FILTER_VARIABLE__CANDIDATES_EXPRESSION:
-            return FilterVariableImpl.CANDIDATES_EXPRESSION_EDEFAULT == null ? candidatesExpression != null : !FilterVariableImpl.CANDIDATES_EXPRESSION_EDEFAULT.equals(candidatesExpression);
-        case FilterPackage.FILTER_VARIABLE__MULTIPLE:
-            return multiple != FilterVariableImpl.MULTIPLE_EDEFAULT;
-        case FilterPackage.FILTER_VARIABLE__TREE:
-            return tree != FilterVariableImpl.TREE_EDEFAULT;
-        case FilterPackage.FILTER_VARIABLE__ROOT_EXPRESSION:
-            return FilterVariableImpl.ROOT_EXPRESSION_EDEFAULT == null ? rootExpression != null : !FilterVariableImpl.ROOT_EXPRESSION_EDEFAULT.equals(rootExpression);
-        case FilterPackage.FILTER_VARIABLE__CHILDREN_EXPRESSION:
-            return FilterVariableImpl.CHILDREN_EXPRESSION_EDEFAULT == null ? childrenExpression != null : !FilterVariableImpl.CHILDREN_EXPRESSION_EDEFAULT.equals(childrenExpression);
-        case FilterPackage.FILTER_VARIABLE__MESSAGE:
-            return FilterVariableImpl.MESSAGE_EDEFAULT == null ? message != null : !FilterVariableImpl.MESSAGE_EDEFAULT.equals(message);
-        case FilterPackage.FILTER_VARIABLE__NAME:
-            return FilterVariableImpl.NAME_EDEFAULT == null ? name != null : !FilterVariableImpl.NAME_EDEFAULT.equals(name);
-        }
-        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(" (candidatesExpression: "); //$NON-NLS-1$
-        result.append(candidatesExpression);
-        result.append(", multiple: "); //$NON-NLS-1$
-        result.append(multiple);
-        result.append(", tree: "); //$NON-NLS-1$
-        result.append(tree);
-        result.append(", rootExpression: "); //$NON-NLS-1$
-        result.append(rootExpression);
-        result.append(", childrenExpression: "); //$NON-NLS-1$
-        result.append(childrenExpression);
-        result.append(", message: "); //$NON-NLS-1$
-        result.append(message);
-        result.append(", name: "); //$NON-NLS-1$
-        result.append(name);
-        result.append(')');
-        return result.toString();
-    }
-
-} // FilterVariableImpl
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/VariableFilterImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/VariableFilterImpl.java
index 2a50fef348..de2fdf58c1 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/VariableFilterImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/impl/VariableFilterImpl.java
@@ -23,8 +23,8 @@ 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.diagram.description.filter.FilterPackage;
-import org.eclipse.sirius.diagram.description.filter.FilterVariable;
 import org.eclipse.sirius.diagram.description.filter.VariableFilter;
+import org.eclipse.sirius.viewpoint.description.InteractiveVariableDescription;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '
@@ -53,7 +53,7 @@ public class VariableFilterImpl extends FilterImpl implements VariableFilter {
      * @generated
      * @ordered
      */
-    protected EList<FilterVariable> ownedVariables;
+    protected EList<InteractiveVariableDescription> ownedVariables;
 
     /**
      * The default value of the '{@link #getSemanticConditionExpression()
@@ -102,9 +102,9 @@ public class VariableFilterImpl extends FilterImpl implements VariableFilter {
      * @generated
      */
     @Override
-    public EList<FilterVariable> getOwnedVariables() {
+    public EList<InteractiveVariableDescription> getOwnedVariables() {
         if (ownedVariables == null) {
-            ownedVariables = new EObjectContainmentEList.Resolving<FilterVariable>(FilterVariable.class, this, FilterPackage.VARIABLE_FILTER__OWNED_VARIABLES);
+            ownedVariables = new EObjectContainmentEList.Resolving<InteractiveVariableDescription>(InteractiveVariableDescription.class, this, FilterPackage.VARIABLE_FILTER__OWNED_VARIABLES);
         }
         return ownedVariables;
     }
@@ -186,7 +186,7 @@ public class VariableFilterImpl extends FilterImpl implements VariableFilter {
         switch (featureID) {
         case FilterPackage.VARIABLE_FILTER__OWNED_VARIABLES:
             getOwnedVariables().clear();
-            getOwnedVariables().addAll((Collection<? extends FilterVariable>) newValue);
+            getOwnedVariables().addAll((Collection<? extends InteractiveVariableDescription>) newValue);
             return;
         case FilterPackage.VARIABLE_FILTER__SEMANTIC_CONDITION_EXPRESSION:
             setSemanticConditionExpression((String) newValue);
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/util/FilterAdapterFactory.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/util/FilterAdapterFactory.java
index c944ae3491..287b642da4 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/util/FilterAdapterFactory.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/util/FilterAdapterFactory.java
@@ -19,12 +19,10 @@ import org.eclipse.sirius.diagram.description.filter.CompositeFilterDescription;
 import org.eclipse.sirius.diagram.description.filter.Filter;
 import org.eclipse.sirius.diagram.description.filter.FilterDescription;
 import org.eclipse.sirius.diagram.description.filter.FilterPackage;
-import org.eclipse.sirius.diagram.description.filter.FilterVariable;
 import org.eclipse.sirius.diagram.description.filter.MappingFilter;
 import org.eclipse.sirius.diagram.description.filter.VariableFilter;
 import org.eclipse.sirius.viewpoint.description.DocumentedElement;
 import org.eclipse.sirius.viewpoint.description.IdentifiedElement;
-import org.eclipse.sirius.viewpoint.description.SelectionDescription;
 
 /**
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides
@@ -107,11 +105,6 @@ public class FilterAdapterFactory extends AdapterFactoryImpl {
         }
 
         @Override
-        public Adapter caseFilterVariable(FilterVariable object) {
-            return createFilterVariableAdapter();
-        }
-
-        @Override
         public Adapter caseDocumentedElement(DocumentedElement object) {
             return createDocumentedElementAdapter();
         }
@@ -122,11 +115,6 @@ public class FilterAdapterFactory extends AdapterFactoryImpl {
         }
 
         @Override
-        public Adapter caseSelectionDescription(SelectionDescription object) {
-            return createSelectionDescriptionAdapter();
-        }
-
-        @Override
         public Adapter defaultCase(EObject object) {
             return createEObjectAdapter();
         }
@@ -228,22 +216,6 @@ public class FilterAdapterFactory extends AdapterFactoryImpl {
 
     /**
      * Creates a new adapter for an object of class '
-     * {@link org.eclipse.sirius.diagram.description.filter.FilterVariable
-     * <em>Variable</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.diagram.description.filter.FilterVariable
-     * @generated
-     */
-    public Adapter createFilterVariableAdapter() {
-        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
@@ -275,22 +247,6 @@ public class FilterAdapterFactory extends AdapterFactoryImpl {
     }
 
     /**
-     * Creates a new adapter for an object of class '
-     * {@link org.eclipse.sirius.viewpoint.description.SelectionDescription
-     * <em>Selection Description</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.description.SelectionDescription
-     * @generated
-     */
-    public Adapter createSelectionDescriptionAdapter() {
-        return null;
-    }
-
-    /**
      * Creates a new adapter for the default case. <!-- begin-user-doc --> This
      * default implementation returns null. <!-- end-user-doc -->
      * 
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/util/FilterSwitch.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/util/FilterSwitch.java
index ad08168611..8fc99adcd1 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/util/FilterSwitch.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/filter/util/FilterSwitch.java
@@ -19,12 +19,10 @@ import org.eclipse.sirius.diagram.description.filter.CompositeFilterDescription;
 import org.eclipse.sirius.diagram.description.filter.Filter;
 import org.eclipse.sirius.diagram.description.filter.FilterDescription;
 import org.eclipse.sirius.diagram.description.filter.FilterPackage;
-import org.eclipse.sirius.diagram.description.filter.FilterVariable;
 import org.eclipse.sirius.diagram.description.filter.MappingFilter;
 import org.eclipse.sirius.diagram.description.filter.VariableFilter;
 import org.eclipse.sirius.viewpoint.description.DocumentedElement;
 import org.eclipse.sirius.viewpoint.description.IdentifiedElement;
-import org.eclipse.sirius.viewpoint.description.SelectionDescription;
 
 /**
  * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance
@@ -160,17 +158,6 @@ public class FilterSwitch<T> {
             }
             return result;
         }
-        case FilterPackage.FILTER_VARIABLE: {
-            FilterVariable filterVariable = (FilterVariable) theEObject;
-            T result = caseFilterVariable(filterVariable);
-            if (result == null) {
-                result = caseSelectionDescription(filterVariable);
-            }
-            if (result == null) {
-                result = defaultCase(theEObject);
-            }
-            return result;
-        }
         default:
             return defaultCase(theEObject);
         }
@@ -263,23 +250,6 @@ public class FilterSwitch<T> {
 
     /**
      * Returns the result of interpreting the object as an instance of '
-     * <em>Variable</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>Variable</em>'.
-     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-     * @generated
-     */
-    public T caseFilterVariable(FilterVariable 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 -->
@@ -314,23 +284,6 @@ public class FilterSwitch<T> {
 
     /**
      * Returns the result of interpreting the object as an instance of '
-     * <em>Selection Description</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>Selection Description</em>'.
-     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-     * @generated
-     */
-    public T caseSelectionDescription(SelectionDescription object) {
-        return null;
-    }
-
-    /**
-     * Returns the result of interpreting the object as an instance of '
      * <em>EObject</em>'. <!-- begin-user-doc --> This implementation returns
      * null; returning a non-null result will terminate the switch, but this is
      * the last case anyway. <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/ElementDoubleClickVariable.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/ElementDoubleClickVariable.java
index c33b1c3675..74c30e3c98 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/ElementDoubleClickVariable.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/ElementDoubleClickVariable.java
@@ -4,14 +4,14 @@
  * 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.description.tool;
 
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.tool.VariableContainer;
 
 /**
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/NodeCreationVariable.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/NodeCreationVariable.java
index f7d7b802cb..0f542478aa 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/NodeCreationVariable.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/NodeCreationVariable.java
@@ -4,14 +4,14 @@
  * 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.description.tool;
 
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.tool.VariableContainer;
 
 /**
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/SourceEdgeCreationVariable.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/SourceEdgeCreationVariable.java
index 2c9341068d..e2620c9a50 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/SourceEdgeCreationVariable.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/SourceEdgeCreationVariable.java
@@ -4,14 +4,14 @@
  * 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.description.tool;
 
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.tool.VariableContainer;
 
 /**
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/SourceEdgeViewCreationVariable.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/SourceEdgeViewCreationVariable.java
index 2ab80f83d7..157d640016 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/SourceEdgeViewCreationVariable.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/SourceEdgeViewCreationVariable.java
@@ -4,14 +4,14 @@
  * 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.description.tool;
 
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.tool.VariableContainer;
 
 /**
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/TargetEdgeCreationVariable.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/TargetEdgeCreationVariable.java
index fa3f3d5709..7c90bb0ac8 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/TargetEdgeCreationVariable.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/TargetEdgeCreationVariable.java
@@ -4,14 +4,14 @@
  * 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.description.tool;
 
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.tool.VariableContainer;
 
 /**
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/TargetEdgeViewCreationVariable.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/TargetEdgeViewCreationVariable.java
index 2e7b7ae772..d2bec2a0b3 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/TargetEdgeViewCreationVariable.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/TargetEdgeViewCreationVariable.java
@@ -4,14 +4,14 @@
  * 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.description.tool;
 
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.tool.VariableContainer;
 
 /**
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/ToolPackage.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/ToolPackage.java
index 08162f7c18..0fd2d271cb 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/ToolPackage.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/ToolPackage.java
@@ -1604,7 +1604,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int SOURCE_EDGE_CREATION_VARIABLE__NAME = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.ABSTRACT_VARIABLE__NAME;
+    int SOURCE_EDGE_CREATION_VARIABLE__NAME = DescriptionPackage.ABSTRACT_VARIABLE__NAME;
 
     /**
      * The feature id for the '<em><b>Sub Variables</b></em>' containment
@@ -1613,7 +1613,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int SOURCE_EDGE_CREATION_VARIABLE__SUB_VARIABLES = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
+    int SOURCE_EDGE_CREATION_VARIABLE__SUB_VARIABLES = DescriptionPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
 
     /**
      * The number of structural features of the '
@@ -1623,7 +1623,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int SOURCE_EDGE_CREATION_VARIABLE_FEATURE_COUNT = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 1;
+    int SOURCE_EDGE_CREATION_VARIABLE_FEATURE_COUNT = DescriptionPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 1;
 
     /**
      * The meta object id for the '
@@ -1644,7 +1644,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int SOURCE_EDGE_VIEW_CREATION_VARIABLE__NAME = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.ABSTRACT_VARIABLE__NAME;
+    int SOURCE_EDGE_VIEW_CREATION_VARIABLE__NAME = DescriptionPackage.ABSTRACT_VARIABLE__NAME;
 
     /**
      * The feature id for the '<em><b>Sub Variables</b></em>' containment
@@ -1653,7 +1653,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int SOURCE_EDGE_VIEW_CREATION_VARIABLE__SUB_VARIABLES = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
+    int SOURCE_EDGE_VIEW_CREATION_VARIABLE__SUB_VARIABLES = DescriptionPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
 
     /**
      * The number of structural features of the '
@@ -1663,7 +1663,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int SOURCE_EDGE_VIEW_CREATION_VARIABLE_FEATURE_COUNT = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 1;
+    int SOURCE_EDGE_VIEW_CREATION_VARIABLE_FEATURE_COUNT = DescriptionPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 1;
 
     /**
      * The meta object id for the '
@@ -1684,7 +1684,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TARGET_EDGE_CREATION_VARIABLE__NAME = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.ABSTRACT_VARIABLE__NAME;
+    int TARGET_EDGE_CREATION_VARIABLE__NAME = DescriptionPackage.ABSTRACT_VARIABLE__NAME;
 
     /**
      * The feature id for the '<em><b>Sub Variables</b></em>' containment
@@ -1693,7 +1693,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TARGET_EDGE_CREATION_VARIABLE__SUB_VARIABLES = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
+    int TARGET_EDGE_CREATION_VARIABLE__SUB_VARIABLES = DescriptionPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
 
     /**
      * The number of structural features of the '
@@ -1703,7 +1703,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TARGET_EDGE_CREATION_VARIABLE_FEATURE_COUNT = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 1;
+    int TARGET_EDGE_CREATION_VARIABLE_FEATURE_COUNT = DescriptionPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 1;
 
     /**
      * The meta object id for the '
@@ -1724,7 +1724,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TARGET_EDGE_VIEW_CREATION_VARIABLE__NAME = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.ABSTRACT_VARIABLE__NAME;
+    int TARGET_EDGE_VIEW_CREATION_VARIABLE__NAME = DescriptionPackage.ABSTRACT_VARIABLE__NAME;
 
     /**
      * The feature id for the '<em><b>Sub Variables</b></em>' containment
@@ -1733,7 +1733,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TARGET_EDGE_VIEW_CREATION_VARIABLE__SUB_VARIABLES = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
+    int TARGET_EDGE_VIEW_CREATION_VARIABLE__SUB_VARIABLES = DescriptionPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
 
     /**
      * The number of structural features of the '
@@ -1743,7 +1743,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TARGET_EDGE_VIEW_CREATION_VARIABLE_FEATURE_COUNT = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 1;
+    int TARGET_EDGE_VIEW_CREATION_VARIABLE_FEATURE_COUNT = DescriptionPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 1;
 
     /**
      * The meta object id for the '
@@ -1764,7 +1764,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int ELEMENT_DOUBLE_CLICK_VARIABLE__NAME = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.ABSTRACT_VARIABLE__NAME;
+    int ELEMENT_DOUBLE_CLICK_VARIABLE__NAME = DescriptionPackage.ABSTRACT_VARIABLE__NAME;
 
     /**
      * The feature id for the '<em><b>Sub Variables</b></em>' containment
@@ -1773,7 +1773,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int ELEMENT_DOUBLE_CLICK_VARIABLE__SUB_VARIABLES = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
+    int ELEMENT_DOUBLE_CLICK_VARIABLE__SUB_VARIABLES = DescriptionPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
 
     /**
      * The number of structural features of the '
@@ -1783,7 +1783,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int ELEMENT_DOUBLE_CLICK_VARIABLE_FEATURE_COUNT = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 1;
+    int ELEMENT_DOUBLE_CLICK_VARIABLE_FEATURE_COUNT = DescriptionPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 1;
 
     /**
      * The meta object id for the '
@@ -1804,7 +1804,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int NODE_CREATION_VARIABLE__NAME = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.ABSTRACT_VARIABLE__NAME;
+    int NODE_CREATION_VARIABLE__NAME = DescriptionPackage.ABSTRACT_VARIABLE__NAME;
 
     /**
      * The feature id for the '<em><b>Sub Variables</b></em>' containment
@@ -1813,7 +1813,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int NODE_CREATION_VARIABLE__SUB_VARIABLES = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
+    int NODE_CREATION_VARIABLE__SUB_VARIABLES = DescriptionPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
 
     /**
      * The number of structural features of the '<em>Node Creation Variable</em>
@@ -1822,7 +1822,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int NODE_CREATION_VARIABLE_FEATURE_COUNT = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 1;
+    int NODE_CREATION_VARIABLE_FEATURE_COUNT = DescriptionPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 1;
 
     /**
      * The meta object id for the '
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ElementDoubleClickVariableImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ElementDoubleClickVariableImpl.java
index f52c7af28b..7c3feb0c40 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ElementDoubleClickVariableImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ElementDoubleClickVariableImpl.java
@@ -21,9 +21,9 @@ import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.sirius.diagram.description.tool.ElementDoubleClickVariable;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
-import org.eclipse.sirius.viewpoint.description.tool.SubVariable;
+import org.eclipse.sirius.viewpoint.description.SubVariable;
+import org.eclipse.sirius.viewpoint.description.impl.AbstractVariableImpl;
 import org.eclipse.sirius.viewpoint.description.tool.VariableContainer;
-import org.eclipse.sirius.viewpoint.description.tool.impl.AbstractVariableImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/NodeCreationVariableImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/NodeCreationVariableImpl.java
index 7e1ce58772..640913d2a5 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/NodeCreationVariableImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/NodeCreationVariableImpl.java
@@ -21,9 +21,9 @@ import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.sirius.diagram.description.tool.NodeCreationVariable;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
-import org.eclipse.sirius.viewpoint.description.tool.SubVariable;
+import org.eclipse.sirius.viewpoint.description.SubVariable;
+import org.eclipse.sirius.viewpoint.description.impl.AbstractVariableImpl;
 import org.eclipse.sirius.viewpoint.description.tool.VariableContainer;
-import org.eclipse.sirius.viewpoint.description.tool.impl.AbstractVariableImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/SourceEdgeCreationVariableImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/SourceEdgeCreationVariableImpl.java
index 8ded2c4747..36dce4ce9d 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/SourceEdgeCreationVariableImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/SourceEdgeCreationVariableImpl.java
@@ -21,9 +21,9 @@ import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.sirius.diagram.description.tool.SourceEdgeCreationVariable;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
-import org.eclipse.sirius.viewpoint.description.tool.SubVariable;
+import org.eclipse.sirius.viewpoint.description.SubVariable;
+import org.eclipse.sirius.viewpoint.description.impl.AbstractVariableImpl;
 import org.eclipse.sirius.viewpoint.description.tool.VariableContainer;
-import org.eclipse.sirius.viewpoint.description.tool.impl.AbstractVariableImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/SourceEdgeViewCreationVariableImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/SourceEdgeViewCreationVariableImpl.java
index 4ee2306767..930727b3d9 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/SourceEdgeViewCreationVariableImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/SourceEdgeViewCreationVariableImpl.java
@@ -21,9 +21,9 @@ import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.sirius.diagram.description.tool.SourceEdgeViewCreationVariable;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
-import org.eclipse.sirius.viewpoint.description.tool.SubVariable;
+import org.eclipse.sirius.viewpoint.description.SubVariable;
+import org.eclipse.sirius.viewpoint.description.impl.AbstractVariableImpl;
 import org.eclipse.sirius.viewpoint.description.tool.VariableContainer;
-import org.eclipse.sirius.viewpoint.description.tool.impl.AbstractVariableImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/TargetEdgeCreationVariableImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/TargetEdgeCreationVariableImpl.java
index b31efc2326..331a72c4ac 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/TargetEdgeCreationVariableImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/TargetEdgeCreationVariableImpl.java
@@ -21,9 +21,9 @@ import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.sirius.diagram.description.tool.TargetEdgeCreationVariable;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
-import org.eclipse.sirius.viewpoint.description.tool.SubVariable;
+import org.eclipse.sirius.viewpoint.description.SubVariable;
+import org.eclipse.sirius.viewpoint.description.impl.AbstractVariableImpl;
 import org.eclipse.sirius.viewpoint.description.tool.VariableContainer;
-import org.eclipse.sirius.viewpoint.description.tool.impl.AbstractVariableImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/TargetEdgeViewCreationVariableImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/TargetEdgeViewCreationVariableImpl.java
index 184c12da02..23fb62f2a6 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/TargetEdgeViewCreationVariableImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/TargetEdgeViewCreationVariableImpl.java
@@ -21,9 +21,9 @@ import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.sirius.diagram.description.tool.TargetEdgeViewCreationVariable;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
-import org.eclipse.sirius.viewpoint.description.tool.SubVariable;
+import org.eclipse.sirius.viewpoint.description.SubVariable;
+import org.eclipse.sirius.viewpoint.description.impl.AbstractVariableImpl;
 import org.eclipse.sirius.viewpoint.description.tool.VariableContainer;
-import org.eclipse.sirius.viewpoint.description.tool.impl.AbstractVariableImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ToolPackageImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ToolPackageImpl.java
index 927685e18c..0ce9cac987 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ToolPackageImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ToolPackageImpl.java
@@ -1580,17 +1580,17 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
         requestDescriptionEClass.getESuperTypes().add(theToolPackage_1.getAbstractToolDescription());
         directEditLabelEClass.getESuperTypes().add(theToolPackage_1.getMappingBasedToolDescription());
         behaviorToolEClass.getESuperTypes().add(theToolPackage_1.getAbstractToolDescription());
-        sourceEdgeCreationVariableEClass.getESuperTypes().add(theToolPackage_1.getAbstractVariable());
+        sourceEdgeCreationVariableEClass.getESuperTypes().add(theDescriptionPackage_1.getAbstractVariable());
         sourceEdgeCreationVariableEClass.getESuperTypes().add(theToolPackage_1.getVariableContainer());
-        sourceEdgeViewCreationVariableEClass.getESuperTypes().add(theToolPackage_1.getAbstractVariable());
+        sourceEdgeViewCreationVariableEClass.getESuperTypes().add(theDescriptionPackage_1.getAbstractVariable());
         sourceEdgeViewCreationVariableEClass.getESuperTypes().add(theToolPackage_1.getVariableContainer());
-        targetEdgeCreationVariableEClass.getESuperTypes().add(theToolPackage_1.getAbstractVariable());
+        targetEdgeCreationVariableEClass.getESuperTypes().add(theDescriptionPackage_1.getAbstractVariable());
         targetEdgeCreationVariableEClass.getESuperTypes().add(theToolPackage_1.getVariableContainer());
-        targetEdgeViewCreationVariableEClass.getESuperTypes().add(theToolPackage_1.getAbstractVariable());
+        targetEdgeViewCreationVariableEClass.getESuperTypes().add(theDescriptionPackage_1.getAbstractVariable());
         targetEdgeViewCreationVariableEClass.getESuperTypes().add(theToolPackage_1.getVariableContainer());
-        elementDoubleClickVariableEClass.getESuperTypes().add(theToolPackage_1.getAbstractVariable());
+        elementDoubleClickVariableEClass.getESuperTypes().add(theDescriptionPackage_1.getAbstractVariable());
         elementDoubleClickVariableEClass.getESuperTypes().add(theToolPackage_1.getVariableContainer());
-        nodeCreationVariableEClass.getESuperTypes().add(theToolPackage_1.getAbstractVariable());
+        nodeCreationVariableEClass.getESuperTypes().add(theDescriptionPackage_1.getAbstractVariable());
         nodeCreationVariableEClass.getESuperTypes().add(theToolPackage_1.getVariableContainer());
         createViewEClass.getESuperTypes().add(theToolPackage_1.getContainerModelOperation());
         createEdgeViewEClass.getESuperTypes().add(this.getCreateView());
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/util/ToolAdapterFactory.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/util/ToolAdapterFactory.java
index 3e200a7efa..40aee886d7 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/util/ToolAdapterFactory.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/util/ToolAdapterFactory.java
@@ -42,10 +42,10 @@ import org.eclipse.sirius.diagram.description.tool.ToolGroup;
 import org.eclipse.sirius.diagram.description.tool.ToolGroupExtension;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.sirius.diagram.description.tool.ToolSection;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.DocumentedElement;
 import org.eclipse.sirius.viewpoint.description.IdentifiedElement;
 import org.eclipse.sirius.viewpoint.description.tool.AbstractToolDescription;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.tool.ContainerModelOperation;
 import org.eclipse.sirius.viewpoint.description.tool.MappingBasedToolDescription;
 import org.eclipse.sirius.viewpoint.description.tool.ModelOperation;
@@ -812,14 +812,14 @@ public class ToolAdapterFactory extends AdapterFactoryImpl {
 
     /**
      * Creates a new adapter for an object of class '
-     * {@link org.eclipse.sirius.viewpoint.description.tool.AbstractVariable
+     * {@link org.eclipse.sirius.viewpoint.description.AbstractVariable
      * <em>Abstract Variable</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.description.tool.AbstractVariable
+     * @see org.eclipse.sirius.viewpoint.description.AbstractVariable
      * @generated
      */
     public Adapter createAbstractVariableAdapter() {
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/util/ToolSwitch.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/util/ToolSwitch.java
index 2e043d7b7c..9f4bf8b41d 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/util/ToolSwitch.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/tool/util/ToolSwitch.java
@@ -42,10 +42,10 @@ import org.eclipse.sirius.diagram.description.tool.ToolGroup;
 import org.eclipse.sirius.diagram.description.tool.ToolGroupExtension;
 import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.sirius.diagram.description.tool.ToolSection;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.DocumentedElement;
 import org.eclipse.sirius.viewpoint.description.IdentifiedElement;
 import org.eclipse.sirius.viewpoint.description.tool.AbstractToolDescription;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.tool.ContainerModelOperation;
 import org.eclipse.sirius.viewpoint.description.tool.MappingBasedToolDescription;
 import org.eclipse.sirius.viewpoint.description.tool.ModelOperation;
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DiagramFactoryImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DiagramFactoryImpl.java
index 799b5fa12e..bee2e4c5f2 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DiagramFactoryImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DiagramFactoryImpl.java
@@ -44,13 +44,13 @@ import org.eclipse.sirius.diagram.DiagramFactory;
 import org.eclipse.sirius.diagram.DiagramPackage;
 import org.eclipse.sirius.diagram.Dot;
 import org.eclipse.sirius.diagram.DragAndDropTarget;
+import org.eclipse.sirius.diagram.EObjectVariableValue;
 import org.eclipse.sirius.diagram.EdgeArrows;
 import org.eclipse.sirius.diagram.EdgeRouting;
 import org.eclipse.sirius.diagram.EdgeStyle;
 import org.eclipse.sirius.diagram.Ellipse;
 import org.eclipse.sirius.diagram.EndLabelStyle;
 import org.eclipse.sirius.diagram.FilterVariableHistory;
-import org.eclipse.sirius.diagram.FilterVariableValue;
 import org.eclipse.sirius.diagram.FlatContainerStyle;
 import org.eclipse.sirius.diagram.FoldingFilter;
 import org.eclipse.sirius.diagram.FoldingPointFilter;
@@ -66,6 +66,7 @@ import org.eclipse.sirius.diagram.Note;
 import org.eclipse.sirius.diagram.ResizeKind;
 import org.eclipse.sirius.diagram.ShapeContainerStyle;
 import org.eclipse.sirius.diagram.Square;
+import org.eclipse.sirius.diagram.TypedVariableValue;
 import org.eclipse.sirius.diagram.WorkspaceImage;
 import org.eclipse.sirius.diagram.business.internal.metamodel.spec.BundledImageSpec;
 import org.eclipse.sirius.diagram.business.internal.metamodel.spec.CustomStyleSpec;
@@ -186,8 +187,6 @@ public class DiagramFactoryImpl extends EFactoryImpl implements DiagramFactory {
             return createNote();
         case DiagramPackage.FILTER_VARIABLE_HISTORY:
             return createFilterVariableHistory();
-        case DiagramPackage.FILTER_VARIABLE_VALUE:
-            return createFilterVariableValue();
         case DiagramPackage.COLLAPSE_FILTER:
             return createCollapseFilter();
         case DiagramPackage.INDIRECTLY_COLLAPSE_FILTER:
@@ -204,6 +203,10 @@ public class DiagramFactoryImpl extends EFactoryImpl implements DiagramFactory {
             return createComputedStyleDescriptionRegistry();
         case DiagramPackage.DRAG_AND_DROP_TARGET:
             return createDragAndDropTarget();
+        case DiagramPackage.TYPED_VARIABLE_VALUE:
+            return createTypedVariableValue();
+        case DiagramPackage.EOBJECT_VARIABLE_VALUE:
+            return createEObjectVariableValue();
         default:
             throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
@@ -593,17 +596,6 @@ public class DiagramFactoryImpl extends EFactoryImpl implements DiagramFactory {
      * @generated
      */
     @Override
-    public FilterVariableValue createFilterVariableValue() {
-        FilterVariableValueImpl filterVariableValue = new FilterVariableValueImpl();
-        return filterVariableValue;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
     public CollapseFilter createCollapseFilter() {
         CollapseFilterImpl collapseFilter = new CollapseFilterImpl();
         return collapseFilter;
@@ -691,6 +683,28 @@ public class DiagramFactoryImpl extends EFactoryImpl implements DiagramFactory {
      * 
      * @generated
      */
+    @Override
+    public TypedVariableValue createTypedVariableValue() {
+        TypedVariableValueImpl typedVariableValue = new TypedVariableValueImpl();
+        return typedVariableValue;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public EObjectVariableValue createEObjectVariableValue() {
+        EObjectVariableValueImpl eObjectVariableValue = new EObjectVariableValueImpl();
+        return eObjectVariableValue;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
     public ContainerLayout createContainerLayoutFromString(EDataType eDataType, String initialValue) {
         ContainerLayout result = ContainerLayout.get(initialValue);
         if (result == null) {
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 87aa1ba0bf..5d7eabfdfa 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
@@ -50,6 +50,7 @@ import org.eclipse.sirius.diagram.DiagramFactory;
 import org.eclipse.sirius.diagram.DiagramPackage;
 import org.eclipse.sirius.diagram.Dot;
 import org.eclipse.sirius.diagram.DragAndDropTarget;
+import org.eclipse.sirius.diagram.EObjectVariableValue;
 import org.eclipse.sirius.diagram.EdgeArrows;
 import org.eclipse.sirius.diagram.EdgeRouting;
 import org.eclipse.sirius.diagram.EdgeStyle;
@@ -57,7 +58,6 @@ import org.eclipse.sirius.diagram.EdgeTarget;
 import org.eclipse.sirius.diagram.Ellipse;
 import org.eclipse.sirius.diagram.EndLabelStyle;
 import org.eclipse.sirius.diagram.FilterVariableHistory;
-import org.eclipse.sirius.diagram.FilterVariableValue;
 import org.eclipse.sirius.diagram.FlatContainerStyle;
 import org.eclipse.sirius.diagram.FoldingFilter;
 import org.eclipse.sirius.diagram.FoldingPointFilter;
@@ -76,6 +76,8 @@ import org.eclipse.sirius.diagram.Note;
 import org.eclipse.sirius.diagram.ResizeKind;
 import org.eclipse.sirius.diagram.ShapeContainerStyle;
 import org.eclipse.sirius.diagram.Square;
+import org.eclipse.sirius.diagram.TypedVariableValue;
+import org.eclipse.sirius.diagram.VariableValue;
 import org.eclipse.sirius.diagram.WorkspaceImage;
 import org.eclipse.sirius.diagram.description.DescriptionPackage;
 import org.eclipse.sirius.diagram.description.concern.ConcernPackage;
@@ -347,13 +349,6 @@ public class DiagramPackageImpl extends EPackageImpl implements DiagramPackage {
      *
      * @generated
      */
-    private EClass filterVariableValueEClass = null;
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
     private EClass collapseFilterEClass = null;
 
     /**
@@ -414,6 +409,27 @@ public class DiagramPackageImpl extends EPackageImpl implements DiagramPackage {
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    private EClass variableValueEClass = null;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    private EClass typedVariableValueEClass = null;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    private EClass eObjectVariableValueEClass = null;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
      */
@@ -536,8 +552,8 @@ public class DiagramPackageImpl extends EPackageImpl implements DiagramPackage {
         }
 
         // Obtain or create and register package
-        DiagramPackageImpl theDiagramPackage = (DiagramPackageImpl) (EPackage.Registry.INSTANCE.get(DiagramPackage.eNS_URI) instanceof DiagramPackageImpl ? EPackage.Registry.INSTANCE
-                .get(DiagramPackage.eNS_URI) : new DiagramPackageImpl());
+        DiagramPackageImpl theDiagramPackage = (DiagramPackageImpl) (EPackage.Registry.INSTANCE.get(DiagramPackage.eNS_URI) instanceof DiagramPackageImpl
+                ? EPackage.Registry.INSTANCE.get(DiagramPackage.eNS_URI) : new DiagramPackageImpl());
 
         DiagramPackageImpl.isInited = true;
 
@@ -545,16 +561,16 @@ public class DiagramPackageImpl extends EPackageImpl implements DiagramPackage {
         ViewpointPackage.eINSTANCE.eClass();
 
         // Obtain or create and register interdependencies
-        DescriptionPackageImpl theDescriptionPackage = (DescriptionPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(DescriptionPackage.eNS_URI) instanceof DescriptionPackageImpl ? EPackage.Registry.INSTANCE
-                .getEPackage(DescriptionPackage.eNS_URI) : DescriptionPackage.eINSTANCE);
-        StylePackageImpl theStylePackage = (StylePackageImpl) (EPackage.Registry.INSTANCE.getEPackage(StylePackage.eNS_URI) instanceof StylePackageImpl ? EPackage.Registry.INSTANCE
-                .getEPackage(StylePackage.eNS_URI) : StylePackage.eINSTANCE);
-        ToolPackageImpl theToolPackage = (ToolPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ToolPackage.eNS_URI) instanceof ToolPackageImpl ? EPackage.Registry.INSTANCE
-                .getEPackage(ToolPackage.eNS_URI) : ToolPackage.eINSTANCE);
-        FilterPackageImpl theFilterPackage = (FilterPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(FilterPackage.eNS_URI) instanceof FilterPackageImpl ? EPackage.Registry.INSTANCE
-                .getEPackage(FilterPackage.eNS_URI) : FilterPackage.eINSTANCE);
-        ConcernPackageImpl theConcernPackage = (ConcernPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ConcernPackage.eNS_URI) instanceof ConcernPackageImpl ? EPackage.Registry.INSTANCE
-                .getEPackage(ConcernPackage.eNS_URI) : ConcernPackage.eINSTANCE);
+        DescriptionPackageImpl theDescriptionPackage = (DescriptionPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(DescriptionPackage.eNS_URI) instanceof DescriptionPackageImpl
+                ? EPackage.Registry.INSTANCE.getEPackage(DescriptionPackage.eNS_URI) : DescriptionPackage.eINSTANCE);
+        StylePackageImpl theStylePackage = (StylePackageImpl) (EPackage.Registry.INSTANCE.getEPackage(StylePackage.eNS_URI) instanceof StylePackageImpl
+                ? EPackage.Registry.INSTANCE.getEPackage(StylePackage.eNS_URI) : StylePackage.eINSTANCE);
+        ToolPackageImpl theToolPackage = (ToolPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ToolPackage.eNS_URI) instanceof ToolPackageImpl
+                ? EPackage.Registry.INSTANCE.getEPackage(ToolPackage.eNS_URI) : ToolPackage.eINSTANCE);
+        FilterPackageImpl theFilterPackage = (FilterPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(FilterPackage.eNS_URI) instanceof FilterPackageImpl
+                ? EPackage.Registry.INSTANCE.getEPackage(FilterPackage.eNS_URI) : FilterPackage.eINSTANCE);
+        ConcernPackageImpl theConcernPackage = (ConcernPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ConcernPackage.eNS_URI) instanceof ConcernPackageImpl
+                ? EPackage.Registry.INSTANCE.getEPackage(ConcernPackage.eNS_URI) : ConcernPackage.eINSTANCE);
 
         // Create package meta-data objects
         theDiagramPackage.createPackageContents();
@@ -2106,36 +2122,6 @@ public class DiagramPackageImpl extends EPackageImpl implements DiagramPackage {
      * @generated
      */
     @Override
-    public EClass getFilterVariableValue() {
-        return filterVariableValueEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public EReference getFilterVariableValue_VariableDefinition() {
-        return (EReference) filterVariableValueEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public EReference getFilterVariableValue_ModelElement() {
-        return (EReference) filterVariableValueEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
     public EClass getCollapseFilter() {
         return collapseFilterEClass;
     }
@@ -2262,6 +2248,76 @@ public class DiagramPackageImpl extends EPackageImpl implements DiagramPackage {
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public EClass getVariableValue() {
+        return variableValueEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public EClass getTypedVariableValue() {
+        return typedVariableValueEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public EReference getTypedVariableValue_VariableDefinition() {
+        return (EReference) typedVariableValueEClass.getEStructuralFeatures().get(0);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public EAttribute getTypedVariableValue_Value() {
+        return (EAttribute) typedVariableValueEClass.getEStructuralFeatures().get(1);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public EClass getEObjectVariableValue() {
+        return eObjectVariableValueEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public EReference getEObjectVariableValue_VariableDefinition() {
+        return (EReference) eObjectVariableValueEClass.getEStructuralFeatures().get(0);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public EReference getEObjectVariableValue_ModelElement() {
+        return (EReference) eObjectVariableValueEClass.getEStructuralFeatures().get(1);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
      */
@@ -2588,10 +2644,6 @@ public class DiagramPackageImpl extends EPackageImpl implements DiagramPackage {
         filterVariableHistoryEClass = createEClass(DiagramPackage.FILTER_VARIABLE_HISTORY);
         createEReference(filterVariableHistoryEClass, DiagramPackage.FILTER_VARIABLE_HISTORY__OWNED_VALUES);
 
-        filterVariableValueEClass = createEClass(DiagramPackage.FILTER_VARIABLE_VALUE);
-        createEReference(filterVariableValueEClass, DiagramPackage.FILTER_VARIABLE_VALUE__VARIABLE_DEFINITION);
-        createEReference(filterVariableValueEClass, DiagramPackage.FILTER_VARIABLE_VALUE__MODEL_ELEMENT);
-
         collapseFilterEClass = createEClass(DiagramPackage.COLLAPSE_FILTER);
         createEAttribute(collapseFilterEClass, DiagramPackage.COLLAPSE_FILTER__WIDTH);
         createEAttribute(collapseFilterEClass, DiagramPackage.COLLAPSE_FILTER__HEIGHT);
@@ -2614,6 +2666,16 @@ public class DiagramPackageImpl extends EPackageImpl implements DiagramPackage {
         hideLabelCapabilityStyleEClass = createEClass(DiagramPackage.HIDE_LABEL_CAPABILITY_STYLE);
         createEAttribute(hideLabelCapabilityStyleEClass, DiagramPackage.HIDE_LABEL_CAPABILITY_STYLE__HIDE_LABEL_BY_DEFAULT);
 
+        variableValueEClass = createEClass(DiagramPackage.VARIABLE_VALUE);
+
+        typedVariableValueEClass = createEClass(DiagramPackage.TYPED_VARIABLE_VALUE);
+        createEReference(typedVariableValueEClass, DiagramPackage.TYPED_VARIABLE_VALUE__VARIABLE_DEFINITION);
+        createEAttribute(typedVariableValueEClass, DiagramPackage.TYPED_VARIABLE_VALUE__VALUE);
+
+        eObjectVariableValueEClass = createEClass(DiagramPackage.EOBJECT_VARIABLE_VALUE);
+        createEReference(eObjectVariableValueEClass, DiagramPackage.EOBJECT_VARIABLE_VALUE__VARIABLE_DEFINITION);
+        createEReference(eObjectVariableValueEClass, DiagramPackage.EOBJECT_VARIABLE_VALUE__MODEL_ELEMENT);
+
         // Create enums
         containerLayoutEEnum = createEEnum(DiagramPackage.CONTAINER_LAYOUT);
         labelPositionEEnum = createEEnum(DiagramPackage.LABEL_POSITION);
@@ -2665,6 +2727,8 @@ public class DiagramPackageImpl extends EPackageImpl implements DiagramPackage {
         EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
         org.eclipse.sirius.viewpoint.description.style.StylePackage theStylePackage_1 = (org.eclipse.sirius.viewpoint.description.style.StylePackage) EPackage.Registry.INSTANCE
                 .getEPackage(org.eclipse.sirius.viewpoint.description.style.StylePackage.eNS_URI);
+        org.eclipse.sirius.viewpoint.description.tool.ToolPackage theToolPackage_1 = (org.eclipse.sirius.viewpoint.description.tool.ToolPackage) EPackage.Registry.INSTANCE
+                .getEPackage(org.eclipse.sirius.viewpoint.description.tool.ToolPackage.eNS_URI);
 
         // Add subpackages
         getESubpackages().add(theDescriptionPackage);
@@ -2727,96 +2791,60 @@ public class DiagramPackageImpl extends EPackageImpl implements DiagramPackage {
         centerLabelStyleEClass.getESuperTypes().add(theViewpointPackage.getBasicLabelStyle());
         endLabelStyleEClass.getESuperTypes().add(theViewpointPackage.getBasicLabelStyle());
         bracketEdgeStyleEClass.getESuperTypes().add(this.getEdgeStyle());
+        typedVariableValueEClass.getESuperTypes().add(this.getVariableValue());
+        eObjectVariableValueEClass.getESuperTypes().add(this.getVariableValue());
 
         // Initialize classes and features; add operations and parameters
         initEClass(dDiagramEClass, DDiagram.class, "DDiagram", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-        initEReference(
-                getDDiagram_OwnedDiagramElements(),
-                this.getDDiagramElement(),
-                null,
-                "ownedDiagramElements", null, 0, -1, DDiagram.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEReference(
-                getDDiagram_DiagramElements(),
-                this.getDDiagramElement(),
-                null,
-                "diagramElements", null, 0, -1, DDiagram.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEReference(
-                getDDiagram_Description(),
-                theDescriptionPackage.getDiagramDescription(),
-                null,
-                "description", null, 0, 1, DDiagram.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEReference(
-                getDDiagram_Edges(),
-                this.getDEdge(),
-                null,
-                "edges", null, 0, -1, DDiagram.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEReference(
-                getDDiagram_Nodes(),
-                this.getDNode(),
-                null,
-                "nodes", null, 0, -1, DDiagram.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEReference(
-                getDDiagram_NodeListElements(),
-                this.getDNodeListElement(),
-                null,
-                "nodeListElements", null, 0, -1, DDiagram.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEReference(
-                getDDiagram_Containers(),
-                this.getDDiagramElementContainer(),
-                null,
-                "containers", null, 0, -1, DDiagram.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEReference(
-                getDDiagram_CurrentConcern(),
-                theConcernPackage.getConcernDescription(),
-                null,
-                "currentConcern", null, 0, 1, DDiagram.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEReference(
-                getDDiagram_ActivatedFilters(),
-                theFilterPackage.getFilterDescription(),
-                null,
-                "activatedFilters", null, 0, -1, DDiagram.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEReference(
-                getDDiagram_AllFilters(),
-                theFilterPackage.getFilterDescription(),
-                null,
-                "allFilters", null, 0, -1, DDiagram.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEReference(
-                getDDiagram_ActivatedRules(),
-                theValidationPackage.getValidationRule(),
-                null,
-                "activatedRules", null, 0, -1, DDiagram.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEReference(
-                getDDiagram_ActivateBehaviors(),
-                theToolPackage.getBehaviorTool(),
-                null,
-                "activateBehaviors", null, 0, -1, DDiagram.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEReference(
-                getDDiagram_FilterVariableHistory(),
-                this.getFilterVariableHistory(),
-                null,
-                "filterVariableHistory", null, 1, 1, DDiagram.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEReference(
-                getDDiagram_ActivatedLayers(),
-                theDescriptionPackage.getLayer(),
-                null,
-                "activatedLayers", null, 0, -1, DDiagram.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEAttribute(
-                getDDiagram_Synchronized(),
-                theEcorePackage.getEBoolean(),
-                "synchronized", "true", 0, 1, DDiagram.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-        initEReference(
-                getDDiagram_HiddenElements(),
-                this.getDDiagramElement(),
-                null,
-                "hiddenElements", null, 0, -1, DDiagram.class, EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEAttribute(
-                getDDiagram_IsInLayoutingMode(),
-                theEcorePackage.getEBoolean(),
-                "isInLayoutingMode", null, 0, 1, DDiagram.class, EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEAttribute(
-                getDDiagram_HeaderHeight(),
-                theEcorePackage.getEInt(),
-                "headerHeight", "1", 0, 1, DDiagram.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEReference(getDDiagram_OwnedDiagramElements(), this.getDDiagramElement(), null, "ownedDiagramElements", null, 0, -1, DDiagram.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);
+        initEReference(getDDiagram_DiagramElements(), this.getDDiagramElement(), null, "diagramElements", null, 0, -1, DDiagram.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);
+        initEReference(getDDiagram_Description(), theDescriptionPackage.getDiagramDescription(), null, "description", null, 0, 1, DDiagram.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);
+        initEReference(getDDiagram_Edges(), this.getDEdge(), null, "edges", null, 0, -1, DDiagram.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, //$NON-NLS-1$
+                !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getDDiagram_Nodes(), this.getDNode(), null, "nodes", null, 0, -1, DDiagram.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, //$NON-NLS-1$
+                !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getDDiagram_NodeListElements(), this.getDNodeListElement(), null, "nodeListElements", null, 0, -1, DDiagram.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);
+        initEReference(getDDiagram_Containers(), this.getDDiagramElementContainer(), null, "containers", null, 0, -1, DDiagram.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);
+        initEReference(getDDiagram_CurrentConcern(), theConcernPackage.getConcernDescription(), null, "currentConcern", null, 0, 1, DDiagram.class, !EPackageImpl.IS_TRANSIENT, //$NON-NLS-1$
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
+                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getDDiagram_ActivatedFilters(), theFilterPackage.getFilterDescription(), null, "activatedFilters", null, 0, -1, DDiagram.class, !EPackageImpl.IS_TRANSIENT, //$NON-NLS-1$
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
+                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getDDiagram_AllFilters(), theFilterPackage.getFilterDescription(), null, "allFilters", null, 0, -1, DDiagram.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);
+        initEReference(getDDiagram_ActivatedRules(), theValidationPackage.getValidationRule(), null, "activatedRules", null, 0, -1, DDiagram.class, !EPackageImpl.IS_TRANSIENT, //$NON-NLS-1$
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
+                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getDDiagram_ActivateBehaviors(), theToolPackage.getBehaviorTool(), null, "activateBehaviors", null, 0, -1, DDiagram.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);
+        initEReference(getDDiagram_FilterVariableHistory(), this.getFilterVariableHistory(), null, "filterVariableHistory", null, 1, 1, DDiagram.class, !EPackageImpl.IS_TRANSIENT, //$NON-NLS-1$
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
+                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getDDiagram_ActivatedLayers(), theDescriptionPackage.getLayer(), null, "activatedLayers", null, 0, -1, DDiagram.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(getDDiagram_Synchronized(), theEcorePackage.getEBoolean(), "synchronized", "true", 0, 1, DDiagram.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, //$NON-NLS-1$ //$NON-NLS-2$
+                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getDDiagram_HiddenElements(), this.getDDiagramElement(), null, "hiddenElements", null, 0, -1, DDiagram.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(getDDiagram_IsInLayoutingMode(), theEcorePackage.getEBoolean(), "isInLayoutingMode", null, 0, 1, DDiagram.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);
+        initEAttribute(getDDiagram_HeaderHeight(), theEcorePackage.getEInt(), "headerHeight", "1", 0, 1, DDiagram.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, //$NON-NLS-1$ //$NON-NLS-2$
+                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
 
         EOperation op = addEOperation(dDiagramEClass, this.getDNode(), "getNodesFromMapping", 0, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         addEParameter(op, theDescriptionPackage.getNodeMapping(), "mapping", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
@@ -2830,34 +2858,22 @@ public class DiagramPackageImpl extends EPackageImpl implements DiagramPackage {
         initEClass(dSemanticDiagramEClass, DSemanticDiagram.class, "DSemanticDiagram", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
         initEClass(dDiagramElementEClass, DDiagramElement.class, "DDiagramElement", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-        initEAttribute(
-                getDDiagramElement_Visible(),
-                theEcorePackage.getEBoolean(),
-                "visible", "true", 0, 1, DDiagramElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-        initEAttribute(
-                getDDiagramElement_TooltipText(),
-                theEcorePackage.getEString(),
-                "tooltipText", null, 0, 1, DDiagramElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEReference(
-                getDDiagramElement_ParentLayers(),
-                theDescriptionPackage.getLayer(),
-                null,
-                "parentLayers", null, 0, -1, DDiagramElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEReference(
-                getDDiagramElement_Decorations(),
-                theViewpointPackage.getDecoration(),
-                null,
-                "decorations", null, 0, -1, DDiagramElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEReference(
-                getDDiagramElement_DiagramElementMapping(),
-                theDescriptionPackage.getDiagramElementMapping(),
-                null,
-                "diagramElementMapping", null, 0, 1, DDiagramElement.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEReference(
-                getDDiagramElement_GraphicalFilters(),
-                this.getGraphicalFilter(),
-                null,
-                "graphicalFilters", null, 0, -1, DDiagramElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(getDDiagramElement_Visible(), theEcorePackage.getEBoolean(), "visible", "true", 0, 1, DDiagramElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, //$NON-NLS-1$ //$NON-NLS-2$
+                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getDDiagramElement_TooltipText(), theEcorePackage.getEString(), "tooltipText", null, 0, 1, DDiagramElement.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);
+        initEReference(getDDiagramElement_ParentLayers(), theDescriptionPackage.getLayer(), null, "parentLayers", null, 0, -1, DDiagramElement.class, !EPackageImpl.IS_TRANSIENT, //$NON-NLS-1$
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
+                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getDDiagramElement_Decorations(), theViewpointPackage.getDecoration(), null, "decorations", null, 0, -1, DDiagramElement.class, !EPackageImpl.IS_TRANSIENT, //$NON-NLS-1$
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
+                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getDDiagramElement_DiagramElementMapping(), theDescriptionPackage.getDiagramElementMapping(), null, "diagramElementMapping", null, 0, 1, DDiagramElement.class, //$NON-NLS-1$
+                EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
+                EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getDDiagramElement_GraphicalFilters(), this.getGraphicalFilter(), null, "graphicalFilters", null, 0, -1, DDiagramElement.class, !EPackageImpl.IS_TRANSIENT, //$NON-NLS-1$
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
+                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
 
         addEOperation(dDiagramElementEClass, this.getDDiagram(), "getParentDiagram", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
 
@@ -2871,126 +2887,77 @@ public class DiagramPackageImpl extends EPackageImpl implements DiagramPackage {
 
         initEClass(foldingFilterEClass, FoldingFilter.class, "FoldingFilter", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-        initEClass(appliedCompositeFiltersEClass, AppliedCompositeFilters.class,
-                "AppliedCompositeFilters", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-        initEReference(
-                getAppliedCompositeFilters_CompositeFilterDescriptions(),
-                theFilterPackage.getCompositeFilterDescription(),
-                null,
-                "compositeFilterDescriptions", null, 0, -1, AppliedCompositeFilters.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEClass(appliedCompositeFiltersEClass, AppliedCompositeFilters.class, "AppliedCompositeFilters", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, //$NON-NLS-1$
+                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+        initEReference(getAppliedCompositeFilters_CompositeFilterDescriptions(), theFilterPackage.getCompositeFilterDescription(), null, "compositeFilterDescriptions", null, 0, -1, //$NON-NLS-1$
+                AppliedCompositeFilters.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES,
+                !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
 
         initEClass(absoluteBoundsFilterEClass, AbsoluteBoundsFilter.class, "AbsoluteBoundsFilter", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-        initEAttribute(
-                getAbsoluteBoundsFilter_X(),
-                theEcorePackage.getEIntegerObject(),
-                "x", null, 0, 1, AbsoluteBoundsFilter.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEAttribute(
-                getAbsoluteBoundsFilter_Y(),
-                theEcorePackage.getEIntegerObject(),
-                "y", null, 0, 1, AbsoluteBoundsFilter.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEAttribute(
-                getAbsoluteBoundsFilter_Height(),
-                theEcorePackage.getEIntegerObject(),
-                "height", null, 0, 1, AbsoluteBoundsFilter.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEAttribute(
-                getAbsoluteBoundsFilter_Width(),
-                theEcorePackage.getEIntegerObject(),
-                "width", null, 0, 1, AbsoluteBoundsFilter.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(getAbsoluteBoundsFilter_X(), theEcorePackage.getEIntegerObject(), "x", null, 0, 1, AbsoluteBoundsFilter.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);
+        initEAttribute(getAbsoluteBoundsFilter_Y(), theEcorePackage.getEIntegerObject(), "y", null, 0, 1, AbsoluteBoundsFilter.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);
+        initEAttribute(getAbsoluteBoundsFilter_Height(), theEcorePackage.getEIntegerObject(), "height", null, 0, 1, AbsoluteBoundsFilter.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);
+        initEAttribute(getAbsoluteBoundsFilter_Width(), theEcorePackage.getEIntegerObject(), "width", null, 0, 1, AbsoluteBoundsFilter.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(abstractDNodeEClass, AbstractDNode.class, "AbstractDNode", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-        initEReference(
-                getAbstractDNode_OwnedBorderedNodes(),
-                this.getDNode(),
-                null,
-                "ownedBorderedNodes", null, 0, -1, AbstractDNode.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEAttribute(
-                getAbstractDNode_ArrangeConstraints(),
-                this.getArrangeConstraint(),
-                "arrangeConstraints", "KEEP_LOCATION", 0, -1, AbstractDNode.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEReference(getAbstractDNode_OwnedBorderedNodes(), this.getDNode(), null, "ownedBorderedNodes", null, 0, -1, AbstractDNode.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(getAbstractDNode_ArrangeConstraints(), this.getArrangeConstraint(), "arrangeConstraints", "KEEP_LOCATION", 0, -1, AbstractDNode.class, !EPackageImpl.IS_TRANSIENT, //$NON-NLS-1$ //$NON-NLS-2$
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
 
         initEClass(dNodeEClass, DNode.class, "DNode", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-        initEAttribute(
-                getDNode_Width(),
-                theEcorePackage.getEIntegerObject(),
-                "width", null, 0, 1, DNode.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEAttribute(
-                getDNode_Height(),
-                theEcorePackage.getEIntegerObject(),
-                "height", null, 0, 1, DNode.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEReference(
-                getDNode_OwnedStyle(),
-                this.getNodeStyle(),
-                null,
-                "ownedStyle", null, 0, 1, DNode.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEAttribute(
-                getDNode_LabelPosition(),
-                this.getLabelPosition(),
-                "labelPosition", null, 0, 1, DNode.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEAttribute(
-                getDNode_ResizeKind(),
-                this.getResizeKind(),
-                "resizeKind", "NONE", 0, 1, DNode.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-        initEReference(
-                getDNode_OriginalStyle(),
-                theViewpointPackage.getStyle(),
-                null,
-                "originalStyle", null, 0, 1, DNode.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEReference(
-                getDNode_ActualMapping(),
-                theDescriptionPackage.getNodeMapping(),
-                null,
-                "actualMapping", null, 1, 1, DNode.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEReference(
-                getDNode_CandidatesMapping(),
-                theDescriptionPackage.getNodeMapping(),
-                null,
-                "candidatesMapping", null, 0, -1, DNode.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-
-        initEClass(dDiagramElementContainerEClass, DDiagramElementContainer.class,
-                "DDiagramElementContainer", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-        initEReference(
-                getDDiagramElementContainer_Nodes(),
-                this.getDNode(),
-                null,
-                "nodes", null, 0, -1, DDiagramElementContainer.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEReference(
-                getDDiagramElementContainer_Containers(),
-                this.getDDiagramElementContainer(),
-                null,
-                "containers", null, 0, -1, DDiagramElementContainer.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEReference(
-                getDDiagramElementContainer_Elements(),
-                this.getDDiagramElement(),
-                null,
-                "elements", null, 0, -1, DDiagramElementContainer.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEReference(
-                getDDiagramElementContainer_OwnedStyle(),
-                this.getContainerStyle(),
-                null,
-                "ownedStyle", null, 0, 1, DDiagramElementContainer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEReference(
-                getDDiagramElementContainer_OriginalStyle(),
-                theViewpointPackage.getStyle(),
-                null,
-                "originalStyle", null, 0, 1, DDiagramElementContainer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEReference(
-                getDDiagramElementContainer_ActualMapping(),
-                theDescriptionPackage.getContainerMapping(),
-                null,
-                "actualMapping", null, 1, 1, DDiagramElementContainer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEReference(
-                getDDiagramElementContainer_CandidatesMapping(),
-                theDescriptionPackage.getContainerMapping(),
-                null,
-                "candidatesMapping", null, 0, -1, DDiagramElementContainer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEAttribute(
-                getDDiagramElementContainer_Width(),
-                theEcorePackage.getEIntegerObject(),
-                "width", null, 0, 1, DDiagramElementContainer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEAttribute(
-                getDDiagramElementContainer_Height(),
-                theEcorePackage.getEIntegerObject(),
-                "height", null, 0, 1, DDiagramElementContainer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(getDNode_Width(), theEcorePackage.getEIntegerObject(), "width", null, 0, 1, DNode.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);
+        initEAttribute(getDNode_Height(), theEcorePackage.getEIntegerObject(), "height", null, 0, 1, DNode.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);
+        initEReference(getDNode_OwnedStyle(), this.getNodeStyle(), null, "ownedStyle", null, 0, 1, DNode.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, //$NON-NLS-1$
+                EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getDNode_LabelPosition(), this.getLabelPosition(), "labelPosition", null, 0, 1, DNode.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);
+        initEAttribute(getDNode_ResizeKind(), this.getResizeKind(), "resizeKind", "NONE", 0, 1, DNode.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, //$NON-NLS-1$ //$NON-NLS-2$
+                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getDNode_OriginalStyle(), theViewpointPackage.getStyle(), null, "originalStyle", null, 0, 1, DNode.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);
+        initEReference(getDNode_ActualMapping(), theDescriptionPackage.getNodeMapping(), null, "actualMapping", null, 1, 1, DNode.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);
+        initEReference(getDNode_CandidatesMapping(), theDescriptionPackage.getNodeMapping(), null, "candidatesMapping", null, 0, -1, DNode.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);
+
+        initEClass(dDiagramElementContainerEClass, DDiagramElementContainer.class, "DDiagramElementContainer", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, //$NON-NLS-1$
+                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+        initEReference(getDDiagramElementContainer_Nodes(), this.getDNode(), null, "nodes", null, 0, -1, DDiagramElementContainer.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);
+        initEReference(getDDiagramElementContainer_Containers(), this.getDDiagramElementContainer(), null, "containers", null, 0, -1, DDiagramElementContainer.class, EPackageImpl.IS_TRANSIENT, //$NON-NLS-1$
+                EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
+                EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getDDiagramElementContainer_Elements(), this.getDDiagramElement(), null, "elements", null, 0, -1, DDiagramElementContainer.class, EPackageImpl.IS_TRANSIENT, //$NON-NLS-1$
+                EPackageImpl.IS_VOLATILE, !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
+                EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getDDiagramElementContainer_OwnedStyle(), this.getContainerStyle(), null, "ownedStyle", null, 0, 1, DDiagramElementContainer.class, !EPackageImpl.IS_TRANSIENT, //$NON-NLS-1$
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
+                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getDDiagramElementContainer_OriginalStyle(), theViewpointPackage.getStyle(), null, "originalStyle", null, 0, 1, DDiagramElementContainer.class, !EPackageImpl.IS_TRANSIENT, //$NON-NLS-1$
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
+                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getDDiagramElementContainer_ActualMapping(), theDescriptionPackage.getContainerMapping(), null, "actualMapping", null, 1, 1, DDiagramElementContainer.class, //$NON-NLS-1$
+                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
+                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getDDiagramElementContainer_CandidatesMapping(), theDescriptionPackage.getContainerMapping(), null, "candidatesMapping", null, 0, -1, DDiagramElementContainer.class, //$NON-NLS-1$
+                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
+                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getDDiagramElementContainer_Width(), theEcorePackage.getEIntegerObject(), "width", null, 0, 1, DDiagramElementContainer.class, !EPackageImpl.IS_TRANSIENT, //$NON-NLS-1$
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getDDiagramElementContainer_Height(), theEcorePackage.getEIntegerObject(), "height", null, 0, 1, DDiagramElementContainer.class, !EPackageImpl.IS_TRANSIENT, //$NON-NLS-1$
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
 
         op = addEOperation(dDiagramElementContainerEClass, this.getDNode(), "getNodesFromMapping", 0, -1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
         addEParameter(op, theDescriptionPackage.getNodeMapping(), "mapping", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
@@ -2999,370 +2966,216 @@ public class DiagramPackageImpl extends EPackageImpl implements DiagramPackage {
         addEParameter(op, theDescriptionPackage.getContainerMapping(), "mapping", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
 
         initEClass(dNodeContainerEClass, DNodeContainer.class, "DNodeContainer", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-        initEReference(
-                getDNodeContainer_OwnedDiagramElements(),
-                this.getDDiagramElement(),
-                null,
-                "ownedDiagramElements", null, 0, -1, DNodeContainer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEAttribute(
-                getDNodeContainer_ChildrenPresentation(),
-                this.getContainerLayout(),
-                "childrenPresentation", "FreeForm", 1, 1, DNodeContainer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEReference(getDNodeContainer_OwnedDiagramElements(), this.getDDiagramElement(), null, "ownedDiagramElements", null, 0, -1, DNodeContainer.class, !EPackageImpl.IS_TRANSIENT, //$NON-NLS-1$
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
+                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getDNodeContainer_ChildrenPresentation(), this.getContainerLayout(), "childrenPresentation", "FreeForm", 1, 1, DNodeContainer.class, !EPackageImpl.IS_TRANSIENT, //$NON-NLS-1$ //$NON-NLS-2$
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
 
         initEClass(dNodeListEClass, DNodeList.class, "DNodeList", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-        initEReference(
-                getDNodeList_OwnedElements(),
-                this.getDNodeListElement(),
-                null,
-                "ownedElements", null, 0, -1, DNodeList.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(getDNodeList_OwnedElements(), this.getDNodeListElement(), null, "ownedElements", null, 0, -1, DNodeList.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);
 
         initEClass(dNodeListElementEClass, DNodeListElement.class, "DNodeListElement", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-        initEReference(
-                getDNodeListElement_OwnedStyle(),
-                this.getNodeStyle(),
-                null,
-                "ownedStyle", null, 0, 1, DNodeListElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEReference(
-                getDNodeListElement_OriginalStyle(),
-                theViewpointPackage.getStyle(),
-                null,
-                "originalStyle", null, 0, 1, DNodeListElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEReference(
-                getDNodeListElement_ActualMapping(),
-                theDescriptionPackage.getNodeMapping(),
-                null,
-                "actualMapping", null, 1, 1, DNodeListElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEReference(
-                getDNodeListElement_CandidatesMapping(),
-                theDescriptionPackage.getNodeMapping(),
-                null,
-                "candidatesMapping", null, 0, -1, DNodeListElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(getDNodeListElement_OwnedStyle(), this.getNodeStyle(), null, "ownedStyle", null, 0, 1, DNodeListElement.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);
+        initEReference(getDNodeListElement_OriginalStyle(), theViewpointPackage.getStyle(), null, "originalStyle", null, 0, 1, DNodeListElement.class, !EPackageImpl.IS_TRANSIENT, //$NON-NLS-1$
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
+                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getDNodeListElement_ActualMapping(), theDescriptionPackage.getNodeMapping(), null, "actualMapping", null, 1, 1, DNodeListElement.class, !EPackageImpl.IS_TRANSIENT, //$NON-NLS-1$
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
+                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getDNodeListElement_CandidatesMapping(), theDescriptionPackage.getNodeMapping(), null, "candidatesMapping", null, 0, -1, DNodeListElement.class, !EPackageImpl.IS_TRANSIENT, //$NON-NLS-1$
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
+                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
 
         initEClass(dEdgeEClass, DEdge.class, "DEdge", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-        initEReference(
-                getDEdge_OwnedStyle(),
-                this.getEdgeStyle(),
-                null,
-                "ownedStyle", null, 0, 1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEAttribute(
-                getDEdge_Size(),
-                theEcorePackage.getEIntegerObject(),
-                "size", "1", 0, 1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-        initEReference(
-                getDEdge_SourceNode(),
-                this.getEdgeTarget(),
-                this.getEdgeTarget_OutgoingEdges(),
-                "sourceNode", null, 1, 1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEReference(
-                getDEdge_TargetNode(),
-                this.getEdgeTarget(),
-                this.getEdgeTarget_IncomingEdges(),
-                "targetNode", null, 1, 1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEReference(
-                getDEdge_ActualMapping(),
-                theDescriptionPackage.getIEdgeMapping(),
-                null,
-                "actualMapping", null, 1, 1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEAttribute(
-                getDEdge_RoutingStyle(),
-                this.getEdgeRouting(),
-                "routingStyle", "straight", 1, 1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-        initEAttribute(
-                getDEdge_IsFold(),
-                theEcorePackage.getEBoolean(),
-                "isFold", null, 0, 1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEAttribute(
-                getDEdge_IsMockEdge(),
-                theEcorePackage.getEBoolean(),
-                "isMockEdge", null, 0, 1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEReference(
-                getDEdge_OriginalStyle(),
-                theViewpointPackage.getStyle(),
-                null,
-                "originalStyle", null, 0, 1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEReference(
-                getDEdge_Path(),
-                this.getEdgeTarget(),
-                null,
-                "path", null, 0, -1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEAttribute(
-                getDEdge_ArrangeConstraints(),
-                this.getArrangeConstraint(),
-                "arrangeConstraints", "KEEP_LOCATION", 0, -1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-        initEAttribute(
-                getDEdge_BeginLabel(),
-                theEcorePackage.getEString(),
-                "beginLabel", "", 0, 1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-        initEAttribute(
-                getDEdge_EndLabel(),
-                theEcorePackage.getEString(),
-                "endLabel", "", 0, 1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEReference(getDEdge_OwnedStyle(), this.getEdgeStyle(), null, "ownedStyle", null, 0, 1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, //$NON-NLS-1$
+                EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getDEdge_Size(), theEcorePackage.getEIntegerObject(), "size", "1", 0, 1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, //$NON-NLS-1$ //$NON-NLS-2$
+                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getDEdge_SourceNode(), this.getEdgeTarget(), this.getEdgeTarget_OutgoingEdges(), "sourceNode", null, 1, 1, DEdge.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);
+        initEReference(getDEdge_TargetNode(), this.getEdgeTarget(), this.getEdgeTarget_IncomingEdges(), "targetNode", null, 1, 1, DEdge.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);
+        initEReference(getDEdge_ActualMapping(), theDescriptionPackage.getIEdgeMapping(), null, "actualMapping", null, 1, 1, DEdge.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(getDEdge_RoutingStyle(), this.getEdgeRouting(), "routingStyle", "straight", 1, 1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, //$NON-NLS-1$ //$NON-NLS-2$
+                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getDEdge_IsFold(), theEcorePackage.getEBoolean(), "isFold", null, 0, 1, DEdge.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);
+        initEAttribute(getDEdge_IsMockEdge(), theEcorePackage.getEBoolean(), "isMockEdge", null, 0, 1, DEdge.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);
+        initEReference(getDEdge_OriginalStyle(), theViewpointPackage.getStyle(), null, "originalStyle", null, 0, 1, DEdge.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);
+        initEReference(getDEdge_Path(), this.getEdgeTarget(), null, "path", null, 0, -1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, //$NON-NLS-1$
+                !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getDEdge_ArrangeConstraints(), this.getArrangeConstraint(), "arrangeConstraints", "KEEP_LOCATION", 0, -1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, //$NON-NLS-1$ //$NON-NLS-2$
+                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getDEdge_BeginLabel(), theEcorePackage.getEString(), "beginLabel", "", 0, 1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, //$NON-NLS-1$ //$NON-NLS-2$
+                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getDEdge_EndLabel(), theEcorePackage.getEString(), "endLabel", "", 0, 1, DEdge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, //$NON-NLS-1$ //$NON-NLS-2$
+                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
 
         addEOperation(dEdgeEClass, theEcorePackage.getEBoolean(), "isRootFolding", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
 
         initEClass(nodeStyleEClass, NodeStyle.class, "NodeStyle", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-        initEAttribute(
-                getNodeStyle_LabelPosition(),
-                this.getLabelPosition(),
-                "labelPosition", null, 0, 1, NodeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(getNodeStyle_LabelPosition(), this.getLabelPosition(), "labelPosition", null, 0, 1, NodeStyle.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(dotEClass, Dot.class, "Dot", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-        initEAttribute(
-                getDot_StrokeSizeComputationExpression(),
-                theDescriptionPackage_1.getInterpretedExpression(),
-                "strokeSizeComputationExpression", "2", 0, 1, Dot.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-        initEAttribute(
-                getDot_BackgroundColor(),
-                theViewpointPackage.getRGBValues(),
-                "backgroundColor", "136,136,136", 0, 1, Dot.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(getDot_StrokeSizeComputationExpression(), theDescriptionPackage_1.getInterpretedExpression(), "strokeSizeComputationExpression", "2", 0, 1, Dot.class, //$NON-NLS-1$ //$NON-NLS-2$
+                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
+                EPackageImpl.IS_ORDERED);
+        initEAttribute(getDot_BackgroundColor(), theViewpointPackage.getRGBValues(), "backgroundColor", "136,136,136", 0, 1, Dot.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, //$NON-NLS-1$ //$NON-NLS-2$
+                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
 
         initEClass(gaugeSectionEClass, GaugeSection.class, "GaugeSection", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-        initEAttribute(
-                getGaugeSection_Min(),
-                theEcorePackage.getEIntegerObject(),
-                "min", null, 0, 1, GaugeSection.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEAttribute(
-                getGaugeSection_Max(),
-                theEcorePackage.getEIntegerObject(),
-                "max", null, 0, 1, GaugeSection.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEAttribute(
-                getGaugeSection_Value(),
-                theEcorePackage.getEIntegerObject(),
-                "value", null, 0, 1, GaugeSection.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEAttribute(
-                getGaugeSection_Label(),
-                theEcorePackage.getEString(),
-                "label", null, 0, 1, GaugeSection.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEAttribute(
-                getGaugeSection_BackgroundColor(),
-                theViewpointPackage.getRGBValues(),
-                "backgroundColor", "0,0,0", 0, 1, GaugeSection.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-        initEAttribute(
-                getGaugeSection_ForegroundColor(),
-                theViewpointPackage.getRGBValues(),
-                "foregroundColor", "138,226,52", 0, 1, GaugeSection.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(getGaugeSection_Min(), theEcorePackage.getEIntegerObject(), "min", null, 0, 1, GaugeSection.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);
+        initEAttribute(getGaugeSection_Max(), theEcorePackage.getEIntegerObject(), "max", null, 0, 1, GaugeSection.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);
+        initEAttribute(getGaugeSection_Value(), theEcorePackage.getEIntegerObject(), "value", null, 0, 1, GaugeSection.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);
+        initEAttribute(getGaugeSection_Label(), theEcorePackage.getEString(), "label", null, 0, 1, GaugeSection.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);
+        initEAttribute(getGaugeSection_BackgroundColor(), theViewpointPackage.getRGBValues(), "backgroundColor", "0,0,0", 0, 1, GaugeSection.class, !EPackageImpl.IS_TRANSIENT, //$NON-NLS-1$ //$NON-NLS-2$
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getGaugeSection_ForegroundColor(), theViewpointPackage.getRGBValues(), "foregroundColor", "138,226,52", 0, 1, GaugeSection.class, !EPackageImpl.IS_TRANSIENT, //$NON-NLS-1$ //$NON-NLS-2$
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
 
         initEClass(containerStyleEClass, ContainerStyle.class, "ContainerStyle", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
         initEClass(flatContainerStyleEClass, FlatContainerStyle.class, "FlatContainerStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-        initEAttribute(
-                getFlatContainerStyle_BackgroundStyle(),
-                this.getBackgroundStyle(),
-                "backgroundStyle", null, 1, 1, FlatContainerStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEAttribute(
-                getFlatContainerStyle_BackgroundColor(),
-                theViewpointPackage.getRGBValues(),
-                "backgroundColor", "255,255,255", 0, 1, FlatContainerStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-        initEAttribute(
-                getFlatContainerStyle_ForegroundColor(),
-                theViewpointPackage.getRGBValues(),
-                "foregroundColor", "209,209,209", 0, 1, FlatContainerStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(getFlatContainerStyle_BackgroundStyle(), this.getBackgroundStyle(), "backgroundStyle", null, 1, 1, FlatContainerStyle.class, !EPackageImpl.IS_TRANSIENT, //$NON-NLS-1$
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getFlatContainerStyle_BackgroundColor(), theViewpointPackage.getRGBValues(), "backgroundColor", "255,255,255", 0, 1, FlatContainerStyle.class, !EPackageImpl.IS_TRANSIENT, //$NON-NLS-1$ //$NON-NLS-2$
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getFlatContainerStyle_ForegroundColor(), theViewpointPackage.getRGBValues(), "foregroundColor", "209,209,209", 0, 1, FlatContainerStyle.class, !EPackageImpl.IS_TRANSIENT, //$NON-NLS-1$ //$NON-NLS-2$
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
 
         initEClass(shapeContainerStyleEClass, ShapeContainerStyle.class, "ShapeContainerStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-        initEAttribute(
-                getShapeContainerStyle_Shape(),
-                this.getContainerShape(),
-                "shape", null, 1, 1, ShapeContainerStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEAttribute(
-                getShapeContainerStyle_BackgroundColor(),
-                theViewpointPackage.getRGBValues(),
-                "backgroundColor", "209,209,209", 0, 1, ShapeContainerStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(getShapeContainerStyle_Shape(), this.getContainerShape(), "shape", null, 1, 1, ShapeContainerStyle.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);
+        initEAttribute(getShapeContainerStyle_BackgroundColor(), theViewpointPackage.getRGBValues(), "backgroundColor", "209,209,209", 0, 1, ShapeContainerStyle.class, !EPackageImpl.IS_TRANSIENT, //$NON-NLS-1$ //$NON-NLS-2$
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
 
         initEClass(squareEClass, Square.class, "Square", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-        initEAttribute(
-                getSquare_Width(),
-                theEcorePackage.getEIntegerObject(),
-                "width", "0", 0, 1, Square.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-        initEAttribute(
-                getSquare_Height(),
-                theEcorePackage.getEIntegerObject(),
-                "height", "0", 0, 1, Square.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-        initEAttribute(
-                getSquare_Color(),
-                theViewpointPackage.getRGBValues(),
-                "color", "136,136,136", 0, 1, Square.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(getSquare_Width(), theEcorePackage.getEIntegerObject(), "width", "0", 0, 1, Square.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, //$NON-NLS-1$ //$NON-NLS-2$
+                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getSquare_Height(), theEcorePackage.getEIntegerObject(), "height", "0", 0, 1, Square.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, //$NON-NLS-1$ //$NON-NLS-2$
+                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getSquare_Color(), theViewpointPackage.getRGBValues(), "color", "136,136,136", 0, 1, Square.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, //$NON-NLS-1$ //$NON-NLS-2$
+                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
 
         initEClass(ellipseEClass, Ellipse.class, "Ellipse", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-        initEAttribute(
-                getEllipse_HorizontalDiameter(),
-                theEcorePackage.getEIntegerObject(),
-                "horizontalDiameter", "0", 0, 1, Ellipse.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-        initEAttribute(
-                getEllipse_VerticalDiameter(),
-                theEcorePackage.getEIntegerObject(),
-                "verticalDiameter", "0", 0, 1, Ellipse.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-        initEAttribute(
-                getEllipse_Color(),
-                theViewpointPackage.getRGBValues(),
-                "color", "136,136,136", 0, 1, Ellipse.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(getEllipse_HorizontalDiameter(), theEcorePackage.getEIntegerObject(), "horizontalDiameter", "0", 0, 1, Ellipse.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, //$NON-NLS-1$ //$NON-NLS-2$
+                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getEllipse_VerticalDiameter(), theEcorePackage.getEIntegerObject(), "verticalDiameter", "0", 0, 1, Ellipse.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, //$NON-NLS-1$ //$NON-NLS-2$
+                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getEllipse_Color(), theViewpointPackage.getRGBValues(), "color", "136,136,136", 0, 1, Ellipse.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, //$NON-NLS-1$ //$NON-NLS-2$
+                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
 
         initEClass(lozengeEClass, Lozenge.class, "Lozenge", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-        initEAttribute(
-                getLozenge_Width(),
-                theEcorePackage.getEIntegerObject(),
-                "width", "0", 0, 1, Lozenge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-        initEAttribute(
-                getLozenge_Height(),
-                theEcorePackage.getEIntegerObject(),
-                "height", "0", 0, 1, Lozenge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-        initEAttribute(
-                getLozenge_Color(),
-                theViewpointPackage.getRGBValues(),
-                "color", "136,136,136", 0, 1, Lozenge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(getLozenge_Width(), theEcorePackage.getEIntegerObject(), "width", "0", 0, 1, Lozenge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, //$NON-NLS-1$ //$NON-NLS-2$
+                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getLozenge_Height(), theEcorePackage.getEIntegerObject(), "height", "0", 0, 1, Lozenge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, //$NON-NLS-1$ //$NON-NLS-2$
+                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getLozenge_Color(), theViewpointPackage.getRGBValues(), "color", "136,136,136", 0, 1, Lozenge.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, //$NON-NLS-1$ //$NON-NLS-2$
+                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
 
         initEClass(bundledImageEClass, BundledImage.class, "BundledImage", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-        initEAttribute(
-                getBundledImage_Shape(),
-                this.getBundledImageShape(),
-                "shape", null, 1, 1, BundledImage.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEAttribute(
-                getBundledImage_Color(),
-                theViewpointPackage.getRGBValues(),
-                "color", "0,0,0", 0, 1, BundledImage.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-        initEAttribute(
-                getBundledImage_ProvidedShapeID(),
-                ecorePackage.getEString(),
-                "providedShapeID", null, 0, 1, BundledImage.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(getBundledImage_Shape(), this.getBundledImageShape(), "shape", null, 1, 1, BundledImage.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);
+        initEAttribute(getBundledImage_Color(), theViewpointPackage.getRGBValues(), "color", "0,0,0", 0, 1, BundledImage.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, //$NON-NLS-1$ //$NON-NLS-2$
+                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getBundledImage_ProvidedShapeID(), ecorePackage.getEString(), "providedShapeID", null, 0, 1, BundledImage.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(workspaceImageEClass, WorkspaceImage.class, "WorkspaceImage", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-        initEAttribute(
-                getWorkspaceImage_WorkspacePath(),
-                theEcorePackage.getEString(),
-                "workspacePath", null, 1, 1, WorkspaceImage.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(getWorkspaceImage_WorkspacePath(), theEcorePackage.getEString(), "workspacePath", null, 1, 1, WorkspaceImage.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(customStyleEClass, CustomStyle.class, "CustomStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-        initEAttribute(
-                getCustomStyle_Id(),
-                theEcorePackage.getEString(),
-                "id", null, 0, 1, CustomStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(getCustomStyle_Id(), theEcorePackage.getEString(), "id", null, 0, 1, CustomStyle.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(edgeTargetEClass, EdgeTarget.class, "EdgeTarget", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-        initEReference(
-                getEdgeTarget_OutgoingEdges(),
-                this.getDEdge(),
-                this.getDEdge_SourceNode(),
-                "outgoingEdges", null, 0, -1, EdgeTarget.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEReference(
-                getEdgeTarget_IncomingEdges(),
-                this.getDEdge(),
-                this.getDEdge_TargetNode(),
-                "incomingEdges", null, 0, -1, EdgeTarget.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(getEdgeTarget_OutgoingEdges(), this.getDEdge(), this.getDEdge_SourceNode(), "outgoingEdges", null, 0, -1, EdgeTarget.class, !EPackageImpl.IS_TRANSIENT, //$NON-NLS-1$
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
+                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getEdgeTarget_IncomingEdges(), this.getDEdge(), this.getDEdge_TargetNode(), "incomingEdges", null, 0, -1, EdgeTarget.class, !EPackageImpl.IS_TRANSIENT, //$NON-NLS-1$
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
+                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
 
         initEClass(edgeStyleEClass, EdgeStyle.class, "EdgeStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-        initEAttribute(
-                getEdgeStyle_LineStyle(),
-                this.getLineStyle(),
-                "lineStyle", null, 0, 1, EdgeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEAttribute(
-                getEdgeStyle_SourceArrow(),
-                this.getEdgeArrows(),
-                "sourceArrow", "NoDecoration", 1, 1, EdgeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-        initEAttribute(
-                getEdgeStyle_TargetArrow(),
-                this.getEdgeArrows(),
-                "targetArrow", "InputArrow", 1, 1, EdgeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-        initEAttribute(
-                getEdgeStyle_FoldingStyle(),
-                theDescriptionPackage.getFoldingStyle(),
-                "foldingStyle", "NONE", 1, 1, EdgeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-        initEAttribute(
-                getEdgeStyle_Size(),
-                theEcorePackage.getEIntegerObject(),
-                "size", "1", 0, 1, EdgeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-        initEAttribute(
-                getEdgeStyle_RoutingStyle(),
-                this.getEdgeRouting(),
-                "routingStyle", "straight", 1, 1, EdgeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-        initEReference(
-                getEdgeStyle_BeginLabelStyle(),
-                this.getBeginLabelStyle(),
-                null,
-                "beginLabelStyle", null, 0, 1, EdgeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEReference(
-                getEdgeStyle_CenterLabelStyle(),
-                this.getCenterLabelStyle(),
-                null,
-                "centerLabelStyle", null, 0, 1, EdgeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEReference(
-                getEdgeStyle_EndLabelStyle(),
-                this.getEndLabelStyle(),
-                null,
-                "endLabelStyle", null, 0, 1, EdgeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEAttribute(
-                getEdgeStyle_Centered(),
-                theDescriptionPackage.getCenteringStyle(),
-                "centered", "None", 1, 1, EdgeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-        initEAttribute(
-                getEdgeStyle_StrokeColor(),
-                theViewpointPackage.getRGBValues(),
-                "strokeColor", "136,136,136", 0, 1, EdgeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(getEdgeStyle_LineStyle(), this.getLineStyle(), "lineStyle", null, 0, 1, EdgeStyle.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);
+        initEAttribute(getEdgeStyle_SourceArrow(), this.getEdgeArrows(), "sourceArrow", "NoDecoration", 1, 1, EdgeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, //$NON-NLS-1$ //$NON-NLS-2$
+                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getEdgeStyle_TargetArrow(), this.getEdgeArrows(), "targetArrow", "InputArrow", 1, 1, EdgeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, //$NON-NLS-1$ //$NON-NLS-2$
+                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getEdgeStyle_FoldingStyle(), theDescriptionPackage.getFoldingStyle(), "foldingStyle", "NONE", 1, 1, EdgeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, //$NON-NLS-1$ //$NON-NLS-2$
+                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getEdgeStyle_Size(), theEcorePackage.getEIntegerObject(), "size", "1", 0, 1, EdgeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, //$NON-NLS-1$ //$NON-NLS-2$
+                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getEdgeStyle_RoutingStyle(), this.getEdgeRouting(), "routingStyle", "straight", 1, 1, EdgeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, //$NON-NLS-1$ //$NON-NLS-2$
+                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getEdgeStyle_BeginLabelStyle(), this.getBeginLabelStyle(), null, "beginLabelStyle", null, 0, 1, EdgeStyle.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);
+        initEReference(getEdgeStyle_CenterLabelStyle(), this.getCenterLabelStyle(), null, "centerLabelStyle", null, 0, 1, EdgeStyle.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);
+        initEReference(getEdgeStyle_EndLabelStyle(), this.getEndLabelStyle(), null, "endLabelStyle", null, 0, 1, EdgeStyle.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(getEdgeStyle_Centered(), theDescriptionPackage.getCenteringStyle(), "centered", "None", 1, 1, EdgeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, //$NON-NLS-1$ //$NON-NLS-2$
+                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getEdgeStyle_StrokeColor(), theViewpointPackage.getRGBValues(), "strokeColor", "136,136,136", 0, 1, EdgeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, //$NON-NLS-1$ //$NON-NLS-2$
+                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
 
         initEClass(gaugeCompositeStyleEClass, GaugeCompositeStyle.class, "GaugeCompositeStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-        initEAttribute(
-                getGaugeCompositeStyle_Alignment(),
-                this.getAlignmentKind(),
-                "alignment", "SQUARE", 0, 1, GaugeCompositeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-        initEReference(
-                getGaugeCompositeStyle_Sections(),
-                this.getGaugeSection(),
-                null,
-                "sections", null, 0, -1, GaugeCompositeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(getGaugeCompositeStyle_Alignment(), this.getAlignmentKind(), "alignment", "SQUARE", 0, 1, GaugeCompositeStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, //$NON-NLS-1$ //$NON-NLS-2$
+                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getGaugeCompositeStyle_Sections(), this.getGaugeSection(), null, "sections", null, 0, -1, GaugeCompositeStyle.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);
 
         initEClass(borderedStyleEClass, BorderedStyle.class, "BorderedStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-        initEAttribute(
-                getBorderedStyle_BorderSize(),
-                theEcorePackage.getEIntegerObject(),
-                "borderSize", "0", 1, 1, BorderedStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-        initEAttribute(
-                getBorderedStyle_BorderSizeComputationExpression(),
-                theDescriptionPackage_1.getInterpretedExpression(),
-                "borderSizeComputationExpression", "0", 0, 1, BorderedStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-        initEAttribute(
-                getBorderedStyle_BorderColor(),
-                theViewpointPackage.getRGBValues(),
-                "borderColor", "0,0,0", 0, 1, BorderedStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-        initEAttribute(
-                getBorderedStyle_BorderLineStyle(),
-                this.getLineStyle(),
-                "borderLineStyle", null, 0, 1, BorderedStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEAttribute(getBorderedStyle_BorderSize(), theEcorePackage.getEIntegerObject(), "borderSize", "0", 1, 1, BorderedStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, //$NON-NLS-1$ //$NON-NLS-2$
+                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getBorderedStyle_BorderSizeComputationExpression(), theDescriptionPackage_1.getInterpretedExpression(), "borderSizeComputationExpression", "0", 0, 1, BorderedStyle.class, //$NON-NLS-1$ //$NON-NLS-2$
+                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
+                EPackageImpl.IS_ORDERED);
+        initEAttribute(getBorderedStyle_BorderColor(), theViewpointPackage.getRGBValues(), "borderColor", "0,0,0", 0, 1, BorderedStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, //$NON-NLS-1$ //$NON-NLS-2$
+                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getBorderedStyle_BorderLineStyle(), this.getLineStyle(), "borderLineStyle", null, 0, 1, BorderedStyle.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(noteEClass, Note.class, "Note", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-        initEAttribute(
-                getNote_Color(),
-                theViewpointPackage.getRGBValues(),
-                "color", "252,233,79", 0, 1, Note.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEAttribute(getNote_Color(), theViewpointPackage.getRGBValues(), "color", "252,233,79", 0, 1, Note.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, //$NON-NLS-1$ //$NON-NLS-2$
+                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
 
         initEClass(filterVariableHistoryEClass, FilterVariableHistory.class, "FilterVariableHistory", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-        initEReference(
-                getFilterVariableHistory_OwnedValues(),
-                this.getFilterVariableValue(),
-                null,
-                "ownedValues", null, 0, -1, FilterVariableHistory.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-
-        initEClass(filterVariableValueEClass, FilterVariableValue.class, "FilterVariableValue", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-        initEReference(
-                getFilterVariableValue_VariableDefinition(),
-                theFilterPackage.getFilterVariable(),
-                null,
-                "variableDefinition", null, 1, 1, FilterVariableValue.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEReference(
-                getFilterVariableValue_ModelElement(),
-                theEcorePackage.getEObject(),
-                null,
-                "modelElement", null, 1, 1, FilterVariableValue.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(getFilterVariableHistory_OwnedValues(), this.getVariableValue(), null, "ownedValues", null, 0, -1, FilterVariableHistory.class, !EPackageImpl.IS_TRANSIENT, //$NON-NLS-1$
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
+                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
 
         initEClass(collapseFilterEClass, CollapseFilter.class, "CollapseFilter", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-        initEAttribute(
-                getCollapseFilter_Width(),
-                theEcorePackage.getEInt(),
-                "width", null, 0, 1, CollapseFilter.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-        initEAttribute(
-                getCollapseFilter_Height(),
-                theEcorePackage.getEInt(),
-                "height", null, 0, 1, CollapseFilter.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-
-        initEClass(indirectlyCollapseFilterEClass, IndirectlyCollapseFilter.class,
-                "IndirectlyCollapseFilter", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(getCollapseFilter_Width(), theEcorePackage.getEInt(), "width", null, 0, 1, CollapseFilter.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);
+        initEAttribute(getCollapseFilter_Height(), theEcorePackage.getEInt(), "height", null, 0, 1, CollapseFilter.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(indirectlyCollapseFilterEClass, IndirectlyCollapseFilter.class, "IndirectlyCollapseFilter", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, //$NON-NLS-1$
+                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
 
         initEClass(beginLabelStyleEClass, BeginLabelStyle.class, "BeginLabelStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
@@ -3387,24 +3200,37 @@ public class DiagramPackageImpl extends EPackageImpl implements DiagramPackage {
 
         initEClass(bracketEdgeStyleEClass, BracketEdgeStyle.class, "BracketEdgeStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-        initEClass(computedStyleDescriptionRegistryEClass, ComputedStyleDescriptionRegistry.class,
-                "ComputedStyleDescriptionRegistry", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-        initEReference(
-                getComputedStyleDescriptionRegistry_ComputedStyleDescriptions(),
-                theStylePackage_1.getStyleDescription(),
-                null,
-                "computedStyleDescriptions", null, 0, -1, ComputedStyleDescriptionRegistry.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEClass(computedStyleDescriptionRegistryEClass, ComputedStyleDescriptionRegistry.class, "ComputedStyleDescriptionRegistry", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, //$NON-NLS-1$
+                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+        initEReference(getComputedStyleDescriptionRegistry_ComputedStyleDescriptions(), theStylePackage_1.getStyleDescription(), null, "computedStyleDescriptions", null, 0, -1, //$NON-NLS-1$
+                ComputedStyleDescriptionRegistry.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES,
+                !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
 
         initEClass(dragAndDropTargetEClass, DragAndDropTarget.class, "DragAndDropTarget", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
         addEOperation(dragAndDropTargetEClass, theDescriptionPackage.getDragAndDropTargetDescription(), "getDragAndDropDescription", 0, 1, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
 
-        initEClass(hideLabelCapabilityStyleEClass, HideLabelCapabilityStyle.class,
-                "HideLabelCapabilityStyle", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-        initEAttribute(
-                getHideLabelCapabilityStyle_HideLabelByDefault(),
-                ecorePackage.getEBoolean(),
-                "hideLabelByDefault", "false", 0, 1, HideLabelCapabilityStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+        initEClass(hideLabelCapabilityStyleEClass, HideLabelCapabilityStyle.class, "HideLabelCapabilityStyle", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, //$NON-NLS-1$
+                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+        initEAttribute(getHideLabelCapabilityStyle_HideLabelByDefault(), ecorePackage.getEBoolean(), "hideLabelByDefault", "false", 0, 1, HideLabelCapabilityStyle.class, !EPackageImpl.IS_TRANSIENT, //$NON-NLS-1$ //$NON-NLS-2$
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+
+        initEClass(variableValueEClass, VariableValue.class, "VariableValue", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(typedVariableValueEClass, TypedVariableValue.class, "TypedVariableValue", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(getTypedVariableValue_VariableDefinition(), theDescriptionPackage_1.getTypedVariable(), null, "variableDefinition", null, 1, 1, TypedVariableValue.class, //$NON-NLS-1$
+                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
+                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getTypedVariableValue_Value(), theEcorePackage.getEString(), "value", null, 0, 1, TypedVariableValue.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(eObjectVariableValueEClass, EObjectVariableValue.class, "EObjectVariableValue", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEReference(getEObjectVariableValue_VariableDefinition(), theToolPackage_1.getSelectModelElementVariable(), null, "variableDefinition", null, 1, 1, EObjectVariableValue.class, //$NON-NLS-1$
+                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
+                EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getEObjectVariableValue_ModelElement(), theEcorePackage.getEObject(), null, "modelElement", null, 1, 1, EObjectVariableValue.class, !EPackageImpl.IS_TRANSIENT, //$NON-NLS-1$
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
+                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
 
         // Initialize enums and add enum literals
         initEEnum(containerLayoutEEnum, ContainerLayout.class, "ContainerLayout"); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/FilterVariableValueImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/EObjectVariableValueImpl.java
index 63408107be..1545478839 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/FilterVariableValueImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/EObjectVariableValueImpl.java
@@ -1,5 +1,5 @@
-/**
- * Copyright (c) 2007, 2013 THALES GLOBAL SERVICES.
+/*******************************************************************************
+ * Copyright (c) 2015 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
@@ -7,8 +7,7 @@
  *
  * Contributors:
  *    Obeo - initial API and implementation
- *
- */
+ *******************************************************************************/
 package org.eclipse.sirius.diagram.impl;
 
 import org.eclipse.emf.common.notify.Notification;
@@ -16,29 +15,28 @@ 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.diagram.DiagramPackage;
-import org.eclipse.sirius.diagram.FilterVariableValue;
-import org.eclipse.sirius.diagram.description.filter.FilterVariable;
+import org.eclipse.sirius.diagram.EObjectVariableValue;
+import org.eclipse.sirius.viewpoint.description.tool.SelectModelElementVariable;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Filter Variable Value</b></em>'. <!-- end-user-doc -->
+ * <em><b>EObject Variable Value</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
  * <li>
- * {@link org.eclipse.sirius.diagram.impl.FilterVariableValueImpl#getVariableDefinition
+ * {@link org.eclipse.sirius.diagram.impl.EObjectVariableValueImpl#getVariableDefinition
  * <em>Variable Definition</em>}</li>
  * <li>
- * {@link org.eclipse.sirius.diagram.impl.FilterVariableValueImpl#getModelElement
+ * {@link org.eclipse.sirius.diagram.impl.EObjectVariableValueImpl#getModelElement
  * <em>Model Element</em>}</li>
  * </ul>
  * </p>
  *
  * @generated
  */
-public class FilterVariableValueImpl extends MinimalEObjectImpl.Container implements FilterVariableValue {
+public class EObjectVariableValueImpl extends VariableValueImpl implements EObjectVariableValue {
     /**
      * The cached value of the '{@link #getVariableDefinition()
      * <em>Variable Definition</em>}' reference. <!-- begin-user-doc --> <!--
@@ -48,7 +46,7 @@ public class FilterVariableValueImpl extends MinimalEObjectImpl.Container implem
      * @generated
      * @ordered
      */
-    protected FilterVariable variableDefinition;
+    protected SelectModelElementVariable variableDefinition;
 
     /**
      * The cached value of the '{@link #getModelElement()
@@ -66,7 +64,7 @@ public class FilterVariableValueImpl extends MinimalEObjectImpl.Container implem
      * 
      * @generated
      */
-    protected FilterVariableValueImpl() {
+    protected EObjectVariableValueImpl() {
         super();
     }
 
@@ -77,7 +75,7 @@ public class FilterVariableValueImpl extends MinimalEObjectImpl.Container implem
      */
     @Override
     protected EClass eStaticClass() {
-        return DiagramPackage.Literals.FILTER_VARIABLE_VALUE;
+        return DiagramPackage.Literals.EOBJECT_VARIABLE_VALUE;
     }
 
     /**
@@ -86,13 +84,13 @@ public class FilterVariableValueImpl extends MinimalEObjectImpl.Container implem
      * @generated
      */
     @Override
-    public FilterVariable getVariableDefinition() {
+    public SelectModelElementVariable getVariableDefinition() {
         if (variableDefinition != null && variableDefinition.eIsProxy()) {
             InternalEObject oldVariableDefinition = (InternalEObject) variableDefinition;
-            variableDefinition = (FilterVariable) eResolveProxy(oldVariableDefinition);
+            variableDefinition = (SelectModelElementVariable) eResolveProxy(oldVariableDefinition);
             if (variableDefinition != oldVariableDefinition) {
                 if (eNotificationRequired()) {
-                    eNotify(new ENotificationImpl(this, Notification.RESOLVE, DiagramPackage.FILTER_VARIABLE_VALUE__VARIABLE_DEFINITION, oldVariableDefinition, variableDefinition));
+                    eNotify(new ENotificationImpl(this, Notification.RESOLVE, DiagramPackage.EOBJECT_VARIABLE_VALUE__VARIABLE_DEFINITION, oldVariableDefinition, variableDefinition));
                 }
             }
         }
@@ -104,7 +102,7 @@ public class FilterVariableValueImpl extends MinimalEObjectImpl.Container implem
      * 
      * @generated
      */
-    public FilterVariable basicGetVariableDefinition() {
+    public SelectModelElementVariable basicGetVariableDefinition() {
         return variableDefinition;
     }
 
@@ -114,11 +112,11 @@ public class FilterVariableValueImpl extends MinimalEObjectImpl.Container implem
      * @generated
      */
     @Override
-    public void setVariableDefinition(FilterVariable newVariableDefinition) {
-        FilterVariable oldVariableDefinition = variableDefinition;
+    public void setVariableDefinition(SelectModelElementVariable newVariableDefinition) {
+        SelectModelElementVariable oldVariableDefinition = variableDefinition;
         variableDefinition = newVariableDefinition;
         if (eNotificationRequired()) {
-            eNotify(new ENotificationImpl(this, Notification.SET, DiagramPackage.FILTER_VARIABLE_VALUE__VARIABLE_DEFINITION, oldVariableDefinition, variableDefinition));
+            eNotify(new ENotificationImpl(this, Notification.SET, DiagramPackage.EOBJECT_VARIABLE_VALUE__VARIABLE_DEFINITION, oldVariableDefinition, variableDefinition));
         }
     }
 
@@ -134,7 +132,7 @@ public class FilterVariableValueImpl extends MinimalEObjectImpl.Container implem
             modelElement = eResolveProxy(oldModelElement);
             if (modelElement != oldModelElement) {
                 if (eNotificationRequired()) {
-                    eNotify(new ENotificationImpl(this, Notification.RESOLVE, DiagramPackage.FILTER_VARIABLE_VALUE__MODEL_ELEMENT, oldModelElement, modelElement));
+                    eNotify(new ENotificationImpl(this, Notification.RESOLVE, DiagramPackage.EOBJECT_VARIABLE_VALUE__MODEL_ELEMENT, oldModelElement, modelElement));
                 }
             }
         }
@@ -160,7 +158,7 @@ public class FilterVariableValueImpl extends MinimalEObjectImpl.Container implem
         EObject oldModelElement = modelElement;
         modelElement = newModelElement;
         if (eNotificationRequired()) {
-            eNotify(new ENotificationImpl(this, Notification.SET, DiagramPackage.FILTER_VARIABLE_VALUE__MODEL_ELEMENT, oldModelElement, modelElement));
+            eNotify(new ENotificationImpl(this, Notification.SET, DiagramPackage.EOBJECT_VARIABLE_VALUE__MODEL_ELEMENT, oldModelElement, modelElement));
         }
     }
 
@@ -172,12 +170,12 @@ public class FilterVariableValueImpl extends MinimalEObjectImpl.Container implem
     @Override
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
-        case DiagramPackage.FILTER_VARIABLE_VALUE__VARIABLE_DEFINITION:
+        case DiagramPackage.EOBJECT_VARIABLE_VALUE__VARIABLE_DEFINITION:
             if (resolve) {
                 return getVariableDefinition();
             }
             return basicGetVariableDefinition();
-        case DiagramPackage.FILTER_VARIABLE_VALUE__MODEL_ELEMENT:
+        case DiagramPackage.EOBJECT_VARIABLE_VALUE__MODEL_ELEMENT:
             if (resolve) {
                 return getModelElement();
             }
@@ -194,10 +192,10 @@ public class FilterVariableValueImpl extends MinimalEObjectImpl.Container implem
     @Override
     public void eSet(int featureID, Object newValue) {
         switch (featureID) {
-        case DiagramPackage.FILTER_VARIABLE_VALUE__VARIABLE_DEFINITION:
-            setVariableDefinition((FilterVariable) newValue);
+        case DiagramPackage.EOBJECT_VARIABLE_VALUE__VARIABLE_DEFINITION:
+            setVariableDefinition((SelectModelElementVariable) newValue);
             return;
-        case DiagramPackage.FILTER_VARIABLE_VALUE__MODEL_ELEMENT:
+        case DiagramPackage.EOBJECT_VARIABLE_VALUE__MODEL_ELEMENT:
             setModelElement((EObject) newValue);
             return;
         }
@@ -212,10 +210,10 @@ public class FilterVariableValueImpl extends MinimalEObjectImpl.Container implem
     @Override
     public void eUnset(int featureID) {
         switch (featureID) {
-        case DiagramPackage.FILTER_VARIABLE_VALUE__VARIABLE_DEFINITION:
-            setVariableDefinition((FilterVariable) null);
+        case DiagramPackage.EOBJECT_VARIABLE_VALUE__VARIABLE_DEFINITION:
+            setVariableDefinition((SelectModelElementVariable) null);
             return;
-        case DiagramPackage.FILTER_VARIABLE_VALUE__MODEL_ELEMENT:
+        case DiagramPackage.EOBJECT_VARIABLE_VALUE__MODEL_ELEMENT:
             setModelElement((EObject) null);
             return;
         }
@@ -230,12 +228,12 @@ public class FilterVariableValueImpl extends MinimalEObjectImpl.Container implem
     @Override
     public boolean eIsSet(int featureID) {
         switch (featureID) {
-        case DiagramPackage.FILTER_VARIABLE_VALUE__VARIABLE_DEFINITION:
+        case DiagramPackage.EOBJECT_VARIABLE_VALUE__VARIABLE_DEFINITION:
             return variableDefinition != null;
-        case DiagramPackage.FILTER_VARIABLE_VALUE__MODEL_ELEMENT:
+        case DiagramPackage.EOBJECT_VARIABLE_VALUE__MODEL_ELEMENT:
             return modelElement != null;
         }
         return super.eIsSet(featureID);
     }
 
-} // FilterVariableValueImpl
+} // EObjectVariableValueImpl
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 dc15b8aa4f..6d33da9d2d 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
@@ -22,7 +22,7 @@ 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.FilterVariableValue;
+import org.eclipse.sirius.diagram.VariableValue;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '
@@ -47,7 +47,7 @@ public class FilterVariableHistoryImpl extends MinimalEObjectImpl.Container impl
      * @generated
      * @ordered
      */
-    protected EList<FilterVariableValue> ownedValues;
+    protected EList<VariableValue> ownedValues;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -74,9 +74,9 @@ public class FilterVariableHistoryImpl extends MinimalEObjectImpl.Container impl
      * @generated
      */
     @Override
-    public EList<FilterVariableValue> getOwnedValues() {
+    public EList<VariableValue> getOwnedValues() {
         if (ownedValues == null) {
-            ownedValues = new EObjectContainmentEList.Resolving<FilterVariableValue>(FilterVariableValue.class, this, DiagramPackage.FILTER_VARIABLE_HISTORY__OWNED_VALUES);
+            ownedValues = new EObjectContainmentEList.Resolving<VariableValue>(VariableValue.class, this, DiagramPackage.FILTER_VARIABLE_HISTORY__OWNED_VALUES);
         }
         return ownedValues;
     }
@@ -120,7 +120,7 @@ public class FilterVariableHistoryImpl extends MinimalEObjectImpl.Container impl
         switch (featureID) {
         case DiagramPackage.FILTER_VARIABLE_HISTORY__OWNED_VALUES:
             getOwnedValues().clear();
-            getOwnedValues().addAll((Collection<? extends FilterVariableValue>) newValue);
+            getOwnedValues().addAll((Collection<? extends VariableValue>) newValue);
             return;
         }
         super.eSet(featureID, newValue);
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/TypedVariableValueImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/TypedVariableValueImpl.java
new file mode 100644
index 0000000000..6a8d89fc21
--- /dev/null
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/TypedVariableValueImpl.java
@@ -0,0 +1,243 @@
+/*******************************************************************************
+ * Copyright (c) 2015 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.diagram.impl;
+
+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.sirius.diagram.DiagramPackage;
+import org.eclipse.sirius.diagram.TypedVariableValue;
+import org.eclipse.sirius.viewpoint.description.TypedVariable;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Typed Variable Value</b></em>'. <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>
+ * {@link org.eclipse.sirius.diagram.impl.TypedVariableValueImpl#getVariableDefinition
+ * <em>Variable Definition</em>}</li>
+ * <li>{@link org.eclipse.sirius.diagram.impl.TypedVariableValueImpl#getValue
+ * <em>Value</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class TypedVariableValueImpl extends VariableValueImpl implements TypedVariableValue {
+    /**
+     * The cached value of the '{@link #getVariableDefinition()
+     * <em>Variable Definition</em>}' reference. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @see #getVariableDefinition()
+     * @generated
+     * @ordered
+     */
+    protected TypedVariable variableDefinition;
+
+    /**
+     * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see #getValue()
+     * @generated
+     * @ordered
+     */
+    protected static final String VALUE_EDEFAULT = null;
+
+    /**
+     * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see #getValue()
+     * @generated
+     * @ordered
+     */
+    protected String value = TypedVariableValueImpl.VALUE_EDEFAULT;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    protected TypedVariableValueImpl() {
+        super();
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    protected EClass eStaticClass() {
+        return DiagramPackage.Literals.TYPED_VARIABLE_VALUE;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public TypedVariable getVariableDefinition() {
+        if (variableDefinition != null && variableDefinition.eIsProxy()) {
+            InternalEObject oldVariableDefinition = (InternalEObject) variableDefinition;
+            variableDefinition = (TypedVariable) eResolveProxy(oldVariableDefinition);
+            if (variableDefinition != oldVariableDefinition) {
+                if (eNotificationRequired()) {
+                    eNotify(new ENotificationImpl(this, Notification.RESOLVE, DiagramPackage.TYPED_VARIABLE_VALUE__VARIABLE_DEFINITION, oldVariableDefinition, variableDefinition));
+                }
+            }
+        }
+        return variableDefinition;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    public TypedVariable basicGetVariableDefinition() {
+        return variableDefinition;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public void setVariableDefinition(TypedVariable newVariableDefinition) {
+        TypedVariable oldVariableDefinition = variableDefinition;
+        variableDefinition = newVariableDefinition;
+        if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, DiagramPackage.TYPED_VARIABLE_VALUE__VARIABLE_DEFINITION, oldVariableDefinition, variableDefinition));
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public void setValue(String newValue) {
+        String oldValue = value;
+        value = newValue;
+        if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, DiagramPackage.TYPED_VARIABLE_VALUE__VALUE, oldValue, value));
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+        switch (featureID) {
+        case DiagramPackage.TYPED_VARIABLE_VALUE__VARIABLE_DEFINITION:
+            if (resolve) {
+                return getVariableDefinition();
+            }
+            return basicGetVariableDefinition();
+        case DiagramPackage.TYPED_VARIABLE_VALUE__VALUE:
+            return getValue();
+        }
+        return super.eGet(featureID, resolve, coreType);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public void eSet(int featureID, Object newValue) {
+        switch (featureID) {
+        case DiagramPackage.TYPED_VARIABLE_VALUE__VARIABLE_DEFINITION:
+            setVariableDefinition((TypedVariable) newValue);
+            return;
+        case DiagramPackage.TYPED_VARIABLE_VALUE__VALUE:
+            setValue((String) newValue);
+            return;
+        }
+        super.eSet(featureID, newValue);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public void eUnset(int featureID) {
+        switch (featureID) {
+        case DiagramPackage.TYPED_VARIABLE_VALUE__VARIABLE_DEFINITION:
+            setVariableDefinition((TypedVariable) null);
+            return;
+        case DiagramPackage.TYPED_VARIABLE_VALUE__VALUE:
+            setValue(TypedVariableValueImpl.VALUE_EDEFAULT);
+            return;
+        }
+        super.eUnset(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public boolean eIsSet(int featureID) {
+        switch (featureID) {
+        case DiagramPackage.TYPED_VARIABLE_VALUE__VARIABLE_DEFINITION:
+            return variableDefinition != null;
+        case DiagramPackage.TYPED_VARIABLE_VALUE__VALUE:
+            return TypedVariableValueImpl.VALUE_EDEFAULT == null ? value != null : !TypedVariableValueImpl.VALUE_EDEFAULT.equals(value);
+        }
+        return super.eIsSet(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public String toString() {
+        if (eIsProxy()) {
+            return super.toString();
+        }
+
+        StringBuffer result = new StringBuffer(super.toString());
+        result.append(" (value: "); //$NON-NLS-1$
+        result.append(value);
+        result.append(')');
+        return result.toString();
+    }
+
+} // TypedVariableValueImpl
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
new file mode 100644
index 0000000000..bf246ad470
--- /dev/null
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/VariableValueImpl.java
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2015 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.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;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Variable Value</b></em>'. <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public abstract class VariableValueImpl extends MinimalEObjectImpl.Container implements VariableValue {
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    protected VariableValueImpl() {
+        super();
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    protected EClass eStaticClass() {
+        return DiagramPackage.Literals.VARIABLE_VALUE;
+    }
+
+} // VariableValueImpl
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 3d4dade2b3..58aa5479c4 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
@@ -39,12 +39,12 @@ import org.eclipse.sirius.diagram.DSemanticDiagram;
 import org.eclipse.sirius.diagram.DiagramPackage;
 import org.eclipse.sirius.diagram.Dot;
 import org.eclipse.sirius.diagram.DragAndDropTarget;
+import org.eclipse.sirius.diagram.EObjectVariableValue;
 import org.eclipse.sirius.diagram.EdgeStyle;
 import org.eclipse.sirius.diagram.EdgeTarget;
 import org.eclipse.sirius.diagram.Ellipse;
 import org.eclipse.sirius.diagram.EndLabelStyle;
 import org.eclipse.sirius.diagram.FilterVariableHistory;
-import org.eclipse.sirius.diagram.FilterVariableValue;
 import org.eclipse.sirius.diagram.FlatContainerStyle;
 import org.eclipse.sirius.diagram.FoldingFilter;
 import org.eclipse.sirius.diagram.FoldingPointFilter;
@@ -60,6 +60,8 @@ import org.eclipse.sirius.diagram.NodeStyle;
 import org.eclipse.sirius.diagram.Note;
 import org.eclipse.sirius.diagram.ShapeContainerStyle;
 import org.eclipse.sirius.diagram.Square;
+import org.eclipse.sirius.diagram.TypedVariableValue;
+import org.eclipse.sirius.diagram.VariableValue;
 import org.eclipse.sirius.diagram.WorkspaceImage;
 import org.eclipse.sirius.viewpoint.BasicLabelStyle;
 import org.eclipse.sirius.viewpoint.Customizable;
@@ -305,11 +307,6 @@ public class DiagramAdapterFactory extends AdapterFactoryImpl {
         }
 
         @Override
-        public Adapter caseFilterVariableValue(FilterVariableValue object) {
-            return createFilterVariableValueAdapter();
-        }
-
-        @Override
         public Adapter caseCollapseFilter(CollapseFilter object) {
             return createCollapseFilterAdapter();
         }
@@ -355,6 +352,21 @@ public class DiagramAdapterFactory extends AdapterFactoryImpl {
         }
 
         @Override
+        public Adapter caseVariableValue(VariableValue object) {
+            return createVariableValueAdapter();
+        }
+
+        @Override
+        public Adapter caseTypedVariableValue(TypedVariableValue object) {
+            return createTypedVariableValueAdapter();
+        }
+
+        @Override
+        public Adapter caseEObjectVariableValue(EObjectVariableValue object) {
+            return createEObjectVariableValueAdapter();
+        }
+
+        @Override
         public Adapter caseDocumentedElement(DocumentedElement object) {
             return createDocumentedElementAdapter();
         }
@@ -977,22 +989,6 @@ public class DiagramAdapterFactory extends AdapterFactoryImpl {
 
     /**
      * Creates a new adapter for an object of class '
-     * {@link org.eclipse.sirius.diagram.FilterVariableValue
-     * <em>Filter Variable Value</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.diagram.FilterVariableValue
-     * @generated
-     */
-    public Adapter createFilterVariableValueAdapter() {
-        return null;
-    }
-
-    /**
-     * Creates a new adapter for an object of class '
      * {@link org.eclipse.sirius.diagram.CollapseFilter
      * <em>Collapse Filter</em>}'. <!-- begin-user-doc --> This default
      * implementation returns null so that we can easily ignore cases; it's
@@ -1136,6 +1132,53 @@ public class DiagramAdapterFactory extends AdapterFactoryImpl {
 
     /**
      * Creates a new adapter for an object of class '
+     * {@link org.eclipse.sirius.diagram.VariableValue <em>Variable Value</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.diagram.VariableValue
+     * @generated
+     */
+    public Adapter createVariableValueAdapter() {
+        return null;
+    }
+
+    /**
+     * Creates a new adapter for an object of class '
+     * {@link org.eclipse.sirius.diagram.TypedVariableValue
+     * <em>Typed Variable Value</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.diagram.TypedVariableValue
+     * @generated
+     */
+    public Adapter createTypedVariableValueAdapter() {
+        return null;
+    }
+
+    /**
+     * Creates a new adapter for an object of class '
+     * {@link org.eclipse.sirius.diagram.EObjectVariableValue
+     * <em>EObject Variable Value</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.diagram.EObjectVariableValue
+     * @generated
+     */
+    public Adapter createEObjectVariableValueAdapter() {
+        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
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 f56428186c..1112914ab1 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
@@ -39,12 +39,12 @@ import org.eclipse.sirius.diagram.DSemanticDiagram;
 import org.eclipse.sirius.diagram.DiagramPackage;
 import org.eclipse.sirius.diagram.Dot;
 import org.eclipse.sirius.diagram.DragAndDropTarget;
+import org.eclipse.sirius.diagram.EObjectVariableValue;
 import org.eclipse.sirius.diagram.EdgeStyle;
 import org.eclipse.sirius.diagram.EdgeTarget;
 import org.eclipse.sirius.diagram.Ellipse;
 import org.eclipse.sirius.diagram.EndLabelStyle;
 import org.eclipse.sirius.diagram.FilterVariableHistory;
-import org.eclipse.sirius.diagram.FilterVariableValue;
 import org.eclipse.sirius.diagram.FlatContainerStyle;
 import org.eclipse.sirius.diagram.FoldingFilter;
 import org.eclipse.sirius.diagram.FoldingPointFilter;
@@ -60,6 +60,8 @@ import org.eclipse.sirius.diagram.NodeStyle;
 import org.eclipse.sirius.diagram.Note;
 import org.eclipse.sirius.diagram.ShapeContainerStyle;
 import org.eclipse.sirius.diagram.Square;
+import org.eclipse.sirius.diagram.TypedVariableValue;
+import org.eclipse.sirius.diagram.VariableValue;
 import org.eclipse.sirius.diagram.WorkspaceImage;
 import org.eclipse.sirius.viewpoint.BasicLabelStyle;
 import org.eclipse.sirius.viewpoint.Customizable;
@@ -1000,14 +1002,6 @@ public class DiagramSwitch<T> {
             }
             return result;
         }
-        case DiagramPackage.FILTER_VARIABLE_VALUE: {
-            FilterVariableValue filterVariableValue = (FilterVariableValue) theEObject;
-            T result = caseFilterVariableValue(filterVariableValue);
-            if (result == null) {
-                result = defaultCase(theEObject);
-            }
-            return result;
-        }
         case DiagramPackage.COLLAPSE_FILTER: {
             CollapseFilter collapseFilter = (CollapseFilter) theEObject;
             T result = caseCollapseFilter(collapseFilter);
@@ -1119,6 +1113,36 @@ public class DiagramSwitch<T> {
             }
             return result;
         }
+        case DiagramPackage.VARIABLE_VALUE: {
+            VariableValue variableValue = (VariableValue) theEObject;
+            T result = caseVariableValue(variableValue);
+            if (result == null) {
+                result = defaultCase(theEObject);
+            }
+            return result;
+        }
+        case DiagramPackage.TYPED_VARIABLE_VALUE: {
+            TypedVariableValue typedVariableValue = (TypedVariableValue) theEObject;
+            T result = caseTypedVariableValue(typedVariableValue);
+            if (result == null) {
+                result = caseVariableValue(typedVariableValue);
+            }
+            if (result == null) {
+                result = defaultCase(theEObject);
+            }
+            return result;
+        }
+        case DiagramPackage.EOBJECT_VARIABLE_VALUE: {
+            EObjectVariableValue eObjectVariableValue = (EObjectVariableValue) theEObject;
+            T result = caseEObjectVariableValue(eObjectVariableValue);
+            if (result == null) {
+                result = caseVariableValue(eObjectVariableValue);
+            }
+            if (result == null) {
+                result = defaultCase(theEObject);
+            }
+            return result;
+        }
         default:
             return defaultCase(theEObject);
         }
@@ -1721,23 +1745,6 @@ public class DiagramSwitch<T> {
 
     /**
      * Returns the result of interpreting the object as an instance of '
-     * <em>Filter Variable Value</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>Filter Variable Value</em>'.
-     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-     * @generated
-     */
-    public T caseFilterVariableValue(FilterVariableValue object) {
-        return null;
-    }
-
-    /**
-     * Returns the result of interpreting the object as an instance of '
      * <em>Collapse Filter</em>'. <!-- begin-user-doc --> This implementation
      * returns null; returning a non-null result will terminate the switch. <!--
      * end-user-doc -->
@@ -1891,6 +1898,57 @@ public class DiagramSwitch<T> {
 
     /**
      * Returns the result of interpreting the object as an instance of '
+     * <em>Variable Value</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>Variable Value</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseVariableValue(VariableValue object) {
+        return null;
+    }
+
+    /**
+     * Returns the result of interpreting the object as an instance of '
+     * <em>Typed Variable Value</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>Typed Variable Value</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseTypedVariableValue(TypedVariableValue object) {
+        return null;
+    }
+
+    /**
+     * Returns the result of interpreting the object as an instance of '
+     * <em>EObject Variable Value</em>'. <!-- begin-user-doc --> This
+     * implementation returns null; returning a non-null result will terminate
+     * the switch. <!-- end-user-doc -->
+     * 
+     * @param object
+     *            the target of the switch.
+     * @return the result of interpreting the object as an instance of '
+     *         <em>EObject Variable Value</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseEObjectVariableValue(EObjectVariableValue 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.editor.diagram/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.editor.diagram/META-INF/MANIFEST.MF
index 155819ff7d..82ed111497 100644
--- a/plugins/org.eclipse.sirius.editor.diagram/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.editor.diagram/META-INF/MANIFEST.MF
@@ -36,7 +36,6 @@ Export-Package: org.eclipse.sirius.diagram.editor.properties.filters.concern.con
  org.eclipse.sirius.diagram.editor.properties.filters.description.nodemappingimport;version="2.0.4",
  org.eclipse.sirius.diagram.editor.properties.filters.description.orderedtreelayout;version="2.0.4",
  org.eclipse.sirius.diagram.editor.properties.filters.filter.filter;version="2.0.4",
- org.eclipse.sirius.diagram.editor.properties.filters.filter.filtervariable;version="2.0.4",
  org.eclipse.sirius.diagram.editor.properties.filters.filter.mappingfilter;version="2.0.4",
  org.eclipse.sirius.diagram.editor.properties.filters.filter.variablefilter;version="2.0.4",
  org.eclipse.sirius.diagram.editor.properties.filters.style.borderedstyledescription;version="2.1.0",
@@ -96,7 +95,6 @@ Export-Package: org.eclipse.sirius.diagram.editor.properties.filters.concern.con
  org.eclipse.sirius.diagram.editor.properties.sections.description.nodemappingimport;version="2.0.4",
  org.eclipse.sirius.diagram.editor.properties.sections.description.orderedtreelayout;version="3.0.0",
  org.eclipse.sirius.diagram.editor.properties.sections.filter.filter;version="2.0.4",
- org.eclipse.sirius.diagram.editor.properties.sections.filter.filtervariable;version="2.0.4",
  org.eclipse.sirius.diagram.editor.properties.sections.filter.mappingfilter;version="3.0.0",
  org.eclipse.sirius.diagram.editor.properties.sections.filter.variablefilter;version="3.0.0",
  org.eclipse.sirius.diagram.editor.properties.sections.style.borderedstyledescription;version="3.1.0",
diff --git a/plugins/org.eclipse.sirius.editor.diagram/help/contexts.xml b/plugins/org.eclipse.sirius.editor.diagram/help/contexts.xml
index f050d52c47..f45e7f2a6a 100644
--- a/plugins/org.eclipse.sirius.editor.diagram/help/contexts.xml
+++ b/plugins/org.eclipse.sirius.editor.diagram/help/contexts.xml
@@ -456,17 +456,6 @@
    
       </description>
    </context>
-   <context id="FilterVariableValue">
-     <description>
-       
-       
-         
-   <!-- Start of user code FilterVariableValue description -->
-   
-   <!-- End of user code FilterVariableValue description -->
-   
-      </description>
-   </context>
    <context id="CollapseFilter">
      <description>
        Graphical filter specifying that the owner element has to be collapsed.
@@ -571,6 +560,39 @@
    
       </description>
    </context>
+   <context id="VariableValue">
+     <description>
+       
+       
+         
+   <!-- Start of user code VariableValue description -->
+   
+   <!-- End of user code VariableValue description -->
+   
+      </description>
+   </context>
+   <context id="TypedVariableValue">
+     <description>
+       
+       
+         
+   <!-- Start of user code TypedVariableValue description -->
+   
+   <!-- End of user code TypedVariableValue description -->
+   
+      </description>
+   </context>
+   <context id="EObjectVariableValue">
+     <description>
+       
+       
+         
+   <!-- Start of user code EObjectVariableValue description -->
+   
+   <!-- End of user code EObjectVariableValue description -->
+   
+      </description>
+   </context>
    <context id="DiagramDescription">
      <description>
        The description of a diagram.
@@ -2029,33 +2051,6 @@
    
       </description>
    </context>
-   <context id="FilterVariable">
-     <description>
-       
-       Interpreted expressions, requested return type and available variables:
-          - candidatesExpression: a Collection&lt;EObject> or an EObject.
-                . diagram: the current DDiagram.
-                . containerView: the view of the container.
-                . container: the semantic element of the container.
-
-          - rootExpression: a Collection&lt;EObject> or an EObject.
-                . diagram: the current DDiagram.
-                . containerView: the view of the container.
-                . container: the semantic element of the container.
-
-          - childrenExpression: a Collection&lt;EObject> or an EObject.
-                . diagram: the current DDiagram.
-                . containerView: the view of the container.
-                . container: the semantic element of the container.
-
-
-         
-   <!-- Start of user code FilterVariable description -->
-   
-   <!-- End of user code FilterVariable description -->
-   
-      </description>
-   </context>
    <context id="ConcernSet">
      <description>
        A set of many concerns.
diff --git a/plugins/org.eclipse.sirius.editor.diagram/plugin.xml b/plugins/org.eclipse.sirius.editor.diagram/plugin.xml
index 607b3e49f6..4e7d82d27e 100644
--- a/plugins/org.eclipse.sirius.editor.diagram/plugin.xml
+++ b/plugins/org.eclipse.sirius.editor.diagram/plugin.xml
@@ -79,14 +79,6 @@
         <input type="org.eclipse.sirius.diagram.description.concern.ConcernDescription"/>
       </propertySection>
   	  <propertySection
-               class="org.eclipse.sirius.diagram.editor.properties.sections.filter.filtervariable.FilterVariableNamePropertySection"
-               id="filter.section.filterVariable.Name"
-               filter="org.eclipse.sirius.diagram.editor.properties.filters.filter.filtervariable.FilterVariableNameFilter"
-               afterSection="description.section.selectionDescription.Tree"
-                tab="viewpoint.tab.general">
-        <input type="org.eclipse.sirius.diagram.description.filter.FilterVariable"/>
-      </propertySection>
-  	  <propertySection
                class="org.eclipse.sirius.diagram.editor.properties.sections.filter.variablefilter.VariableFilterSemanticConditionExpressionPropertySection"
                id="filter.section.variableFilter.SemanticConditionExpression"
                filter="org.eclipse.sirius.diagram.editor.properties.filters.filter.variablefilter.VariableFilterSemanticConditionExpressionFilter"
diff --git a/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/sections/filter/filtervariable/FilterVariableNamePropertySection.java b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/sections/filter/filtervariable/FilterVariableNamePropertySection.java
deleted file mode 100644
index d15e2232f2..0000000000
--- a/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/sections/filter/filtervariable/FilterVariableNamePropertySection.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2013 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.editor.properties.sections.filter.filtervariable;
-
-// Start of user code imports
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.sirius.diagram.description.filter.FilterPackage;
-import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
-import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-
-// End of user code imports
-
-/**
- * A section for the name property of a FilterVariable object.
- */
-public class FilterVariableNamePropertySection extends AbstractTextPropertySection {
-
-    /**
-     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractTextPropertySection#getDefaultLabelText()
-     */
-    protected String getDefaultLabelText() {
-        return "Name"; //$NON-NLS-1$
-    }
-
-    /**
-     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractTextPropertySection#getLabelText()
-     */
-    protected String getLabelText() {
-        String labelText;
-        labelText = super.getLabelText() + "*:"; //$NON-NLS-1$
-        // Start of user code get label text
-
-        // End of user code get label text
-        return labelText;
-    }
-
-    /**
-     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractTextPropertySection#getFeature()
-     */
-    public EAttribute getFeature() {
-        return FilterPackage.eINSTANCE.getFilterVariable_Name();
-    }
-
-    /**
-     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractTextPropertySection#getFeatureValue(String)
-     */
-    protected Object getFeatureValue(String newText) {
-        return newText;
-    }
-
-    /**
-     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractTextPropertySection#isEqual(String)
-     */
-    protected boolean isEqual(String newText) {
-        return getFeatureAsText().equals(newText);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
-        super.createControls(parent, tabbedPropertySheetPage);
-
-        nameLabel.setFont(SiriusEditor.getFontRegistry().get("required"));
-
-        // Start of user code create controls
-
-        // End of user code create controls
-
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected String getPropertyDescription() {
-        return "";
-    }
-
-    // Start of user code user operations
-
-    // End of user code user operations
-}
diff --git a/plugins/org.eclipse.sirius.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.editor/META-INF/MANIFEST.MF
index 5e8374b5f9..c52d4c2cf4 100644
--- a/plugins/org.eclipse.sirius.editor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.editor/META-INF/MANIFEST.MF
@@ -33,6 +33,7 @@ Export-Package: org.eclipse.sirius.editor.assist.content;version="2.0.4",
  org.eclipse.sirius.editor.properties.filters.contribution.directeobjectreference;version="2.0.4",
  org.eclipse.sirius.editor.properties.filters.contribution.featurecontribution;version="2.0.4",
  org.eclipse.sirius.editor.properties.filters.description.abstractmappingimport;version="2.0.4",
+ org.eclipse.sirius.editor.properties.filters.description.abstractvariable;version="2.0.4",
  org.eclipse.sirius.editor.properties.filters.description.annotationentry;version="2.0.4",
  org.eclipse.sirius.editor.properties.filters.description.colorstep;version="2.0.4",
  org.eclipse.sirius.editor.properties.filters.description.computedcolor;version="2.0.4",
@@ -48,6 +49,7 @@ Export-Package: org.eclipse.sirius.editor.assist.content;version="2.0.4",
  org.eclipse.sirius.editor.properties.filters.description.fixedcolor;version="2.0.4",
  org.eclipse.sirius.editor.properties.filters.description.group;version="2.0.4",
  org.eclipse.sirius.editor.properties.filters.description.identifiedelement;version="2.0.4",
+ org.eclipse.sirius.editor.properties.filters.description.interactivevariabledescription;version="3.1.3",
  org.eclipse.sirius.editor.properties.filters.description.interpolatedcolor;version="2.0.4",
  org.eclipse.sirius.editor.properties.filters.description.javaextension;version="2.0.4",
  org.eclipse.sirius.editor.properties.filters.description.metamodelextensionsetting;version="2.0.4",
@@ -59,6 +61,7 @@ Export-Package: org.eclipse.sirius.editor.assist.content;version="2.0.4",
  org.eclipse.sirius.editor.properties.filters.description.selectiondescription;version="2.0.4",
  org.eclipse.sirius.editor.properties.filters.description.semanticbaseddecoration;version="2.0.4",
  org.eclipse.sirius.editor.properties.filters.description.systemcolor;version="2.0.4",
+ org.eclipse.sirius.editor.properties.filters.description.typedvariable;version="3.1.3",
  org.eclipse.sirius.editor.properties.filters.description.usercolor;version="2.0.4",
  org.eclipse.sirius.editor.properties.filters.description.usercolorspalette;version="2.0.4",
  org.eclipse.sirius.editor.properties.filters.description.viewpoint;version="2.0.4",
@@ -70,7 +73,6 @@ Export-Package: org.eclipse.sirius.editor.assist.content;version="2.0.4",
  org.eclipse.sirius.editor.properties.filters.style.tooltipstyledescription;version="2.0.4",
  org.eclipse.sirius.editor.properties.filters.tool.abstracttool;version="3.1.0",
  org.eclipse.sirius.editor.properties.filters.tool.abstracttooldescription;version="2.1.0",
- org.eclipse.sirius.editor.properties.filters.tool.abstractvariable;version="2.0.4",
  org.eclipse.sirius.editor.properties.filters.tool.acceleovariable;version="2.0.4",
  org.eclipse.sirius.editor.properties.filters.tool.case_;version="2.0.4",
  org.eclipse.sirius.editor.properties.filters.tool.changecontext;version="2.0.4",
@@ -110,6 +112,7 @@ Export-Package: org.eclipse.sirius.editor.assist.content;version="2.0.4",
  org.eclipse.sirius.editor.properties.sections.contribution.directeobjectreference;version="2.0.4",
  org.eclipse.sirius.editor.properties.sections.contribution.featurecontribution;version="2.0.4",
  org.eclipse.sirius.editor.properties.sections.description.abstractmappingimport;version="2.0.4",
+ org.eclipse.sirius.editor.properties.sections.description.abstractvariable;version="2.0.4",
  org.eclipse.sirius.editor.properties.sections.description.annotationentry;version="2.0.4",
  org.eclipse.sirius.editor.properties.sections.description.colorstep;version="3.0.0",
  org.eclipse.sirius.editor.properties.sections.description.computedcolor;version="3.0.0",
@@ -125,6 +128,7 @@ Export-Package: org.eclipse.sirius.editor.assist.content;version="2.0.4",
  org.eclipse.sirius.editor.properties.sections.description.fixedcolor;version="2.0.4",
  org.eclipse.sirius.editor.properties.sections.description.group;version="2.0.4",
  org.eclipse.sirius.editor.properties.sections.description.identifiedelement;version="2.0.4",
+ org.eclipse.sirius.editor.properties.sections.description.interactivevariabledescription;version="3.1.3",
  org.eclipse.sirius.editor.properties.sections.description.interpolatedcolor;version="3.0.0",
  org.eclipse.sirius.editor.properties.sections.description.javaextension;version="2.0.4",
  org.eclipse.sirius.editor.properties.sections.description.metamodelextensionsetting;version="2.0.4",
@@ -136,6 +140,7 @@ Export-Package: org.eclipse.sirius.editor.assist.content;version="2.0.4",
  org.eclipse.sirius.editor.properties.sections.description.selectiondescription;version="3.0.0",
  org.eclipse.sirius.editor.properties.sections.description.semanticbaseddecoration;version="2.0.4",
  org.eclipse.sirius.editor.properties.sections.description.systemcolor;version="2.0.4",
+ org.eclipse.sirius.editor.properties.sections.description.typedvariable;version="3.1.3",
  org.eclipse.sirius.editor.properties.sections.description.usercolor;version="2.0.4",
  org.eclipse.sirius.editor.properties.sections.description.usercolorspalette;version="2.0.4",
  org.eclipse.sirius.editor.properties.sections.description.viewpoint;version="3.0.0",
@@ -147,7 +152,6 @@ Export-Package: org.eclipse.sirius.editor.assist.content;version="2.0.4",
  org.eclipse.sirius.editor.properties.sections.style.labelstyledescription;version="2.0.4",
  org.eclipse.sirius.editor.properties.sections.style.tooltipstyledescription;version="3.0.0",
  org.eclipse.sirius.editor.properties.sections.tool.abstracttooldescription;version="3.1.0",
- org.eclipse.sirius.editor.properties.sections.tool.abstractvariable;version="2.0.4",
  org.eclipse.sirius.editor.properties.sections.tool.acceleovariable;version="3.0.0",
  org.eclipse.sirius.editor.properties.sections.tool.case_;version="3.0.0",
  org.eclipse.sirius.editor.properties.sections.tool.changecontext;version="3.0.0",
diff --git a/plugins/org.eclipse.sirius.editor/help/contexts.xml b/plugins/org.eclipse.sirius.editor/help/contexts.xml
index 6cdd0b4401..b65882d284 100644
--- a/plugins/org.eclipse.sirius.editor/help/contexts.xml
+++ b/plugins/org.eclipse.sirius.editor/help/contexts.xml
@@ -359,7 +359,7 @@
        
        Interpreted expressions, requested return type and available variables:
           - titleExpression: a string.
-
+       
 
          
    <!-- Start of user code RepresentationDescription description -->
@@ -384,7 +384,7 @@
        
        Interpreted expressions, requested return type and available variables:
           - titleExpression: a string.
-
+       
 
          
    <!-- Start of user code RepresentationImportDescription description -->
@@ -490,7 +490,7 @@
           - predicateExpression: a boolean.
                 . view: the current view.
                 . container: the semantic container.
-
+       
 
          
    <!-- Start of user code ConditionalStyleDescription description -->
@@ -531,7 +531,7 @@
                 . container: the semantic element of the container view.
                 . viewpoint: (deprecated) the current diagram.
                 . diagram: the current diagram.
-
+       
 
          
    <!-- Start of user code DecorationDescription description -->
@@ -550,7 +550,7 @@
                 . container: the semantic element of the container view.
                 . viewpoint: (deprecated) the current diagram.
                 . diagram: the current diagram.
-
+       
 
          
    <!-- Start of user code SemanticBasedDecoration description -->
@@ -588,7 +588,7 @@
           - predicateExpression: a boolean result. True to enable the customization, false to disabled it. True by default.
                 . view: the current view.
                 . container: the semantic container.
-
+       
 
          
    <!-- Start of user code VSMElementCustomization description -->
@@ -626,7 +626,7 @@
           - value: A java Object to affect as new value of a EAttribute, for example a java primitive.
                 . view: the current view.
                 . container: the semantic container.
-
+       
 
          
    <!-- Start of user code EAttributeCustomization description -->
@@ -654,17 +654,17 @@
                 . diagram: the current DDiagram.
                 . containerView: the view of the container.
                 . container: the semantic element of the container.
-
+       
           - rootExpression: a Collection&lt;EObject> or an EObject.
                 . diagram: the current DDiagram.
                 . containerView: the view of the container.
                 . container: the semantic element of the container.
-
+       
           - childrenExpression: a Collection&lt;EObject> or an EObject.
                 . diagram: the current DDiagram.
                 . containerView: the view of the container.
                 . container: the semantic element of the container.
-
+       
 
          
    <!-- Start of user code SelectionDescription description -->
@@ -708,11 +708,11 @@
 
        Interpreted expressions, requested return type and available variables:
           - colorValueComputationExpression: an integer.
-
+       
           - minValueComputationExpression: an integer.
-
+       
           - maxValueComputationExpression: an integer.
-
+       
 
          
    <!-- Start of user code InterpolatedColor description -->
@@ -727,7 +727,7 @@
 
        Interpreted expressions, requested return type and available variables:
           - associatedValue: an integer.
-
+       
 
          
    <!-- Start of user code ColorStep description -->
@@ -843,11 +843,11 @@
 
        Interpreted expressions, requested return type and available variables:
           - red: an integer.
-
+       
           - green: an integer.
-
+       
           - blue: an integer.
-
+       
 
          
    <!-- Start of user code ComputedColor description -->
@@ -867,6 +867,55 @@
    
       </description>
    </context>
+   <context id="AbstractVariable">
+     <description>
+       
+       
+         
+   <!-- Start of user code AbstractVariable description -->
+   
+   <!-- End of user code AbstractVariable description -->
+   
+      </description>
+   </context>
+   <context id="SubVariable">
+     <description>
+       
+       
+         
+   <!-- Start of user code SubVariable description -->
+   
+   <!-- End of user code SubVariable description -->
+   
+      </description>
+   </context>
+   <context id="InteractiveVariableDescription">
+     <description>
+       This interface represents a variable which value is given by the user.
+
+       
+         
+   <!-- Start of user code InteractiveVariableDescription description -->
+   
+   <!-- End of user code InteractiveVariableDescription description -->
+   
+      </description>
+   </context>
+   <context id="TypedVariable">
+     <description>
+       
+       Interpreted expressions, requested return type and available variables:
+          - defaultValueExpression: Must return an instance of type valueType.
+                . diagram: the current DDiagram.
+       
+
+         
+   <!-- Start of user code TypedVariable description -->
+   
+   <!-- End of user code TypedVariable description -->
+   
+      </description>
+   </context>
    <context id="StyleDescription">
      <description>
        
@@ -886,7 +935,7 @@
           - labelExpression: a string.
                 . diagram: the current DSemanticDiagram.
                 . view: the current view for which the label is calculated.
-
+       
 
          
    <!-- Start of user code BasicLabelStyleDescription description -->
@@ -903,7 +952,7 @@
           - labelExpression: a string.
                 . diagram: the current DSemanticDiagram.
                 . view: the current view for which the label is calculated.
-
+       
 
          
    <!-- Start of user code LabelStyleDescription description -->
@@ -942,7 +991,7 @@
        Interpreted expressions, requested return type and available variables:
           - tooltipExpression: a string.
                 . view: the current view.
-
+       
 
          
    <!-- Start of user code TooltipStyleDescription description -->
@@ -969,9 +1018,9 @@
        Interpreted expressions, requested return type and available variables:
           - precondition: a boolean.
                 . container: the container.
-
+       
           - elementsToSelect: a Collection&lt;EObject>
-
+       
 
          
    <!-- Start of user code AbstractToolDescription description -->
@@ -987,9 +1036,9 @@
        Interpreted expressions, requested return type and available variables:
           - precondition: a boolean.
                 . container: the container.
-
+       
           - elementsToSelect: a Collection&lt;EObject>
-
+       
 
          
    <!-- Start of user code MappingBasedToolDescription description -->
@@ -1004,9 +1053,9 @@
        Interpreted expressions, requested return type and available variables:
           - precondition: a boolean.
                 . container: the container.
-
+       
           - elementsToSelect: a Collection&lt;EObject>
-
+       
 
        List of the available variables for tool operations:
             - element: The variable container that represents the semantic element of the clicked view.
@@ -1025,9 +1074,9 @@
        Interpreted expressions, requested return type and available variables:
           - precondition: a boolean.
                 . container: the container.
-
+       
           - elementsToSelect: a Collection&lt;EObject>
-
+       
 
        List of the available variables for tool operations:
             - newSemanticContainer: The semantic element of the new container view.
@@ -1047,24 +1096,24 @@
        Interpreted expressions, requested return type and available variables:
           - precondition: a boolean.
                 . container: the container.
-
+       
           - elementsToSelect: a Collection&lt;EObject>
-
+       
           - candidatesExpression: a Collection&lt;EObject> or an EObject.
                 . diagram: the current DDiagram.
                 . containerView: the view of the container.
                 . container: the semantic element of the container.
-
+       
           - rootExpression: a Collection&lt;EObject> or an EObject.
                 . diagram: the current DDiagram.
                 . containerView: the view of the container.
                 . container: the semantic element of the container.
-
+       
           - childrenExpression: a Collection&lt;EObject> or an EObject.
                 . diagram: the current DDiagram.
                 . containerView: the view of the container.
                 . container: the semantic element of the container.
-
+       
 
        List of the available variables for tool operations:
             - element: 
@@ -1083,29 +1132,29 @@
        Interpreted expressions, requested return type and available variables:
           - precondition: a boolean.
                 . container: the container.
-
+       
           - elementsToSelect: a Collection&lt;EObject>
-
+       
           - candidatesExpression: a Collection&lt;EObject> or an EObject.
                 . diagram: the current DDiagram.
                 . containerView: the selected view.
                 . container: the semantic element of containerView.
-
+       
           - rootExpression: a Collection&lt;EObject> or an EObject.
                 . diagram: the current DDiagram.
                 . containerView: the selected view.
                 . container: the semantic element of containerView.
-
+       
           - childrenExpression: a Collection&lt;EObject> or an EObject.
                 . diagram: the current DDiagram.
                 . containerView: the selected view.
                 . container: the semantic element of containerView.
-
+       
           - preSelectedCandidatesExpression: a Collection&lt;EObject> or an EObject.
                 . diagram: the current DDiagram.
                 . containerView: the selected view.
                 . container: the semantic element of containerView.
-
+       
 
        List of the available variables for tool operations:
             - element: 
@@ -1124,13 +1173,13 @@
        Interpreted expressions, requested return type and available variables:
           - precondition: a boolean.
                 . container: the container.
-
+       
           - elementsToSelect: a Collection&lt;EObject>
-
+       
           - titleExpression: a string.
-
+       
           - browseExpression: an EObject.
-
+       
 
        List of the available variables for tool operations:
             - containerView: The variable containerView that represents the clickedView (instance of ViewPoint or ViewPointElement).
@@ -1148,14 +1197,14 @@
        Interpreted expressions, requested return type and available variables:
           - precondition: a boolean.
                 . container: the container.
-
+       
           - elementsToSelect: a Collection&lt;EObject>
-
+       
           - browseExpression: an EObject.
-
+       
           - navigationNameExpression: a string.
                 . name: name of the targeted Representation.
-
+       
 
        List of the available variables for tool operations:
             - containerView: The variable containerView that represents the clickedView (instance of ViewPoint or ViewPointElement).
@@ -1185,9 +1234,9 @@
        Interpreted expressions, requested return type and available variables:
           - precondition: a boolean.
                 . container: the container.
-
+       
           - elementsToSelect: a Collection&lt;EObject>
-
+       
 
          
    <!-- Start of user code MenuItemDescription description -->
@@ -1213,9 +1262,9 @@
        Interpreted expressions, requested return type and available variables:
           - precondition: a boolean.
                 . container: the container.
-
+       
           - elementsToSelect: a Collection&lt;EObject>
-
+       
 
        List of the available variables for tool operations:
             - view: 
@@ -1232,9 +1281,9 @@
        Interpreted expressions, requested return type and available variables:
           - precondition: a boolean.
                 . container: the container.
-
+       
           - elementsToSelect: a Collection&lt;EObject>
-
+       
 
          
    <!-- Start of user code ExternalJavaAction description -->
@@ -1250,9 +1299,9 @@
        Interpreted expressions, requested return type and available variables:
           - precondition: a boolean.
                 . container: the container.
-
+       
           - elementsToSelect: a Collection&lt;EObject>
-
+       
 
          
    <!-- Start of user code ExternalJavaActionCall description -->
@@ -1267,9 +1316,9 @@
        Interpreted expressions, requested return type and available variables:
           - precondition: a boolean.
                 . container: the container.
-
+       
           - elementsToSelect: a Collection&lt;EObject>
-
+       
 
          
    <!-- Start of user code PopupMenu description -->
@@ -1278,17 +1327,6 @@
    
       </description>
    </context>
-   <context id="AbstractVariable">
-     <description>
-       
-       
-         
-   <!-- Start of user code AbstractVariable description -->
-   
-   <!-- End of user code AbstractVariable description -->
-   
-      </description>
-   </context>
    <context id="VariableContainer">
      <description>
        
@@ -1305,7 +1343,7 @@
        
        Interpreted expressions, requested return type and available variables:
           - computationExpression: a Collection&lt;Object> or an Object.
-
+       
 
          
    <!-- Start of user code AcceleoVariable description -->
@@ -1314,17 +1352,6 @@
    
       </description>
    </context>
-   <context id="SubVariable">
-     <description>
-       
-       
-         
-   <!-- Start of user code SubVariable description -->
-   
-   <!-- End of user code SubVariable description -->
-   
-      </description>
-   </context>
    <context id="DialogVariable">
      <description>
        
@@ -1432,17 +1459,17 @@
                 . diagram: the current DDiagram.
                 . containerView: the view of the container.
                 . container: the semantic element of the container.
-
+       
           - rootExpression: a Collection&lt;EObject> or an EObject.
                 . diagram: the current DDiagram.
                 . containerView: the view of the container.
                 . container: the semantic element of the container.
-
+       
           - childrenExpression: a Collection&lt;EObject> or an EObject.
                 . diagram: the current DDiagram.
                 . containerView: the view of the container.
                 . container: the semantic element of the container.
-
+       
 
          
    <!-- Start of user code SelectModelElementVariable description -->
@@ -1546,7 +1573,7 @@
 
        Interpreted expressions, requested return type and available variables:
           - browseExpression: an EObject.
-
+       
 
          
    <!-- Start of user code ChangeContext description -->
@@ -1561,7 +1588,7 @@
 
        Interpreted expressions, requested return type and available variables:
           - valueExpression: any type supported by the feature.
-
+       
 
          
    <!-- Start of user code SetValue description -->
@@ -1586,7 +1613,7 @@
        
        Interpreted expressions, requested return type and available variables:
           - elementExpression: a Collection&lt;EObject> or an EObject.
-
+       
 
          
    <!-- Start of user code Unset description -->
@@ -1601,7 +1628,7 @@
 
        Interpreted expressions, requested return type and available variables:
           - newContainerExpression: an EObject.
-
+       
 
          
    <!-- Start of user code MoveElement description -->
@@ -1628,7 +1655,7 @@
 
        Interpreted expressions, requested return type and available variables:
           - expression: a Collection&lt;EObject> or an EObject.
-
+       
 
          
    <!-- Start of user code For description -->
@@ -1643,7 +1670,7 @@
 
        Interpreted expressions, requested return type and available variables:
           - conditionExpression: a boolean.
-
+       
 
          
    <!-- Start of user code If description -->
@@ -1680,7 +1707,7 @@
        
        Interpreted expressions, requested return type and available variables:
           - value: any type supported by the corresponding java parameter.
-
+       
 
          
    <!-- Start of user code ExternalJavaActionParameter description -->
@@ -1695,9 +1722,9 @@
 
        Interpreted expressions, requested return type and available variables:
           - precondition: a boolean.
-
+       
           - elementsToListen: a collection.
-
+       
 
          
    <!-- Start of user code ToolFilterDescription description -->
@@ -1723,7 +1750,7 @@
 
        Interpreted expressions, requested return type and available variables:
           - conditionExpression: a boolean.
-
+       
 
          
    <!-- Start of user code Case description -->
@@ -1785,7 +1812,7 @@
 
        Interpreted expressions, requested return type and available variables:
           - message: a string.
-
+       
 
          
    <!-- Start of user code ValidationRule description -->
@@ -1800,7 +1827,7 @@
 
        Interpreted expressions, requested return type and available variables:
           - message: a string.
-
+       
 
          
    <!-- Start of user code SemanticValidationRule description -->
@@ -1815,7 +1842,7 @@
 
        Interpreted expressions, requested return type and available variables:
           - message: a string.
-
+       
 
          
    <!-- Start of user code ViewValidationRule description -->
@@ -1830,7 +1857,7 @@
 
        Interpreted expressions, requested return type and available variables:
           - auditExpression: a boolean.
-
+       
 
          
    <!-- Start of user code RuleAudit description -->
diff --git a/plugins/org.eclipse.sirius.editor/plugin.xml b/plugins/org.eclipse.sirius.editor/plugin.xml
index e9f26ba75c..bb6b2ae50f 100644
--- a/plugins/org.eclipse.sirius.editor/plugin.xml
+++ b/plugins/org.eclipse.sirius.editor/plugin.xml
@@ -2,7 +2,7 @@
 <?eclipse version="3.0"?>
 
 <!--
-   Copyright (c) 2007, 2013 THALES GLOBAL SERVICES.
+   Copyright (c) 2007, 2015 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
@@ -323,14 +323,14 @@
                class="org.eclipse.sirius.editor.properties.sections.tool.acceleovariable.AcceleoVariableComputationExpressionPropertySection"
                filter="org.eclipse.sirius.editor.properties.filters.tool.acceleovariable.AcceleoVariableComputationExpressionFilter"
                id="tool.section.acceleoVariable.ComputationExpression"
-               afterSection="tool.section.abstractVariable.Name"
+               afterSection="description.section.abstractVariable.Name"
                 tab="viewpoint.tab.general">
         <input type="org.eclipse.sirius.viewpoint.description.tool.AcceleoVariable"/>        
       </propertySection>
   	  <propertySection
-               class="org.eclipse.sirius.editor.properties.sections.tool.abstractvariable.AbstractVariableNamePropertySection"
-               filter="org.eclipse.sirius.editor.properties.filters.tool.abstractvariable.AbstractVariableNameFilter"
-               id="tool.section.abstractVariable.Name"
+               class="org.eclipse.sirius.editor.properties.sections.description.abstractvariable.AbstractVariableNamePropertySection"
+               filter="org.eclipse.sirius.editor.properties.filters.description.abstractvariable.AbstractVariableNameFilter"
+               id="description.section.abstractVariable.Name"
                 tab="viewpoint.tab.general">
         <input type="org.eclipse.sirius.viewpoint.description.tool.AbstractVariable"/>        
       </propertySection>
@@ -600,6 +600,30 @@
         <input type="org.eclipse.sirius.viewpoint.description.style.BasicLabelStyleDescription"/>        
       </propertySection>
   	  <propertySection
+               class="org.eclipse.sirius.editor.properties.sections.description.typedvariable.TypedVariableDefaultValueExpressionPropertySection"
+               filter="org.eclipse.sirius.editor.properties.filters.description.typedvariable.TypedVariableDefaultValueExpressionFilter"
+               id="description.section.typedVariable.DefaultValueExpression"
+               afterSection="description.section.typedVariable.ValueClass"
+                tab="viewpoint.tab.general">
+        <input type="org.eclipse.sirius.viewpoint.description.TypedVariable"/>        
+      </propertySection>
+  	  <propertySection
+               class="org.eclipse.sirius.editor.properties.sections.description.typedvariable.TypedVariableValueTypePropertySection"
+               filter="org.eclipse.sirius.editor.properties.filters.description.typedvariable.TypedVariableValueTypeFilter"
+               id="description.section.typedVariable.ValueType"
+               afterSection="description.section.abstractVariable.Name"
+                tab="viewpoint.tab.general">
+        <input type="org.eclipse.sirius.viewpoint.description.TypedVariable"/>        
+      </propertySection>
+  	  <propertySection
+               class="org.eclipse.sirius.editor.properties.sections.description.interactivevariabledescription.InteractiveVariableDescriptionUserDocumentationPropertySection"
+               filter="org.eclipse.sirius.editor.properties.filters.description.interactivevariabledescription.InteractiveVariableDescriptionUserDocumentationFilter"
+               id="description.section.interactiveVariableDescription.UserDocumentation"
+               afterSection="description.section.typedVariable.DefaultValueExpression"
+                tab="viewpoint.tab.general">
+        <input type="org.eclipse.sirius.viewpoint.description.InteractiveVariableDescription"/>        
+      </propertySection>
+  	  <propertySection
                class="org.eclipse.sirius.editor.properties.sections.style.basiclabelstyledescription.BasicLabelStyleDescriptionLabelExpressionPropertySection"
                filter="org.eclipse.sirius.editor.properties.filters.style.basiclabelstyledescription.BasicLabelStyleDescriptionLabelExpressionFilter"
                id="style.section.basicLabelStyleDescription.LabelExpression"
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/abstractvariable/AbstractVariableNameFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/description/abstractvariable/AbstractVariableNameFilter.java
index ce2cd8448d..683c0e38ed 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/tool/abstractvariable/AbstractVariableNameFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/description/abstractvariable/AbstractVariableNameFilter.java
@@ -7,13 +7,13 @@
  * Contributors:
  *    Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.editor.properties.filters.tool.abstractvariable;
+package org.eclipse.sirius.editor.properties.filters.description.abstractvariable;
 
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
-import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
+import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
 
 // End of user code specific imports
 
@@ -26,14 +26,14 @@ public class AbstractVariableNameFilter extends ViewpointPropertyFilter {
      * {@inheritDoc}
      */
     protected EStructuralFeature getFeature() {
-        return ToolPackage.eINSTANCE.getAbstractVariable_Name();
+        return DescriptionPackage.eINSTANCE.getAbstractVariable_Name();
     }
 
     /**
      * {@inheritDoc}
      */
     protected boolean isRightInputType(Object arg0) {
-        return arg0 instanceof org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+        return arg0 instanceof org.eclipse.sirius.viewpoint.description.AbstractVariable;
     }
 
     // Start of user code user methods
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/description/interactivevariabledescription/InteractiveVariableDescriptionUserDocumentationFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/description/interactivevariabledescription/InteractiveVariableDescriptionUserDocumentationFilter.java
new file mode 100644
index 0000000000..a700e02d9c
--- /dev/null
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/description/interactivevariabledescription/InteractiveVariableDescriptionUserDocumentationFilter.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2013 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.editor.properties.filters.description.interactivevariabledescription;
+
+// Start of user code specific imports
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
+import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
+
+// End of user code specific imports
+
+/**
+ * A filter for the userDocumentation property section.
+ */
+public class InteractiveVariableDescriptionUserDocumentationFilter extends ViewpointPropertyFilter {
+
+    /**
+     * {@inheritDoc}
+     */
+    protected EStructuralFeature getFeature() {
+        return DescriptionPackage.eINSTANCE.getInteractiveVariableDescription_UserDocumentation();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected boolean isRightInputType(Object arg0) {
+        return arg0 instanceof org.eclipse.sirius.viewpoint.description.InteractiveVariableDescription;
+    }
+
+    // Start of user code user methods
+
+    // End of user code user methods
+
+}
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/description/typedvariable/TypedVariableDefaultValueExpressionFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/description/typedvariable/TypedVariableDefaultValueExpressionFilter.java
new file mode 100644
index 0000000000..2583a85d94
--- /dev/null
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/description/typedvariable/TypedVariableDefaultValueExpressionFilter.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2013 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.editor.properties.filters.description.typedvariable;
+
+// Start of user code specific imports
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
+import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
+
+// End of user code specific imports
+
+/**
+ * A filter for the defaultValueExpression property section.
+ */
+public class TypedVariableDefaultValueExpressionFilter extends ViewpointPropertyFilter {
+
+    /**
+     * {@inheritDoc}
+     */
+    protected EStructuralFeature getFeature() {
+        return DescriptionPackage.eINSTANCE.getTypedVariable_DefaultValueExpression();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected boolean isRightInputType(Object arg0) {
+        return arg0 instanceof org.eclipse.sirius.viewpoint.description.TypedVariable;
+    }
+
+    // Start of user code user methods
+
+    // End of user code user methods
+
+}
diff --git a/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/filters/filter/filtervariable/FilterVariableNameFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/description/typedvariable/TypedVariableValueTypeFilter.java
index 6efcc622bf..99289dc273 100644
--- a/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/filters/filter/filtervariable/FilterVariableNameFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/description/typedvariable/TypedVariableValueTypeFilter.java
@@ -7,33 +7,33 @@
  * Contributors:
  *    Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.diagram.editor.properties.filters.filter.filtervariable;
+package org.eclipse.sirius.editor.properties.filters.description.typedvariable;
 
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.diagram.description.filter.FilterPackage;
 import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
+import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
 
 // End of user code specific imports
 
 /**
- * A filter for the name property section.
+ * A filter for the valueType property section.
  */
-public class FilterVariableNameFilter extends ViewpointPropertyFilter {
+public class TypedVariableValueTypeFilter extends ViewpointPropertyFilter {
 
     /**
      * {@inheritDoc}
      */
     protected EStructuralFeature getFeature() {
-        return FilterPackage.eINSTANCE.getFilterVariable_Name();
+        return DescriptionPackage.eINSTANCE.getTypedVariable_ValueType();
     }
 
     /**
      * {@inheritDoc}
      */
     protected boolean isRightInputType(Object arg0) {
-        return arg0 instanceof org.eclipse.sirius.diagram.description.filter.FilterVariable;
+        return arg0 instanceof org.eclipse.sirius.viewpoint.description.TypedVariable;
     }
 
     // Start of user code user methods
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/abstractvariable/AbstractVariableNamePropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/description/abstractvariable/AbstractVariableNamePropertySection.java
index 6fc2b277ee..fa3197238f 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/tool/abstractvariable/AbstractVariableNamePropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/description/abstractvariable/AbstractVariableNamePropertySection.java
@@ -7,13 +7,13 @@
  * Contributors:
  *    Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.editor.properties.sections.tool.abstractvariable;
+package org.eclipse.sirius.editor.properties.sections.description.abstractvariable;
 
 // Start of user code imports
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
-import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
+import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
 import org.eclipse.swt.layout.FormAttachment;
@@ -66,7 +66,7 @@ public class AbstractVariableNamePropertySection extends AbstractTextPropertySec
      * @see org.eclipse.sirius.editor.properties.sections.AbstractTextPropertySection#getFeature()
      */
     public EAttribute getFeature() {
-        return ToolPackage.eINSTANCE.getAbstractVariable_Name();
+        return DescriptionPackage.eINSTANCE.getAbstractVariable_Name();
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/description/interactivevariabledescription/InteractiveVariableDescriptionUserDocumentationPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/description/interactivevariabledescription/InteractiveVariableDescriptionUserDocumentationPropertySection.java
new file mode 100644
index 0000000000..59c07723c8
--- /dev/null
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/description/interactivevariabledescription/InteractiveVariableDescriptionUserDocumentationPropertySection.java
@@ -0,0 +1,119 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2013 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.editor.properties.sections.description.interactivevariabledescription;
+
+// Start of user code imports
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
+import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CLabel;
+import org.eclipse.swt.layout.FormAttachment;
+import org.eclipse.swt.layout.FormData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
+
+// End of user code imports
+
+/**
+ * A section for the userDocumentation property of a
+ * InteractiveVariableDescription object.
+ */
+public class InteractiveVariableDescriptionUserDocumentationPropertySection extends AbstractTextPropertySection {
+
+    /** Help control of the section. */
+    protected CLabel help;
+
+    /**
+     * @see org.eclipse.ui.views.properties.tabbed.view.ITabbedPropertySection#refresh()
+     */
+    public void refresh() {
+        super.refresh();
+
+        final String tooltip = getToolTipText();
+        if (tooltip != null && help != null) {
+            help.setToolTipText(getToolTipText());
+        }
+    }
+
+    /**
+     * @see org.eclipse.sirius.editor.properties.sections.AbstractTextPropertySection#getDefaultLabelText()
+     */
+    protected String getDefaultLabelText() {
+        return "UserDocumentation"; //$NON-NLS-1$
+    }
+
+    /**
+     * @see org.eclipse.sirius.editor.properties.sections.AbstractTextPropertySection#getLabelText()
+     */
+    protected String getLabelText() {
+        String labelText;
+        labelText = super.getLabelText() + ":"; //$NON-NLS-1$
+        // Start of user code get label text
+
+        // End of user code get label text
+        return labelText;
+    }
+
+    /**
+     * @see org.eclipse.sirius.editor.properties.sections.AbstractTextPropertySection#getFeature()
+     */
+    public EAttribute getFeature() {
+        return DescriptionPackage.eINSTANCE.getInteractiveVariableDescription_UserDocumentation();
+    }
+
+    /**
+     * @see org.eclipse.sirius.editor.properties.sections.AbstractTextPropertySection#getFeatureValue(String)
+     */
+    protected Object getFeatureValue(String newText) {
+        return newText;
+    }
+
+    /**
+     * @see org.eclipse.sirius.editor.properties.sections.AbstractTextPropertySection#isEqual(String)
+     */
+    protected boolean isEqual(String newText) {
+        return getFeatureAsText().equals(newText);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
+        super.createControls(parent, tabbedPropertySheetPage);
+
+        text.setToolTipText(getToolTipText());
+
+        help = getWidgetFactory().createCLabel(composite, "");
+        FormData data = new FormData();
+        data.top = new FormAttachment(text, 0, SWT.TOP);
+        data.left = new FormAttachment(nameLabel);
+        help.setLayoutData(data);
+        help.setImage(getHelpIcon());
+        help.setToolTipText(getToolTipText());
+
+        // Start of user code create controls
+
+        // End of user code create controls
+
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected String getPropertyDescription() {
+        return "A documentation that is displayed to the user";
+    }
+
+    // Start of user code user operations
+
+    // End of user code user operations
+}
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/description/typedvariable/TypedVariableDefaultValueExpressionPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/description/typedvariable/TypedVariableDefaultValueExpressionPropertySection.java
new file mode 100644
index 0000000000..0b0a782dad
--- /dev/null
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/description/typedvariable/TypedVariableDefaultValueExpressionPropertySection.java
@@ -0,0 +1,143 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2013 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.editor.properties.sections.description.typedvariable;
+
+// Start of user code imports
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
+import org.eclipse.sirius.editor.properties.sections.common.AbstractTextWithButtonPropertySection;
+import org.eclipse.sirius.editor.tools.api.assist.TypeContentProposalProvider;
+import org.eclipse.sirius.editor.tools.internal.presentation.TextWithContentProposalDialog;
+import org.eclipse.sirius.ui.tools.api.assist.ContentProposalClient;
+import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CLabel;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.FormAttachment;
+import org.eclipse.swt.layout.FormData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
+
+// End of user code imports
+
+/**
+ * A section for the defaultValueExpression property of a TypedVariable object.
+ */
+public class TypedVariableDefaultValueExpressionPropertySection extends AbstractTextWithButtonPropertySection implements ContentProposalClient {
+
+    /** Help control of the section. */
+    protected CLabel help;
+
+    /**
+     * @see org.eclipse.ui.views.properties.tabbed.view.ITabbedPropertySection#refresh()
+     */
+    public void refresh() {
+        super.refresh();
+
+        final String tooltip = getToolTipText();
+        if (tooltip != null && help != null) {
+            help.setToolTipText(getToolTipText());
+        }
+    }
+
+    /**
+     * @see org.eclipse.sirius.editor.properties.sections.AbstractTextWithButtonPropertySection#getDefaultLabelText()
+     */
+    protected String getDefaultLabelText() {
+        return "DefaultValueExpression"; //$NON-NLS-1$
+    }
+
+    /**
+     * @see org.eclipse.sirius.editor.properties.sections.AbstractTextWithButtonPropertySection#getLabelText()
+     */
+    protected String getLabelText() {
+        String labelText;
+        labelText = super.getLabelText() + ":"; //$NON-NLS-1$
+        // Start of user code get label text
+
+        // End of user code get label text
+        return labelText;
+    }
+
+    /**
+     * @see org.eclipse.sirius.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeature()
+     */
+    public EAttribute getFeature() {
+        return DescriptionPackage.eINSTANCE.getTypedVariable_DefaultValueExpression();
+    }
+
+    /**
+     * @see org.eclipse.sirius.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeatureValue(String)
+     */
+    protected Object getFeatureValue(String newText) {
+        return newText;
+    }
+
+    /**
+     * @see org.eclipse.sirius.editor.properties.sections.AbstractTextWithButtonPropertySection#isEqual(String)
+     */
+    protected boolean isEqual(String newText) {
+        return getFeatureAsText().equals(newText);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
+        super.createControls(parent, tabbedPropertySheetPage);
+        /*
+         * We set the color as it's a InterpretedExpression
+         */
+        text.setBackground(SiriusEditor.getColorRegistry().get("yellow"));
+
+        text.setToolTipText(getToolTipText());
+
+        help = getWidgetFactory().createCLabel(composite, "");
+        FormData data = new FormData();
+        data.top = new FormAttachment(text, 0, SWT.TOP);
+        data.left = new FormAttachment(nameLabel);
+        help.setLayoutData(data);
+        help.setImage(getHelpIcon());
+        help.setToolTipText(getToolTipText());
+
+        TypeContentProposalProvider.bindPluginsCompletionProcessors(this, text);
+
+        // Start of user code create controls
+
+        // End of user code create controls
+
+    }
+
+    @Override
+    protected SelectionListener createButtonListener() {
+        return new SelectionAdapter() {
+            public void widgetSelected(SelectionEvent e) {
+                TextWithContentProposalDialog dialog = new TextWithContentProposalDialog(composite.getShell(), TypedVariableDefaultValueExpressionPropertySection.this, text.getText());
+                dialog.open();
+                text.setText(dialog.getResult());
+                handleTextModified();
+            }
+        };
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected String getPropertyDescription() {
+        return "An expression used to define the default variable value";
+    }
+
+    // Start of user code user operations
+
+    // End of user code user operations
+}
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/description/typedvariable/TypedVariableValueTypePropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/description/typedvariable/TypedVariableValueTypePropertySection.java
new file mode 100644
index 0000000000..45342feb72
--- /dev/null
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/description/typedvariable/TypedVariableValueTypePropertySection.java
@@ -0,0 +1,140 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2013 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.editor.properties.sections.description.typedvariable;
+
+// Start of user code imports
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
+import org.eclipse.sirius.editor.properties.sections.common.AbstractComboPropertySection;
+import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CLabel;
+import org.eclipse.swt.layout.FormAttachment;
+import org.eclipse.swt.layout.FormData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
+
+// End of user code imports
+
+/**
+ * A section for the valueType property of a TypedVariable object.
+ */
+public class TypedVariableValueTypePropertySection extends AbstractComboPropertySection {
+    /**
+     * @see org.eclipse.sirius.editor.properties.sections.AbstractComboPropertySection#getDefaultLabelText()
+     */
+    protected String getDefaultLabelText() {
+        return "ValueType"; //$NON-NLS-1$
+    }
+
+    /**
+     * @see org.eclipse.sirius.editor.properties.sections.AbstractComboPropertySection#getLabelText()
+     */
+    protected String getLabelText() {
+        String labelText;
+        labelText = super.getLabelText() + "*:"; //$NON-NLS-1$
+        // Start of user code get label text
+
+        // End of user code get label text
+        return labelText;
+    }
+
+    /**
+     * @see org.eclipse.sirius.editor.properties.sections.AbstractComboPropertySection#getFeature()
+     */
+    protected EReference getFeature() {
+        return DescriptionPackage.eINSTANCE.getTypedVariable_ValueType();
+    }
+
+    /**
+     * @see org.eclipse.sirius.editor.properties.sections.AbstractComboPropertySection#getFeatureValue(int)
+     */
+    protected Object getFeatureValue(int index) {
+        return getFeatureValueAt(index);
+    }
+
+    /**
+     * @see org.eclipse.sirius.editor.properties.sections.AbstractComboPropertySection#isEqual(int)
+     */
+    protected boolean isEqual(int index) {
+        boolean isEqual = false;
+        if (getFeatureValueAt(index) == null)
+            isEqual = eObject.eGet(getFeature()) == null;
+        else
+            isEqual = getFeatureValueAt(index).equals(eObject.eGet(getFeature()));
+        return isEqual;
+    }
+
+    /**
+     * Returns the value at the specified index in the choice of values for the
+     * feature.
+     * 
+     * @param index
+     *            Index of the value.
+     * @return the value at the specified index in the choice of values.
+     */
+    protected Object getFeatureValueAt(int index) {
+        List<?> values = getChoiceOfValues();
+        if (values.size() < index || values.size() == 0 || index == -1) {
+            return null;
+        }
+        return values.get(index);
+    }
+
+    /**
+     * Fetches the list of available values for the feature.
+     * 
+     * @return The list of available values for the feature.
+     */
+    protected List<?> getChoiceOfValues() {
+        List<?> values = Collections.emptyList();
+        List<IItemPropertyDescriptor> propertyDescriptors = getDescriptors();
+        for (Iterator<IItemPropertyDescriptor> iterator = propertyDescriptors.iterator(); iterator.hasNext();) {
+            IItemPropertyDescriptor propertyDescriptor = iterator.next();
+            if (((EStructuralFeature) propertyDescriptor.getFeature(eObject)) == getFeature())
+                values = new ArrayList<Object>(propertyDescriptor.getChoiceOfValues(eObject));
+        }
+
+        // Start of user code choice of values
+        // End of user code choice of values
+        return values;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
+        super.createControls(parent, tabbedPropertySheetPage);
+        combo.setToolTipText("The type of the variable value");
+
+        CLabel help = getWidgetFactory().createCLabel(composite, "");
+        FormData data = new FormData();
+        data.top = new FormAttachment(combo, 0, SWT.TOP);
+        data.left = new FormAttachment(nameLabel);
+        help.setLayoutData(data);
+        help.setImage(getHelpIcon());
+        help.setToolTipText("The type of the variable value");
+        nameLabel.setFont(SiriusEditor.getFontRegistry().get("required"));
+        // Start of user code create controls
+
+        // End of user code create controls
+    }
+    // Start of user code user operations
+
+    // End of user code user operations
+}
diff --git a/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/properties/validation/SiriusInterpreterErrorDecorator.java b/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/properties/validation/SiriusInterpreterErrorDecorator.java
index 3693442523..2833185847 100644
--- a/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/properties/validation/SiriusInterpreterErrorDecorator.java
+++ b/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/properties/validation/SiriusInterpreterErrorDecorator.java
@@ -48,13 +48,13 @@ public class SiriusInterpreterErrorDecorator extends LabelDecorator implements I
     /**
      * Default image descriptor for the error overlay.
      */
-    public static final ImageDescriptor ERROR_OVERLAY_DESC = AbstractUIPlugin.imageDescriptorFromPlugin(SiriusEditPlugin.ID, "/icons/full/validation/error_co.png"); //$NON-NLS-1$;
+    public static final ImageDescriptor ERROR_OVERLAY_DESC = AbstractUIPlugin.imageDescriptorFromPlugin(SiriusEditPlugin.ID, "/icons/full/validation/error_co.png"); //$NON-NLS-1$ ;
 
     /**
      * Default image descriptor for the error overlay, if the current element
      * has no error, but at least one of its children has.
      */
-    public static final ImageDescriptor ERROR_OVERLAY_DESC_CHILDREN_ONLY = AbstractUIPlugin.imageDescriptorFromPlugin(SiriusEditPlugin.ID, "/icons/full/validation/error_co_children_only.png"); //$NON-NLS-1$;
+    public static final ImageDescriptor ERROR_OVERLAY_DESC_CHILDREN_ONLY = AbstractUIPlugin.imageDescriptorFromPlugin(SiriusEditPlugin.ID, "/icons/full/validation/error_co_children_only.png"); //$NON-NLS-1$ ;
 
     /**
      * Image descriptor for warning overlay.
@@ -65,7 +65,7 @@ public class SiriusInterpreterErrorDecorator extends LabelDecorator implements I
      * Default image descriptor for the warning overlay, if the current element
      * has no error, but at least one of its children has.
      */
-    public static final ImageDescriptor WARNING_OVERLAY_DESC_CHILDREN_ONLY = AbstractUIPlugin.imageDescriptorFromPlugin(SiriusEditPlugin.ID, "/icons/full/validation/warning_co_children_only.png"); //$NON-NLS-1$;
+    public static final ImageDescriptor WARNING_OVERLAY_DESC_CHILDREN_ONLY = AbstractUIPlugin.imageDescriptorFromPlugin(SiriusEditPlugin.ID, "/icons/full/validation/warning_co_children_only.png"); //$NON-NLS-1$ ;
 
     private List<ILabelProviderListener> listeners = new ArrayList<ILabelProviderListener>(1);
 
@@ -98,6 +98,7 @@ public class SiriusInterpreterErrorDecorator extends LabelDecorator implements I
     /**
      * {@inheritDoc}
      */
+    @Override
     public void addListener(ILabelProviderListener listener) {
         listeners.add(listener);
 
@@ -106,6 +107,7 @@ public class SiriusInterpreterErrorDecorator extends LabelDecorator implements I
     /**
      * {@inheritDoc}
      */
+    @Override
     public Image decorateImage(Image image, Object element) {
         return image;
     }
@@ -199,6 +201,7 @@ public class SiriusInterpreterErrorDecorator extends LabelDecorator implements I
     /**
      * {@inheritDoc}
      */
+    @Override
     public String decorateText(String text, Object element) {
         return text;
     }
@@ -214,6 +217,7 @@ public class SiriusInterpreterErrorDecorator extends LabelDecorator implements I
     /**
      * {@inheritDoc}
      */
+    @Override
     public void dispose() {
         listeners = new ArrayList<ILabelProviderListener>(1);
     }
@@ -221,6 +225,7 @@ public class SiriusInterpreterErrorDecorator extends LabelDecorator implements I
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isLabelProperty(Object element, String property) {
         return true;
     }
@@ -236,6 +241,7 @@ public class SiriusInterpreterErrorDecorator extends LabelDecorator implements I
     /**
      * {@inheritDoc}
      */
+    @Override
     public void removeListener(ILabelProviderListener listener) {
         listeners.remove(listener);
     }
diff --git a/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/tools/internal/menu/child/VariablesMenuBuilder.java b/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/tools/internal/menu/child/VariablesMenuBuilder.java
index 472031c655..a9677d62f9 100644
--- a/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/tools/internal/menu/child/VariablesMenuBuilder.java
+++ b/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/tools/internal/menu/child/VariablesMenuBuilder.java
@@ -12,7 +12,7 @@ package org.eclipse.sirius.editor.tools.internal.menu.child;
 
 import org.eclipse.sirius.editor.tools.api.menu.AbstractMenuBuilder;
 import org.eclipse.sirius.editor.tools.api.menu.AbstractTypeRestrictingMenuBuilder;
-import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
+import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
 
 /**
  * The variables menu.
@@ -26,7 +26,7 @@ public class VariablesMenuBuilder extends AbstractTypeRestrictingMenuBuilder {
      */
     public VariablesMenuBuilder() {
         super();
-        addValidType(ToolPackage.eINSTANCE.getAbstractVariable());
+        addValidType(DescriptionPackage.eINSTANCE.getAbstractVariable());
     }
 
     @Override
diff --git a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/TableVariableItemProvider.java b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/TableVariableItemProvider.java
index f5ffd304a7..992e2bfa43 100644
--- a/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/TableVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.table.ui/src-gen/org/eclipse/sirius/table/metamodel/table/description/provider/TableVariableItemProvider.java
@@ -24,9 +24,10 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.sirius.table.metamodel.table.description.DescriptionPackage;
 import org.eclipse.sirius.table.metamodel.table.description.TableVariable;
 import org.eclipse.sirius.table.metamodel.table.provider.TableUIPlugin;
+import org.eclipse.sirius.viewpoint.description.DescriptionFactory;
+import org.eclipse.sirius.viewpoint.description.provider.AbstractVariableItemProvider;
 import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
-import org.eclipse.sirius.viewpoint.description.tool.provider.AbstractVariableItemProvider;
 
 /**
  * This is the item provider adapter for a
@@ -69,11 +70,11 @@ public class TableVariableItemProvider extends AbstractVariableItemProvider {
      * @generated
      */
     protected void addDocumentationPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TableVariable_documentation_feature"), //$NON-NLS-1$
-                getString("_UI_PropertyDescriptor_description", "_UI_TableVariable_documentation_feature", "_UI_TableVariable_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-                DescriptionPackage.Literals.TABLE_VARIABLE__DOCUMENTATION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_DocumentationPropertyCategory"), //$NON-NLS-1$
-                null));
+        itemPropertyDescriptors
+                .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_TableVariable_documentation_feature"), //$NON-NLS-1$
+                        getString("_UI_PropertyDescriptor_description", "_UI_TableVariable_documentation_feature", "_UI_TableVariable_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                        DescriptionPackage.Literals.TABLE_VARIABLE__DOCUMENTATION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_DocumentationPropertyCategory"), //$NON-NLS-1$
+                        null));
     }
 
     /**
@@ -166,6 +167,8 @@ public class TableVariableItemProvider extends AbstractVariableItemProvider {
     protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
         super.collectNewChildDescriptors(newChildDescriptors, object);
 
+        newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, DescriptionFactory.eINSTANCE.createTypedVariable()));
+
         newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, ToolFactory.eINSTANCE.createAcceleoVariable()));
 
         newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, ToolFactory.eINSTANCE.createSelectModelElementVariable()));
diff --git a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/DTableMenuListener.java b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/DTableMenuListener.java
index 724068ccbf..860483f76a 100644
--- a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/DTableMenuListener.java
+++ b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/DTableMenuListener.java
@@ -72,7 +72,7 @@ import org.eclipse.sirius.viewpoint.DSemanticDecorator;
 import org.eclipse.sirius.viewpoint.SiriusPlugin;
 import org.eclipse.sirius.viewpoint.description.RepresentationDescription;
 import org.eclipse.sirius.viewpoint.description.Viewpoint;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.tool.RepresentationCreationDescription;
 import org.eclipse.sirius.viewpoint.description.tool.RepresentationNavigationDescription;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/DescriptionPackage.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/DescriptionPackage.java
index 1d16b2c098..70c9fb6654 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/DescriptionPackage.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/DescriptionPackage.java
@@ -3024,7 +3024,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TABLE_VARIABLE__NAME = ToolPackage.ABSTRACT_VARIABLE__NAME;
+    int TABLE_VARIABLE__NAME = org.eclipse.sirius.viewpoint.description.DescriptionPackage.ABSTRACT_VARIABLE__NAME;
 
     /**
      * The feature id for the '<em><b>Sub Variables</b></em>' containment
@@ -3033,7 +3033,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TABLE_VARIABLE__SUB_VARIABLES = ToolPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
+    int TABLE_VARIABLE__SUB_VARIABLES = org.eclipse.sirius.viewpoint.description.DescriptionPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
 
     /**
      * The feature id for the '<em><b>Documentation</b></em>' attribute. <!--
@@ -3042,7 +3042,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TABLE_VARIABLE__DOCUMENTATION = ToolPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 1;
+    int TABLE_VARIABLE__DOCUMENTATION = org.eclipse.sirius.viewpoint.description.DescriptionPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 1;
 
     /**
      * The number of structural features of the '<em>Table Variable</em>' class.
@@ -3051,7 +3051,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TABLE_VARIABLE_FEATURE_COUNT = ToolPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 2;
+    int TABLE_VARIABLE_FEATURE_COUNT = org.eclipse.sirius.viewpoint.description.DescriptionPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 2;
 
     /**
      * The meta object id for the '
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/TableVariable.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/TableVariable.java
index a0c6ea6986..b2d30c0749 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/TableVariable.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/TableVariable.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.sirius.table.metamodel.table.description;
 
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.tool.VariableContainer;
 
 /**
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/DescriptionPackageImpl.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/DescriptionPackageImpl.java
index 05ddd45b29..588d37ee13 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/DescriptionPackageImpl.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/DescriptionPackageImpl.java
@@ -1622,7 +1622,7 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
         deleteToolEClass.getESuperTypes().add(this.getTableTool());
         deleteColumnToolEClass.getESuperTypes().add(this.getDeleteTool());
         deleteLineToolEClass.getESuperTypes().add(this.getDeleteTool());
-        tableVariableEClass.getESuperTypes().add(theToolPackage.getAbstractVariable());
+        tableVariableEClass.getESuperTypes().add(theDescriptionPackage_1.getAbstractVariable());
         tableVariableEClass.getESuperTypes().add(theToolPackage.getVariableContainer());
         tableCreationDescriptionEClass.getESuperTypes().add(theToolPackage.getRepresentationCreationDescription());
         tableNavigationDescriptionEClass.getESuperTypes().add(theToolPackage.getRepresentationNavigationDescription());
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/TableVariableImpl.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/TableVariableImpl.java
index 0024c26f22..0d0988026a 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/TableVariableImpl.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/impl/TableVariableImpl.java
@@ -22,10 +22,10 @@ import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.sirius.table.metamodel.table.description.DescriptionPackage;
 import org.eclipse.sirius.table.metamodel.table.description.TableVariable;
-import org.eclipse.sirius.viewpoint.description.tool.SubVariable;
+import org.eclipse.sirius.viewpoint.description.SubVariable;
+import org.eclipse.sirius.viewpoint.description.impl.AbstractVariableImpl;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
 import org.eclipse.sirius.viewpoint.description.tool.VariableContainer;
-import org.eclipse.sirius.viewpoint.description.tool.impl.AbstractVariableImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/util/DescriptionAdapterFactory.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/util/DescriptionAdapterFactory.java
index 260aacc098..0281032968 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/util/DescriptionAdapterFactory.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/util/DescriptionAdapterFactory.java
@@ -43,13 +43,13 @@ import org.eclipse.sirius.table.metamodel.table.description.TableMapping;
 import org.eclipse.sirius.table.metamodel.table.description.TableNavigationDescription;
 import org.eclipse.sirius.table.metamodel.table.description.TableTool;
 import org.eclipse.sirius.table.metamodel.table.description.TableVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.DocumentedElement;
 import org.eclipse.sirius.viewpoint.description.EndUserDocumentedElement;
 import org.eclipse.sirius.viewpoint.description.IdentifiedElement;
 import org.eclipse.sirius.viewpoint.description.RepresentationDescription;
 import org.eclipse.sirius.viewpoint.description.RepresentationElementMapping;
 import org.eclipse.sirius.viewpoint.description.tool.AbstractToolDescription;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.tool.RepresentationCreationDescription;
 import org.eclipse.sirius.viewpoint.description.tool.RepresentationNavigationDescription;
 import org.eclipse.sirius.viewpoint.description.tool.ToolEntry;
@@ -887,14 +887,14 @@ public class DescriptionAdapterFactory extends AdapterFactoryImpl {
 
     /**
      * Creates a new adapter for an object of class '
-     * {@link org.eclipse.sirius.viewpoint.description.tool.AbstractVariable
+     * {@link org.eclipse.sirius.viewpoint.description.AbstractVariable
      * <em>Abstract Variable</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.description.tool.AbstractVariable
+     * @see org.eclipse.sirius.viewpoint.description.AbstractVariable
      * @generated
      */
     public Adapter createAbstractVariableAdapter() {
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/util/DescriptionSwitch.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/util/DescriptionSwitch.java
index e64caa6749..6f4fdcd52d 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/util/DescriptionSwitch.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/util/DescriptionSwitch.java
@@ -43,13 +43,13 @@ import org.eclipse.sirius.table.metamodel.table.description.TableMapping;
 import org.eclipse.sirius.table.metamodel.table.description.TableNavigationDescription;
 import org.eclipse.sirius.table.metamodel.table.description.TableTool;
 import org.eclipse.sirius.table.metamodel.table.description.TableVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.DocumentedElement;
 import org.eclipse.sirius.viewpoint.description.EndUserDocumentedElement;
 import org.eclipse.sirius.viewpoint.description.IdentifiedElement;
 import org.eclipse.sirius.viewpoint.description.RepresentationDescription;
 import org.eclipse.sirius.viewpoint.description.RepresentationElementMapping;
 import org.eclipse.sirius.viewpoint.description.tool.AbstractToolDescription;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.tool.RepresentationCreationDescription;
 import org.eclipse.sirius.viewpoint.description.tool.RepresentationNavigationDescription;
 import org.eclipse.sirius.viewpoint.description.tool.ToolEntry;
diff --git a/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/dialect/description/TableInterpretedExpressionQuery.java b/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/dialect/description/TableInterpretedExpressionQuery.java
index 7943656b4d..8ba3a40ba1 100644
--- a/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/dialect/description/TableInterpretedExpressionQuery.java
+++ b/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/dialect/description/TableInterpretedExpressionQuery.java
@@ -40,7 +40,7 @@ import org.eclipse.sirius.table.metamodel.table.description.LabelEditTool;
 import org.eclipse.sirius.table.metamodel.table.description.LineMapping;
 import org.eclipse.sirius.table.metamodel.table.description.TableDescription;
 import org.eclipse.sirius.table.tools.api.interpreter.IInterpreterSiriusTableVariables;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.tool.EditMaskVariables;
 
 import com.google.common.collect.Sets;
diff --git a/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/tools/internal/command/TableCommandFactory.java b/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/tools/internal/command/TableCommandFactory.java
index ca383c11e2..37287738a2 100644
--- a/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/tools/internal/command/TableCommandFactory.java
+++ b/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/tools/internal/command/TableCommandFactory.java
@@ -70,7 +70,7 @@ import org.eclipse.sirius.viewpoint.DRepresentation;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
 import org.eclipse.sirius.viewpoint.SiriusPlugin;
 import org.eclipse.sirius.viewpoint.description.tool.AbstractToolDescription;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.tool.RepresentationCreationDescription;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
 
diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/sequence/vsm/interpreted/expression/variables/AbstractToolDescription_Precondition_AbstractVariable_Access_Tests.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/sequence/vsm/interpreted/expression/variables/AbstractToolDescription_Precondition_AbstractVariable_Access_Tests.java
index 3cc64940b2..fb04d7998b 100644
--- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/sequence/vsm/interpreted/expression/variables/AbstractToolDescription_Precondition_AbstractVariable_Access_Tests.java
+++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/sequence/vsm/interpreted/expression/variables/AbstractToolDescription_Precondition_AbstractVariable_Access_Tests.java
@@ -69,11 +69,11 @@ import org.eclipse.sirius.tests.support.api.SiriusDiagramTestCase;
 import org.eclipse.sirius.tests.support.api.TestsUtil;
 import org.eclipse.sirius.ui.business.api.dialect.DialectUIManager;
 import org.eclipse.sirius.viewpoint.DRepresentation;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.Group;
 import org.eclipse.sirius.viewpoint.description.RepresentationDescription;
 import org.eclipse.sirius.viewpoint.description.Viewpoint;
 import org.eclipse.sirius.viewpoint.description.tool.AbstractToolDescription;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.tool.ExternalJavaAction;
 import org.eclipse.sirius.viewpoint.description.tool.ExternalJavaActionCall;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
@@ -145,6 +145,7 @@ public class AbstractToolDescription_Precondition_AbstractVariable_Access_Tests
 
     private GraphicalEditPart lifelineCEditPart;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();
@@ -272,7 +273,7 @@ public class AbstractToolDescription_Precondition_AbstractVariable_Access_Tests
             for (AbstractVariable variable : variables) {
                 String name = variable.getName();
                 String newName = name + "Renamed";
-                Command changeVariableNameCmd = SetCommand.create(domain, variable, ToolPackage.Literals.ABSTRACT_VARIABLE__NAME, newName);
+                Command changeVariableNameCmd = SetCommand.create(domain, variable, org.eclipse.sirius.viewpoint.description.DescriptionPackage.Literals.ABSTRACT_VARIABLE__NAME, newName);
                 commandStack.execute(changeVariableNameCmd);
             }
         }
@@ -490,7 +491,7 @@ public class AbstractToolDescription_Precondition_AbstractVariable_Access_Tests
         for (EStructuralFeature structuralFeature : abstractToolDescription.eClass().getEAllStructuralFeatures()) {
             if (structuralFeature.getEType() instanceof EClass) {
                 EClass eClass = (EClass) structuralFeature.getEType();
-                if (eClass.getEAllSuperTypes().contains(ToolPackage.Literals.ABSTRACT_VARIABLE)) {
+                if (eClass.getEAllSuperTypes().contains(org.eclipse.sirius.viewpoint.description.DescriptionPackage.Literals.ABSTRACT_VARIABLE)) {
                     AbstractVariable variable = (AbstractVariable) abstractToolDescription.eGet(structuralFeature);
                     if (variable != null) {
                         variableNames.add(variable);
@@ -501,6 +502,7 @@ public class AbstractToolDescription_Precondition_AbstractVariable_Access_Tests
         return variableNames;
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         TestsUtil.synchronizationWithUIThread();
@@ -538,10 +540,12 @@ public class AbstractToolDescription_Precondition_AbstractVariable_Access_Tests
             this.abstractToolDescription = abstractToolDescription;
         }
 
+        @Override
         public Object getNewObject() {
             return abstractToolDescription;
         }
 
+        @Override
         public Object getObjectType() {
             return abstractToolDescription.getClass();
         }
diff --git a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeVariableItemProvider.java b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeVariableItemProvider.java
index dafc6270d5..b07c0d5363 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src-gen/org/eclipse/sirius/tree/description/provider/TreeVariableItemProvider.java
@@ -25,9 +25,10 @@ import org.eclipse.sirius.common.tools.api.util.StringUtil;
 import org.eclipse.sirius.tree.description.DescriptionPackage;
 import org.eclipse.sirius.tree.description.TreeVariable;
 import org.eclipse.sirius.tree.ui.provider.TreeUIPlugin;
+import org.eclipse.sirius.viewpoint.description.DescriptionFactory;
+import org.eclipse.sirius.viewpoint.description.provider.AbstractVariableItemProvider;
 import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
-import org.eclipse.sirius.viewpoint.description.tool.provider.AbstractVariableItemProvider;
 
 /**
  * This is the item provider adapter for a
@@ -70,11 +71,11 @@ public class TreeVariableItemProvider extends AbstractVariableItemProvider {
      * @generated
      */
     protected void addDocumentationPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TreeVariable_documentation_feature"), //$NON-NLS-1$
-                getString("_UI_PropertyDescriptor_description", "_UI_TreeVariable_documentation_feature", "_UI_TreeVariable_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-                DescriptionPackage.Literals.TREE_VARIABLE__DOCUMENTATION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
-                null));
+        itemPropertyDescriptors
+                .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_TreeVariable_documentation_feature"), //$NON-NLS-1$
+                        getString("_UI_PropertyDescriptor_description", "_UI_TreeVariable_documentation_feature", "_UI_TreeVariable_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                        DescriptionPackage.Literals.TREE_VARIABLE__DOCUMENTATION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
+                        null));
     }
 
     /**
@@ -167,6 +168,8 @@ public class TreeVariableItemProvider extends AbstractVariableItemProvider {
     protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
         super.collectNewChildDescriptors(newChildDescriptors, object);
 
+        newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, DescriptionFactory.eINSTANCE.createTypedVariable()));
+
         newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, ToolFactory.eINSTANCE.createAcceleoVariable()));
 
         newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, ToolFactory.eINSTANCE.createSelectModelElementVariable()));
diff --git a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/DTreeMenuListener.java b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/DTreeMenuListener.java
index 4e48f9c50c..38e3b7e89f 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/DTreeMenuListener.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/DTreeMenuListener.java
@@ -52,7 +52,7 @@ import org.eclipse.sirius.viewpoint.DSemanticDecorator;
 import org.eclipse.sirius.viewpoint.SiriusPlugin;
 import org.eclipse.sirius.viewpoint.description.RepresentationDescription;
 import org.eclipse.sirius.viewpoint.description.Viewpoint;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.tool.RepresentationCreationDescription;
 import org.eclipse.sirius.viewpoint.description.tool.RepresentationNavigationDescription;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
diff --git a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/DescriptionPackage.java b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/DescriptionPackage.java
index b26e330155..ce0f266593 100644
--- a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/DescriptionPackage.java
+++ b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/DescriptionPackage.java
@@ -1834,7 +1834,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TREE_VARIABLE__NAME = ToolPackage.ABSTRACT_VARIABLE__NAME;
+    int TREE_VARIABLE__NAME = org.eclipse.sirius.viewpoint.description.DescriptionPackage.ABSTRACT_VARIABLE__NAME;
 
     /**
      * The feature id for the '<em><b>Sub Variables</b></em>' containment
@@ -1843,7 +1843,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TREE_VARIABLE__SUB_VARIABLES = ToolPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
+    int TREE_VARIABLE__SUB_VARIABLES = org.eclipse.sirius.viewpoint.description.DescriptionPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
 
     /**
      * The feature id for the '<em><b>Documentation</b></em>' attribute. <!--
@@ -1852,7 +1852,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TREE_VARIABLE__DOCUMENTATION = ToolPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 1;
+    int TREE_VARIABLE__DOCUMENTATION = org.eclipse.sirius.viewpoint.description.DescriptionPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 1;
 
     /**
      * The number of structural features of the '<em>Tree Variable</em>' class.
@@ -1861,7 +1861,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TREE_VARIABLE_FEATURE_COUNT = ToolPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 2;
+    int TREE_VARIABLE_FEATURE_COUNT = org.eclipse.sirius.viewpoint.description.DescriptionPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 2;
 
     /**
      * The meta object id for the '
diff --git a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/TreeVariable.java b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/TreeVariable.java
index 4b798dedd2..a34cea6fe6 100644
--- a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/TreeVariable.java
+++ b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/TreeVariable.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.sirius.tree.description;
 
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.tool.VariableContainer;
 
 /**
diff --git a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/DescriptionPackageImpl.java b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/DescriptionPackageImpl.java
index 906bae2089..62ada91cd4 100644
--- a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/DescriptionPackageImpl.java
+++ b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/DescriptionPackageImpl.java
@@ -1126,7 +1126,7 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
         treeCreationDescriptionEClass.getESuperTypes().add(theToolPackage.getRepresentationCreationDescription());
         treeNavigationDescriptionEClass.getESuperTypes().add(theToolPackage.getRepresentationNavigationDescription());
         treeMappingEClass.getESuperTypes().add(theDescriptionPackage_1.getRepresentationElementMapping());
-        treeVariableEClass.getESuperTypes().add(theToolPackage.getAbstractVariable());
+        treeVariableEClass.getESuperTypes().add(theDescriptionPackage_1.getAbstractVariable());
         treeVariableEClass.getESuperTypes().add(theToolPackage.getVariableContainer());
         precedingSiblingsVariablesEClass.getESuperTypes().add(this.getTreeVariable());
         treePopupMenuEClass.getESuperTypes().add(theToolPackage.getAbstractToolDescription());
diff --git a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/TreeVariableImpl.java b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/TreeVariableImpl.java
index 953f7daf55..d755a85e41 100644
--- a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/TreeVariableImpl.java
+++ b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/impl/TreeVariableImpl.java
@@ -22,10 +22,10 @@ import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.sirius.tree.description.DescriptionPackage;
 import org.eclipse.sirius.tree.description.TreeVariable;
-import org.eclipse.sirius.viewpoint.description.tool.SubVariable;
+import org.eclipse.sirius.viewpoint.description.SubVariable;
+import org.eclipse.sirius.viewpoint.description.impl.AbstractVariableImpl;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
 import org.eclipse.sirius.viewpoint.description.tool.VariableContainer;
-import org.eclipse.sirius.viewpoint.description.tool.impl.AbstractVariableImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '
diff --git a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/util/DescriptionAdapterFactory.java b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/util/DescriptionAdapterFactory.java
index 7bbcb7b6a0..07ea0f0934 100644
--- a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/util/DescriptionAdapterFactory.java
+++ b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/util/DescriptionAdapterFactory.java
@@ -34,6 +34,7 @@ import org.eclipse.sirius.tree.description.TreeMapping;
 import org.eclipse.sirius.tree.description.TreeNavigationDescription;
 import org.eclipse.sirius.tree.description.TreePopupMenu;
 import org.eclipse.sirius.tree.description.TreeVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.ConditionalStyleDescription;
 import org.eclipse.sirius.viewpoint.description.DocumentedElement;
 import org.eclipse.sirius.viewpoint.description.EndUserDocumentedElement;
@@ -44,7 +45,6 @@ import org.eclipse.sirius.viewpoint.description.style.BasicLabelStyleDescription
 import org.eclipse.sirius.viewpoint.description.style.LabelStyleDescription;
 import org.eclipse.sirius.viewpoint.description.style.StyleDescription;
 import org.eclipse.sirius.viewpoint.description.tool.AbstractToolDescription;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.tool.MappingBasedToolDescription;
 import org.eclipse.sirius.viewpoint.description.tool.RepresentationCreationDescription;
 import org.eclipse.sirius.viewpoint.description.tool.RepresentationNavigationDescription;
@@ -831,14 +831,14 @@ public class DescriptionAdapterFactory extends AdapterFactoryImpl {
 
     /**
      * Creates a new adapter for an object of class '
-     * {@link org.eclipse.sirius.viewpoint.description.tool.AbstractVariable
+     * {@link org.eclipse.sirius.viewpoint.description.AbstractVariable
      * <em>Abstract Variable</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.description.tool.AbstractVariable
+     * @see org.eclipse.sirius.viewpoint.description.AbstractVariable
      * @generated
      */
     public Adapter createAbstractVariableAdapter() {
diff --git a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/util/DescriptionSwitch.java b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/util/DescriptionSwitch.java
index 584dcc3c2b..109b615a7a 100644
--- a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/util/DescriptionSwitch.java
+++ b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/util/DescriptionSwitch.java
@@ -34,6 +34,7 @@ import org.eclipse.sirius.tree.description.TreeMapping;
 import org.eclipse.sirius.tree.description.TreeNavigationDescription;
 import org.eclipse.sirius.tree.description.TreePopupMenu;
 import org.eclipse.sirius.tree.description.TreeVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.ConditionalStyleDescription;
 import org.eclipse.sirius.viewpoint.description.DocumentedElement;
 import org.eclipse.sirius.viewpoint.description.EndUserDocumentedElement;
@@ -44,7 +45,6 @@ import org.eclipse.sirius.viewpoint.description.style.BasicLabelStyleDescription
 import org.eclipse.sirius.viewpoint.description.style.LabelStyleDescription;
 import org.eclipse.sirius.viewpoint.description.style.StyleDescription;
 import org.eclipse.sirius.viewpoint.description.tool.AbstractToolDescription;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.tool.MappingBasedToolDescription;
 import org.eclipse.sirius.viewpoint.description.tool.RepresentationCreationDescription;
 import org.eclipse.sirius.viewpoint.description.tool.RepresentationNavigationDescription;
diff --git a/plugins/org.eclipse.sirius.tree/src/org/eclipse/sirius/tree/tools/internal/command/TreeCommandFactory.java b/plugins/org.eclipse.sirius.tree/src/org/eclipse/sirius/tree/tools/internal/command/TreeCommandFactory.java
index 382e38e513..8c67fefbad 100644
--- a/plugins/org.eclipse.sirius.tree/src/org/eclipse/sirius/tree/tools/internal/command/TreeCommandFactory.java
+++ b/plugins/org.eclipse.sirius.tree/src/org/eclipse/sirius/tree/tools/internal/command/TreeCommandFactory.java
@@ -65,7 +65,7 @@ import org.eclipse.sirius.tree.tools.internal.Messages;
 import org.eclipse.sirius.viewpoint.DRepresentation;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
 import org.eclipse.sirius.viewpoint.description.tool.AbstractToolDescription;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.tool.ExternalJavaAction;
 import org.eclipse.sirius.viewpoint.description.tool.OperationAction;
 import org.eclipse.sirius.viewpoint.description.tool.RepresentationCreationDescription;
diff --git a/plugins/org.eclipse.sirius.ui/icons/full/obj16/TypedVariable.gif b/plugins/org.eclipse.sirius.ui/icons/full/obj16/TypedVariable.gif
new file mode 100644
index 0000000000..4365960a04
--- /dev/null
+++ b/plugins/org.eclipse.sirius.ui/icons/full/obj16/TypedVariable.gif
diff --git a/plugins/org.eclipse.sirius.ui/plugin.properties b/plugins/org.eclipse.sirius.ui/plugin.properties
index d95f0b7dda..f1e1aaecef 100644
--- a/plugins/org.eclipse.sirius.ui/plugin.properties
+++ b/plugins/org.eclipse.sirius.ui/plugin.properties
@@ -1406,3 +1406,11 @@ _UI_AbstractToolDescription_elementsToSelect_description = An expression used to
 _UI_AbstractToolDescription_inverseSelectionOrder_description = By default the elements to select are listed in the creation order. If true, the order is inverted.
 _UI_Extension_type = Extension
 _UI_Group_extensions_feature = Extensions
+_UI_InteractiveVariableDescription_type = Interactive Variable Description
+_UI_TypedVariable_type = Typed Variable
+_UI_InteractiveVariableDescription_userDocumentation_feature = User Documentation
+_UI_InteractiveVariableDescription_userDocumentation_description = A documentation that is displayed to the user
+_UI_TypedVariable_defaultValueExpression_feature = Default Value Expression
+_UI_TypedVariable_defaultValueExpression_description = An expression used to define the default variable value
+_UI_TypedVariable_valueType_feature = Value Type
+_UI_TypedVariable_valueType_description = The type of the variable value
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/AbstractVariableItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/AbstractVariableItemProvider.java
index c5105160a7..b53634a4a9 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/AbstractVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/AbstractVariableItemProvider.java
@@ -9,7 +9,7 @@
  *    Obeo - initial API and implementation
  *
  */
-package org.eclipse.sirius.viewpoint.description.tool.provider;
+package org.eclipse.sirius.viewpoint.description.provider;
 
 import java.util.Collection;
 import java.util.List;
@@ -28,13 +28,13 @@ 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.description.tool.AbstractVariable;
-import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
 
 /**
  * This is the item provider adapter for a
- * {@link org.eclipse.sirius.viewpoint.description.tool.AbstractVariable}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * {@link org.eclipse.sirius.viewpoint.description.AbstractVariable} object.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
  * 
  * @generated
  */
@@ -76,8 +76,7 @@ IItemPropertySource {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
                 getString("_UI_AbstractVariable_name_feature"), //$NON-NLS-1$
                 getString("_UI_AbstractVariable_name_description"), //$NON-NLS-1$
-                ToolPackage.Literals.ABSTRACT_VARIABLE__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
-                null));
+                DescriptionPackage.Literals.ABSTRACT_VARIABLE__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
@@ -106,7 +105,7 @@ IItemPropertySource {
         updateChildren(notification);
 
         switch (notification.getFeatureID(AbstractVariable.class)) {
-        case ToolPackage.ABSTRACT_VARIABLE__NAME:
+        case DescriptionPackage.ABSTRACT_VARIABLE__NAME:
             fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
             return;
         }
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DescriptionItemProviderAdapterFactory.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DescriptionItemProviderAdapterFactory.java
index e1b5ab0605..30f294a3cd 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DescriptionItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DescriptionItemProviderAdapterFactory.java
@@ -697,6 +697,31 @@ public class DescriptionItemProviderAdapterFactory extends DescriptionAdapterFac
     }
 
     /**
+     * This keeps track of the one adapter used for all
+     * {@link org.eclipse.sirius.viewpoint.description.TypedVariable} instances.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    protected TypedVariableItemProvider typedVariableItemProvider;
+
+    /**
+     * This creates an adapter for a
+     * {@link org.eclipse.sirius.viewpoint.description.TypedVariable}. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Adapter createTypedVariableAdapter() {
+        if (typedVariableItemProvider == null) {
+            typedVariableItemProvider = new TypedVariableItemProvider(this);
+        }
+
+        return typedVariableItemProvider;
+    }
+
+    /**
      * This returns the root adapter factory that contains this factory. <!--
      * begin-user-doc --> <!-- end-user-doc -->
      *
@@ -901,6 +926,9 @@ public class DescriptionItemProviderAdapterFactory extends DescriptionAdapterFac
         if (dAnnotationEntryItemProvider != null) {
             dAnnotationEntryItemProvider.dispose();
         }
+        if (typedVariableItemProvider != null) {
+            typedVariableItemProvider.dispose();
+        }
     }
 
 }
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SubVariableItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/SubVariableItemProvider.java
index 97e125b584..c1daaa0736 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SubVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/SubVariableItemProvider.java
@@ -9,7 +9,7 @@
  *    Obeo - initial API and implementation
  *
  */
-package org.eclipse.sirius.viewpoint.description.tool.provider;
+package org.eclipse.sirius.viewpoint.description.provider;
 
 import java.util.Collection;
 import java.util.List;
@@ -17,13 +17,13 @@ import java.util.List;
 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.viewpoint.description.tool.SubVariable;
+import org.eclipse.sirius.viewpoint.description.SubVariable;
 
 /**
  * This is the item provider adapter for a
- * {@link org.eclipse.sirius.viewpoint.description.tool.SubVariable} object.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
+ * {@link org.eclipse.sirius.viewpoint.description.SubVariable} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
  * @generated
  */
 public class SubVariableItemProvider extends AbstractVariableItemProvider {
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/TypedVariableItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/TypedVariableItemProvider.java
new file mode 100644
index 0000000000..b8f5ded6b6
--- /dev/null
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/TypedVariableItemProvider.java
@@ -0,0 +1,192 @@
+/*******************************************************************************
+ * Copyright (c) 2015 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.viewpoint.description.provider;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IChildCreationExtender;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
+import org.eclipse.sirius.viewpoint.description.TypedVariable;
+
+/**
+ * This is the item provider adapter for a
+ * {@link org.eclipse.sirius.viewpoint.description.TypedVariable} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class TypedVariableItemProvider 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 TypedVariableItemProvider(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);
+
+            addUserDocumentationPropertyDescriptor(object);
+            addNamePropertyDescriptor(object);
+            addDefaultValueExpressionPropertyDescriptor(object);
+            addValueTypePropertyDescriptor(object);
+        }
+        return itemPropertyDescriptors;
+    }
+
+    /**
+     * This adds a property descriptor for the User Documentation feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected void addUserDocumentationPropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_InteractiveVariableDescription_userDocumentation_feature"), //$NON-NLS-1$
+                getString("_UI_InteractiveVariableDescription_userDocumentation_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.INTERACTIVE_VARIABLE_DESCRIPTION__USER_DOCUMENTATION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    }
+
+    /**
+     * This adds a property descriptor for the Name feature. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    protected void addNamePropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_AbstractVariable_name_feature"), //$NON-NLS-1$
+                getString("_UI_AbstractVariable_name_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.ABSTRACT_VARIABLE__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    }
+
+    /**
+     * This adds a property descriptor for the Default Value Expression feature.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    protected void addDefaultValueExpressionPropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_TypedVariable_defaultValueExpression_feature"), //$NON-NLS-1$
+                getString("_UI_TypedVariable_defaultValueExpression_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.TYPED_VARIABLE__DEFAULT_VALUE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    }
+
+    /**
+     * This adds a property descriptor for the Value Type feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected void addValueTypePropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_TypedVariable_valueType_feature"), //$NON-NLS-1$
+                getString("_UI_TypedVariable_valueType_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.TYPED_VARIABLE__VALUE_TYPE, true, false, true, null, null, null));
+    }
+
+    /**
+     * This returns TypedVariable.gif. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     */
+    @Override
+    public Object getImage(Object object) {
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TypedVariable")); //$NON-NLS-1$
+    }
+
+    /**
+     * This returns the label text for the adapted class. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public String getText(Object object) {
+        String label = ((TypedVariable) object).getName();
+        return label == null || label.length() == 0 ? getString("_UI_TypedVariable_type") : //$NON-NLS-1$
+            getString("_UI_TypedVariable_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(TypedVariable.class)) {
+        case DescriptionPackage.TYPED_VARIABLE__USER_DOCUMENTATION:
+        case DescriptionPackage.TYPED_VARIABLE__NAME:
+        case DescriptionPackage.TYPED_VARIABLE__DEFAULT_VALUE_EXPRESSION:
+            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+            return;
+        }
+        super.notifyChanged(notification);
+    }
+
+    /**
+     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
+     * describing the children that can be created under this object. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+        super.collectNewChildDescriptors(newChildDescriptors, object);
+    }
+
+    /**
+     * Return the resource locator for this item provider's resources. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public ResourceLocator getResourceLocator() {
+        return ((IChildCreationExtender) adapterFactory).getResourceLocator();
+    }
+
+}
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/AcceleoVariableItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/AcceleoVariableItemProvider.java
index 5673db5db7..25383ecc03 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/AcceleoVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/AcceleoVariableItemProvider.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
 import org.eclipse.sirius.viewpoint.description.tool.AcceleoVariable;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
 
@@ -68,8 +69,7 @@ public class AcceleoVariableItemProvider extends VariableContainerItemProvider {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
                 getString("_UI_AbstractVariable_name_feature"), //$NON-NLS-1$
                 getString("_UI_AbstractVariable_name_description"), //$NON-NLS-1$
-                ToolPackage.Literals.ABSTRACT_VARIABLE__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), //$NON-NLS-1$
-                null));
+                DescriptionPackage.Literals.ABSTRACT_VARIABLE__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ContainerViewVariableItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ContainerViewVariableItemProvider.java
index 2090e3eaac..70a32a4bcb 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ContainerViewVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ContainerViewVariableItemProvider.java
@@ -19,6 +19,8 @@ import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.sirius.viewpoint.description.DescriptionFactory;
+import org.eclipse.sirius.viewpoint.description.provider.AbstractVariableItemProvider;
 import org.eclipse.sirius.viewpoint.description.tool.ContainerViewVariable;
 import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
@@ -147,6 +149,8 @@ public class ContainerViewVariableItemProvider extends AbstractVariableItemProvi
         newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, ToolFactory.eINSTANCE.createAcceleoVariable()));
 
         newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, ToolFactory.eINSTANCE.createSelectModelElementVariable()));
+
+        newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, DescriptionFactory.eINSTANCE.createTypedVariable()));
     }
 
 }
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/DialogVariableItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/DialogVariableItemProvider.java
index 3174a52337..f1f02fb47e 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/DialogVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/DialogVariableItemProvider.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.sirius.viewpoint.description.provider.AbstractVariableItemProvider;
 import org.eclipse.sirius.viewpoint.description.tool.DialogVariable;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
 
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/DropContainerVariableItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/DropContainerVariableItemProvider.java
index a223103e60..0cd4fba161 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/DropContainerVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/DropContainerVariableItemProvider.java
@@ -19,6 +19,8 @@ import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.sirius.viewpoint.description.DescriptionFactory;
+import org.eclipse.sirius.viewpoint.description.provider.AbstractVariableItemProvider;
 import org.eclipse.sirius.viewpoint.description.tool.DropContainerVariable;
 import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
@@ -147,6 +149,8 @@ public class DropContainerVariableItemProvider extends AbstractVariableItemProvi
         newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, ToolFactory.eINSTANCE.createAcceleoVariable()));
 
         newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, ToolFactory.eINSTANCE.createSelectModelElementVariable()));
+
+        newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, DescriptionFactory.eINSTANCE.createTypedVariable()));
     }
 
 }
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ElementDeleteVariableItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ElementDeleteVariableItemProvider.java
index be08740b9e..f62a0ab8cc 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ElementDeleteVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ElementDeleteVariableItemProvider.java
@@ -19,6 +19,8 @@ import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.sirius.viewpoint.description.DescriptionFactory;
+import org.eclipse.sirius.viewpoint.description.provider.AbstractVariableItemProvider;
 import org.eclipse.sirius.viewpoint.description.tool.ElementDeleteVariable;
 import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
@@ -147,6 +149,8 @@ public class ElementDeleteVariableItemProvider extends AbstractVariableItemProvi
         newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, ToolFactory.eINSTANCE.createAcceleoVariable()));
 
         newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, ToolFactory.eINSTANCE.createSelectModelElementVariable()));
+
+        newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, DescriptionFactory.eINSTANCE.createTypedVariable()));
     }
 
 }
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ElementDropVariableItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ElementDropVariableItemProvider.java
index 5a38e17789..1d6d7988f1 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ElementDropVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ElementDropVariableItemProvider.java
@@ -19,6 +19,8 @@ import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.sirius.viewpoint.description.DescriptionFactory;
+import org.eclipse.sirius.viewpoint.description.provider.AbstractVariableItemProvider;
 import org.eclipse.sirius.viewpoint.description.tool.ElementDropVariable;
 import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
@@ -147,6 +149,8 @@ public class ElementDropVariableItemProvider extends AbstractVariableItemProvide
         newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, ToolFactory.eINSTANCE.createAcceleoVariable()));
 
         newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, ToolFactory.eINSTANCE.createSelectModelElementVariable()));
+
+        newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, DescriptionFactory.eINSTANCE.createTypedVariable()));
     }
 
 }
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ElementSelectVariableItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ElementSelectVariableItemProvider.java
index f28b1e6a1d..bfd54cac0e 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ElementSelectVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ElementSelectVariableItemProvider.java
@@ -17,6 +17,7 @@ import java.util.List;
 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.viewpoint.description.provider.AbstractVariableItemProvider;
 import org.eclipse.sirius.viewpoint.description.tool.ElementSelectVariable;
 
 /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ElementVariableItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ElementVariableItemProvider.java
index 586813cbd7..29090bb79d 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ElementVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ElementVariableItemProvider.java
@@ -19,6 +19,8 @@ import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.sirius.viewpoint.description.DescriptionFactory;
+import org.eclipse.sirius.viewpoint.description.provider.AbstractVariableItemProvider;
 import org.eclipse.sirius.viewpoint.description.tool.ElementVariable;
 import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
@@ -147,6 +149,8 @@ public class ElementVariableItemProvider extends AbstractVariableItemProvider {
         newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, ToolFactory.eINSTANCE.createAcceleoVariable()));
 
         newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, ToolFactory.eINSTANCE.createSelectModelElementVariable()));
+
+        newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, DescriptionFactory.eINSTANCE.createTypedVariable()));
     }
 
 }
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ElementViewVariableItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ElementViewVariableItemProvider.java
index 29c450e329..a5c2f790a8 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ElementViewVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ElementViewVariableItemProvider.java
@@ -19,6 +19,8 @@ import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.sirius.viewpoint.description.DescriptionFactory;
+import org.eclipse.sirius.viewpoint.description.provider.AbstractVariableItemProvider;
 import org.eclipse.sirius.viewpoint.description.tool.ElementViewVariable;
 import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
@@ -147,6 +149,8 @@ public class ElementViewVariableItemProvider extends AbstractVariableItemProvide
         newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, ToolFactory.eINSTANCE.createAcceleoVariable()));
 
         newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, ToolFactory.eINSTANCE.createSelectModelElementVariable()));
+
+        newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, DescriptionFactory.eINSTANCE.createTypedVariable()));
     }
 
 }
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/NameVariableItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/NameVariableItemProvider.java
index 00829da133..51063b361a 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/NameVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/NameVariableItemProvider.java
@@ -17,6 +17,7 @@ import java.util.List;
 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.viewpoint.description.provider.AbstractVariableItemProvider;
 import org.eclipse.sirius.viewpoint.description.tool.NameVariable;
 
 /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SelectContainerVariableItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SelectContainerVariableItemProvider.java
index 9c552988b8..45b4162090 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SelectContainerVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SelectContainerVariableItemProvider.java
@@ -19,6 +19,8 @@ import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.sirius.viewpoint.description.DescriptionFactory;
+import org.eclipse.sirius.viewpoint.description.provider.AbstractVariableItemProvider;
 import org.eclipse.sirius.viewpoint.description.tool.SelectContainerVariable;
 import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
@@ -147,6 +149,8 @@ public class SelectContainerVariableItemProvider extends AbstractVariableItemPro
         newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, ToolFactory.eINSTANCE.createAcceleoVariable()));
 
         newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, ToolFactory.eINSTANCE.createSelectModelElementVariable()));
+
+        newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, DescriptionFactory.eINSTANCE.createTypedVariable()));
     }
 
 }
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SelectModelElementVariableItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SelectModelElementVariableItemProvider.java
index 97ba8d5d9a..bee8caca84 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SelectModelElementVariableItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/SelectModelElementVariableItemProvider.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
+import org.eclipse.sirius.viewpoint.description.provider.SubVariableItemProvider;
 import org.eclipse.sirius.viewpoint.description.tool.SelectModelElementVariable;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
 
@@ -59,6 +60,7 @@ public class SelectModelElementVariableItemProvider extends SubVariableItemProvi
             addRootExpressionPropertyDescriptor(object);
             addChildrenExpressionPropertyDescriptor(object);
             addMessagePropertyDescriptor(object);
+            addUserDocumentationPropertyDescriptor(object);
         }
         return itemPropertyDescriptors;
     }
@@ -148,6 +150,19 @@ public class SelectModelElementVariableItemProvider extends SubVariableItemProvi
     }
 
     /**
+     * This adds a property descriptor for the User Documentation feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected void addUserDocumentationPropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_InteractiveVariableDescription_userDocumentation_feature"), //$NON-NLS-1$
+                getString("_UI_InteractiveVariableDescription_userDocumentation_description"), //$NON-NLS-1$
+                DescriptionPackage.Literals.INTERACTIVE_VARIABLE_DESCRIPTION__USER_DOCUMENTATION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    }
+
+    /**
      * This returns SelectModelElementVariable.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      * 
@@ -190,6 +205,7 @@ public class SelectModelElementVariableItemProvider extends SubVariableItemProvi
         case ToolPackage.SELECT_MODEL_ELEMENT_VARIABLE__ROOT_EXPRESSION:
         case ToolPackage.SELECT_MODEL_ELEMENT_VARIABLE__CHILDREN_EXPRESSION:
         case ToolPackage.SELECT_MODEL_ELEMENT_VARIABLE__MESSAGE:
+        case ToolPackage.SELECT_MODEL_ELEMENT_VARIABLE__USER_DOCUMENTATION:
             fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
             return;
         }
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/VariableContainerItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/VariableContainerItemProvider.java
index 63cb9c4e89..2eca8d7189 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/VariableContainerItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/VariableContainerItemProvider.java
@@ -27,6 +27,7 @@ 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.description.DescriptionFactory;
 import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
 import org.eclipse.sirius.viewpoint.description.tool.VariableContainer;
@@ -143,6 +144,8 @@ IItemPropertySource {
         newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, ToolFactory.eINSTANCE.createAcceleoVariable()));
 
         newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, ToolFactory.eINSTANCE.createSelectModelElementVariable()));
+
+        newChildDescriptors.add(createChildParameter(ToolPackage.Literals.VARIABLE_CONTAINER__SUB_VARIABLES, DescriptionFactory.eINSTANCE.createTypedVariable()));
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/AbstractVariable.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/AbstractVariable.java
index f350afc940..eefd47e4e5 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/AbstractVariable.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/AbstractVariable.java
@@ -9,7 +9,7 @@
  *    Obeo - initial API and implementation
  *
  */
-package org.eclipse.sirius.viewpoint.description.tool;
+package org.eclipse.sirius.viewpoint.description;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -20,13 +20,12 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- * <li>
- * {@link org.eclipse.sirius.viewpoint.description.tool.AbstractVariable#getName
+ * <li>{@link org.eclipse.sirius.viewpoint.description.AbstractVariable#getName
  * <em>Name</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.sirius.viewpoint.description.tool.ToolPackage#getAbstractVariable()
+ * @see org.eclipse.sirius.viewpoint.description.DescriptionPackage#getAbstractVariable()
  * @model abstract="true"
  * @generated
  */
@@ -42,7 +41,7 @@ public interface AbstractVariable extends EObject {
      *
      * @return the value of the '<em>Name</em>' attribute.
      * @see #setName(String)
-     * @see org.eclipse.sirius.viewpoint.description.tool.ToolPackage#getAbstractVariable_Name()
+     * @see org.eclipse.sirius.viewpoint.description.DescriptionPackage#getAbstractVariable_Name()
      * @model
      * @generated
      */
@@ -50,7 +49,7 @@ public interface AbstractVariable extends EObject {
 
     /**
      * Sets the value of the '
-     * {@link org.eclipse.sirius.viewpoint.description.tool.AbstractVariable#getName
+     * {@link org.eclipse.sirius.viewpoint.description.AbstractVariable#getName
      * <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @param value
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DescriptionFactory.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DescriptionFactory.java
index 0d6e721d55..600cf17e08 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DescriptionFactory.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DescriptionFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2007, 2013 THALES GLOBAL SERVICES.
+ * Copyright (c) 2007, 2015 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
@@ -246,6 +246,15 @@ public interface DescriptionFactory extends EFactory {
     DAnnotationEntry createDAnnotationEntry();
 
     /**
+     * Returns a new object of class '<em>Typed Variable</em>'. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @return a new object of class '<em>Typed Variable</em>'.
+     * @generated
+     */
+    TypedVariable createTypedVariable();
+
+    /**
      * Returns the package supported by this factory. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * 
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DescriptionPackage.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DescriptionPackage.java
index b1237d17ab..cf6c8e9805 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DescriptionPackage.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DescriptionPackage.java
@@ -199,7 +199,7 @@ public interface DescriptionPackage extends EPackage {
     /**
      * The number of structural features of the '<em>Extension</em>' class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -677,7 +677,8 @@ public interface DescriptionPackage extends EPackage {
      * <em>Representation Extension Description</em>}' class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
      *
-     * @see org.eclipse.sirius.viewpoint.description.RepresentationExtensionDescription
+     * @see org.eclipse.sirius.viewpoint.description.
+     *      RepresentationExtensionDescription
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getRepresentationExtensionDescription()
      * @generated
      */
@@ -2150,6 +2151,154 @@ public interface DescriptionPackage extends EPackage {
 
     /**
      * The meta object id for the '
+     * {@link org.eclipse.sirius.viewpoint.description.impl.AbstractVariableImpl
+     * <em>Abstract Variable</em>}' class. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @see org.eclipse.sirius.viewpoint.description.impl.AbstractVariableImpl
+     * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getAbstractVariable()
+     * @generated
+     */
+    int ABSTRACT_VARIABLE = 44;
+
+    /**
+     * The feature id for the '<em><b>Name</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int ABSTRACT_VARIABLE__NAME = 0;
+
+    /**
+     * The number of structural features of the '<em>Abstract Variable</em>'
+     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     * @ordered
+     */
+    int ABSTRACT_VARIABLE_FEATURE_COUNT = 1;
+
+    /**
+     * The meta object id for the '
+     * {@link org.eclipse.sirius.viewpoint.description.impl.SubVariableImpl
+     * <em>Sub Variable</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @see org.eclipse.sirius.viewpoint.description.impl.SubVariableImpl
+     * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getSubVariable()
+     * @generated
+     */
+    int SUB_VARIABLE = 45;
+
+    /**
+     * The feature id for the '<em><b>Name</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int SUB_VARIABLE__NAME = DescriptionPackage.ABSTRACT_VARIABLE__NAME;
+
+    /**
+     * The number of structural features of the '<em>Sub Variable</em>' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     * @ordered
+     */
+    int SUB_VARIABLE_FEATURE_COUNT = DescriptionPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
+
+    /**
+     * The meta object id for the '
+     * {@link org.eclipse.sirius.viewpoint.description.InteractiveVariableDescription
+     * <em>Interactive Variable Description</em>}' class. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.sirius.viewpoint.description.InteractiveVariableDescription
+     * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getInteractiveVariableDescription()
+     * @generated
+     */
+    int INTERACTIVE_VARIABLE_DESCRIPTION = 46;
+
+    /**
+     * The feature id for the '<em><b>User Documentation</b></em>' attribute.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     * @ordered
+     */
+    int INTERACTIVE_VARIABLE_DESCRIPTION__USER_DOCUMENTATION = 0;
+
+    /**
+     * The number of structural features of the '
+     * <em>Interactive Variable Description</em>' class. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * 
+     * @generated
+     * @ordered
+     */
+    int INTERACTIVE_VARIABLE_DESCRIPTION_FEATURE_COUNT = 1;
+
+    /**
+     * The meta object id for the '
+     * {@link org.eclipse.sirius.viewpoint.description.impl.TypedVariableImpl
+     * <em>Typed Variable</em>}' class. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @see org.eclipse.sirius.viewpoint.description.impl.TypedVariableImpl
+     * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getTypedVariable()
+     * @generated
+     */
+    int TYPED_VARIABLE = 47;
+
+    /**
+     * The feature id for the '<em><b>User Documentation</b></em>' attribute.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     * @ordered
+     */
+    int TYPED_VARIABLE__USER_DOCUMENTATION = DescriptionPackage.INTERACTIVE_VARIABLE_DESCRIPTION__USER_DOCUMENTATION;
+
+    /**
+     * The feature id for the '<em><b>Name</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int TYPED_VARIABLE__NAME = DescriptionPackage.INTERACTIVE_VARIABLE_DESCRIPTION_FEATURE_COUNT + 0;
+
+    /**
+     * The feature id for the '<em><b>Default Value Expression</b></em>'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     * @ordered
+     */
+    int TYPED_VARIABLE__DEFAULT_VALUE_EXPRESSION = DescriptionPackage.INTERACTIVE_VARIABLE_DESCRIPTION_FEATURE_COUNT + 1;
+
+    /**
+     * The feature id for the '<em><b>Value Type</b></em>' reference. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int TYPED_VARIABLE__VALUE_TYPE = DescriptionPackage.INTERACTIVE_VARIABLE_DESCRIPTION_FEATURE_COUNT + 2;
+
+    /**
+     * The number of structural features of the '<em>Typed Variable</em>' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     * @ordered
+     */
+    int TYPED_VARIABLE_FEATURE_COUNT = DescriptionPackage.INTERACTIVE_VARIABLE_DESCRIPTION_FEATURE_COUNT + 3;
+
+    /**
+     * The meta object id for the '
      * {@link org.eclipse.sirius.viewpoint.description.Position
      * <em>Position</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
@@ -2157,7 +2306,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getPosition()
      * @generated
      */
-    int POSITION = 44;
+    int POSITION = 48;
 
     /**
      * The meta object id for the '
@@ -2169,7 +2318,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getSystemColors()
      * @generated
      */
-    int SYSTEM_COLORS = 45;
+    int SYSTEM_COLORS = 49;
 
     /**
      * The meta object id for the '<em>Type Name</em>' data type. <!--
@@ -2179,7 +2328,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getTypeName()
      * @generated
      */
-    int TYPE_NAME = 46;
+    int TYPE_NAME = 50;
 
     /**
      * The meta object id for the '<em>Interpreted Expression</em>' data type.
@@ -2189,7 +2338,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getInterpretedExpression()
      * @generated
      */
-    int INTERPRETED_EXPRESSION = 47;
+    int INTERPRETED_EXPRESSION = 51;
 
     /**
      * The meta object id for the '<em>Feature Name</em>' data type. <!--
@@ -2199,7 +2348,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getFeatureName()
      * @generated
      */
-    int FEATURE_NAME = 48;
+    int FEATURE_NAME = 52;
 
     /**
      * The meta object id for the '<em>Image Path</em>' data type. <!--
@@ -2209,7 +2358,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getImagePath()
      * @generated
      */
-    int IMAGE_PATH = 49;
+    int IMAGE_PATH = 53;
 
     /**
      * The meta object id for the '<em>URI</em>' data type. <!-- begin-user-doc
@@ -2219,7 +2368,7 @@ public interface DescriptionPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getURI()
      * @generated
      */
-    int URI = 50;
+    int URI = 54;
 
     /**
      * Returns the meta object for class '
@@ -3892,6 +4041,104 @@ public interface DescriptionPackage extends EPackage {
     EAttribute getDAnnotationEntry_Details();
 
     /**
+     * Returns the meta object for class '
+     * {@link org.eclipse.sirius.viewpoint.description.AbstractVariable
+     * <em>Abstract Variable</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @return the meta object for class '<em>Abstract Variable</em>'.
+     * @see org.eclipse.sirius.viewpoint.description.AbstractVariable
+     * @generated
+     */
+    EClass getAbstractVariable();
+
+    /**
+     * Returns the meta object for the attribute '
+     * {@link org.eclipse.sirius.viewpoint.description.AbstractVariable#getName
+     * <em>Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @return the meta object for the attribute '<em>Name</em>'.
+     * @see org.eclipse.sirius.viewpoint.description.AbstractVariable#getName()
+     * @see #getAbstractVariable()
+     * @generated
+     */
+    EAttribute getAbstractVariable_Name();
+
+    /**
+     * Returns the meta object for class '
+     * {@link org.eclipse.sirius.viewpoint.description.SubVariable
+     * <em>Sub Variable</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @return the meta object for class '<em>Sub Variable</em>'.
+     * @see org.eclipse.sirius.viewpoint.description.SubVariable
+     * @generated
+     */
+    EClass getSubVariable();
+
+    /**
+     * Returns the meta object for class '
+     * {@link org.eclipse.sirius.viewpoint.description.InteractiveVariableDescription
+     * <em>Interactive Variable Description</em>}'. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @return the meta object for class '
+     *         <em>Interactive Variable Description</em>'.
+     * @see org.eclipse.sirius.viewpoint.description.InteractiveVariableDescription
+     * @generated
+     */
+    EClass getInteractiveVariableDescription();
+
+    /**
+     * Returns the meta object for the attribute '
+     * {@link org.eclipse.sirius.viewpoint.description.InteractiveVariableDescription#getUserDocumentation
+     * <em>User Documentation</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @return the meta object for the attribute '<em>User Documentation</em>'.
+     * @see org.eclipse.sirius.viewpoint.description.InteractiveVariableDescription#getUserDocumentation()
+     * @see #getInteractiveVariableDescription()
+     * @generated
+     */
+    EAttribute getInteractiveVariableDescription_UserDocumentation();
+
+    /**
+     * Returns the meta object for class '
+     * {@link org.eclipse.sirius.viewpoint.description.TypedVariable
+     * <em>Typed Variable</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @return the meta object for class '<em>Typed Variable</em>'.
+     * @see org.eclipse.sirius.viewpoint.description.TypedVariable
+     * @generated
+     */
+    EClass getTypedVariable();
+
+    /**
+     * Returns the meta object for the attribute '
+     * {@link org.eclipse.sirius.viewpoint.description.TypedVariable#getDefaultValueExpression
+     * <em>Default Value Expression</em>}'. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @return the meta object for the attribute '
+     *         <em>Default Value Expression</em>'.
+     * @see org.eclipse.sirius.viewpoint.description.TypedVariable#getDefaultValueExpression()
+     * @see #getTypedVariable()
+     * @generated
+     */
+    EAttribute getTypedVariable_DefaultValueExpression();
+
+    /**
+     * Returns the meta object for the reference '
+     * {@link org.eclipse.sirius.viewpoint.description.TypedVariable#getValueType
+     * <em>Value Type</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @return the meta object for the reference '<em>Value Type</em>'.
+     * @see org.eclipse.sirius.viewpoint.description.TypedVariable#getValueType()
+     * @see #getTypedVariable()
+     * @generated
+     */
+    EReference getTypedVariable_ValueType();
+
+    /**
      * Returns the meta object for enum '
      * {@link org.eclipse.sirius.viewpoint.description.Position
      * <em>Position</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -4061,7 +4308,7 @@ public interface DescriptionPackage extends EPackage {
          * {@link org.eclipse.sirius.viewpoint.description.Extension
          * <em>Extension</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc
          * -->
-         * 
+         *
          * @see org.eclipse.sirius.viewpoint.description.Extension
          * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getExtension()
          * @generated
@@ -4286,7 +4533,8 @@ public interface DescriptionPackage extends EPackage {
          * <em>Representation Import Description</em>}' class. <!--
          * begin-user-doc --> <!-- end-user-doc -->
          *
-         * @see org.eclipse.sirius.viewpoint.description.RepresentationImportDescription
+         * @see org.eclipse.sirius.viewpoint.description.
+         *      RepresentationImportDescription
          * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getRepresentationImportDescription()
          * @generated
          */
@@ -4298,7 +4546,8 @@ public interface DescriptionPackage extends EPackage {
          * <em>Representation Extension Description</em>}' class. <!--
          * begin-user-doc --> <!-- end-user-doc -->
          *
-         * @see org.eclipse.sirius.viewpoint.description.RepresentationExtensionDescription
+         * @see org.eclipse.sirius.viewpoint.description.
+         *      RepresentationExtensionDescription
          * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getRepresentationExtensionDescription()
          * @generated
          */
@@ -4725,7 +4974,8 @@ public interface DescriptionPackage extends EPackage {
          * <em>EStructural Feature Customization</em>}' class. <!--
          * begin-user-doc --> <!-- end-user-doc -->
          *
-         * @see org.eclipse.sirius.viewpoint.description.impl.EStructuralFeatureCustomizationImpl
+         * @see org.eclipse.sirius.viewpoint.description.impl.
+         *      EStructuralFeatureCustomizationImpl
          * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getEStructuralFeatureCustomization()
          * @generated
          */
@@ -5270,6 +5520,88 @@ public interface DescriptionPackage extends EPackage {
 
         /**
          * The meta object literal for the '
+         * {@link org.eclipse.sirius.viewpoint.description.impl.AbstractVariableImpl
+         * <em>Abstract Variable</em>}' class. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         * 
+         * @see org.eclipse.sirius.viewpoint.description.impl.AbstractVariableImpl
+         * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getAbstractVariable()
+         * @generated
+         */
+        EClass ABSTRACT_VARIABLE = DescriptionPackage.eINSTANCE.getAbstractVariable();
+
+        /**
+         * The meta object literal for the '<em><b>Name</b></em>' attribute
+         * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
+         * @generated
+         */
+        EAttribute ABSTRACT_VARIABLE__NAME = DescriptionPackage.eINSTANCE.getAbstractVariable_Name();
+
+        /**
+         * The meta object literal for the '
+         * {@link org.eclipse.sirius.viewpoint.description.impl.SubVariableImpl
+         * <em>Sub Variable</em>}' class. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         * 
+         * @see org.eclipse.sirius.viewpoint.description.impl.SubVariableImpl
+         * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getSubVariable()
+         * @generated
+         */
+        EClass SUB_VARIABLE = DescriptionPackage.eINSTANCE.getSubVariable();
+
+        /**
+         * The meta object literal for the '
+         * {@link org.eclipse.sirius.viewpoint.description.InteractiveVariableDescription
+         * <em>Interactive Variable Description</em>}' class. <!--
+         * begin-user-doc --> <!-- end-user-doc -->
+         *
+         * @see org.eclipse.sirius.viewpoint.description.
+         *      InteractiveVariableDescription
+         * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getInteractiveVariableDescription()
+         * @generated
+         */
+        EClass INTERACTIVE_VARIABLE_DESCRIPTION = DescriptionPackage.eINSTANCE.getInteractiveVariableDescription();
+
+        /**
+         * The meta object literal for the '<em><b>User Documentation</b></em>'
+         * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
+         * @generated
+         */
+        EAttribute INTERACTIVE_VARIABLE_DESCRIPTION__USER_DOCUMENTATION = DescriptionPackage.eINSTANCE.getInteractiveVariableDescription_UserDocumentation();
+
+        /**
+         * The meta object literal for the '
+         * {@link org.eclipse.sirius.viewpoint.description.impl.TypedVariableImpl
+         * <em>Typed Variable</em>}' class. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         * 
+         * @see org.eclipse.sirius.viewpoint.description.impl.TypedVariableImpl
+         * @see org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl#getTypedVariable()
+         * @generated
+         */
+        EClass TYPED_VARIABLE = DescriptionPackage.eINSTANCE.getTypedVariable();
+
+        /**
+         * The meta object literal for the '
+         * <em><b>Default Value Expression</b></em>' attribute feature. <!--
+         * begin-user-doc --> <!-- end-user-doc -->
+         *
+         * @generated
+         */
+        EAttribute TYPED_VARIABLE__DEFAULT_VALUE_EXPRESSION = DescriptionPackage.eINSTANCE.getTypedVariable_DefaultValueExpression();
+
+        /**
+         * The meta object literal for the '<em><b>Value Type</b></em>'
+         * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
+         * @generated
+         */
+        EReference TYPED_VARIABLE__VALUE_TYPE = DescriptionPackage.eINSTANCE.getTypedVariable_ValueType();
+
+        /**
+         * The meta object literal for the '
          * {@link org.eclipse.sirius.viewpoint.description.Position
          * <em>Position</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc
          * -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/InteractiveVariableDescription.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/InteractiveVariableDescription.java
new file mode 100644
index 0000000000..72ce147ada
--- /dev/null
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/InteractiveVariableDescription.java
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (c) 2015 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.viewpoint.description;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Interactive Variable Description</b></em>'. <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc --> This interface represents a variable which value is
+ * given by the user. <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>
+ * {@link org.eclipse.sirius.viewpoint.description.InteractiveVariableDescription#getUserDocumentation
+ * <em>User Documentation</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.sirius.viewpoint.description.DescriptionPackage#getInteractiveVariableDescription()
+ * @model interface="true" abstract="true"
+ * @generated
+ */
+public interface InteractiveVariableDescription extends EObject {
+    /**
+     * Returns the value of the '<em><b>User Documentation</b></em>' attribute.
+     * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> A
+     * documentation that is displayed to the user. <!-- end-model-doc -->
+     *
+     * @return the value of the '<em>User Documentation</em>' attribute.
+     * @see #setUserDocumentation(String)
+     * @see org.eclipse.sirius.viewpoint.description.DescriptionPackage#getInteractiveVariableDescription_UserDocumentation()
+     * @model
+     * @generated
+     */
+    String getUserDocumentation();
+
+    /**
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.viewpoint.description.InteractiveVariableDescription#getUserDocumentation
+     * <em>User Documentation</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @param value
+     *            the new value of the '<em>User Documentation</em>' attribute.
+     * @see #getUserDocumentation()
+     * @generated
+     */
+    void setUserDocumentation(String value);
+
+} // InteractiveVariableDescription
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/SubVariable.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/SubVariable.java
index bf6c7f23a3..57a5a3631b 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/SubVariable.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/SubVariable.java
@@ -4,19 +4,19 @@
  * 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.description.tool;
+package org.eclipse.sirius.viewpoint.description;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Sub Variable</b></em>'. <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.sirius.viewpoint.description.tool.ToolPackage#getSubVariable()
+ * @see org.eclipse.sirius.viewpoint.description.DescriptionPackage#getSubVariable()
  * @model abstract="true"
  * @generated
  */
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/TypedVariable.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/TypedVariable.java
new file mode 100644
index 0000000000..7535547233
--- /dev/null
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/TypedVariable.java
@@ -0,0 +1,97 @@
+/*******************************************************************************
+ * Copyright (c) 2015 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.viewpoint.description;
+
+import org.eclipse.emf.ecore.EDataType;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Typed Variable</b></em>'. <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>
+ * {@link org.eclipse.sirius.viewpoint.description.TypedVariable#getDefaultValueExpression
+ * <em>Default Value Expression</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.viewpoint.description.TypedVariable#getValueType
+ * <em>Value Type</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.sirius.viewpoint.description.DescriptionPackage#getTypedVariable()
+ * @model
+ * @generated
+ */
+public interface TypedVariable extends InteractiveVariableDescription, SubVariable {
+    /**
+     * Returns the value of the '<em><b>Default Value Expression</b></em>'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+     * begin-model-doc --> An expression used to define the default variable
+     * value. <!-- end-model-doc -->
+     *
+     * @return the value of the '<em>Default Value Expression</em>' attribute.
+     * @see #setDefaultValueExpression(String)
+     * @see org.eclipse.sirius.viewpoint.description.DescriptionPackage#getTypedVariable_DefaultValueExpression()
+     * @model dataType=
+     *        "org.eclipse.sirius.viewpoint.description.InterpretedExpression"
+     *        annotation=
+     *        "http://www.eclipse.org/sirius/interpreted/expression/returnType returnType='Must return an instance of type valueType.'"
+     * @generated
+     */
+    String getDefaultValueExpression();
+
+    /**
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.viewpoint.description.TypedVariable#getDefaultValueExpression
+     * <em>Default Value Expression</em>}' attribute. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * 
+     * @param value
+     *            the new value of the '<em>Default Value Expression</em>'
+     *            attribute.
+     * @see #getDefaultValueExpression()
+     * @generated
+     */
+    void setDefaultValueExpression(String value);
+
+    /**
+     * Returns the value of the '<em><b>Value Type</b></em>' reference. <!--
+     * begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Value Type</em>' reference isn't clear, there
+     * really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     *
+     * @return the value of the '<em>Value Type</em>' reference.
+     * @see #setValueType(EDataType)
+     * @see org.eclipse.sirius.viewpoint.description.DescriptionPackage#getTypedVariable_ValueType()
+     * @model required="true"
+     * @generated
+     */
+    EDataType getValueType();
+
+    /**
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.viewpoint.description.TypedVariable#getValueType
+     * <em>Value Type</em>}' reference. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @param value
+     *            the new value of the '<em>Value Type</em>' reference.
+     * @see #getValueType()
+     * @generated
+     */
+    void setValueType(EDataType value);
+
+} // TypedVariable
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/AbstractVariableImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/AbstractVariableImpl.java
index 08335e9344..cdd9653feb 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/AbstractVariableImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/AbstractVariableImpl.java
@@ -9,14 +9,14 @@
  *    Obeo - initial API and implementation
  *
  */
-package org.eclipse.sirius.viewpoint.description.tool.impl;
+package org.eclipse.sirius.viewpoint.description.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.description.tool.AbstractVariable;
-import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '
@@ -25,7 +25,7 @@ import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
  * The following features are implemented:
  * <ul>
  * <li>
- * {@link org.eclipse.sirius.viewpoint.description.tool.impl.AbstractVariableImpl#getName
+ * {@link org.eclipse.sirius.viewpoint.description.impl.AbstractVariableImpl#getName
  * <em>Name</em>}</li>
  * </ul>
  * </p>
@@ -69,7 +69,7 @@ public abstract class AbstractVariableImpl extends MinimalEObjectImpl.Container
      */
     @Override
     protected EClass eStaticClass() {
-        return ToolPackage.Literals.ABSTRACT_VARIABLE;
+        return DescriptionPackage.Literals.ABSTRACT_VARIABLE;
     }
 
     /**
@@ -92,7 +92,7 @@ public abstract class AbstractVariableImpl extends MinimalEObjectImpl.Container
         String oldName = name;
         name = newName;
         if (eNotificationRequired()) {
-            eNotify(new ENotificationImpl(this, Notification.SET, ToolPackage.ABSTRACT_VARIABLE__NAME, oldName, name));
+            eNotify(new ENotificationImpl(this, Notification.SET, DescriptionPackage.ABSTRACT_VARIABLE__NAME, oldName, name));
         }
     }
 
@@ -104,7 +104,7 @@ public abstract class AbstractVariableImpl extends MinimalEObjectImpl.Container
     @Override
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
-        case ToolPackage.ABSTRACT_VARIABLE__NAME:
+        case DescriptionPackage.ABSTRACT_VARIABLE__NAME:
             return getName();
         }
         return super.eGet(featureID, resolve, coreType);
@@ -118,7 +118,7 @@ public abstract class AbstractVariableImpl extends MinimalEObjectImpl.Container
     @Override
     public void eSet(int featureID, Object newValue) {
         switch (featureID) {
-        case ToolPackage.ABSTRACT_VARIABLE__NAME:
+        case DescriptionPackage.ABSTRACT_VARIABLE__NAME:
             setName((String) newValue);
             return;
         }
@@ -133,7 +133,7 @@ public abstract class AbstractVariableImpl extends MinimalEObjectImpl.Container
     @Override
     public void eUnset(int featureID) {
         switch (featureID) {
-        case ToolPackage.ABSTRACT_VARIABLE__NAME:
+        case DescriptionPackage.ABSTRACT_VARIABLE__NAME:
             setName(AbstractVariableImpl.NAME_EDEFAULT);
             return;
         }
@@ -148,7 +148,7 @@ public abstract class AbstractVariableImpl extends MinimalEObjectImpl.Container
     @Override
     public boolean eIsSet(int featureID) {
         switch (featureID) {
-        case ToolPackage.ABSTRACT_VARIABLE__NAME:
+        case DescriptionPackage.ABSTRACT_VARIABLE__NAME:
             return AbstractVariableImpl.NAME_EDEFAULT == null ? name != null : !AbstractVariableImpl.NAME_EDEFAULT.equals(name);
         }
         return super.eIsSet(featureID);
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DescriptionFactoryImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DescriptionFactoryImpl.java
index cb736afa17..d45ac100ae 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DescriptionFactoryImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DescriptionFactoryImpl.java
@@ -50,6 +50,7 @@ import org.eclipse.sirius.viewpoint.description.SemanticBasedDecoration;
 import org.eclipse.sirius.viewpoint.description.SystemColor;
 import org.eclipse.sirius.viewpoint.description.SystemColors;
 import org.eclipse.sirius.viewpoint.description.SytemColorsPalette;
+import org.eclipse.sirius.viewpoint.description.TypedVariable;
 import org.eclipse.sirius.viewpoint.description.UserColorsPalette;
 import org.eclipse.sirius.viewpoint.description.UserFixedColor;
 import org.eclipse.sirius.viewpoint.description.VSMElementCustomization;
@@ -147,6 +148,8 @@ public class DescriptionFactoryImpl extends EFactoryImpl implements DescriptionF
             return createComputedColor();
         case DescriptionPackage.DANNOTATION_ENTRY:
             return createDAnnotationEntry();
+        case DescriptionPackage.TYPED_VARIABLE:
+            return createTypedVariable();
         default:
             throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
         }
@@ -485,6 +488,17 @@ public class DescriptionFactoryImpl extends EFactoryImpl implements DescriptionF
      * 
      * @generated
      */
+    @Override
+    public TypedVariable createTypedVariable() {
+        TypedVariableImpl typedVariable = new TypedVariableImpl();
+        return typedVariable;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
     public Position createPositionFromString(EDataType eDataType, String initialValue) {
         Position result = Position.get(initialValue);
         if (result == null) {
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DescriptionPackageImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DescriptionPackageImpl.java
index 6bff2c08fc..40591652dc 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DescriptionPackageImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DescriptionPackageImpl.java
@@ -22,6 +22,7 @@ import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
 import org.eclipse.sirius.viewpoint.description.AbstractMappingImport;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.AnnotationEntry;
 import org.eclipse.sirius.viewpoint.description.ColorDescription;
 import org.eclipse.sirius.viewpoint.description.ColorStep;
@@ -48,6 +49,7 @@ import org.eclipse.sirius.viewpoint.description.FixedColor;
 import org.eclipse.sirius.viewpoint.description.Group;
 import org.eclipse.sirius.viewpoint.description.IVSMElementCustomization;
 import org.eclipse.sirius.viewpoint.description.IdentifiedElement;
+import org.eclipse.sirius.viewpoint.description.InteractiveVariableDescription;
 import org.eclipse.sirius.viewpoint.description.InterpolatedColor;
 import org.eclipse.sirius.viewpoint.description.JavaExtension;
 import org.eclipse.sirius.viewpoint.description.MetamodelExtensionSetting;
@@ -60,9 +62,11 @@ import org.eclipse.sirius.viewpoint.description.RepresentationImportDescription;
 import org.eclipse.sirius.viewpoint.description.RepresentationTemplate;
 import org.eclipse.sirius.viewpoint.description.SelectionDescription;
 import org.eclipse.sirius.viewpoint.description.SemanticBasedDecoration;
+import org.eclipse.sirius.viewpoint.description.SubVariable;
 import org.eclipse.sirius.viewpoint.description.SystemColor;
 import org.eclipse.sirius.viewpoint.description.SystemColors;
 import org.eclipse.sirius.viewpoint.description.SytemColorsPalette;
+import org.eclipse.sirius.viewpoint.description.TypedVariable;
 import org.eclipse.sirius.viewpoint.description.UserColor;
 import org.eclipse.sirius.viewpoint.description.UserColorsPalette;
 import org.eclipse.sirius.viewpoint.description.UserFixedColor;
@@ -399,6 +403,34 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
      * 
      * @generated
      */
+    private EClass abstractVariableEClass = null;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    private EClass subVariableEClass = null;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    private EClass interactiveVariableDescriptionEClass = null;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    private EClass typedVariableEClass = null;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
     private EEnum positionEEnum = null;
 
     /**
@@ -1880,6 +1912,86 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
      * @generated
      */
     @Override
+    public EClass getAbstractVariable() {
+        return abstractVariableEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public EAttribute getAbstractVariable_Name() {
+        return (EAttribute) abstractVariableEClass.getEStructuralFeatures().get(0);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public EClass getSubVariable() {
+        return subVariableEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public EClass getInteractiveVariableDescription() {
+        return interactiveVariableDescriptionEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public EAttribute getInteractiveVariableDescription_UserDocumentation() {
+        return (EAttribute) interactiveVariableDescriptionEClass.getEStructuralFeatures().get(0);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public EClass getTypedVariable() {
+        return typedVariableEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public EAttribute getTypedVariable_DefaultValueExpression() {
+        return (EAttribute) typedVariableEClass.getEStructuralFeatures().get(0);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public EReference getTypedVariable_ValueType() {
+        return (EReference) typedVariableEClass.getEStructuralFeatures().get(1);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
     public EEnum getPosition() {
         return positionEEnum;
     }
@@ -2153,6 +2265,18 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
         createEAttribute(dAnnotationEntryEClass, DescriptionPackage.DANNOTATION_ENTRY__SOURCE);
         createEAttribute(dAnnotationEntryEClass, DescriptionPackage.DANNOTATION_ENTRY__DETAILS);
 
+        abstractVariableEClass = createEClass(DescriptionPackage.ABSTRACT_VARIABLE);
+        createEAttribute(abstractVariableEClass, DescriptionPackage.ABSTRACT_VARIABLE__NAME);
+
+        subVariableEClass = createEClass(DescriptionPackage.SUB_VARIABLE);
+
+        interactiveVariableDescriptionEClass = createEClass(DescriptionPackage.INTERACTIVE_VARIABLE_DESCRIPTION);
+        createEAttribute(interactiveVariableDescriptionEClass, DescriptionPackage.INTERACTIVE_VARIABLE_DESCRIPTION__USER_DOCUMENTATION);
+
+        typedVariableEClass = createEClass(DescriptionPackage.TYPED_VARIABLE);
+        createEAttribute(typedVariableEClass, DescriptionPackage.TYPED_VARIABLE__DEFAULT_VALUE_EXPRESSION);
+        createEReference(typedVariableEClass, DescriptionPackage.TYPED_VARIABLE__VALUE_TYPE);
+
         // Create enums
         positionEEnum = createEEnum(DescriptionPackage.POSITION);
         systemColorsEEnum = createEEnum(DescriptionPackage.SYSTEM_COLORS);
@@ -2232,6 +2356,9 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
         userFixedColorEClass.getESuperTypes().add(this.getUserColor());
         computedColorEClass.getESuperTypes().add(this.getUserColor());
         computedColorEClass.getESuperTypes().add(this.getColorDescription());
+        subVariableEClass.getESuperTypes().add(this.getAbstractVariable());
+        typedVariableEClass.getESuperTypes().add(this.getInteractiveVariableDescription());
+        typedVariableEClass.getESuperTypes().add(this.getSubVariable());
 
         // Initialize classes and features; add operations and parameters
         initEClass(groupEClass, Group.class, "Group", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
@@ -2753,6 +2880,32 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
                 theEcorePackage.getEString(),
                 "details", null, 0, -1, DAnnotationEntry.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
 
+        initEClass(abstractVariableEClass, AbstractVariable.class, "AbstractVariable", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getAbstractVariable_Name(),
+                theEcorePackage.getEString(),
+                "name", null, 0, 1, AbstractVariable.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(subVariableEClass, SubVariable.class, "SubVariable", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+        initEClass(interactiveVariableDescriptionEClass, InteractiveVariableDescription.class,
+                "InteractiveVariableDescription", EPackageImpl.IS_ABSTRACT, EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getInteractiveVariableDescription_UserDocumentation(),
+                theEcorePackage.getEString(),
+                "userDocumentation", null, 0, 1, InteractiveVariableDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
+        initEClass(typedVariableEClass, TypedVariable.class, "TypedVariable", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+        initEAttribute(
+                getTypedVariable_DefaultValueExpression(),
+                this.getInterpretedExpression(),
+                "defaultValueExpression", null, 0, 1, TypedVariable.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+        initEReference(
+                getTypedVariable_ValueType(),
+                theEcorePackage.getEDataType(),
+                null,
+                "valueType", null, 1, 1, TypedVariable.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
+
         // Initialize enums and add enum literals
         initEEnum(positionEEnum, Position.class, "Position"); //$NON-NLS-1$
         addEEnumLiteral(positionEEnum, Position.NORTH_LITERAL);
@@ -2847,6 +3000,8 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
         });
         addAnnotation(getComputedColor_Blue(), source, new String[] { "returnType", "an integer." //$NON-NLS-1$ //$NON-NLS-2$
         });
+        addAnnotation(getTypedVariable_DefaultValueExpression(), source, new String[] { "returnType", "Must return an instance of type valueType." //$NON-NLS-1$ //$NON-NLS-2$
+        });
     }
 
     /**
@@ -2893,6 +3048,8 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
         addAnnotation(getComputedColor_Red(), source, new String[] {});
         addAnnotation(getComputedColor_Green(), source, new String[] {});
         addAnnotation(getComputedColor_Blue(), source, new String[] {});
+        addAnnotation(getTypedVariable_DefaultValueExpression(), source, new String[] { "diagram", "diagram.DDiagram | the current DDiagram." //$NON-NLS-1$ //$NON-NLS-2$
+        });
     }
 
 } // DescriptionPackageImpl
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/SubVariableImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/SubVariableImpl.java
index 01979352d0..2582d98a0d 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/SubVariableImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/SubVariableImpl.java
@@ -9,11 +9,11 @@
  *    Obeo - initial API and implementation
  *
  */
-package org.eclipse.sirius.viewpoint.description.tool.impl;
+package org.eclipse.sirius.viewpoint.description.impl;
 
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.sirius.viewpoint.description.tool.SubVariable;
-import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
+import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
+import org.eclipse.sirius.viewpoint.description.SubVariable;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '
@@ -40,7 +40,7 @@ public abstract class SubVariableImpl extends AbstractVariableImpl implements Su
      */
     @Override
     protected EClass eStaticClass() {
-        return ToolPackage.Literals.SUB_VARIABLE;
+        return DescriptionPackage.Literals.SUB_VARIABLE;
     }
 
 } // SubVariableImpl
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/TypedVariableImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/TypedVariableImpl.java
new file mode 100644
index 0000000000..5823c479c1
--- /dev/null
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/TypedVariableImpl.java
@@ -0,0 +1,416 @@
+/*******************************************************************************
+ * Copyright (c) 2015 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.viewpoint.description.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+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.description.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
+import org.eclipse.sirius.viewpoint.description.SubVariable;
+import org.eclipse.sirius.viewpoint.description.TypedVariable;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Typed Variable</b></em>'. <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>
+ * {@link org.eclipse.sirius.viewpoint.description.impl.TypedVariableImpl#getUserDocumentation
+ * <em>User Documentation</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.viewpoint.description.impl.TypedVariableImpl#getName
+ * <em>Name</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.viewpoint.description.impl.TypedVariableImpl#getDefaultValueExpression
+ * <em>Default Value Expression</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.viewpoint.description.impl.TypedVariableImpl#getValueType
+ * <em>Value Type</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class TypedVariableImpl extends MinimalEObjectImpl.Container implements TypedVariable {
+    /**
+     * The default value of the '{@link #getUserDocumentation()
+     * <em>User Documentation</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @see #getUserDocumentation()
+     * @generated
+     * @ordered
+     */
+    protected static final String USER_DOCUMENTATION_EDEFAULT = null;
+
+    /**
+     * The cached value of the '{@link #getUserDocumentation()
+     * <em>User Documentation</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @see #getUserDocumentation()
+     * @generated
+     * @ordered
+     */
+    protected String userDocumentation = TypedVariableImpl.USER_DOCUMENTATION_EDEFAULT;
+
+    /**
+     * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see #getName()
+     * @generated
+     * @ordered
+     */
+    protected static final String NAME_EDEFAULT = null;
+
+    /**
+     * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see #getName()
+     * @generated
+     * @ordered
+     */
+    protected String name = TypedVariableImpl.NAME_EDEFAULT;
+
+    /**
+     * The default value of the '{@link #getDefaultValueExpression()
+     * <em>Default Value Expression</em>}' attribute. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * 
+     * @see #getDefaultValueExpression()
+     * @generated
+     * @ordered
+     */
+    protected static final String DEFAULT_VALUE_EXPRESSION_EDEFAULT = null;
+
+    /**
+     * The cached value of the '{@link #getDefaultValueExpression()
+     * <em>Default Value Expression</em>}' attribute. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * 
+     * @see #getDefaultValueExpression()
+     * @generated
+     * @ordered
+     */
+    protected String defaultValueExpression = TypedVariableImpl.DEFAULT_VALUE_EXPRESSION_EDEFAULT;
+
+    /**
+     * The cached value of the '{@link #getValueType() <em>Value Type</em>}'
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see #getValueType()
+     * @generated
+     * @ordered
+     */
+    protected EDataType valueType;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    protected TypedVariableImpl() {
+        super();
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    protected EClass eStaticClass() {
+        return DescriptionPackage.Literals.TYPED_VARIABLE;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public String getUserDocumentation() {
+        return userDocumentation;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public void setUserDocumentation(String newUserDocumentation) {
+        String oldUserDocumentation = userDocumentation;
+        userDocumentation = newUserDocumentation;
+        if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, DescriptionPackage.TYPED_VARIABLE__USER_DOCUMENTATION, oldUserDocumentation, userDocumentation));
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public void setName(String newName) {
+        String oldName = name;
+        name = newName;
+        if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, DescriptionPackage.TYPED_VARIABLE__NAME, oldName, name));
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public String getDefaultValueExpression() {
+        return defaultValueExpression;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public void setDefaultValueExpression(String newDefaultValueExpression) {
+        String oldDefaultValueExpression = defaultValueExpression;
+        defaultValueExpression = newDefaultValueExpression;
+        if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, DescriptionPackage.TYPED_VARIABLE__DEFAULT_VALUE_EXPRESSION, oldDefaultValueExpression, defaultValueExpression));
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public EDataType getValueType() {
+        if (valueType != null && valueType.eIsProxy()) {
+            InternalEObject oldValueType = (InternalEObject) valueType;
+            valueType = (EDataType) eResolveProxy(oldValueType);
+            if (valueType != oldValueType) {
+                if (eNotificationRequired()) {
+                    eNotify(new ENotificationImpl(this, Notification.RESOLVE, DescriptionPackage.TYPED_VARIABLE__VALUE_TYPE, oldValueType, valueType));
+                }
+            }
+        }
+        return valueType;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    public EDataType basicGetValueType() {
+        return valueType;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public void setValueType(EDataType newValueType) {
+        EDataType oldValueType = valueType;
+        valueType = newValueType;
+        if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, DescriptionPackage.TYPED_VARIABLE__VALUE_TYPE, oldValueType, valueType));
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+        switch (featureID) {
+        case DescriptionPackage.TYPED_VARIABLE__USER_DOCUMENTATION:
+            return getUserDocumentation();
+        case DescriptionPackage.TYPED_VARIABLE__NAME:
+            return getName();
+        case DescriptionPackage.TYPED_VARIABLE__DEFAULT_VALUE_EXPRESSION:
+            return getDefaultValueExpression();
+        case DescriptionPackage.TYPED_VARIABLE__VALUE_TYPE:
+            if (resolve) {
+                return getValueType();
+            }
+            return basicGetValueType();
+        }
+        return super.eGet(featureID, resolve, coreType);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public void eSet(int featureID, Object newValue) {
+        switch (featureID) {
+        case DescriptionPackage.TYPED_VARIABLE__USER_DOCUMENTATION:
+            setUserDocumentation((String) newValue);
+            return;
+        case DescriptionPackage.TYPED_VARIABLE__NAME:
+            setName((String) newValue);
+            return;
+        case DescriptionPackage.TYPED_VARIABLE__DEFAULT_VALUE_EXPRESSION:
+            setDefaultValueExpression((String) newValue);
+            return;
+        case DescriptionPackage.TYPED_VARIABLE__VALUE_TYPE:
+            setValueType((EDataType) newValue);
+            return;
+        }
+        super.eSet(featureID, newValue);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public void eUnset(int featureID) {
+        switch (featureID) {
+        case DescriptionPackage.TYPED_VARIABLE__USER_DOCUMENTATION:
+            setUserDocumentation(TypedVariableImpl.USER_DOCUMENTATION_EDEFAULT);
+            return;
+        case DescriptionPackage.TYPED_VARIABLE__NAME:
+            setName(TypedVariableImpl.NAME_EDEFAULT);
+            return;
+        case DescriptionPackage.TYPED_VARIABLE__DEFAULT_VALUE_EXPRESSION:
+            setDefaultValueExpression(TypedVariableImpl.DEFAULT_VALUE_EXPRESSION_EDEFAULT);
+            return;
+        case DescriptionPackage.TYPED_VARIABLE__VALUE_TYPE:
+            setValueType((EDataType) null);
+            return;
+        }
+        super.eUnset(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public boolean eIsSet(int featureID) {
+        switch (featureID) {
+        case DescriptionPackage.TYPED_VARIABLE__USER_DOCUMENTATION:
+            return TypedVariableImpl.USER_DOCUMENTATION_EDEFAULT == null ? userDocumentation != null : !TypedVariableImpl.USER_DOCUMENTATION_EDEFAULT.equals(userDocumentation);
+        case DescriptionPackage.TYPED_VARIABLE__NAME:
+            return TypedVariableImpl.NAME_EDEFAULT == null ? name != null : !TypedVariableImpl.NAME_EDEFAULT.equals(name);
+        case DescriptionPackage.TYPED_VARIABLE__DEFAULT_VALUE_EXPRESSION:
+            return TypedVariableImpl.DEFAULT_VALUE_EXPRESSION_EDEFAULT == null ? defaultValueExpression != null : !TypedVariableImpl.DEFAULT_VALUE_EXPRESSION_EDEFAULT.equals(defaultValueExpression);
+        case DescriptionPackage.TYPED_VARIABLE__VALUE_TYPE:
+            return valueType != null;
+        }
+        return super.eIsSet(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+        if (baseClass == AbstractVariable.class) {
+            switch (derivedFeatureID) {
+            case DescriptionPackage.TYPED_VARIABLE__NAME:
+                return DescriptionPackage.ABSTRACT_VARIABLE__NAME;
+            default:
+                return -1;
+            }
+        }
+        if (baseClass == SubVariable.class) {
+            switch (derivedFeatureID) {
+            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 == AbstractVariable.class) {
+            switch (baseFeatureID) {
+            case DescriptionPackage.ABSTRACT_VARIABLE__NAME:
+                return DescriptionPackage.TYPED_VARIABLE__NAME;
+            default:
+                return -1;
+            }
+        }
+        if (baseClass == SubVariable.class) {
+            switch (baseFeatureID) {
+            default:
+                return -1;
+            }
+        }
+        return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public String toString() {
+        if (eIsProxy()) {
+            return super.toString();
+        }
+
+        StringBuffer result = new StringBuffer(super.toString());
+        result.append(" (userDocumentation: "); //$NON-NLS-1$
+        result.append(userDocumentation);
+        result.append(", name: "); //$NON-NLS-1$
+        result.append(name);
+        result.append(", defaultValueExpression: "); //$NON-NLS-1$
+        result.append(defaultValueExpression);
+        result.append(')');
+        return result.toString();
+    }
+
+} // TypedVariableImpl
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/AcceleoVariable.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/AcceleoVariable.java
index 57faadaded..dad633e06c 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/AcceleoVariable.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/AcceleoVariable.java
@@ -11,6 +11,8 @@
  */
 package org.eclipse.sirius.viewpoint.description.tool;
 
+import org.eclipse.sirius.viewpoint.description.SubVariable;
+
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Acceleo Variable</b></em>'. <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ContainerViewVariable.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ContainerViewVariable.java
index 25eb3d085e..087740f010 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ContainerViewVariable.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ContainerViewVariable.java
@@ -4,13 +4,15 @@
  * 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.description.tool;
 
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
+
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Container View Variable</b></em>'. <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/DialogVariable.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/DialogVariable.java
index 065ad62b59..dbf7641fcc 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/DialogVariable.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/DialogVariable.java
@@ -11,6 +11,8 @@
  */
 package org.eclipse.sirius.viewpoint.description.tool;
 
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
+
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Dialog Variable</b></em>'. <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/DropContainerVariable.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/DropContainerVariable.java
index bec75a79db..2fa88826ee 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/DropContainerVariable.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/DropContainerVariable.java
@@ -4,13 +4,15 @@
  * 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.description.tool;
 
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
+
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Drop Container Variable</b></em>'. <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ElementDeleteVariable.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ElementDeleteVariable.java
index 74d3334f52..ff10067d73 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ElementDeleteVariable.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ElementDeleteVariable.java
@@ -4,13 +4,15 @@
  * 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.description.tool;
 
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
+
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Element Delete Variable</b></em>'. <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ElementDropVariable.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ElementDropVariable.java
index f684fc170c..179460264e 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ElementDropVariable.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ElementDropVariable.java
@@ -4,13 +4,15 @@
  * 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.description.tool;
 
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
+
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Element Drop Variable</b></em>'. <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ElementSelectVariable.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ElementSelectVariable.java
index 753f382767..feac1750d0 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ElementSelectVariable.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ElementSelectVariable.java
@@ -4,13 +4,15 @@
  * 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.description.tool;
 
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
+
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Element Select Variable</b></em>'. <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ElementVariable.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ElementVariable.java
index 80503ac575..c517f84649 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ElementVariable.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ElementVariable.java
@@ -4,13 +4,15 @@
  * 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.description.tool;
 
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
+
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Element Variable</b></em>'. <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ElementViewVariable.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ElementViewVariable.java
index 4066f3ef52..a3c2530bfb 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ElementViewVariable.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ElementViewVariable.java
@@ -4,13 +4,15 @@
  * 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.description.tool;
 
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
+
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Element View Variable</b></em>'. <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/NameVariable.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/NameVariable.java
index f89f9e673f..3461ee4ae6 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/NameVariable.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/NameVariable.java
@@ -4,13 +4,15 @@
  * 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.description.tool;
 
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
+
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Name Variable</b></em>'. <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/SelectContainerVariable.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/SelectContainerVariable.java
index 5114568a84..36c88f40c8 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/SelectContainerVariable.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/SelectContainerVariable.java
@@ -4,13 +4,15 @@
  * 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.description.tool;
 
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
+
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Select Container Variable</b></em>'. <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/SelectModelElementVariable.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/SelectModelElementVariable.java
index 3a17a3c955..a0a8923fac 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/SelectModelElementVariable.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/SelectModelElementVariable.java
@@ -4,14 +4,16 @@
  * 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.description.tool;
 
+import org.eclipse.sirius.viewpoint.description.InteractiveVariableDescription;
 import org.eclipse.sirius.viewpoint.description.SelectionDescription;
+import org.eclipse.sirius.viewpoint.description.SubVariable;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '
@@ -22,5 +24,5 @@ import org.eclipse.sirius.viewpoint.description.SelectionDescription;
  * @model
  * @generated
  */
-public interface SelectModelElementVariable extends SubVariable, SelectionDescription {
+public interface SelectModelElementVariable extends SubVariable, SelectionDescription, InteractiveVariableDescription {
 } // SelectModelElementVariable
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ToolPackage.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ToolPackage.java
index a3aeeb11cd..eb2e7be3b8 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ToolPackage.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/ToolPackage.java
@@ -1930,36 +1930,6 @@ public interface ToolPackage extends EPackage {
 
     /**
      * The meta object id for the '
-     * {@link org.eclipse.sirius.viewpoint.description.tool.impl.AbstractVariableImpl
-     * <em>Abstract Variable</em>}' class. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @see org.eclipse.sirius.viewpoint.description.tool.impl.AbstractVariableImpl
-     * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getAbstractVariable()
-     * @generated
-     */
-    int ABSTRACT_VARIABLE = 16;
-
-    /**
-     * The feature id for the '<em><b>Name</b></em>' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int ABSTRACT_VARIABLE__NAME = 0;
-
-    /**
-     * The number of structural features of the '<em>Abstract Variable</em>'
-     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     * @ordered
-     */
-    int ABSTRACT_VARIABLE_FEATURE_COUNT = 1;
-
-    /**
-     * The meta object id for the '
      * {@link org.eclipse.sirius.viewpoint.description.tool.impl.VariableContainerImpl
      * <em>Variable Container</em>}' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
@@ -1968,7 +1938,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getVariableContainer()
      * @generated
      */
-    int VARIABLE_CONTAINER = 17;
+    int VARIABLE_CONTAINER = 16;
 
     /**
      * The feature id for the '<em><b>Sub Variables</b></em>' containment
@@ -1998,7 +1968,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getAcceleoVariable()
      * @generated
      */
-    int ACCELEO_VARIABLE = 18;
+    int ACCELEO_VARIABLE = 17;
 
     /**
      * The feature id for the '<em><b>Sub Variables</b></em>' containment
@@ -2038,36 +2008,6 @@ public interface ToolPackage extends EPackage {
 
     /**
      * The meta object id for the '
-     * {@link org.eclipse.sirius.viewpoint.description.tool.impl.SubVariableImpl
-     * <em>Sub Variable</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
-     *
-     * @see org.eclipse.sirius.viewpoint.description.tool.impl.SubVariableImpl
-     * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getSubVariable()
-     * @generated
-     */
-    int SUB_VARIABLE = 19;
-
-    /**
-     * The feature id for the '<em><b>Name</b></em>' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int SUB_VARIABLE__NAME = ToolPackage.ABSTRACT_VARIABLE__NAME;
-
-    /**
-     * The number of structural features of the '<em>Sub Variable</em>' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     * @ordered
-     */
-    int SUB_VARIABLE_FEATURE_COUNT = ToolPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
-
-    /**
-     * The meta object id for the '
      * {@link org.eclipse.sirius.viewpoint.description.tool.impl.DialogVariableImpl
      * <em>Dialog Variable</em>}' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
@@ -2076,7 +2016,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getDialogVariable()
      * @generated
      */
-    int DIALOG_VARIABLE = 20;
+    int DIALOG_VARIABLE = 18;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!--
@@ -2085,7 +2025,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DIALOG_VARIABLE__NAME = ToolPackage.ABSTRACT_VARIABLE__NAME;
+    int DIALOG_VARIABLE__NAME = DescriptionPackage.ABSTRACT_VARIABLE__NAME;
 
     /**
      * The feature id for the '<em><b>Dialog Prompt</b></em>' attribute. <!--
@@ -2094,7 +2034,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DIALOG_VARIABLE__DIALOG_PROMPT = ToolPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
+    int DIALOG_VARIABLE__DIALOG_PROMPT = DescriptionPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
 
     /**
      * The number of structural features of the '<em>Dialog Variable</em>'
@@ -2103,7 +2043,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DIALOG_VARIABLE_FEATURE_COUNT = ToolPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 1;
+    int DIALOG_VARIABLE_FEATURE_COUNT = DescriptionPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 1;
 
     /**
      * The meta object id for the '
@@ -2115,7 +2055,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getElementDropVariable()
      * @generated
      */
-    int ELEMENT_DROP_VARIABLE = 21;
+    int ELEMENT_DROP_VARIABLE = 19;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!--
@@ -2124,7 +2064,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int ELEMENT_DROP_VARIABLE__NAME = ToolPackage.ABSTRACT_VARIABLE__NAME;
+    int ELEMENT_DROP_VARIABLE__NAME = DescriptionPackage.ABSTRACT_VARIABLE__NAME;
 
     /**
      * The feature id for the '<em><b>Sub Variables</b></em>' containment
@@ -2133,7 +2073,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int ELEMENT_DROP_VARIABLE__SUB_VARIABLES = ToolPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
+    int ELEMENT_DROP_VARIABLE__SUB_VARIABLES = DescriptionPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
 
     /**
      * The number of structural features of the '<em>Element Drop Variable</em>'
@@ -2142,7 +2082,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int ELEMENT_DROP_VARIABLE_FEATURE_COUNT = ToolPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 1;
+    int ELEMENT_DROP_VARIABLE_FEATURE_COUNT = DescriptionPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 1;
 
     /**
      * The meta object id for the '
@@ -2154,7 +2094,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getElementSelectVariable()
      * @generated
      */
-    int ELEMENT_SELECT_VARIABLE = 22;
+    int ELEMENT_SELECT_VARIABLE = 20;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!--
@@ -2163,7 +2103,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int ELEMENT_SELECT_VARIABLE__NAME = ToolPackage.ABSTRACT_VARIABLE__NAME;
+    int ELEMENT_SELECT_VARIABLE__NAME = DescriptionPackage.ABSTRACT_VARIABLE__NAME;
 
     /**
      * The number of structural features of the '
@@ -2173,7 +2113,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int ELEMENT_SELECT_VARIABLE_FEATURE_COUNT = ToolPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
+    int ELEMENT_SELECT_VARIABLE_FEATURE_COUNT = DescriptionPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
 
     /**
      * The meta object id for the '
@@ -2185,7 +2125,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getElementVariable()
      * @generated
      */
-    int ELEMENT_VARIABLE = 23;
+    int ELEMENT_VARIABLE = 21;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!--
@@ -2194,7 +2134,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int ELEMENT_VARIABLE__NAME = ToolPackage.ABSTRACT_VARIABLE__NAME;
+    int ELEMENT_VARIABLE__NAME = DescriptionPackage.ABSTRACT_VARIABLE__NAME;
 
     /**
      * The feature id for the '<em><b>Sub Variables</b></em>' containment
@@ -2203,7 +2143,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int ELEMENT_VARIABLE__SUB_VARIABLES = ToolPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
+    int ELEMENT_VARIABLE__SUB_VARIABLES = DescriptionPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
 
     /**
      * The number of structural features of the '<em>Element Variable</em>'
@@ -2212,7 +2152,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int ELEMENT_VARIABLE_FEATURE_COUNT = ToolPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 1;
+    int ELEMENT_VARIABLE_FEATURE_COUNT = DescriptionPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 1;
 
     /**
      * The meta object id for the '
@@ -2224,7 +2164,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getElementViewVariable()
      * @generated
      */
-    int ELEMENT_VIEW_VARIABLE = 24;
+    int ELEMENT_VIEW_VARIABLE = 22;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!--
@@ -2233,7 +2173,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int ELEMENT_VIEW_VARIABLE__NAME = ToolPackage.ABSTRACT_VARIABLE__NAME;
+    int ELEMENT_VIEW_VARIABLE__NAME = DescriptionPackage.ABSTRACT_VARIABLE__NAME;
 
     /**
      * The feature id for the '<em><b>Sub Variables</b></em>' containment
@@ -2242,7 +2182,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int ELEMENT_VIEW_VARIABLE__SUB_VARIABLES = ToolPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
+    int ELEMENT_VIEW_VARIABLE__SUB_VARIABLES = DescriptionPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
 
     /**
      * The number of structural features of the '<em>Element View Variable</em>'
@@ -2251,7 +2191,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int ELEMENT_VIEW_VARIABLE_FEATURE_COUNT = ToolPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 1;
+    int ELEMENT_VIEW_VARIABLE_FEATURE_COUNT = DescriptionPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 1;
 
     /**
      * The meta object id for the '
@@ -2263,7 +2203,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getElementDeleteVariable()
      * @generated
      */
-    int ELEMENT_DELETE_VARIABLE = 25;
+    int ELEMENT_DELETE_VARIABLE = 23;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!--
@@ -2272,7 +2212,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int ELEMENT_DELETE_VARIABLE__NAME = ToolPackage.ABSTRACT_VARIABLE__NAME;
+    int ELEMENT_DELETE_VARIABLE__NAME = DescriptionPackage.ABSTRACT_VARIABLE__NAME;
 
     /**
      * The feature id for the '<em><b>Sub Variables</b></em>' containment
@@ -2281,7 +2221,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int ELEMENT_DELETE_VARIABLE__SUB_VARIABLES = ToolPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
+    int ELEMENT_DELETE_VARIABLE__SUB_VARIABLES = DescriptionPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
 
     /**
      * The number of structural features of the '
@@ -2291,7 +2231,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int ELEMENT_DELETE_VARIABLE_FEATURE_COUNT = ToolPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 1;
+    int ELEMENT_DELETE_VARIABLE_FEATURE_COUNT = DescriptionPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 1;
 
     /**
      * The meta object id for the '
@@ -2303,7 +2243,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getDropContainerVariable()
      * @generated
      */
-    int DROP_CONTAINER_VARIABLE = 26;
+    int DROP_CONTAINER_VARIABLE = 24;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!--
@@ -2312,7 +2252,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DROP_CONTAINER_VARIABLE__NAME = ToolPackage.ABSTRACT_VARIABLE__NAME;
+    int DROP_CONTAINER_VARIABLE__NAME = DescriptionPackage.ABSTRACT_VARIABLE__NAME;
 
     /**
      * The feature id for the '<em><b>Sub Variables</b></em>' containment
@@ -2321,7 +2261,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DROP_CONTAINER_VARIABLE__SUB_VARIABLES = ToolPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
+    int DROP_CONTAINER_VARIABLE__SUB_VARIABLES = DescriptionPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
 
     /**
      * The number of structural features of the '
@@ -2331,7 +2271,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DROP_CONTAINER_VARIABLE_FEATURE_COUNT = ToolPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 1;
+    int DROP_CONTAINER_VARIABLE_FEATURE_COUNT = DescriptionPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 1;
 
     /**
      * The meta object id for the '
@@ -2343,7 +2283,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getSelectContainerVariable()
      * @generated
      */
-    int SELECT_CONTAINER_VARIABLE = 27;
+    int SELECT_CONTAINER_VARIABLE = 25;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!--
@@ -2352,7 +2292,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int SELECT_CONTAINER_VARIABLE__NAME = ToolPackage.ABSTRACT_VARIABLE__NAME;
+    int SELECT_CONTAINER_VARIABLE__NAME = DescriptionPackage.ABSTRACT_VARIABLE__NAME;
 
     /**
      * The feature id for the '<em><b>Sub Variables</b></em>' containment
@@ -2361,7 +2301,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int SELECT_CONTAINER_VARIABLE__SUB_VARIABLES = ToolPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
+    int SELECT_CONTAINER_VARIABLE__SUB_VARIABLES = DescriptionPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
 
     /**
      * The number of structural features of the '
@@ -2371,7 +2311,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int SELECT_CONTAINER_VARIABLE_FEATURE_COUNT = ToolPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 1;
+    int SELECT_CONTAINER_VARIABLE_FEATURE_COUNT = DescriptionPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 1;
 
     /**
      * The meta object id for the '
@@ -2383,7 +2323,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getContainerViewVariable()
      * @generated
      */
-    int CONTAINER_VIEW_VARIABLE = 28;
+    int CONTAINER_VIEW_VARIABLE = 26;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!--
@@ -2392,7 +2332,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int CONTAINER_VIEW_VARIABLE__NAME = ToolPackage.ABSTRACT_VARIABLE__NAME;
+    int CONTAINER_VIEW_VARIABLE__NAME = DescriptionPackage.ABSTRACT_VARIABLE__NAME;
 
     /**
      * The feature id for the '<em><b>Sub Variables</b></em>' containment
@@ -2401,7 +2341,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int CONTAINER_VIEW_VARIABLE__SUB_VARIABLES = ToolPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
+    int CONTAINER_VIEW_VARIABLE__SUB_VARIABLES = DescriptionPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
 
     /**
      * The number of structural features of the '
@@ -2411,7 +2351,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int CONTAINER_VIEW_VARIABLE_FEATURE_COUNT = ToolPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 1;
+    int CONTAINER_VIEW_VARIABLE_FEATURE_COUNT = DescriptionPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 1;
 
     /**
      * The meta object id for the '
@@ -2423,7 +2363,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getSelectModelElementVariable()
      * @generated
      */
-    int SELECT_MODEL_ELEMENT_VARIABLE = 29;
+    int SELECT_MODEL_ELEMENT_VARIABLE = 27;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!--
@@ -2432,7 +2372,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int SELECT_MODEL_ELEMENT_VARIABLE__NAME = ToolPackage.SUB_VARIABLE__NAME;
+    int SELECT_MODEL_ELEMENT_VARIABLE__NAME = DescriptionPackage.SUB_VARIABLE__NAME;
 
     /**
      * The feature id for the '<em><b>Candidates Expression</b></em>' attribute.
@@ -2441,7 +2381,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int SELECT_MODEL_ELEMENT_VARIABLE__CANDIDATES_EXPRESSION = ToolPackage.SUB_VARIABLE_FEATURE_COUNT + 0;
+    int SELECT_MODEL_ELEMENT_VARIABLE__CANDIDATES_EXPRESSION = DescriptionPackage.SUB_VARIABLE_FEATURE_COUNT + 0;
 
     /**
      * The feature id for the '<em><b>Multiple</b></em>' attribute. <!--
@@ -2450,7 +2390,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int SELECT_MODEL_ELEMENT_VARIABLE__MULTIPLE = ToolPackage.SUB_VARIABLE_FEATURE_COUNT + 1;
+    int SELECT_MODEL_ELEMENT_VARIABLE__MULTIPLE = DescriptionPackage.SUB_VARIABLE_FEATURE_COUNT + 1;
 
     /**
      * The feature id for the '<em><b>Tree</b></em>' attribute. <!--
@@ -2459,7 +2399,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int SELECT_MODEL_ELEMENT_VARIABLE__TREE = ToolPackage.SUB_VARIABLE_FEATURE_COUNT + 2;
+    int SELECT_MODEL_ELEMENT_VARIABLE__TREE = DescriptionPackage.SUB_VARIABLE_FEATURE_COUNT + 2;
 
     /**
      * The feature id for the '<em><b>Root Expression</b></em>' attribute. <!--
@@ -2468,7 +2408,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int SELECT_MODEL_ELEMENT_VARIABLE__ROOT_EXPRESSION = ToolPackage.SUB_VARIABLE_FEATURE_COUNT + 3;
+    int SELECT_MODEL_ELEMENT_VARIABLE__ROOT_EXPRESSION = DescriptionPackage.SUB_VARIABLE_FEATURE_COUNT + 3;
 
     /**
      * The feature id for the '<em><b>Children Expression</b></em>' attribute.
@@ -2477,7 +2417,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int SELECT_MODEL_ELEMENT_VARIABLE__CHILDREN_EXPRESSION = ToolPackage.SUB_VARIABLE_FEATURE_COUNT + 4;
+    int SELECT_MODEL_ELEMENT_VARIABLE__CHILDREN_EXPRESSION = DescriptionPackage.SUB_VARIABLE_FEATURE_COUNT + 4;
 
     /**
      * The feature id for the '<em><b>Message</b></em>' attribute. <!--
@@ -2486,7 +2426,16 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int SELECT_MODEL_ELEMENT_VARIABLE__MESSAGE = ToolPackage.SUB_VARIABLE_FEATURE_COUNT + 5;
+    int SELECT_MODEL_ELEMENT_VARIABLE__MESSAGE = DescriptionPackage.SUB_VARIABLE_FEATURE_COUNT + 5;
+
+    /**
+     * The feature id for the '<em><b>User Documentation</b></em>' attribute.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     * @ordered
+     */
+    int SELECT_MODEL_ELEMENT_VARIABLE__USER_DOCUMENTATION = DescriptionPackage.SUB_VARIABLE_FEATURE_COUNT + 6;
 
     /**
      * The number of structural features of the '
@@ -2496,7 +2445,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int SELECT_MODEL_ELEMENT_VARIABLE_FEATURE_COUNT = ToolPackage.SUB_VARIABLE_FEATURE_COUNT + 6;
+    int SELECT_MODEL_ELEMENT_VARIABLE_FEATURE_COUNT = DescriptionPackage.SUB_VARIABLE_FEATURE_COUNT + 7;
 
     /**
      * The meta object id for the '
@@ -2508,7 +2457,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getEditMaskVariables()
      * @generated
      */
-    int EDIT_MASK_VARIABLES = 30;
+    int EDIT_MASK_VARIABLES = 28;
 
     /**
      * The feature id for the '<em><b>Mask</b></em>' attribute. <!--
@@ -2538,7 +2487,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getModelOperation()
      * @generated
      */
-    int MODEL_OPERATION = 32;
+    int MODEL_OPERATION = 30;
 
     /**
      * The number of structural features of the '<em>Model Operation</em>'
@@ -2559,7 +2508,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getContainerModelOperation()
      * @generated
      */
-    int CONTAINER_MODEL_OPERATION = 31;
+    int CONTAINER_MODEL_OPERATION = 29;
 
     /**
      * The feature id for the '<em><b>Sub Model Operations</b></em>' containment
@@ -2590,7 +2539,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getInitialNodeCreationOperation()
      * @generated
      */
-    int INITIAL_NODE_CREATION_OPERATION = 33;
+    int INITIAL_NODE_CREATION_OPERATION = 31;
 
     /**
      * The feature id for the '<em><b>First Model Operations</b></em>'
@@ -2621,7 +2570,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getInitialOperation()
      * @generated
      */
-    int INITIAL_OPERATION = 34;
+    int INITIAL_OPERATION = 32;
 
     /**
      * The feature id for the '<em><b>First Model Operations</b></em>'
@@ -2651,7 +2600,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getInitEdgeCreationOperation()
      * @generated
      */
-    int INIT_EDGE_CREATION_OPERATION = 35;
+    int INIT_EDGE_CREATION_OPERATION = 33;
 
     /**
      * The feature id for the '<em><b>First Model Operations</b></em>'
@@ -2682,7 +2631,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getInitialContainerDropOperation()
      * @generated
      */
-    int INITIAL_CONTAINER_DROP_OPERATION = 36;
+    int INITIAL_CONTAINER_DROP_OPERATION = 34;
 
     /**
      * The feature id for the '<em><b>First Model Operations</b></em>'
@@ -2713,7 +2662,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getCreateInstance()
      * @generated
      */
-    int CREATE_INSTANCE = 37;
+    int CREATE_INSTANCE = 35;
 
     /**
      * The feature id for the '<em><b>Sub Model Operations</b></em>' containment
@@ -2770,7 +2719,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getChangeContext()
      * @generated
      */
-    int CHANGE_CONTEXT = 38;
+    int CHANGE_CONTEXT = 36;
 
     /**
      * The feature id for the '<em><b>Sub Model Operations</b></em>' containment
@@ -2808,7 +2757,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getSetValue()
      * @generated
      */
-    int SET_VALUE = 39;
+    int SET_VALUE = 37;
 
     /**
      * The feature id for the '<em><b>Sub Model Operations</b></em>' containment
@@ -2856,7 +2805,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getSetObject()
      * @generated
      */
-    int SET_OBJECT = 40;
+    int SET_OBJECT = 38;
 
     /**
      * The feature id for the '<em><b>Sub Model Operations</b></em>' containment
@@ -2903,7 +2852,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getUnset()
      * @generated
      */
-    int UNSET = 41;
+    int UNSET = 39;
 
     /**
      * The feature id for the '<em><b>Sub Model Operations</b></em>' containment
@@ -2951,7 +2900,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getMoveElement()
      * @generated
      */
-    int MOVE_ELEMENT = 42;
+    int MOVE_ELEMENT = 40;
 
     /**
      * The feature id for the '<em><b>Sub Model Operations</b></em>' containment
@@ -2999,7 +2948,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getRemoveElement()
      * @generated
      */
-    int REMOVE_ELEMENT = 43;
+    int REMOVE_ELEMENT = 41;
 
     /**
      * The feature id for the '<em><b>Sub Model Operations</b></em>' containment
@@ -3028,7 +2977,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getFor()
      * @generated
      */
-    int FOR = 44;
+    int FOR = 42;
 
     /**
      * The feature id for the '<em><b>Sub Model Operations</b></em>' containment
@@ -3075,7 +3024,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getIf()
      * @generated
      */
-    int IF = 45;
+    int IF = 43;
 
     /**
      * The feature id for the '<em><b>Sub Model Operations</b></em>' containment
@@ -3114,7 +3063,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getDeleteView()
      * @generated
      */
-    int DELETE_VIEW = 46;
+    int DELETE_VIEW = 44;
 
     /**
      * The feature id for the '<em><b>Sub Model Operations</b></em>' containment
@@ -3144,7 +3093,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getNameVariable()
      * @generated
      */
-    int NAME_VARIABLE = 47;
+    int NAME_VARIABLE = 45;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!--
@@ -3153,7 +3102,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int NAME_VARIABLE__NAME = ToolPackage.ABSTRACT_VARIABLE__NAME;
+    int NAME_VARIABLE__NAME = DescriptionPackage.ABSTRACT_VARIABLE__NAME;
 
     /**
      * The number of structural features of the '<em>Name Variable</em>' class.
@@ -3162,7 +3111,7 @@ public interface ToolPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int NAME_VARIABLE_FEATURE_COUNT = ToolPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
+    int NAME_VARIABLE_FEATURE_COUNT = DescriptionPackage.ABSTRACT_VARIABLE_FEATURE_COUNT + 0;
 
     /**
      * The meta object id for the '
@@ -3174,7 +3123,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getExternalJavaActionParameter()
      * @generated
      */
-    int EXTERNAL_JAVA_ACTION_PARAMETER = 48;
+    int EXTERNAL_JAVA_ACTION_PARAMETER = 46;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute. <!--
@@ -3214,7 +3163,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getToolFilterDescription()
      * @generated
      */
-    int TOOL_FILTER_DESCRIPTION = 49;
+    int TOOL_FILTER_DESCRIPTION = 47;
 
     /**
      * The feature id for the '<em><b>Precondition</b></em>' attribute. <!--
@@ -3262,7 +3211,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getFeatureChangeListener()
      * @generated
      */
-    int FEATURE_CHANGE_LISTENER = 50;
+    int FEATURE_CHANGE_LISTENER = 48;
 
     /**
      * The feature id for the '<em><b>Domain Class</b></em>' attribute. <!--
@@ -3302,7 +3251,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getSwitchChild()
      * @generated
      */
-    int SWITCH_CHILD = 52;
+    int SWITCH_CHILD = 50;
 
     /**
      * The feature id for the '<em><b>Sub Model Operations</b></em>' containment
@@ -3331,7 +3280,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getCase()
      * @generated
      */
-    int CASE = 51;
+    int CASE = 49;
 
     /**
      * The feature id for the '<em><b>Sub Model Operations</b></em>' containment
@@ -3369,7 +3318,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getDefault()
      * @generated
      */
-    int DEFAULT = 53;
+    int DEFAULT = 51;
 
     /**
      * The feature id for the '<em><b>Sub Model Operations</b></em>' containment
@@ -3398,7 +3347,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getSwitch()
      * @generated
      */
-    int SWITCH = 54;
+    int SWITCH = 52;
 
     /**
      * The feature id for the '<em><b>Cases</b></em>' containment reference
@@ -3437,7 +3386,7 @@ public interface ToolPackage extends EPackage {
      * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getDragSource()
      * @generated
      */
-    int DRAG_SOURCE = 55;
+    int DRAG_SOURCE = 53;
 
     /**
      * Returns the meta object for class '
@@ -4366,30 +4315,6 @@ public interface ToolPackage extends EPackage {
 
     /**
      * Returns the meta object for class '
-     * {@link org.eclipse.sirius.viewpoint.description.tool.AbstractVariable
-     * <em>Abstract Variable</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
-     *
-     * @return the meta object for class '<em>Abstract Variable</em>'.
-     * @see org.eclipse.sirius.viewpoint.description.tool.AbstractVariable
-     * @generated
-     */
-    EClass getAbstractVariable();
-
-    /**
-     * Returns the meta object for the attribute '
-     * {@link org.eclipse.sirius.viewpoint.description.tool.AbstractVariable#getName
-     * <em>Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @return the meta object for the attribute '<em>Name</em>'.
-     * @see org.eclipse.sirius.viewpoint.description.tool.AbstractVariable#getName()
-     * @see #getAbstractVariable()
-     * @generated
-     */
-    EAttribute getAbstractVariable_Name();
-
-    /**
-     * Returns the meta object for class '
      * {@link org.eclipse.sirius.viewpoint.description.tool.VariableContainer
      * <em>Variable Container</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -4441,17 +4366,6 @@ public interface ToolPackage extends EPackage {
 
     /**
      * Returns the meta object for class '
-     * {@link org.eclipse.sirius.viewpoint.description.tool.SubVariable
-     * <em>Sub Variable</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @return the meta object for class '<em>Sub Variable</em>'.
-     * @see org.eclipse.sirius.viewpoint.description.tool.SubVariable
-     * @generated
-     */
-    EClass getSubVariable();
-
-    /**
-     * Returns the meta object for class '
      * {@link org.eclipse.sirius.viewpoint.description.tool.DialogVariable
      * <em>Dialog Variable</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
@@ -5983,26 +5897,6 @@ public interface ToolPackage extends EPackage {
 
         /**
          * The meta object literal for the '
-         * {@link org.eclipse.sirius.viewpoint.description.tool.impl.AbstractVariableImpl
-         * <em>Abstract Variable</em>}' class. <!-- begin-user-doc --> <!--
-         * end-user-doc -->
-         * 
-         * @see org.eclipse.sirius.viewpoint.description.tool.impl.AbstractVariableImpl
-         * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getAbstractVariable()
-         * @generated
-         */
-        EClass ABSTRACT_VARIABLE = ToolPackage.eINSTANCE.getAbstractVariable();
-
-        /**
-         * The meta object literal for the '<em><b>Name</b></em>' attribute
-         * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
-         * @generated
-         */
-        EAttribute ABSTRACT_VARIABLE__NAME = ToolPackage.eINSTANCE.getAbstractVariable_Name();
-
-        /**
-         * The meta object literal for the '
          * {@link org.eclipse.sirius.viewpoint.description.tool.impl.VariableContainerImpl
          * <em>Variable Container</em>}' class. <!-- begin-user-doc --> <!--
          * end-user-doc -->
@@ -6045,18 +5939,6 @@ public interface ToolPackage extends EPackage {
 
         /**
          * The meta object literal for the '
-         * {@link org.eclipse.sirius.viewpoint.description.tool.impl.SubVariableImpl
-         * <em>Sub Variable</em>}' class. <!-- begin-user-doc --> <!--
-         * end-user-doc -->
-         * 
-         * @see org.eclipse.sirius.viewpoint.description.tool.impl.SubVariableImpl
-         * @see org.eclipse.sirius.viewpoint.description.tool.impl.ToolPackageImpl#getSubVariable()
-         * @generated
-         */
-        EClass SUB_VARIABLE = ToolPackage.eINSTANCE.getSubVariable();
-
-        /**
-         * The meta object literal for the '
          * {@link org.eclipse.sirius.viewpoint.description.tool.impl.DialogVariableImpl
          * <em>Dialog Variable</em>}' class. <!-- begin-user-doc --> <!--
          * end-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/VariableContainer.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/VariableContainer.java
index d7605a0481..c03f640652 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/VariableContainer.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/VariableContainer.java
@@ -13,6 +13,7 @@ package org.eclipse.sirius.viewpoint.description.tool;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.sirius.viewpoint.description.SubVariable;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/AcceleoVariableImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/AcceleoVariableImpl.java
index bc9c1da687..f4ca53dab2 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/AcceleoVariableImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/AcceleoVariableImpl.java
@@ -14,9 +14,10 @@ package org.eclipse.sirius.viewpoint.description.tool.impl;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
+import org.eclipse.sirius.viewpoint.description.SubVariable;
 import org.eclipse.sirius.viewpoint.description.tool.AcceleoVariable;
-import org.eclipse.sirius.viewpoint.description.tool.SubVariable;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
 
 /**
@@ -224,7 +225,7 @@ public class AcceleoVariableImpl extends VariableContainerImpl implements Accele
         if (baseClass == AbstractVariable.class) {
             switch (derivedFeatureID) {
             case ToolPackage.ACCELEO_VARIABLE__NAME:
-                return ToolPackage.ABSTRACT_VARIABLE__NAME;
+                return DescriptionPackage.ABSTRACT_VARIABLE__NAME;
             default:
                 return -1;
             }
@@ -247,7 +248,7 @@ public class AcceleoVariableImpl extends VariableContainerImpl implements Accele
     public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
         if (baseClass == AbstractVariable.class) {
             switch (baseFeatureID) {
-            case ToolPackage.ABSTRACT_VARIABLE__NAME:
+            case DescriptionPackage.ABSTRACT_VARIABLE__NAME:
                 return ToolPackage.ACCELEO_VARIABLE__NAME;
             default:
                 return -1;
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ContainerViewVariableImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ContainerViewVariableImpl.java
index 63739e5225..39f148632a 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ContainerViewVariableImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ContainerViewVariableImpl.java
@@ -19,8 +19,9 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.sirius.viewpoint.description.SubVariable;
+import org.eclipse.sirius.viewpoint.description.impl.AbstractVariableImpl;
 import org.eclipse.sirius.viewpoint.description.tool.ContainerViewVariable;
-import org.eclipse.sirius.viewpoint.description.tool.SubVariable;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
 import org.eclipse.sirius.viewpoint.description.tool.VariableContainer;
 
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/DialogVariableImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/DialogVariableImpl.java
index 06b8d70c4c..22b467856a 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/DialogVariableImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/DialogVariableImpl.java
@@ -14,6 +14,7 @@ package org.eclipse.sirius.viewpoint.description.tool.impl;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.sirius.viewpoint.description.impl.AbstractVariableImpl;
 import org.eclipse.sirius.viewpoint.description.tool.DialogVariable;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
 
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/DropContainerVariableImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/DropContainerVariableImpl.java
index ccb1fb78a0..1ca22d6a5e 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/DropContainerVariableImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/DropContainerVariableImpl.java
@@ -19,8 +19,9 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.sirius.viewpoint.description.SubVariable;
+import org.eclipse.sirius.viewpoint.description.impl.AbstractVariableImpl;
 import org.eclipse.sirius.viewpoint.description.tool.DropContainerVariable;
-import org.eclipse.sirius.viewpoint.description.tool.SubVariable;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
 import org.eclipse.sirius.viewpoint.description.tool.VariableContainer;
 
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ElementDeleteVariableImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ElementDeleteVariableImpl.java
index ffa613fc83..9de5dabd87 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ElementDeleteVariableImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ElementDeleteVariableImpl.java
@@ -19,8 +19,9 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.sirius.viewpoint.description.SubVariable;
+import org.eclipse.sirius.viewpoint.description.impl.AbstractVariableImpl;
 import org.eclipse.sirius.viewpoint.description.tool.ElementDeleteVariable;
-import org.eclipse.sirius.viewpoint.description.tool.SubVariable;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
 import org.eclipse.sirius.viewpoint.description.tool.VariableContainer;
 
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ElementDropVariableImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ElementDropVariableImpl.java
index b64b314a4f..36c1db3954 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ElementDropVariableImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ElementDropVariableImpl.java
@@ -19,8 +19,9 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.sirius.viewpoint.description.SubVariable;
+import org.eclipse.sirius.viewpoint.description.impl.AbstractVariableImpl;
 import org.eclipse.sirius.viewpoint.description.tool.ElementDropVariable;
-import org.eclipse.sirius.viewpoint.description.tool.SubVariable;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
 import org.eclipse.sirius.viewpoint.description.tool.VariableContainer;
 
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ElementSelectVariableImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ElementSelectVariableImpl.java
index b2f61f9654..ea5d3f5045 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ElementSelectVariableImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ElementSelectVariableImpl.java
@@ -12,6 +12,7 @@
 package org.eclipse.sirius.viewpoint.description.tool.impl;
 
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.sirius.viewpoint.description.impl.AbstractVariableImpl;
 import org.eclipse.sirius.viewpoint.description.tool.ElementSelectVariable;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
 
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ElementVariableImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ElementVariableImpl.java
index 4a8ca932e2..9276cc2fd4 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ElementVariableImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ElementVariableImpl.java
@@ -19,8 +19,9 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.sirius.viewpoint.description.SubVariable;
+import org.eclipse.sirius.viewpoint.description.impl.AbstractVariableImpl;
 import org.eclipse.sirius.viewpoint.description.tool.ElementVariable;
-import org.eclipse.sirius.viewpoint.description.tool.SubVariable;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
 import org.eclipse.sirius.viewpoint.description.tool.VariableContainer;
 
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ElementViewVariableImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ElementViewVariableImpl.java
index 0c640f47ab..b3473f5403 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ElementViewVariableImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ElementViewVariableImpl.java
@@ -19,8 +19,9 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.sirius.viewpoint.description.SubVariable;
+import org.eclipse.sirius.viewpoint.description.impl.AbstractVariableImpl;
 import org.eclipse.sirius.viewpoint.description.tool.ElementViewVariable;
-import org.eclipse.sirius.viewpoint.description.tool.SubVariable;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
 import org.eclipse.sirius.viewpoint.description.tool.VariableContainer;
 
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/NameVariableImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/NameVariableImpl.java
index 52695abef2..2a901e6f5d 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/NameVariableImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/NameVariableImpl.java
@@ -12,6 +12,7 @@
 package org.eclipse.sirius.viewpoint.description.tool.impl;
 
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.sirius.viewpoint.description.impl.AbstractVariableImpl;
 import org.eclipse.sirius.viewpoint.description.tool.NameVariable;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
 
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/SelectContainerVariableImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/SelectContainerVariableImpl.java
index 3b0648d2d5..332bc57377 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/SelectContainerVariableImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/SelectContainerVariableImpl.java
@@ -19,8 +19,9 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.sirius.viewpoint.description.SubVariable;
+import org.eclipse.sirius.viewpoint.description.impl.AbstractVariableImpl;
 import org.eclipse.sirius.viewpoint.description.tool.SelectContainerVariable;
-import org.eclipse.sirius.viewpoint.description.tool.SubVariable;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
 import org.eclipse.sirius.viewpoint.description.tool.VariableContainer;
 
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/SelectModelElementVariableImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/SelectModelElementVariableImpl.java
index 5687a75e72..c667dbb48c 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/SelectModelElementVariableImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/SelectModelElementVariableImpl.java
@@ -15,7 +15,9 @@ import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
+import org.eclipse.sirius.viewpoint.description.InteractiveVariableDescription;
 import org.eclipse.sirius.viewpoint.description.SelectionDescription;
+import org.eclipse.sirius.viewpoint.description.impl.SubVariableImpl;
 import org.eclipse.sirius.viewpoint.description.tool.SelectModelElementVariable;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
 
@@ -43,6 +45,9 @@ import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
  * <li>
  * {@link org.eclipse.sirius.viewpoint.description.tool.impl.SelectModelElementVariableImpl#getMessage
  * <em>Message</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.viewpoint.description.tool.impl.SelectModelElementVariableImpl#getUserDocumentation
+ * <em>User Documentation</em>}</li>
  * </ul>
  * </p>
  *
@@ -176,6 +181,28 @@ public class SelectModelElementVariableImpl extends SubVariableImpl implements S
     protected String message = SelectModelElementVariableImpl.MESSAGE_EDEFAULT;
 
     /**
+     * The default value of the '{@link #getUserDocumentation()
+     * <em>User Documentation</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @see #getUserDocumentation()
+     * @generated
+     * @ordered
+     */
+    protected static final String USER_DOCUMENTATION_EDEFAULT = null;
+
+    /**
+     * The cached value of the '{@link #getUserDocumentation()
+     * <em>User Documentation</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @see #getUserDocumentation()
+     * @generated
+     * @ordered
+     */
+    protected String userDocumentation = SelectModelElementVariableImpl.USER_DOCUMENTATION_EDEFAULT;
+
+    /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
@@ -344,6 +371,30 @@ public class SelectModelElementVariableImpl extends SubVariableImpl implements S
      * @generated
      */
     @Override
+    public String getUserDocumentation() {
+        return userDocumentation;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public void setUserDocumentation(String newUserDocumentation) {
+        String oldUserDocumentation = userDocumentation;
+        userDocumentation = newUserDocumentation;
+        if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, ToolPackage.SELECT_MODEL_ELEMENT_VARIABLE__USER_DOCUMENTATION, oldUserDocumentation, userDocumentation));
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
         case ToolPackage.SELECT_MODEL_ELEMENT_VARIABLE__CANDIDATES_EXPRESSION:
@@ -358,6 +409,8 @@ public class SelectModelElementVariableImpl extends SubVariableImpl implements S
             return getChildrenExpression();
         case ToolPackage.SELECT_MODEL_ELEMENT_VARIABLE__MESSAGE:
             return getMessage();
+        case ToolPackage.SELECT_MODEL_ELEMENT_VARIABLE__USER_DOCUMENTATION:
+            return getUserDocumentation();
         }
         return super.eGet(featureID, resolve, coreType);
     }
@@ -388,6 +441,9 @@ public class SelectModelElementVariableImpl extends SubVariableImpl implements S
         case ToolPackage.SELECT_MODEL_ELEMENT_VARIABLE__MESSAGE:
             setMessage((String) newValue);
             return;
+        case ToolPackage.SELECT_MODEL_ELEMENT_VARIABLE__USER_DOCUMENTATION:
+            setUserDocumentation((String) newValue);
+            return;
         }
         super.eSet(featureID, newValue);
     }
@@ -418,6 +474,9 @@ public class SelectModelElementVariableImpl extends SubVariableImpl implements S
         case ToolPackage.SELECT_MODEL_ELEMENT_VARIABLE__MESSAGE:
             setMessage(SelectModelElementVariableImpl.MESSAGE_EDEFAULT);
             return;
+        case ToolPackage.SELECT_MODEL_ELEMENT_VARIABLE__USER_DOCUMENTATION:
+            setUserDocumentation(SelectModelElementVariableImpl.USER_DOCUMENTATION_EDEFAULT);
+            return;
         }
         super.eUnset(featureID);
     }
@@ -444,6 +503,9 @@ public class SelectModelElementVariableImpl extends SubVariableImpl implements S
                     .equals(childrenExpression);
         case ToolPackage.SELECT_MODEL_ELEMENT_VARIABLE__MESSAGE:
             return SelectModelElementVariableImpl.MESSAGE_EDEFAULT == null ? message != null : !SelectModelElementVariableImpl.MESSAGE_EDEFAULT.equals(message);
+        case ToolPackage.SELECT_MODEL_ELEMENT_VARIABLE__USER_DOCUMENTATION:
+            return SelectModelElementVariableImpl.USER_DOCUMENTATION_EDEFAULT == null ? userDocumentation != null : !SelectModelElementVariableImpl.USER_DOCUMENTATION_EDEFAULT
+                    .equals(userDocumentation);
         }
         return super.eIsSet(featureID);
     }
@@ -473,6 +535,14 @@ public class SelectModelElementVariableImpl extends SubVariableImpl implements S
                 return -1;
             }
         }
+        if (baseClass == InteractiveVariableDescription.class) {
+            switch (derivedFeatureID) {
+            case ToolPackage.SELECT_MODEL_ELEMENT_VARIABLE__USER_DOCUMENTATION:
+                return DescriptionPackage.INTERACTIVE_VARIABLE_DESCRIPTION__USER_DOCUMENTATION;
+            default:
+                return -1;
+            }
+        }
         return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
     }
 
@@ -501,6 +571,14 @@ public class SelectModelElementVariableImpl extends SubVariableImpl implements S
                 return -1;
             }
         }
+        if (baseClass == InteractiveVariableDescription.class) {
+            switch (baseFeatureID) {
+            case DescriptionPackage.INTERACTIVE_VARIABLE_DESCRIPTION__USER_DOCUMENTATION:
+                return ToolPackage.SELECT_MODEL_ELEMENT_VARIABLE__USER_DOCUMENTATION;
+            default:
+                return -1;
+            }
+        }
         return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
     }
 
@@ -528,6 +606,8 @@ public class SelectModelElementVariableImpl extends SubVariableImpl implements S
         result.append(childrenExpression);
         result.append(", message: "); //$NON-NLS-1$
         result.append(message);
+        result.append(", userDocumentation: "); //$NON-NLS-1$
+        result.append(userDocumentation);
         result.append(')');
         return result.toString();
     }
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ToolPackageImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ToolPackageImpl.java
index 70f2145308..49e2db9379 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ToolPackageImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/ToolPackageImpl.java
@@ -26,7 +26,6 @@ import org.eclipse.sirius.viewpoint.description.impl.DescriptionPackageImpl;
 import org.eclipse.sirius.viewpoint.description.style.StylePackage;
 import org.eclipse.sirius.viewpoint.description.style.impl.StylePackageImpl;
 import org.eclipse.sirius.viewpoint.description.tool.AbstractToolDescription;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.tool.AcceleoVariable;
 import org.eclipse.sirius.viewpoint.description.tool.Case;
 import org.eclipse.sirius.viewpoint.description.tool.ChangeContext;
@@ -73,7 +72,6 @@ import org.eclipse.sirius.viewpoint.description.tool.SelectModelElementVariable;
 import org.eclipse.sirius.viewpoint.description.tool.SelectionWizardDescription;
 import org.eclipse.sirius.viewpoint.description.tool.SetObject;
 import org.eclipse.sirius.viewpoint.description.tool.SetValue;
-import org.eclipse.sirius.viewpoint.description.tool.SubVariable;
 import org.eclipse.sirius.viewpoint.description.tool.Switch;
 import org.eclipse.sirius.viewpoint.description.tool.SwitchChild;
 import org.eclipse.sirius.viewpoint.description.tool.ToolDescription;
@@ -211,13 +209,6 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
      * 
      * @generated
      */
-    private EClass abstractVariableEClass = null;
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
     private EClass variableContainerEClass = null;
 
     /**
@@ -232,13 +223,6 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
      * 
      * @generated
      */
-    private EClass subVariableEClass = null;
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
     private EClass dialogVariableEClass = null;
 
     /**
@@ -1303,26 +1287,6 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
      * @generated
      */
     @Override
-    public EClass getAbstractVariable() {
-        return abstractVariableEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public EAttribute getAbstractVariable_Name() {
-        return (EAttribute) abstractVariableEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
     public EClass getVariableContainer() {
         return variableContainerEClass;
     }
@@ -1363,16 +1327,6 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
      * @generated
      */
     @Override
-    public EClass getSubVariable() {
-        return subVariableEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
     public EClass getDialogVariable() {
         return dialogVariableEClass;
     }
@@ -2176,17 +2130,12 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
         popupMenuEClass = createEClass(ToolPackage.POPUP_MENU);
         createEReference(popupMenuEClass, ToolPackage.POPUP_MENU__MENU_ITEM_DESCRIPTION);
 
-        abstractVariableEClass = createEClass(ToolPackage.ABSTRACT_VARIABLE);
-        createEAttribute(abstractVariableEClass, ToolPackage.ABSTRACT_VARIABLE__NAME);
-
         variableContainerEClass = createEClass(ToolPackage.VARIABLE_CONTAINER);
         createEReference(variableContainerEClass, ToolPackage.VARIABLE_CONTAINER__SUB_VARIABLES);
 
         acceleoVariableEClass = createEClass(ToolPackage.ACCELEO_VARIABLE);
         createEAttribute(acceleoVariableEClass, ToolPackage.ACCELEO_VARIABLE__COMPUTATION_EXPRESSION);
 
-        subVariableEClass = createEClass(ToolPackage.SUB_VARIABLE);
-
         dialogVariableEClass = createEClass(ToolPackage.DIALOG_VARIABLE);
         createEAttribute(dialogVariableEClass, ToolPackage.DIALOG_VARIABLE__DIALOG_PROMPT);
 
@@ -2349,26 +2298,26 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
         externalJavaActionCallEClass.getESuperTypes().add(this.getContainerModelOperation());
         popupMenuEClass.getESuperTypes().add(this.getAbstractToolDescription());
         acceleoVariableEClass.getESuperTypes().add(this.getVariableContainer());
-        acceleoVariableEClass.getESuperTypes().add(this.getSubVariable());
-        subVariableEClass.getESuperTypes().add(this.getAbstractVariable());
-        dialogVariableEClass.getESuperTypes().add(this.getAbstractVariable());
-        elementDropVariableEClass.getESuperTypes().add(this.getAbstractVariable());
+        acceleoVariableEClass.getESuperTypes().add(theDescriptionPackage.getSubVariable());
+        dialogVariableEClass.getESuperTypes().add(theDescriptionPackage.getAbstractVariable());
+        elementDropVariableEClass.getESuperTypes().add(theDescriptionPackage.getAbstractVariable());
         elementDropVariableEClass.getESuperTypes().add(this.getVariableContainer());
-        elementSelectVariableEClass.getESuperTypes().add(this.getAbstractVariable());
-        elementVariableEClass.getESuperTypes().add(this.getAbstractVariable());
+        elementSelectVariableEClass.getESuperTypes().add(theDescriptionPackage.getAbstractVariable());
+        elementVariableEClass.getESuperTypes().add(theDescriptionPackage.getAbstractVariable());
         elementVariableEClass.getESuperTypes().add(this.getVariableContainer());
-        elementViewVariableEClass.getESuperTypes().add(this.getAbstractVariable());
+        elementViewVariableEClass.getESuperTypes().add(theDescriptionPackage.getAbstractVariable());
         elementViewVariableEClass.getESuperTypes().add(this.getVariableContainer());
-        elementDeleteVariableEClass.getESuperTypes().add(this.getAbstractVariable());
+        elementDeleteVariableEClass.getESuperTypes().add(theDescriptionPackage.getAbstractVariable());
         elementDeleteVariableEClass.getESuperTypes().add(this.getVariableContainer());
-        dropContainerVariableEClass.getESuperTypes().add(this.getAbstractVariable());
+        dropContainerVariableEClass.getESuperTypes().add(theDescriptionPackage.getAbstractVariable());
         dropContainerVariableEClass.getESuperTypes().add(this.getVariableContainer());
-        selectContainerVariableEClass.getESuperTypes().add(this.getAbstractVariable());
+        selectContainerVariableEClass.getESuperTypes().add(theDescriptionPackage.getAbstractVariable());
         selectContainerVariableEClass.getESuperTypes().add(this.getVariableContainer());
-        containerViewVariableEClass.getESuperTypes().add(this.getAbstractVariable());
+        containerViewVariableEClass.getESuperTypes().add(theDescriptionPackage.getAbstractVariable());
         containerViewVariableEClass.getESuperTypes().add(this.getVariableContainer());
-        selectModelElementVariableEClass.getESuperTypes().add(this.getSubVariable());
+        selectModelElementVariableEClass.getESuperTypes().add(theDescriptionPackage.getSubVariable());
         selectModelElementVariableEClass.getESuperTypes().add(theDescriptionPackage.getSelectionDescription());
+        selectModelElementVariableEClass.getESuperTypes().add(theDescriptionPackage.getInteractiveVariableDescription());
         containerModelOperationEClass.getESuperTypes().add(this.getModelOperation());
         createInstanceEClass.getESuperTypes().add(this.getContainerModelOperation());
         changeContextEClass.getESuperTypes().add(this.getContainerModelOperation());
@@ -2380,7 +2329,7 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
         forEClass.getESuperTypes().add(this.getContainerModelOperation());
         ifEClass.getESuperTypes().add(this.getContainerModelOperation());
         deleteViewEClass.getESuperTypes().add(this.getContainerModelOperation());
-        nameVariableEClass.getESuperTypes().add(this.getAbstractVariable());
+        nameVariableEClass.getESuperTypes().add(theDescriptionPackage.getAbstractVariable());
         caseEClass.getESuperTypes().add(this.getSwitchChild());
         defaultEClass.getESuperTypes().add(this.getSwitchChild());
         switchEClass.getESuperTypes().add(this.getModelOperation());
@@ -2687,16 +2636,10 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
                 null,
                 "menuItemDescription", null, 1, -1, PopupMenu.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
 
-        initEClass(abstractVariableEClass, AbstractVariable.class, "AbstractVariable", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-        initEAttribute(
-                getAbstractVariable_Name(),
-                theEcorePackage.getEString(),
-                "name", null, 0, 1, AbstractVariable.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-
         initEClass(variableContainerEClass, VariableContainer.class, "VariableContainer", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
         initEReference(
                 getVariableContainer_SubVariables(),
-                this.getSubVariable(),
+                theDescriptionPackage.getSubVariable(),
                 null,
                 "subVariables", null, 0, -1, VariableContainer.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
 
@@ -2706,8 +2649,6 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
                 theDescriptionPackage.getInterpretedExpression(),
                 "computationExpression", null, 0, 1, AcceleoVariable.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
 
-        initEClass(subVariableEClass, SubVariable.class, "SubVariable", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
         initEClass(dialogVariableEClass, DialogVariable.class, "DialogVariable", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
         initEAttribute(
                 getDialogVariable_DialogPrompt(),
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/VariableContainerImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/VariableContainerImpl.java
index 89036af3ea..09ece9bfcb 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/VariableContainerImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/VariableContainerImpl.java
@@ -20,7 +20,7 @@ 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.viewpoint.description.tool.SubVariable;
+import org.eclipse.sirius.viewpoint.description.SubVariable;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
 import org.eclipse.sirius.viewpoint.description.tool.VariableContainer;
 
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/util/ToolAdapterFactory.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/util/ToolAdapterFactory.java
index 2c1bba5682..6a01341a8f 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/util/ToolAdapterFactory.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/util/ToolAdapterFactory.java
@@ -15,11 +15,13 @@ import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.DocumentedElement;
 import org.eclipse.sirius.viewpoint.description.IdentifiedElement;
+import org.eclipse.sirius.viewpoint.description.InteractiveVariableDescription;
 import org.eclipse.sirius.viewpoint.description.SelectionDescription;
+import org.eclipse.sirius.viewpoint.description.SubVariable;
 import org.eclipse.sirius.viewpoint.description.tool.AbstractToolDescription;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.tool.AcceleoVariable;
 import org.eclipse.sirius.viewpoint.description.tool.Case;
 import org.eclipse.sirius.viewpoint.description.tool.ChangeContext;
@@ -65,7 +67,6 @@ import org.eclipse.sirius.viewpoint.description.tool.SelectModelElementVariable;
 import org.eclipse.sirius.viewpoint.description.tool.SelectionWizardDescription;
 import org.eclipse.sirius.viewpoint.description.tool.SetObject;
 import org.eclipse.sirius.viewpoint.description.tool.SetValue;
-import org.eclipse.sirius.viewpoint.description.tool.SubVariable;
 import org.eclipse.sirius.viewpoint.description.tool.Switch;
 import org.eclipse.sirius.viewpoint.description.tool.SwitchChild;
 import org.eclipse.sirius.viewpoint.description.tool.ToolDescription;
@@ -211,11 +212,6 @@ public class ToolAdapterFactory extends AdapterFactoryImpl {
         }
 
         @Override
-        public Adapter caseAbstractVariable(AbstractVariable object) {
-            return createAbstractVariableAdapter();
-        }
-
-        @Override
         public Adapter caseVariableContainer(VariableContainer object) {
             return createVariableContainerAdapter();
         }
@@ -226,11 +222,6 @@ public class ToolAdapterFactory extends AdapterFactoryImpl {
         }
 
         @Override
-        public Adapter caseSubVariable(SubVariable object) {
-            return createSubVariableAdapter();
-        }
-
-        @Override
         public Adapter caseDialogVariable(DialogVariable object) {
             return createDialogVariableAdapter();
         }
@@ -421,6 +412,21 @@ public class ToolAdapterFactory extends AdapterFactoryImpl {
         }
 
         @Override
+        public Adapter caseAbstractVariable(AbstractVariable object) {
+            return createAbstractVariableAdapter();
+        }
+
+        @Override
+        public Adapter caseSubVariable(SubVariable object) {
+            return createSubVariableAdapter();
+        }
+
+        @Override
+        public Adapter caseInteractiveVariableDescription(InteractiveVariableDescription object) {
+            return createInteractiveVariableDescriptionAdapter();
+        }
+
+        @Override
         public Adapter defaultCase(EObject object) {
             return createEObjectAdapter();
         }
@@ -698,14 +704,14 @@ public class ToolAdapterFactory extends AdapterFactoryImpl {
 
     /**
      * Creates a new adapter for an object of class '
-     * {@link org.eclipse.sirius.viewpoint.description.tool.AbstractVariable
+     * {@link org.eclipse.sirius.viewpoint.description.AbstractVariable
      * <em>Abstract Variable</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.description.tool.AbstractVariable
+     * @see org.eclipse.sirius.viewpoint.description.AbstractVariable
      * @generated
      */
     public Adapter createAbstractVariableAdapter() {
@@ -746,14 +752,14 @@ public class ToolAdapterFactory extends AdapterFactoryImpl {
 
     /**
      * Creates a new adapter for an object of class '
-     * {@link org.eclipse.sirius.viewpoint.description.tool.SubVariable
+     * {@link org.eclipse.sirius.viewpoint.description.SubVariable
      * <em>Sub Variable</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.description.tool.SubVariable
+     * @see org.eclipse.sirius.viewpoint.description.SubVariable
      * @generated
      */
     public Adapter createSubVariableAdapter() {
@@ -762,6 +768,22 @@ public class ToolAdapterFactory extends AdapterFactoryImpl {
 
     /**
      * Creates a new adapter for an object of class '
+     * {@link org.eclipse.sirius.viewpoint.description.InteractiveVariableDescription
+     * <em>Interactive Variable Description</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.description.InteractiveVariableDescription
+     * @generated
+     */
+    public Adapter createInteractiveVariableDescriptionAdapter() {
+        return null;
+    }
+
+    /**
+     * Creates a new adapter for an object of class '
      * {@link org.eclipse.sirius.viewpoint.description.tool.DialogVariable
      * <em>Dialog Variable</em>}'. <!-- begin-user-doc --> This default
      * implementation returns null so that we can easily ignore cases; it's
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/util/ToolSwitch.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/util/ToolSwitch.java
index 43572c43f5..c63b83439e 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/util/ToolSwitch.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/util/ToolSwitch.java
@@ -15,11 +15,13 @@ import java.util.List;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.DocumentedElement;
 import org.eclipse.sirius.viewpoint.description.IdentifiedElement;
+import org.eclipse.sirius.viewpoint.description.InteractiveVariableDescription;
 import org.eclipse.sirius.viewpoint.description.SelectionDescription;
+import org.eclipse.sirius.viewpoint.description.SubVariable;
 import org.eclipse.sirius.viewpoint.description.tool.AbstractToolDescription;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.tool.AcceleoVariable;
 import org.eclipse.sirius.viewpoint.description.tool.Case;
 import org.eclipse.sirius.viewpoint.description.tool.ChangeContext;
@@ -65,7 +67,6 @@ import org.eclipse.sirius.viewpoint.description.tool.SelectModelElementVariable;
 import org.eclipse.sirius.viewpoint.description.tool.SelectionWizardDescription;
 import org.eclipse.sirius.viewpoint.description.tool.SetObject;
 import org.eclipse.sirius.viewpoint.description.tool.SetValue;
-import org.eclipse.sirius.viewpoint.description.tool.SubVariable;
 import org.eclipse.sirius.viewpoint.description.tool.Switch;
 import org.eclipse.sirius.viewpoint.description.tool.SwitchChild;
 import org.eclipse.sirius.viewpoint.description.tool.ToolDescription;
@@ -480,14 +481,6 @@ public class ToolSwitch<T> {
             }
             return result;
         }
-        case ToolPackage.ABSTRACT_VARIABLE: {
-            AbstractVariable abstractVariable = (AbstractVariable) theEObject;
-            T result = caseAbstractVariable(abstractVariable);
-            if (result == null) {
-                result = defaultCase(theEObject);
-            }
-            return result;
-        }
         case ToolPackage.VARIABLE_CONTAINER: {
             VariableContainer variableContainer = (VariableContainer) theEObject;
             T result = caseVariableContainer(variableContainer);
@@ -513,17 +506,6 @@ public class ToolSwitch<T> {
             }
             return result;
         }
-        case ToolPackage.SUB_VARIABLE: {
-            SubVariable subVariable = (SubVariable) theEObject;
-            T result = caseSubVariable(subVariable);
-            if (result == null) {
-                result = caseAbstractVariable(subVariable);
-            }
-            if (result == null) {
-                result = defaultCase(theEObject);
-            }
-            return result;
-        }
         case ToolPackage.DIALOG_VARIABLE: {
             DialogVariable dialogVariable = (DialogVariable) theEObject;
             T result = caseDialogVariable(dialogVariable);
@@ -654,6 +636,9 @@ public class ToolSwitch<T> {
                 result = caseSelectionDescription(selectModelElementVariable);
             }
             if (result == null) {
+                result = caseInteractiveVariableDescription(selectModelElementVariable);
+            }
+            if (result == null) {
                 result = caseAbstractVariable(selectModelElementVariable);
             }
             if (result == null) {
@@ -1215,23 +1200,6 @@ public class ToolSwitch<T> {
 
     /**
      * Returns the result of interpreting the object as an instance of '
-     * <em>Abstract Variable</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>Abstract Variable</em>'.
-     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-     * @generated
-     */
-    public T caseAbstractVariable(AbstractVariable object) {
-        return null;
-    }
-
-    /**
-     * Returns the result of interpreting the object as an instance of '
      * <em>Variable Container</em>'. <!-- begin-user-doc --> This implementation
      * returns null; returning a non-null result will terminate the switch. <!--
      * end-user-doc -->
@@ -1266,23 +1234,6 @@ public class ToolSwitch<T> {
 
     /**
      * Returns the result of interpreting the object as an instance of '
-     * <em>Sub Variable</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>Sub Variable</em>'.
-     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-     * @generated
-     */
-    public T caseSubVariable(SubVariable object) {
-        return null;
-    }
-
-    /**
-     * Returns the result of interpreting the object as an instance of '
      * <em>Dialog Variable</em>'. <!-- begin-user-doc --> This implementation
      * returns null; returning a non-null result will terminate the switch. <!--
      * end-user-doc -->
@@ -1929,6 +1880,57 @@ public class ToolSwitch<T> {
 
     /**
      * Returns the result of interpreting the object as an instance of '
+     * <em>Abstract Variable</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>Abstract Variable</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseAbstractVariable(AbstractVariable object) {
+        return null;
+    }
+
+    /**
+     * Returns the result of interpreting the object as an instance of '
+     * <em>Sub Variable</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>Sub Variable</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseSubVariable(SubVariable object) {
+        return null;
+    }
+
+    /**
+     * Returns the result of interpreting the object as an instance of '
+     * <em>Interactive Variable Description</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>Interactive Variable Description</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseInteractiveVariableDescription(InteractiveVariableDescription object) {
+        return null;
+    }
+
+    /**
+     * Returns the result of interpreting the object as an instance of '
      * <em>EObject</em>'. <!-- begin-user-doc --> This implementation returns
      * null; returning a non-null result will terminate the switch, but this is
      * the last case anyway. <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/util/DescriptionAdapterFactory.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/util/DescriptionAdapterFactory.java
index 6cab7381e1..cb4b8a0bcc 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/util/DescriptionAdapterFactory.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/util/DescriptionAdapterFactory.java
@@ -16,6 +16,7 @@ import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.sirius.viewpoint.description.AbstractMappingImport;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.AnnotationEntry;
 import org.eclipse.sirius.viewpoint.description.ColorDescription;
 import org.eclipse.sirius.viewpoint.description.ColorStep;
@@ -41,6 +42,7 @@ import org.eclipse.sirius.viewpoint.description.FixedColor;
 import org.eclipse.sirius.viewpoint.description.Group;
 import org.eclipse.sirius.viewpoint.description.IVSMElementCustomization;
 import org.eclipse.sirius.viewpoint.description.IdentifiedElement;
+import org.eclipse.sirius.viewpoint.description.InteractiveVariableDescription;
 import org.eclipse.sirius.viewpoint.description.InterpolatedColor;
 import org.eclipse.sirius.viewpoint.description.JavaExtension;
 import org.eclipse.sirius.viewpoint.description.MetamodelExtensionSetting;
@@ -52,8 +54,10 @@ import org.eclipse.sirius.viewpoint.description.RepresentationImportDescription;
 import org.eclipse.sirius.viewpoint.description.RepresentationTemplate;
 import org.eclipse.sirius.viewpoint.description.SelectionDescription;
 import org.eclipse.sirius.viewpoint.description.SemanticBasedDecoration;
+import org.eclipse.sirius.viewpoint.description.SubVariable;
 import org.eclipse.sirius.viewpoint.description.SystemColor;
 import org.eclipse.sirius.viewpoint.description.SytemColorsPalette;
+import org.eclipse.sirius.viewpoint.description.TypedVariable;
 import org.eclipse.sirius.viewpoint.description.UserColor;
 import org.eclipse.sirius.viewpoint.description.UserColorsPalette;
 import org.eclipse.sirius.viewpoint.description.UserFixedColor;
@@ -337,6 +341,26 @@ public class DescriptionAdapterFactory extends AdapterFactoryImpl {
         }
 
         @Override
+        public Adapter caseAbstractVariable(AbstractVariable object) {
+            return createAbstractVariableAdapter();
+        }
+
+        @Override
+        public Adapter caseSubVariable(SubVariable object) {
+            return createSubVariableAdapter();
+        }
+
+        @Override
+        public Adapter caseInteractiveVariableDescription(InteractiveVariableDescription object) {
+            return createInteractiveVariableDescriptionAdapter();
+        }
+
+        @Override
+        public Adapter caseTypedVariable(TypedVariable object) {
+            return createTypedVariableAdapter();
+        }
+
+        @Override
         public Adapter defaultCase(EObject object) {
             return createEObjectAdapter();
         }
@@ -1060,6 +1084,70 @@ public class DescriptionAdapterFactory extends AdapterFactoryImpl {
     }
 
     /**
+     * Creates a new adapter for an object of class '
+     * {@link org.eclipse.sirius.viewpoint.description.AbstractVariable
+     * <em>Abstract Variable</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.description.AbstractVariable
+     * @generated
+     */
+    public Adapter createAbstractVariableAdapter() {
+        return null;
+    }
+
+    /**
+     * Creates a new adapter for an object of class '
+     * {@link org.eclipse.sirius.viewpoint.description.SubVariable
+     * <em>Sub Variable</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.description.SubVariable
+     * @generated
+     */
+    public Adapter createSubVariableAdapter() {
+        return null;
+    }
+
+    /**
+     * Creates a new adapter for an object of class '
+     * {@link org.eclipse.sirius.viewpoint.description.InteractiveVariableDescription
+     * <em>Interactive Variable Description</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.description.InteractiveVariableDescription
+     * @generated
+     */
+    public Adapter createInteractiveVariableDescriptionAdapter() {
+        return null;
+    }
+
+    /**
+     * Creates a new adapter for an object of class '
+     * {@link org.eclipse.sirius.viewpoint.description.TypedVariable
+     * <em>Typed Variable</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.description.TypedVariable
+     * @generated
+     */
+    public Adapter createTypedVariableAdapter() {
+        return null;
+    }
+
+    /**
      * Creates a new adapter for the default case. <!-- begin-user-doc --> This
      * default implementation returns null. <!-- end-user-doc -->
      * 
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/util/DescriptionSwitch.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/util/DescriptionSwitch.java
index 4761cd5429..0eaeea6f70 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/util/DescriptionSwitch.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/util/DescriptionSwitch.java
@@ -16,6 +16,7 @@ import java.util.List;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.sirius.viewpoint.description.AbstractMappingImport;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.AnnotationEntry;
 import org.eclipse.sirius.viewpoint.description.ColorDescription;
 import org.eclipse.sirius.viewpoint.description.ColorStep;
@@ -41,6 +42,7 @@ import org.eclipse.sirius.viewpoint.description.FixedColor;
 import org.eclipse.sirius.viewpoint.description.Group;
 import org.eclipse.sirius.viewpoint.description.IVSMElementCustomization;
 import org.eclipse.sirius.viewpoint.description.IdentifiedElement;
+import org.eclipse.sirius.viewpoint.description.InteractiveVariableDescription;
 import org.eclipse.sirius.viewpoint.description.InterpolatedColor;
 import org.eclipse.sirius.viewpoint.description.JavaExtension;
 import org.eclipse.sirius.viewpoint.description.MetamodelExtensionSetting;
@@ -52,8 +54,10 @@ import org.eclipse.sirius.viewpoint.description.RepresentationImportDescription;
 import org.eclipse.sirius.viewpoint.description.RepresentationTemplate;
 import org.eclipse.sirius.viewpoint.description.SelectionDescription;
 import org.eclipse.sirius.viewpoint.description.SemanticBasedDecoration;
+import org.eclipse.sirius.viewpoint.description.SubVariable;
 import org.eclipse.sirius.viewpoint.description.SystemColor;
 import org.eclipse.sirius.viewpoint.description.SytemColorsPalette;
+import org.eclipse.sirius.viewpoint.description.TypedVariable;
 import org.eclipse.sirius.viewpoint.description.UserColor;
 import org.eclipse.sirius.viewpoint.description.UserColorsPalette;
 import org.eclipse.sirius.viewpoint.description.UserFixedColor;
@@ -573,6 +577,50 @@ public class DescriptionSwitch<T> {
             }
             return result;
         }
+        case DescriptionPackage.ABSTRACT_VARIABLE: {
+            AbstractVariable abstractVariable = (AbstractVariable) theEObject;
+            T result = caseAbstractVariable(abstractVariable);
+            if (result == null) {
+                result = defaultCase(theEObject);
+            }
+            return result;
+        }
+        case DescriptionPackage.SUB_VARIABLE: {
+            SubVariable subVariable = (SubVariable) theEObject;
+            T result = caseSubVariable(subVariable);
+            if (result == null) {
+                result = caseAbstractVariable(subVariable);
+            }
+            if (result == null) {
+                result = defaultCase(theEObject);
+            }
+            return result;
+        }
+        case DescriptionPackage.INTERACTIVE_VARIABLE_DESCRIPTION: {
+            InteractiveVariableDescription interactiveVariableDescription = (InteractiveVariableDescription) theEObject;
+            T result = caseInteractiveVariableDescription(interactiveVariableDescription);
+            if (result == null) {
+                result = defaultCase(theEObject);
+            }
+            return result;
+        }
+        case DescriptionPackage.TYPED_VARIABLE: {
+            TypedVariable typedVariable = (TypedVariable) theEObject;
+            T result = caseTypedVariable(typedVariable);
+            if (result == null) {
+                result = caseInteractiveVariableDescription(typedVariable);
+            }
+            if (result == null) {
+                result = caseSubVariable(typedVariable);
+            }
+            if (result == null) {
+                result = caseAbstractVariable(typedVariable);
+            }
+            if (result == null) {
+                result = defaultCase(theEObject);
+            }
+            return result;
+        }
         default:
             return defaultCase(theEObject);
         }
@@ -1328,6 +1376,74 @@ public class DescriptionSwitch<T> {
 
     /**
      * Returns the result of interpreting the object as an instance of '
+     * <em>Abstract Variable</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>Abstract Variable</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseAbstractVariable(AbstractVariable object) {
+        return null;
+    }
+
+    /**
+     * Returns the result of interpreting the object as an instance of '
+     * <em>Sub Variable</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>Sub Variable</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseSubVariable(SubVariable object) {
+        return null;
+    }
+
+    /**
+     * Returns the result of interpreting the object as an instance of '
+     * <em>Interactive Variable Description</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>Interactive Variable Description</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseInteractiveVariableDescription(InteractiveVariableDescription object) {
+        return null;
+    }
+
+    /**
+     * Returns the result of interpreting the object as an instance of '
+     * <em>Typed Variable</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>Typed Variable</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseTypedVariable(TypedVariable object) {
+        return null;
+    }
+
+    /**
+     * Returns the result of interpreting the object as an instance of '
      * <em>EObject</em>'. <!-- begin-user-doc --> This implementation returns
      * null; returning a non-null result will terminate the switch, but this is
      * the last case anyway. <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/dialect/description/AbstractInterpretedExpressionQuery.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/dialect/description/AbstractInterpretedExpressionQuery.java
index ab2ec9884e..e5a6ef79d7 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/dialect/description/AbstractInterpretedExpressionQuery.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/dialect/description/AbstractInterpretedExpressionQuery.java
@@ -39,7 +39,7 @@ import org.eclipse.sirius.viewpoint.description.JavaExtension;
 import org.eclipse.sirius.viewpoint.description.RepresentationDescription;
 import org.eclipse.sirius.viewpoint.description.Viewpoint;
 import org.eclipse.sirius.viewpoint.description.tool.AbstractToolDescription;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.tool.ChangeContext;
 import org.eclipse.sirius.viewpoint.description.tool.CreateInstance;
 import org.eclipse.sirius.viewpoint.description.tool.EditMaskVariables;
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/helper/task/InitInterpreterVariablesTask.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/helper/task/InitInterpreterVariablesTask.java
index bbbac1a36e..caf6ccb58e 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/helper/task/InitInterpreterVariablesTask.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/helper/task/InitInterpreterVariablesTask.java
@@ -31,10 +31,10 @@ import org.eclipse.sirius.common.tools.api.interpreter.IInterpreter;
 import org.eclipse.sirius.common.tools.api.util.EObjectCollectionWrapper;
 import org.eclipse.sirius.tools.api.command.ui.UICallBack;
 import org.eclipse.sirius.viewpoint.Messages;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.tool.AcceleoVariable;
 import org.eclipse.sirius.viewpoint.description.tool.SelectModelElementVariable;
-import org.eclipse.sirius.viewpoint.description.tool.SubVariable;
+import org.eclipse.sirius.viewpoint.description.SubVariable;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
 import org.eclipse.sirius.viewpoint.description.tool.VariableContainer;
 
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/description/constraints/ExistingExpressionVariablesConstraint.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/description/constraints/ExistingExpressionVariablesConstraint.java
index 1b082c2f91..b57754584c 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/description/constraints/ExistingExpressionVariablesConstraint.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/description/constraints/ExistingExpressionVariablesConstraint.java
@@ -24,7 +24,7 @@ import org.eclipse.sirius.common.tools.api.util.StringUtil;
 import org.eclipse.sirius.tools.internal.validation.AbstractConstraint;
 import org.eclipse.sirius.viewpoint.description.ConditionalStyleDescription;
 import org.eclipse.sirius.viewpoint.description.tool.AbstractToolDescription;
-import org.eclipse.sirius.viewpoint.description.tool.AbstractVariable;
+import org.eclipse.sirius.viewpoint.description.AbstractVariable;
 import org.eclipse.sirius.viewpoint.description.tool.AcceleoVariable;
 import org.eclipse.sirius.viewpoint.description.tool.ChangeContext;
 import org.eclipse.sirius.viewpoint.description.tool.CreateInstance;
author	Laurent Fasani	2015-12-17 14:40:49 +0000
committer	Laurent Fasani	2016-01-28 12:58:01 +0000
commit	4b9a851c65dc3782693c9a11786c5d87844f6ae6 (patch)
tree	3b99ddefafc754c4d605462106977523eb3fdde2
parent	6710e636d2a6293d3e20a025962b627666fbe221 (diff)
download	org.eclipse.sirius-4b9a851c65dc3782693c9a11786c5d87844f6ae6.tar.gz org.eclipse.sirius-4b9a851c65dc3782693c9a11786c5d87844f6ae6.tar.xz org.eclipse.sirius-4b9a851c65dc3782693c9a11786c5d87844f6ae6.zip