UPDATED: Fixed build

105 files changed, 2131 insertions, 235 deletions

diff --git a/features/org.eclipse.emf.eef.tests-feature/feature.xml b/features/org.eclipse.emf.eef.tests-feature/feature.xml
index 967981cd6..68e596599 100644
--- a/features/org.eclipse.emf.eef.tests-feature/feature.xml
+++ b/features/org.eclipse.emf.eef.tests-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.emf.eef.tests-feature"
       label="%featureName"
-      version="1.2.0.qualifier"
+      version="1.3.0.qualifier"
       provider-name="%providerName">
 
    <description>
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.eef.modelingbot/META-INF/MANIFEST.MF
index e0ae36c9b..8b0ce37d9 100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.eef.modelingbot/META-INF/MANIFEST.MF
@@ -68,7 +68,8 @@ Export-Package: org.eclipse.emf.eef.modelingBot;
   uses:="org.eclipse.emf.ecore,
    org.eclipse.emf.common.notify.impl,
    org.eclipse.emf.eef.modelingBot,
-   org.eclipse.emf.common.notify"
+   org.eclipse.emf.common.notify",
+ org.eclipse.emf.eef.modelingBot.validation
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.emf.eef.components;visibility:=reexport,
@@ -83,7 +84,5 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.apache.log4j,
  org.eclipse.emf.ecore.xmi,
- org.eclipse.emf.compare,
- org.eclipse.emf.compare.diff,
- org.eclipse.emf.compare.match
+ org.eclipse.emf.compare;bundle-version="3.0.0"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/model/mbot.ecore b/plugins/org.eclipse.emf.eef.modelingbot/model/mbot.ecore
index d11ab3291..23863ebf1 100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/model/mbot.ecore
+++ b/plugins/org.eclipse.emf.eef.modelingbot/model/mbot.ecore
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="modelingBot"
-    nsURI="http://www.eclipse.org/emf/eef/mbot/1.0.0" nsPrefix="eef-mbot">
-  <eClassifiers xsi:type="ecore:EClass" name="Scenario" eSuperTypes="#//Sequence"/>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="modelingBot" nsURI="http://www.eclipse.org/emf/eef/mbot/1.0.0"
+    nsPrefix="eef-mbot">
+  <eClassifiers xsi:type="ecore:EClass" name="Scenario" eSuperTypes="#//Sequence">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore" references="#//Scenario">
+      <details key="constraints" value="JavaTestExistsForScenarioConstraint"/>
+    </eAnnotations>
+  </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Action" abstract="true" eSuperTypes="#//DocumentedElement #//Processing"/>
   <eClassifiers xsi:type="ecore:EClass" name="Sequence" abstract="true" eSuperTypes="#//DocumentedElement #//Processing">
     <eStructuralFeatures xsi:type="ecore:EReference" name="actions" upperBound="-1"
@@ -42,18 +45,37 @@
     <eClassifiers xsi:type="ecore:EClass" name="EditAction" abstract="true" eSuperTypes="#//EEFActions/EEFAction platform:/plugin/org.eclipse.emf.eef.editor.model/model/extended.ecore#//editor/ReferenceableObject">
       <eStructuralFeatures xsi:type="ecore:EReference" name="propertiesEditionElement"
           eType="ecore:EClass platform:/plugin/org.eclipse.emf.eef.components/model/components.ecore#//PropertiesEditionElement"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="propertiesEditionElementURI"
+          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="computedPropertiesEditionElement"
+          eType="ecore:EClass platform:/plugin/org.eclipse.emf.eef.components/model/components.ecore#//PropertiesEditionElement"
+          changeable="false" volatile="true" transient="true" derived="true"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="referenceableObject"
           eType="ecore:EClass platform:/plugin/org.eclipse.emf.eef.editor.model/model/extended.ecore#//editor/ReferenceableObject"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="Add" eSuperTypes="#//EEFActions/EditAction">
       <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="computedType" lowerBound="1"
+          eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass"
+          changeable="false" volatile="true" transient="true" derived="true"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="eContainingFeature" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="eContainingFeatureURI"
+          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="computedEContainingFeature"
+          lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"
+          changeable="false" volatile="true" transient="true" derived="true"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="Remove" eSuperTypes="#//EEFActions/EditAction"/>
     <eClassifiers xsi:type="ecore:EClass" name="SetAttribute" eSuperTypes="#//EEFActions/EditAction">
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="values" upperBound="-1"
           eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="eContainingFeature" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="eContainingFeatureURI"
+          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="computedEContainingFeature"
+          lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"
+          changeable="false" volatile="true" transient="true" derived="true"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="UnsetAttribute" eSuperTypes="#//EEFActions/EditAction">
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="values" upperBound="-1"
@@ -87,7 +109,8 @@
       nsPrefix="eef-test">
     <eClassifiers xsi:type="ecore:EClass" name="EclipseAction" abstract="true" eSuperTypes="#//Action"/>
     <eClassifiers xsi:type="ecore:EClass" name="CreateProject" eSuperTypes="#//EclipseActions/EclipseAction">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="projectName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="projectName" lowerBound="1"
+          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="OpenPerspective" eSuperTypes="#//EclipseActions/EclipseAction">
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -112,9 +135,15 @@
       <eStructuralFeatures xsi:type="ecore:EReference" name="root" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="CreateModel" eSuperTypes="#//EclipseActions/EclipseAction platform:/plugin/org.eclipse.emf.eef.editor.model/model/extended.ecore#//editor/ReferenceableObject">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="modelName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="modelName" lowerBound="1"
+          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="path" lowerBound="1"
+          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="root" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="computedRoot" lowerBound="1"
+          eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass"
+          changeable="false" volatile="true" transient="true" derived="true"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="rootURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     </eClassifiers>
   </eSubpackages>
 </ecore:EPackage>
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/model/mbot.genmodel b/plugins/org.eclipse.emf.eef.modelingbot/model/mbot.genmodel
index 915050dd9..ad4adef70 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/model/mbot.genmodel
+++ b/plugins/org.eclipse.emf.eef.modelingbot/model/mbot.genmodel
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.eef.modelingbot/src-gen"
-    creationIcons="false" editDirectory="/org.eclipse.emf.eef.modelingbot.edit/src-gen"
-    editorDirectory="/org.eclipse.emf.eef.modelingbot.editor/src-gen" modelPluginID="org.eclipse.emf.eef.modelingbot"
-    modelName="Mbot" testsDirectory="/org.eclipse.emf.eef.modelingbot.tests/src-gen"
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.eef.modelingbot/src-gen" creationIcons="false"
+    editDirectory="/org.eclipse.emf.eef.modelingbot.edit/src-gen" editorDirectory="/org.eclipse.emf.eef.modelingbot.editor/src-gen"
+    modelPluginID="org.eclipse.emf.eef.modelingbot" modelName="Mbot" testsDirectory="/org.eclipse.emf.eef.modelingbot.tests/src-gen"
     importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
     runtimeVersion="2.5" usedGenPackages="platform:/plugin/org.eclipse.emf.eef.components/model/components.genmodel#//components platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.emf.eef.editor.model/model/extended.genmodel#//extended platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.genmodel#//genmodel platform:/plugin/org.eclipse.emf.eef.mapping/model/mapping.genmodel#//mapping platform:/plugin/org.eclipse.emf.eef.views/model/views.genmodel#//views"
     classNamePattern="">
@@ -45,20 +43,30 @@
       <genClasses image="false" ecoreClass="mbot.ecore#//EEFActions/EditAction">
         <genFeatures notify="false" createChild="false" propertySortChoices="true"
             ecoreFeature="ecore:EReference mbot.ecore#//EEFActions/EditAction/propertiesEditionElement"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mbot.ecore#//EEFActions/EditAction/propertiesEditionElementURI"/>
+        <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference mbot.ecore#//EEFActions/EditAction/computedPropertiesEditionElement"/>
         <genFeatures notify="false" createChild="false" propertySortChoices="true"
             ecoreFeature="ecore:EReference mbot.ecore#//EEFActions/EditAction/referenceableObject"/>
       </genClasses>
       <genClasses ecoreClass="mbot.ecore#//EEFActions/Add">
         <genFeatures notify="false" createChild="false" propertySortChoices="true"
             ecoreFeature="ecore:EReference mbot.ecore#//EEFActions/Add/type"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mbot.ecore#//EEFActions/Add/typeURI"/>
+        <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference mbot.ecore#//EEFActions/Add/computedType"/>
         <genFeatures notify="false" createChild="false" propertySortChoices="true"
             ecoreFeature="ecore:EReference mbot.ecore#//EEFActions/Add/eContainingFeature"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mbot.ecore#//EEFActions/Add/eContainingFeatureURI"/>
+        <genFeatures property="None" notify="false" createChild="false" propertySortChoices="true"
+            ecoreFeature="ecore:EReference mbot.ecore#//EEFActions/Add/computedEContainingFeature"/>
       </genClasses>
       <genClasses ecoreClass="mbot.ecore#//EEFActions/Remove"/>
       <genClasses ecoreClass="mbot.ecore#//EEFActions/SetAttribute">
         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mbot.ecore#//EEFActions/SetAttribute/values"/>
         <genFeatures notify="false" createChild="false" propertySortChoices="true"
             ecoreFeature="ecore:EReference mbot.ecore#//EEFActions/SetAttribute/eContainingFeature"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mbot.ecore#//EEFActions/SetAttribute/eContainingFeatureURI"/>
+        <genFeatures property="None" notify="false" createChild="false" propertySortChoices="true"
+            ecoreFeature="ecore:EReference mbot.ecore#//EEFActions/SetAttribute/computedEContainingFeature"/>
       </genClasses>
       <genClasses ecoreClass="mbot.ecore#//EEFActions/UnsetAttribute">
         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mbot.ecore#//EEFActions/UnsetAttribute/values"/>
@@ -126,6 +134,8 @@
         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mbot.ecore#//EclipseActions/CreateModel/path"/>
         <genFeatures notify="false" createChild="false" propertySortChoices="true"
             ecoreFeature="ecore:EReference mbot.ecore#//EclipseActions/CreateModel/root"/>
+        <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference mbot.ecore#//EclipseActions/CreateModel/computedRoot"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mbot.ecore#//EclipseActions/CreateModel/rootURI"/>
       </genClasses>
     </nestedGenPackages>
   </genPackages>
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/Action.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/Action.java
index b16333ef5..b16333ef5 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/Action.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/Action.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/DetailsPage.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/DetailsPage.java
index 1fa23017c..1fa23017c 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/DetailsPage.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/DetailsPage.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/DocumentedElement.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/DocumentedElement.java
index f617c5671..f617c5671 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/DocumentedElement.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/DocumentedElement.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/Add.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/Add.java
index 814f30a3c..df1d79ed5 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/Add.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/Add.java
@@ -23,7 +23,11 @@ import org.eclipse.emf.ecore.EStructuralFeature;
  * The following features are supported:
  * <ul>
  *   <li>{@link org.eclipse.emf.eef.modelingBot.EEFActions.Add#getType <em>Type</em>}</li>
+ *   <li>{@link org.eclipse.emf.eef.modelingBot.EEFActions.Add#getTypeURI <em>Type URI</em>}</li>
+ *   <li>{@link org.eclipse.emf.eef.modelingBot.EEFActions.Add#getComputedType <em>Computed Type</em>}</li>
  *   <li>{@link org.eclipse.emf.eef.modelingBot.EEFActions.Add#getEContainingFeature <em>EContaining Feature</em>}</li>
+ *   <li>{@link org.eclipse.emf.eef.modelingBot.EEFActions.Add#getEContainingFeatureURI <em>EContaining Feature URI</em>}</li>
+ *   <li>{@link org.eclipse.emf.eef.modelingBot.EEFActions.Add#getComputedEContainingFeature <em>Computed EContaining Feature</em>}</li>
  * </ul>
  * </p>
  *
@@ -60,6 +64,47 @@ public interface Add extends EditAction {
 	void setType(EClass value);
 
 	/**
+	 * Returns the value of the '<em><b>Type URI</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Type URI</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Type URI</em>' attribute.
+	 * @see #setTypeURI(String)
+	 * @see org.eclipse.emf.eef.modelingBot.EEFActions.EEFActionsPackage#getAdd_TypeURI()
+	 * @model
+	 * @generated
+	 */
+	String getTypeURI();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.eef.modelingBot.EEFActions.Add#getTypeURI <em>Type URI</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Type URI</em>' attribute.
+	 * @see #getTypeURI()
+	 * @generated
+	 */
+	void setTypeURI(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Computed Type</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Computed 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>Computed Type</em>' reference.
+	 * @see org.eclipse.emf.eef.modelingBot.EEFActions.EEFActionsPackage#getAdd_ComputedType()
+	 * @model required="true" transient="true" changeable="false" volatile="true" derived="true"
+	 * @generated
+	 */
+	EClass getComputedType();
+
+	/**
 	 * Returns the value of the '<em><b>EContaining Feature</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
@@ -84,4 +129,45 @@ public interface Add extends EditAction {
 	 * @generated
 	 */
 	void setEContainingFeature(EStructuralFeature value);
+
+	/**
+	 * Returns the value of the '<em><b>EContaining Feature URI</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>EContaining Feature URI</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>EContaining Feature URI</em>' attribute.
+	 * @see #setEContainingFeatureURI(String)
+	 * @see org.eclipse.emf.eef.modelingBot.EEFActions.EEFActionsPackage#getAdd_EContainingFeatureURI()
+	 * @model
+	 * @generated
+	 */
+	String getEContainingFeatureURI();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.eef.modelingBot.EEFActions.Add#getEContainingFeatureURI <em>EContaining Feature URI</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>EContaining Feature URI</em>' attribute.
+	 * @see #getEContainingFeatureURI()
+	 * @generated
+	 */
+	void setEContainingFeatureURI(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Computed EContaining Feature</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Computed EContaining Feature</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Computed EContaining Feature</em>' reference.
+	 * @see org.eclipse.emf.eef.modelingBot.EEFActions.EEFActionsPackage#getAdd_ComputedEContainingFeature()
+	 * @model required="true" transient="true" changeable="false" volatile="true" derived="true"
+	 * @generated
+	 */
+	EStructuralFeature getComputedEContainingFeature();
 } // Add
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/Cancel.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/Cancel.java
index 743afb121..743afb121 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/Cancel.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/Cancel.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/Check.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/Check.java
index 8a670c8ad..8a670c8ad 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/Check.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/Check.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/EEFAction.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/EEFAction.java
index 73c1e4ee3..73c1e4ee3 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/EEFAction.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/EEFAction.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/EEFActionsFactory.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/EEFActionsFactory.java
index 48cd7b74c..48cd7b74c 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/EEFActionsFactory.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/EEFActionsFactory.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/EEFActionsPackage.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/EEFActionsPackage.java
index e7db11efd..887d7673f 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/EEFActionsPackage.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/EEFActionsPackage.java
@@ -131,13 +131,40 @@ public interface EEFActionsPackage extends EPackage {
 	int EDIT_ACTION__DOCUMENTATION = EEF_ACTION__DOCUMENTATION;
 
 	/**
+	 * The feature id for the '<em><b>Reference Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EDIT_ACTION__REFERENCE_NAME = EEF_ACTION_FEATURE_COUNT + 0;
+
+	/**
 	 * The feature id for the '<em><b>Properties Edition Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int EDIT_ACTION__PROPERTIES_EDITION_ELEMENT = EEF_ACTION_FEATURE_COUNT + 0;
+	int EDIT_ACTION__PROPERTIES_EDITION_ELEMENT = EEF_ACTION_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Properties Edition Element URI</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EDIT_ACTION__PROPERTIES_EDITION_ELEMENT_URI = EEF_ACTION_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Computed Properties Edition Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EDIT_ACTION__COMPUTED_PROPERTIES_EDITION_ELEMENT = EEF_ACTION_FEATURE_COUNT + 3;
 
 	/**
 	 * The feature id for the '<em><b>Referenceable Object</b></em>' reference.
@@ -146,7 +173,7 @@ public interface EEFActionsPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int EDIT_ACTION__REFERENCEABLE_OBJECT = EEF_ACTION_FEATURE_COUNT + 1;
+	int EDIT_ACTION__REFERENCEABLE_OBJECT = EEF_ACTION_FEATURE_COUNT + 4;
 
 	/**
 	 * The number of structural features of the '<em>Edit Action</em>' class.
@@ -155,7 +182,7 @@ public interface EEFActionsPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int EDIT_ACTION_FEATURE_COUNT = EEF_ACTION_FEATURE_COUNT + 2;
+	int EDIT_ACTION_FEATURE_COUNT = EEF_ACTION_FEATURE_COUNT + 5;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.emf.eef.modelingBot.EEFActions.impl.AddImpl <em>Add</em>}' class.
@@ -186,6 +213,15 @@ public interface EEFActionsPackage extends EPackage {
 	int ADD__DOCUMENTATION = EDIT_ACTION__DOCUMENTATION;
 
 	/**
+	 * The feature id for the '<em><b>Reference Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ADD__REFERENCE_NAME = EDIT_ACTION__REFERENCE_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Properties Edition Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -195,6 +231,24 @@ public interface EEFActionsPackage extends EPackage {
 	int ADD__PROPERTIES_EDITION_ELEMENT = EDIT_ACTION__PROPERTIES_EDITION_ELEMENT;
 
 	/**
+	 * The feature id for the '<em><b>Properties Edition Element URI</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ADD__PROPERTIES_EDITION_ELEMENT_URI = EDIT_ACTION__PROPERTIES_EDITION_ELEMENT_URI;
+
+	/**
+	 * The feature id for the '<em><b>Computed Properties Edition Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ADD__COMPUTED_PROPERTIES_EDITION_ELEMENT = EDIT_ACTION__COMPUTED_PROPERTIES_EDITION_ELEMENT;
+
+	/**
 	 * The feature id for the '<em><b>Referenceable Object</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -213,13 +267,49 @@ public interface EEFActionsPackage extends EPackage {
 	int ADD__TYPE = EDIT_ACTION_FEATURE_COUNT + 0;
 
 	/**
+	 * The feature id for the '<em><b>Type URI</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ADD__TYPE_URI = EDIT_ACTION_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Computed Type</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ADD__COMPUTED_TYPE = EDIT_ACTION_FEATURE_COUNT + 2;
+
+	/**
 	 * The feature id for the '<em><b>EContaining Feature</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int ADD__ECONTAINING_FEATURE = EDIT_ACTION_FEATURE_COUNT + 1;
+	int ADD__ECONTAINING_FEATURE = EDIT_ACTION_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>EContaining Feature URI</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ADD__ECONTAINING_FEATURE_URI = EDIT_ACTION_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>Computed EContaining Feature</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ADD__COMPUTED_ECONTAINING_FEATURE = EDIT_ACTION_FEATURE_COUNT + 5;
 
 	/**
 	 * The number of structural features of the '<em>Add</em>' class.
@@ -228,7 +318,7 @@ public interface EEFActionsPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int ADD_FEATURE_COUNT = EDIT_ACTION_FEATURE_COUNT + 2;
+	int ADD_FEATURE_COUNT = EDIT_ACTION_FEATURE_COUNT + 6;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.emf.eef.modelingBot.EEFActions.impl.RemoveImpl <em>Remove</em>}' class.
@@ -259,6 +349,15 @@ public interface EEFActionsPackage extends EPackage {
 	int REMOVE__DOCUMENTATION = EDIT_ACTION__DOCUMENTATION;
 
 	/**
+	 * The feature id for the '<em><b>Reference Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int REMOVE__REFERENCE_NAME = EDIT_ACTION__REFERENCE_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Properties Edition Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -268,6 +367,24 @@ public interface EEFActionsPackage extends EPackage {
 	int REMOVE__PROPERTIES_EDITION_ELEMENT = EDIT_ACTION__PROPERTIES_EDITION_ELEMENT;
 
 	/**
+	 * The feature id for the '<em><b>Properties Edition Element URI</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int REMOVE__PROPERTIES_EDITION_ELEMENT_URI = EDIT_ACTION__PROPERTIES_EDITION_ELEMENT_URI;
+
+	/**
+	 * The feature id for the '<em><b>Computed Properties Edition Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int REMOVE__COMPUTED_PROPERTIES_EDITION_ELEMENT = EDIT_ACTION__COMPUTED_PROPERTIES_EDITION_ELEMENT;
+
+	/**
 	 * The feature id for the '<em><b>Referenceable Object</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -314,6 +431,15 @@ public interface EEFActionsPackage extends EPackage {
 	int SET_ATTRIBUTE__DOCUMENTATION = EDIT_ACTION__DOCUMENTATION;
 
 	/**
+	 * The feature id for the '<em><b>Reference Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SET_ATTRIBUTE__REFERENCE_NAME = EDIT_ACTION__REFERENCE_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Properties Edition Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -323,6 +449,24 @@ public interface EEFActionsPackage extends EPackage {
 	int SET_ATTRIBUTE__PROPERTIES_EDITION_ELEMENT = EDIT_ACTION__PROPERTIES_EDITION_ELEMENT;
 
 	/**
+	 * The feature id for the '<em><b>Properties Edition Element URI</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SET_ATTRIBUTE__PROPERTIES_EDITION_ELEMENT_URI = EDIT_ACTION__PROPERTIES_EDITION_ELEMENT_URI;
+
+	/**
+	 * The feature id for the '<em><b>Computed Properties Edition Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SET_ATTRIBUTE__COMPUTED_PROPERTIES_EDITION_ELEMENT = EDIT_ACTION__COMPUTED_PROPERTIES_EDITION_ELEMENT;
+
+	/**
 	 * The feature id for the '<em><b>Referenceable Object</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -350,13 +494,31 @@ public interface EEFActionsPackage extends EPackage {
 	int SET_ATTRIBUTE__ECONTAINING_FEATURE = EDIT_ACTION_FEATURE_COUNT + 1;
 
 	/**
+	 * The feature id for the '<em><b>EContaining Feature URI</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SET_ATTRIBUTE__ECONTAINING_FEATURE_URI = EDIT_ACTION_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Computed EContaining Feature</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SET_ATTRIBUTE__COMPUTED_ECONTAINING_FEATURE = EDIT_ACTION_FEATURE_COUNT + 3;
+
+	/**
 	 * The number of structural features of the '<em>Set Attribute</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int SET_ATTRIBUTE_FEATURE_COUNT = EDIT_ACTION_FEATURE_COUNT + 2;
+	int SET_ATTRIBUTE_FEATURE_COUNT = EDIT_ACTION_FEATURE_COUNT + 4;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.emf.eef.modelingBot.EEFActions.impl.UnsetAttributeImpl <em>Unset Attribute</em>}' class.
@@ -387,6 +549,15 @@ public interface EEFActionsPackage extends EPackage {
 	int UNSET_ATTRIBUTE__DOCUMENTATION = EDIT_ACTION__DOCUMENTATION;
 
 	/**
+	 * The feature id for the '<em><b>Reference Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UNSET_ATTRIBUTE__REFERENCE_NAME = EDIT_ACTION__REFERENCE_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Properties Edition Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -396,6 +567,24 @@ public interface EEFActionsPackage extends EPackage {
 	int UNSET_ATTRIBUTE__PROPERTIES_EDITION_ELEMENT = EDIT_ACTION__PROPERTIES_EDITION_ELEMENT;
 
 	/**
+	 * The feature id for the '<em><b>Properties Edition Element URI</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UNSET_ATTRIBUTE__PROPERTIES_EDITION_ELEMENT_URI = EDIT_ACTION__PROPERTIES_EDITION_ELEMENT_URI;
+
+	/**
+	 * The feature id for the '<em><b>Computed Properties Edition Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UNSET_ATTRIBUTE__COMPUTED_PROPERTIES_EDITION_ELEMENT = EDIT_ACTION__COMPUTED_PROPERTIES_EDITION_ELEMENT;
+
+	/**
 	 * The feature id for the '<em><b>Referenceable Object</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -460,6 +649,15 @@ public interface EEFActionsPackage extends EPackage {
 	int UNSET__DOCUMENTATION = EDIT_ACTION__DOCUMENTATION;
 
 	/**
+	 * The feature id for the '<em><b>Reference Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UNSET__REFERENCE_NAME = EDIT_ACTION__REFERENCE_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Properties Edition Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -469,6 +667,24 @@ public interface EEFActionsPackage extends EPackage {
 	int UNSET__PROPERTIES_EDITION_ELEMENT = EDIT_ACTION__PROPERTIES_EDITION_ELEMENT;
 
 	/**
+	 * The feature id for the '<em><b>Properties Edition Element URI</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UNSET__PROPERTIES_EDITION_ELEMENT_URI = EDIT_ACTION__PROPERTIES_EDITION_ELEMENT_URI;
+
+	/**
+	 * The feature id for the '<em><b>Computed Properties Edition Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UNSET__COMPUTED_PROPERTIES_EDITION_ELEMENT = EDIT_ACTION__COMPUTED_PROPERTIES_EDITION_ELEMENT;
+
+	/**
 	 * The feature id for the '<em><b>Referenceable Object</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -654,6 +870,15 @@ public interface EEFActionsPackage extends EPackage {
 	int SET_REFERENCE__DOCUMENTATION = EDIT_ACTION__DOCUMENTATION;
 
 	/**
+	 * The feature id for the '<em><b>Reference Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SET_REFERENCE__REFERENCE_NAME = EDIT_ACTION__REFERENCE_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Properties Edition Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -663,6 +888,24 @@ public interface EEFActionsPackage extends EPackage {
 	int SET_REFERENCE__PROPERTIES_EDITION_ELEMENT = EDIT_ACTION__PROPERTIES_EDITION_ELEMENT;
 
 	/**
+	 * The feature id for the '<em><b>Properties Edition Element URI</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SET_REFERENCE__PROPERTIES_EDITION_ELEMENT_URI = EDIT_ACTION__PROPERTIES_EDITION_ELEMENT_URI;
+
+	/**
+	 * The feature id for the '<em><b>Computed Properties Edition Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SET_REFERENCE__COMPUTED_PROPERTIES_EDITION_ELEMENT = EDIT_ACTION__COMPUTED_PROPERTIES_EDITION_ELEMENT;
+
+	/**
 	 * The feature id for the '<em><b>Referenceable Object</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -728,6 +971,15 @@ public interface EEFActionsPackage extends EPackage {
 	int UNSET_REFERENCE__DOCUMENTATION = EDIT_ACTION__DOCUMENTATION;
 
 	/**
+	 * The feature id for the '<em><b>Reference Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UNSET_REFERENCE__REFERENCE_NAME = EDIT_ACTION__REFERENCE_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Properties Edition Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -737,6 +989,24 @@ public interface EEFActionsPackage extends EPackage {
 	int UNSET_REFERENCE__PROPERTIES_EDITION_ELEMENT = EDIT_ACTION__PROPERTIES_EDITION_ELEMENT;
 
 	/**
+	 * The feature id for the '<em><b>Properties Edition Element URI</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UNSET_REFERENCE__PROPERTIES_EDITION_ELEMENT_URI = EDIT_ACTION__PROPERTIES_EDITION_ELEMENT_URI;
+
+	/**
+	 * The feature id for the '<em><b>Computed Properties Edition Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UNSET_REFERENCE__COMPUTED_PROPERTIES_EDITION_ELEMENT = EDIT_ACTION__COMPUTED_PROPERTIES_EDITION_ELEMENT;
+
+	/**
 	 * The feature id for the '<em><b>Referenceable Object</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -802,6 +1072,15 @@ public interface EEFActionsPackage extends EPackage {
 	int MOVE_UP__DOCUMENTATION = EDIT_ACTION__DOCUMENTATION;
 
 	/**
+	 * The feature id for the '<em><b>Reference Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MOVE_UP__REFERENCE_NAME = EDIT_ACTION__REFERENCE_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Properties Edition Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -811,6 +1090,24 @@ public interface EEFActionsPackage extends EPackage {
 	int MOVE_UP__PROPERTIES_EDITION_ELEMENT = EDIT_ACTION__PROPERTIES_EDITION_ELEMENT;
 
 	/**
+	 * The feature id for the '<em><b>Properties Edition Element URI</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MOVE_UP__PROPERTIES_EDITION_ELEMENT_URI = EDIT_ACTION__PROPERTIES_EDITION_ELEMENT_URI;
+
+	/**
+	 * The feature id for the '<em><b>Computed Properties Edition Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MOVE_UP__COMPUTED_PROPERTIES_EDITION_ELEMENT = EDIT_ACTION__COMPUTED_PROPERTIES_EDITION_ELEMENT;
+
+	/**
 	 * The feature id for the '<em><b>Referenceable Object</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -857,6 +1154,15 @@ public interface EEFActionsPackage extends EPackage {
 	int MOVE_DOWN__DOCUMENTATION = EDIT_ACTION__DOCUMENTATION;
 
 	/**
+	 * The feature id for the '<em><b>Reference Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MOVE_DOWN__REFERENCE_NAME = EDIT_ACTION__REFERENCE_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Properties Edition Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -866,6 +1172,24 @@ public interface EEFActionsPackage extends EPackage {
 	int MOVE_DOWN__PROPERTIES_EDITION_ELEMENT = EDIT_ACTION__PROPERTIES_EDITION_ELEMENT;
 
 	/**
+	 * The feature id for the '<em><b>Properties Edition Element URI</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MOVE_DOWN__PROPERTIES_EDITION_ELEMENT_URI = EDIT_ACTION__PROPERTIES_EDITION_ELEMENT_URI;
+
+	/**
+	 * The feature id for the '<em><b>Computed Properties Edition Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MOVE_DOWN__COMPUTED_PROPERTIES_EDITION_ELEMENT = EDIT_ACTION__COMPUTED_PROPERTIES_EDITION_ELEMENT;
+
+	/**
 	 * The feature id for the '<em><b>Referenceable Object</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -915,6 +1239,28 @@ public interface EEFActionsPackage extends EPackage {
 	EReference getEditAction_PropertiesEditionElement();
 
 	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.eef.modelingBot.EEFActions.EditAction#getPropertiesEditionElementURI <em>Properties Edition Element URI</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Properties Edition Element URI</em>'.
+	 * @see org.eclipse.emf.eef.modelingBot.EEFActions.EditAction#getPropertiesEditionElementURI()
+	 * @see #getEditAction()
+	 * @generated
+	 */
+	EAttribute getEditAction_PropertiesEditionElementURI();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.emf.eef.modelingBot.EEFActions.EditAction#getComputedPropertiesEditionElement <em>Computed Properties Edition Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Computed Properties Edition Element</em>'.
+	 * @see org.eclipse.emf.eef.modelingBot.EEFActions.EditAction#getComputedPropertiesEditionElement()
+	 * @see #getEditAction()
+	 * @generated
+	 */
+	EReference getEditAction_ComputedPropertiesEditionElement();
+
+	/**
 	 * Returns the meta object for the reference '{@link org.eclipse.emf.eef.modelingBot.EEFActions.EditAction#getReferenceableObject <em>Referenceable Object</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -947,6 +1293,28 @@ public interface EEFActionsPackage extends EPackage {
 	EReference getAdd_Type();
 
 	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.eef.modelingBot.EEFActions.Add#getTypeURI <em>Type URI</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Type URI</em>'.
+	 * @see org.eclipse.emf.eef.modelingBot.EEFActions.Add#getTypeURI()
+	 * @see #getAdd()
+	 * @generated
+	 */
+	EAttribute getAdd_TypeURI();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.emf.eef.modelingBot.EEFActions.Add#getComputedType <em>Computed Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Computed Type</em>'.
+	 * @see org.eclipse.emf.eef.modelingBot.EEFActions.Add#getComputedType()
+	 * @see #getAdd()
+	 * @generated
+	 */
+	EReference getAdd_ComputedType();
+
+	/**
 	 * Returns the meta object for the reference '{@link org.eclipse.emf.eef.modelingBot.EEFActions.Add#getEContainingFeature <em>EContaining Feature</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -958,6 +1326,28 @@ public interface EEFActionsPackage extends EPackage {
 	EReference getAdd_EContainingFeature();
 
 	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.eef.modelingBot.EEFActions.Add#getEContainingFeatureURI <em>EContaining Feature URI</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>EContaining Feature URI</em>'.
+	 * @see org.eclipse.emf.eef.modelingBot.EEFActions.Add#getEContainingFeatureURI()
+	 * @see #getAdd()
+	 * @generated
+	 */
+	EAttribute getAdd_EContainingFeatureURI();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.emf.eef.modelingBot.EEFActions.Add#getComputedEContainingFeature <em>Computed EContaining Feature</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Computed EContaining Feature</em>'.
+	 * @see org.eclipse.emf.eef.modelingBot.EEFActions.Add#getComputedEContainingFeature()
+	 * @see #getAdd()
+	 * @generated
+	 */
+	EReference getAdd_ComputedEContainingFeature();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.emf.eef.modelingBot.EEFActions.Remove <em>Remove</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1000,6 +1390,28 @@ public interface EEFActionsPackage extends EPackage {
 	EReference getSetAttribute_EContainingFeature();
 
 	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.eef.modelingBot.EEFActions.SetAttribute#getEContainingFeatureURI <em>EContaining Feature URI</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>EContaining Feature URI</em>'.
+	 * @see org.eclipse.emf.eef.modelingBot.EEFActions.SetAttribute#getEContainingFeatureURI()
+	 * @see #getSetAttribute()
+	 * @generated
+	 */
+	EAttribute getSetAttribute_EContainingFeatureURI();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.emf.eef.modelingBot.EEFActions.SetAttribute#getComputedEContainingFeature <em>Computed EContaining Feature</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Computed EContaining Feature</em>'.
+	 * @see org.eclipse.emf.eef.modelingBot.EEFActions.SetAttribute#getComputedEContainingFeature()
+	 * @see #getSetAttribute()
+	 * @generated
+	 */
+	EReference getSetAttribute_ComputedEContainingFeature();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.emf.eef.modelingBot.EEFActions.UnsetAttribute <em>Unset Attribute</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1239,6 +1651,22 @@ public interface EEFActionsPackage extends EPackage {
 		EReference EDIT_ACTION__PROPERTIES_EDITION_ELEMENT = eINSTANCE.getEditAction_PropertiesEditionElement();
 
 		/**
+		 * The meta object literal for the '<em><b>Properties Edition Element URI</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute EDIT_ACTION__PROPERTIES_EDITION_ELEMENT_URI = eINSTANCE.getEditAction_PropertiesEditionElementURI();
+
+		/**
+		 * The meta object literal for the '<em><b>Computed Properties Edition Element</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference EDIT_ACTION__COMPUTED_PROPERTIES_EDITION_ELEMENT = eINSTANCE.getEditAction_ComputedPropertiesEditionElement();
+
+		/**
 		 * The meta object literal for the '<em><b>Referenceable Object</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -1265,6 +1693,22 @@ public interface EEFActionsPackage extends EPackage {
 		EReference ADD__TYPE = eINSTANCE.getAdd_Type();
 
 		/**
+		 * The meta object literal for the '<em><b>Type URI</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute ADD__TYPE_URI = eINSTANCE.getAdd_TypeURI();
+
+		/**
+		 * The meta object literal for the '<em><b>Computed Type</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ADD__COMPUTED_TYPE = eINSTANCE.getAdd_ComputedType();
+
+		/**
 		 * The meta object literal for the '<em><b>EContaining Feature</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -1273,6 +1717,22 @@ public interface EEFActionsPackage extends EPackage {
 		EReference ADD__ECONTAINING_FEATURE = eINSTANCE.getAdd_EContainingFeature();
 
 		/**
+		 * The meta object literal for the '<em><b>EContaining Feature URI</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute ADD__ECONTAINING_FEATURE_URI = eINSTANCE.getAdd_EContainingFeatureURI();
+
+		/**
+		 * The meta object literal for the '<em><b>Computed EContaining Feature</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ADD__COMPUTED_ECONTAINING_FEATURE = eINSTANCE.getAdd_ComputedEContainingFeature();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.emf.eef.modelingBot.EEFActions.impl.RemoveImpl <em>Remove</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -1309,6 +1769,22 @@ public interface EEFActionsPackage extends EPackage {
 		EReference SET_ATTRIBUTE__ECONTAINING_FEATURE = eINSTANCE.getSetAttribute_EContainingFeature();
 
 		/**
+		 * The meta object literal for the '<em><b>EContaining Feature URI</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute SET_ATTRIBUTE__ECONTAINING_FEATURE_URI = eINSTANCE.getSetAttribute_EContainingFeatureURI();
+
+		/**
+		 * The meta object literal for the '<em><b>Computed EContaining Feature</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference SET_ATTRIBUTE__COMPUTED_ECONTAINING_FEATURE = eINSTANCE.getSetAttribute_ComputedEContainingFeature();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.emf.eef.modelingBot.EEFActions.impl.UnsetAttributeImpl <em>Unset Attribute</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/EditAction.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/EditAction.java
index 3b8250295..749959427 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/EditAction.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/EditAction.java
@@ -23,6 +23,8 @@ import org.eclipse.emf.eef.extended.editor.ReferenceableObject;
  * The following features are supported:
  * <ul>
  *   <li>{@link org.eclipse.emf.eef.modelingBot.EEFActions.EditAction#getPropertiesEditionElement <em>Properties Edition Element</em>}</li>
+ *   <li>{@link org.eclipse.emf.eef.modelingBot.EEFActions.EditAction#getPropertiesEditionElementURI <em>Properties Edition Element URI</em>}</li>
+ *   <li>{@link org.eclipse.emf.eef.modelingBot.EEFActions.EditAction#getComputedPropertiesEditionElement <em>Computed Properties Edition Element</em>}</li>
  *   <li>{@link org.eclipse.emf.eef.modelingBot.EEFActions.EditAction#getReferenceableObject <em>Referenceable Object</em>}</li>
  * </ul>
  * </p>
@@ -59,6 +61,47 @@ public interface EditAction extends EEFAction, ReferenceableObject {
 	void setPropertiesEditionElement(PropertiesEditionElement value);
 
 	/**
+	 * Returns the value of the '<em><b>Properties Edition Element URI</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Properties Edition Element URI</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Properties Edition Element URI</em>' attribute.
+	 * @see #setPropertiesEditionElementURI(String)
+	 * @see org.eclipse.emf.eef.modelingBot.EEFActions.EEFActionsPackage#getEditAction_PropertiesEditionElementURI()
+	 * @model
+	 * @generated
+	 */
+	String getPropertiesEditionElementURI();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.eef.modelingBot.EEFActions.EditAction#getPropertiesEditionElementURI <em>Properties Edition Element URI</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Properties Edition Element URI</em>' attribute.
+	 * @see #getPropertiesEditionElementURI()
+	 * @generated
+	 */
+	void setPropertiesEditionElementURI(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Computed Properties Edition Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Computed Properties Edition Element</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Computed Properties Edition Element</em>' reference.
+	 * @see org.eclipse.emf.eef.modelingBot.EEFActions.EEFActionsPackage#getEditAction_ComputedPropertiesEditionElement()
+	 * @model transient="true" changeable="false" volatile="true" derived="true"
+	 * @generated
+	 */
+	PropertiesEditionElement getComputedPropertiesEditionElement();
+
+	/**
 	 * Returns the value of the '<em><b>Referenceable Object</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/OpenEEFEditor.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/OpenEEFEditor.java
index e4e81c30c..e4e81c30c 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/OpenEEFEditor.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/OpenEEFEditor.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/Remove.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/Remove.java
index 45a3bccc1..45a3bccc1 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/Remove.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/Remove.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/SetAttribute.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/SetAttribute.java
index 8c4d975c4..066a9f75b 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/SetAttribute.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/SetAttribute.java
@@ -24,6 +24,8 @@ import org.eclipse.emf.ecore.EStructuralFeature;
  * <ul>
  *   <li>{@link org.eclipse.emf.eef.modelingBot.EEFActions.SetAttribute#getValues <em>Values</em>}</li>
  *   <li>{@link org.eclipse.emf.eef.modelingBot.EEFActions.SetAttribute#getEContainingFeature <em>EContaining Feature</em>}</li>
+ *   <li>{@link org.eclipse.emf.eef.modelingBot.EEFActions.SetAttribute#getEContainingFeatureURI <em>EContaining Feature URI</em>}</li>
+ *   <li>{@link org.eclipse.emf.eef.modelingBot.EEFActions.SetAttribute#getComputedEContainingFeature <em>Computed EContaining Feature</em>}</li>
  * </ul>
  * </p>
  *
@@ -74,4 +76,45 @@ public interface SetAttribute extends EditAction {
 	 */
 	void setEContainingFeature(EStructuralFeature value);
 
+	/**
+	 * Returns the value of the '<em><b>EContaining Feature URI</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>EContaining Feature URI</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>EContaining Feature URI</em>' attribute.
+	 * @see #setEContainingFeatureURI(String)
+	 * @see org.eclipse.emf.eef.modelingBot.EEFActions.EEFActionsPackage#getSetAttribute_EContainingFeatureURI()
+	 * @model
+	 * @generated
+	 */
+	String getEContainingFeatureURI();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.eef.modelingBot.EEFActions.SetAttribute#getEContainingFeatureURI <em>EContaining Feature URI</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>EContaining Feature URI</em>' attribute.
+	 * @see #getEContainingFeatureURI()
+	 * @generated
+	 */
+	void setEContainingFeatureURI(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Computed EContaining Feature</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Computed EContaining Feature</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Computed EContaining Feature</em>' reference.
+	 * @see org.eclipse.emf.eef.modelingBot.EEFActions.EEFActionsPackage#getSetAttribute_ComputedEContainingFeature()
+	 * @model required="true" transient="true" changeable="false" volatile="true" derived="true"
+	 * @generated
+	 */
+	EStructuralFeature getComputedEContainingFeature();
+
 } // SetAttribute
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/SetReference.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/SetReference.java
index 885806ca9..885806ca9 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/SetReference.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/SetReference.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/Unset.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/Unset.java
index ab110cf77..ab110cf77 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/Unset.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/Unset.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/AddImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/AddImpl.java
index afc377502..51726cd68 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/AddImpl.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/AddImpl.java
@@ -18,6 +18,7 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.eef.modelingBot.EEFActions.Add;
 import org.eclipse.emf.eef.modelingBot.EEFActions.EEFActionsPackage;
+import org.eclipse.emf.eef.modelingBot.helper.EMFHelper;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,7 +28,11 @@ import org.eclipse.emf.eef.modelingBot.EEFActions.EEFActionsPackage;
  * The following features are implemented:
  * <ul>
  *   <li>{@link org.eclipse.emf.eef.modelingBot.EEFActions.impl.AddImpl#getType <em>Type</em>}</li>
+ *   <li>{@link org.eclipse.emf.eef.modelingBot.EEFActions.impl.AddImpl#getTypeURI <em>Type URI</em>}</li>
+ *   <li>{@link org.eclipse.emf.eef.modelingBot.EEFActions.impl.AddImpl#getComputedType <em>Computed Type</em>}</li>
  *   <li>{@link org.eclipse.emf.eef.modelingBot.EEFActions.impl.AddImpl#getEContainingFeature <em>EContaining Feature</em>}</li>
+ *   <li>{@link org.eclipse.emf.eef.modelingBot.EEFActions.impl.AddImpl#getEContainingFeatureURI <em>EContaining Feature URI</em>}</li>
+ *   <li>{@link org.eclipse.emf.eef.modelingBot.EEFActions.impl.AddImpl#getComputedEContainingFeature <em>Computed EContaining Feature</em>}</li>
  * </ul>
  * </p>
  *
@@ -45,6 +50,26 @@ public class AddImpl extends EditActionImpl implements Add {
 	protected EClass type;
 
 	/**
+	 * The default value of the '{@link #getTypeURI() <em>Type URI</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTypeURI()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String TYPE_URI_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getTypeURI() <em>Type URI</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTypeURI()
+	 * @generated
+	 * @ordered
+	 */
+	protected String typeURI = TYPE_URI_EDEFAULT;
+
+	/**
 	 * The cached value of the '{@link #getEContainingFeature() <em>EContaining Feature</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -55,6 +80,26 @@ public class AddImpl extends EditActionImpl implements Add {
 	protected EStructuralFeature eContainingFeature;
 
 	/**
+	 * The default value of the '{@link #getEContainingFeatureURI() <em>EContaining Feature URI</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getEContainingFeatureURI()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ECONTAINING_FEATURE_URI_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getEContainingFeatureURI() <em>EContaining Feature URI</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getEContainingFeatureURI()
+	 * @generated
+	 * @ordered
+	 */
+	protected String eContainingFeatureURI = ECONTAINING_FEATURE_URI_EDEFAULT;
+
+	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -116,6 +161,46 @@ public class AddImpl extends EditActionImpl implements Add {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public String getTypeURI() {
+		return typeURI;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setTypeURI(String newTypeURI) {
+		String oldTypeURI = typeURI;
+		typeURI = newTypeURI;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, EEFActionsPackage.ADD__TYPE_URI, oldTypeURI, typeURI));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getComputedType() {
+		EClass computedType = basicGetComputedType();
+		return computedType != null && computedType.eIsProxy() ? (EClass)eResolveProxy((InternalEObject)computedType) : computedType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	public EClass basicGetComputedType() {
+		return EMFHelper.computeEObject(this, EEFActionsPackage.Literals.ADD__TYPE, EEFActionsPackage.Literals.ADD__TYPE_URI);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EStructuralFeature getEContainingFeature() {
 		if (eContainingFeature != null && eContainingFeature.eIsProxy()) {
 			InternalEObject oldEContainingFeature = (InternalEObject)eContainingFeature;
@@ -154,15 +239,65 @@ public class AddImpl extends EditActionImpl implements Add {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public String getEContainingFeatureURI() {
+		return eContainingFeatureURI;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setEContainingFeatureURI(String newEContainingFeatureURI) {
+		String oldEContainingFeatureURI = eContainingFeatureURI;
+		eContainingFeatureURI = newEContainingFeatureURI;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, EEFActionsPackage.ADD__ECONTAINING_FEATURE_URI, oldEContainingFeatureURI, eContainingFeatureURI));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EStructuralFeature getComputedEContainingFeature() {
+		EStructuralFeature computedEContainingFeature = basicGetComputedEContainingFeature();
+		return computedEContainingFeature != null && computedEContainingFeature.eIsProxy() ? (EStructuralFeature)eResolveProxy((InternalEObject)computedEContainingFeature) : computedEContainingFeature;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	public EStructuralFeature basicGetComputedEContainingFeature() {
+		return EMFHelper.computeEObject(this, EEFActionsPackage.Literals.ADD__ECONTAINING_FEATURE, EEFActionsPackage.Literals.ADD__ECONTAINING_FEATURE_URI);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
 			case EEFActionsPackage.ADD__TYPE:
 				if (resolve) return getType();
 				return basicGetType();
+			case EEFActionsPackage.ADD__TYPE_URI:
+				return getTypeURI();
+			case EEFActionsPackage.ADD__COMPUTED_TYPE:
+				if (resolve) return getComputedType();
+				return basicGetComputedType();
 			case EEFActionsPackage.ADD__ECONTAINING_FEATURE:
 				if (resolve) return getEContainingFeature();
 				return basicGetEContainingFeature();
+			case EEFActionsPackage.ADD__ECONTAINING_FEATURE_URI:
+				return getEContainingFeatureURI();
+			case EEFActionsPackage.ADD__COMPUTED_ECONTAINING_FEATURE:
+				if (resolve) return getComputedEContainingFeature();
+				return basicGetComputedEContainingFeature();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -178,9 +313,15 @@ public class AddImpl extends EditActionImpl implements Add {
 			case EEFActionsPackage.ADD__TYPE:
 				setType((EClass)newValue);
 				return;
+			case EEFActionsPackage.ADD__TYPE_URI:
+				setTypeURI((String)newValue);
+				return;
 			case EEFActionsPackage.ADD__ECONTAINING_FEATURE:
 				setEContainingFeature((EStructuralFeature)newValue);
 				return;
+			case EEFActionsPackage.ADD__ECONTAINING_FEATURE_URI:
+				setEContainingFeatureURI((String)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -196,9 +337,15 @@ public class AddImpl extends EditActionImpl implements Add {
 			case EEFActionsPackage.ADD__TYPE:
 				setType((EClass)null);
 				return;
+			case EEFActionsPackage.ADD__TYPE_URI:
+				setTypeURI(TYPE_URI_EDEFAULT);
+				return;
 			case EEFActionsPackage.ADD__ECONTAINING_FEATURE:
 				setEContainingFeature((EStructuralFeature)null);
 				return;
+			case EEFActionsPackage.ADD__ECONTAINING_FEATURE_URI:
+				setEContainingFeatureURI(ECONTAINING_FEATURE_URI_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -213,10 +360,36 @@ public class AddImpl extends EditActionImpl implements Add {
 		switch (featureID) {
 			case EEFActionsPackage.ADD__TYPE:
 				return type != null;
+			case EEFActionsPackage.ADD__TYPE_URI:
+				return TYPE_URI_EDEFAULT == null ? typeURI != null : !TYPE_URI_EDEFAULT.equals(typeURI);
+			case EEFActionsPackage.ADD__COMPUTED_TYPE:
+				return basicGetComputedType() != null;
 			case EEFActionsPackage.ADD__ECONTAINING_FEATURE:
 				return eContainingFeature != null;
+			case EEFActionsPackage.ADD__ECONTAINING_FEATURE_URI:
+				return ECONTAINING_FEATURE_URI_EDEFAULT == null ? eContainingFeatureURI != null : !ECONTAINING_FEATURE_URI_EDEFAULT.equals(eContainingFeatureURI);
+			case EEFActionsPackage.ADD__COMPUTED_ECONTAINING_FEATURE:
+				return basicGetComputedEContainingFeature() != null;
 		}
 		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(" (typeURI: ");
+		result.append(typeURI);
+		result.append(", eContainingFeatureURI: ");
+		result.append(eContainingFeatureURI);
+		result.append(')');
+		return result.toString();
+	}
+
 } //AddImpl
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/CancelImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/CancelImpl.java
index bc288484c..bc288484c 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/CancelImpl.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/CancelImpl.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/CheckImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/CheckImpl.java
index 40279e98f..40279e98f 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/CheckImpl.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/CheckImpl.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/EEFActionImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/EEFActionImpl.java
index 1b4740beb..1b4740beb 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/EEFActionImpl.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/EEFActionImpl.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/EEFActionsFactoryImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/EEFActionsFactoryImpl.java
index 51207b87a..51207b87a 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/EEFActionsFactoryImpl.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/EEFActionsFactoryImpl.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/EEFActionsPackageImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/EEFActionsPackageImpl.java
index d4bd4a8c6..c2c18b0ed 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/EEFActionsPackageImpl.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/EEFActionsPackageImpl.java
@@ -250,8 +250,26 @@ public class EEFActionsPackageImpl extends EPackageImpl implements EEFActionsPac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EAttribute getEditAction_PropertiesEditionElementURI() {
+		return (EAttribute)editActionEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getEditAction_ComputedPropertiesEditionElement() {
+		return (EReference)editActionEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EReference getEditAction_ReferenceableObject() {
-		return (EReference)editActionEClass.getEStructuralFeatures().get(1);
+		return (EReference)editActionEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
@@ -277,8 +295,44 @@ public class EEFActionsPackageImpl extends EPackageImpl implements EEFActionsPac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EAttribute getAdd_TypeURI() {
+		return (EAttribute)addEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getAdd_ComputedType() {
+		return (EReference)addEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EReference getAdd_EContainingFeature() {
-		return (EReference)addEClass.getEStructuralFeatures().get(1);
+		return (EReference)addEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getAdd_EContainingFeatureURI() {
+		return (EAttribute)addEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getAdd_ComputedEContainingFeature() {
+		return (EReference)addEClass.getEStructuralFeatures().get(5);
 	}
 
 	/**
@@ -322,6 +376,24 @@ public class EEFActionsPackageImpl extends EPackageImpl implements EEFActionsPac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EAttribute getSetAttribute_EContainingFeatureURI() {
+		return (EAttribute)setAttributeEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getSetAttribute_ComputedEContainingFeature() {
+		return (EReference)setAttributeEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EClass getUnsetAttribute() {
 		return unsetAttributeEClass;
 	}
@@ -511,17 +583,25 @@ public class EEFActionsPackageImpl extends EPackageImpl implements EEFActionsPac
 
 		editActionEClass = createEClass(EDIT_ACTION);
 		createEReference(editActionEClass, EDIT_ACTION__PROPERTIES_EDITION_ELEMENT);
+		createEAttribute(editActionEClass, EDIT_ACTION__PROPERTIES_EDITION_ELEMENT_URI);
+		createEReference(editActionEClass, EDIT_ACTION__COMPUTED_PROPERTIES_EDITION_ELEMENT);
 		createEReference(editActionEClass, EDIT_ACTION__REFERENCEABLE_OBJECT);
 
 		addEClass = createEClass(ADD);
 		createEReference(addEClass, ADD__TYPE);
+		createEAttribute(addEClass, ADD__TYPE_URI);
+		createEReference(addEClass, ADD__COMPUTED_TYPE);
 		createEReference(addEClass, ADD__ECONTAINING_FEATURE);
+		createEAttribute(addEClass, ADD__ECONTAINING_FEATURE_URI);
+		createEReference(addEClass, ADD__COMPUTED_ECONTAINING_FEATURE);
 
 		removeEClass = createEClass(REMOVE);
 
 		setAttributeEClass = createEClass(SET_ATTRIBUTE);
 		createEAttribute(setAttributeEClass, SET_ATTRIBUTE__VALUES);
 		createEReference(setAttributeEClass, SET_ATTRIBUTE__ECONTAINING_FEATURE);
+		createEAttribute(setAttributeEClass, SET_ATTRIBUTE__ECONTAINING_FEATURE_URI);
+		createEReference(setAttributeEClass, SET_ATTRIBUTE__COMPUTED_ECONTAINING_FEATURE);
 
 		unsetAttributeEClass = createEClass(UNSET_ATTRIBUTE);
 		createEAttribute(unsetAttributeEClass, UNSET_ATTRIBUTE__VALUES);
@@ -606,17 +686,25 @@ public class EEFActionsPackageImpl extends EPackageImpl implements EEFActionsPac
 
 		initEClass(editActionEClass, EditAction.class, "EditAction", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getEditAction_PropertiesEditionElement(), theComponentsPackage.getPropertiesEditionElement(), null, "propertiesEditionElement", null, 0, 1, EditAction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getEditAction_PropertiesEditionElementURI(), ecorePackage.getEString(), "propertiesEditionElementURI", null, 0, 1, EditAction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getEditAction_ComputedPropertiesEditionElement(), theComponentsPackage.getPropertiesEditionElement(), null, "computedPropertiesEditionElement", null, 0, 1, EditAction.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
 		initEReference(getEditAction_ReferenceableObject(), theEditorPackage.getReferenceableObject(), null, "referenceableObject", null, 0, 1, EditAction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(addEClass, Add.class, "Add", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getAdd_Type(), theEcorePackage.getEClass(), null, "type", null, 0, 1, Add.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getAdd_TypeURI(), ecorePackage.getEString(), "typeURI", null, 0, 1, Add.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getAdd_ComputedType(), theEcorePackage.getEClass(), null, "computedType", null, 1, 1, Add.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
 		initEReference(getAdd_EContainingFeature(), theEcorePackage.getEStructuralFeature(), null, "eContainingFeature", null, 0, 1, Add.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getAdd_EContainingFeatureURI(), ecorePackage.getEString(), "eContainingFeatureURI", null, 0, 1, Add.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getAdd_ComputedEContainingFeature(), theEcorePackage.getEStructuralFeature(), null, "computedEContainingFeature", null, 1, 1, Add.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
 
 		initEClass(removeEClass, Remove.class, "Remove", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
 		initEClass(setAttributeEClass, SetAttribute.class, "SetAttribute", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getSetAttribute_Values(), theEcorePackage.getEString(), "values", null, 0, -1, SetAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getSetAttribute_EContainingFeature(), theEcorePackage.getEStructuralFeature(), null, "eContainingFeature", null, 0, 1, SetAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getSetAttribute_EContainingFeatureURI(), ecorePackage.getEString(), "eContainingFeatureURI", null, 0, 1, SetAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getSetAttribute_ComputedEContainingFeature(), theEcorePackage.getEStructuralFeature(), null, "computedEContainingFeature", null, 1, 1, SetAttribute.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
 
 		initEClass(unsetAttributeEClass, UnsetAttribute.class, "UnsetAttribute", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getUnsetAttribute_Values(), theEcorePackage.getEString(), "values", null, 0, -1, UnsetAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/EditActionImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/EditActionImpl.java
index 896eb9967..fc4b3b834 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/EditActionImpl.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/EditActionImpl.java
@@ -11,18 +11,15 @@
 package org.eclipse.emf.eef.modelingBot.EEFActions.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.emf.eef.components.PropertiesEditionElement;
-
+import org.eclipse.emf.eef.extended.editor.EditorPackage;
 import org.eclipse.emf.eef.extended.editor.ReferenceableObject;
-
 import org.eclipse.emf.eef.modelingBot.EEFActions.EEFActionsPackage;
 import org.eclipse.emf.eef.modelingBot.EEFActions.EditAction;
+import org.eclipse.emf.eef.modelingBot.helper.EMFHelper;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,7 +28,10 @@ import org.eclipse.emf.eef.modelingBot.EEFActions.EditAction;
  * <p>
  * The following features are implemented:
  * <ul>
+ *   <li>{@link org.eclipse.emf.eef.modelingBot.EEFActions.impl.EditActionImpl#getReferenceName <em>Reference Name</em>}</li>
  *   <li>{@link org.eclipse.emf.eef.modelingBot.EEFActions.impl.EditActionImpl#getPropertiesEditionElement <em>Properties Edition Element</em>}</li>
+ *   <li>{@link org.eclipse.emf.eef.modelingBot.EEFActions.impl.EditActionImpl#getPropertiesEditionElementURI <em>Properties Edition Element URI</em>}</li>
+ *   <li>{@link org.eclipse.emf.eef.modelingBot.EEFActions.impl.EditActionImpl#getComputedPropertiesEditionElement <em>Computed Properties Edition Element</em>}</li>
  *   <li>{@link org.eclipse.emf.eef.modelingBot.EEFActions.impl.EditActionImpl#getReferenceableObject <em>Referenceable Object</em>}</li>
  * </ul>
  * </p>
@@ -40,6 +40,26 @@ import org.eclipse.emf.eef.modelingBot.EEFActions.EditAction;
  */
 public abstract class EditActionImpl extends EEFActionImpl implements EditAction {
 	/**
+	 * The default value of the '{@link #getReferenceName() <em>Reference Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getReferenceName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String REFERENCE_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getReferenceName() <em>Reference Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getReferenceName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String referenceName = REFERENCE_NAME_EDEFAULT;
+
+	/**
 	 * The cached value of the '{@link #getPropertiesEditionElement() <em>Properties Edition Element</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -50,6 +70,26 @@ public abstract class EditActionImpl extends EEFActionImpl implements EditAction
 	protected PropertiesEditionElement propertiesEditionElement;
 
 	/**
+	 * The default value of the '{@link #getPropertiesEditionElementURI() <em>Properties Edition Element URI</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPropertiesEditionElementURI()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String PROPERTIES_EDITION_ELEMENT_URI_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getPropertiesEditionElementURI() <em>Properties Edition Element URI</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPropertiesEditionElementURI()
+	 * @generated
+	 * @ordered
+	 */
+	protected String propertiesEditionElementURI = PROPERTIES_EDITION_ELEMENT_URI_EDEFAULT;
+
+	/**
 	 * The cached value of the '{@link #getReferenceableObject() <em>Referenceable Object</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -83,6 +123,27 @@ public abstract class EditActionImpl extends EEFActionImpl implements EditAction
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public String getReferenceName() {
+		return referenceName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setReferenceName(String newReferenceName) {
+		String oldReferenceName = referenceName;
+		referenceName = newReferenceName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, EEFActionsPackage.EDIT_ACTION__REFERENCE_NAME, oldReferenceName, referenceName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public PropertiesEditionElement getPropertiesEditionElement() {
 		if (propertiesEditionElement != null && propertiesEditionElement.eIsProxy()) {
 			InternalEObject oldPropertiesEditionElement = (InternalEObject)propertiesEditionElement;
@@ -121,6 +182,46 @@ public abstract class EditActionImpl extends EEFActionImpl implements EditAction
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public String getPropertiesEditionElementURI() {
+		return propertiesEditionElementURI;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setPropertiesEditionElementURI(String newPropertiesEditionElementURI) {
+		String oldPropertiesEditionElementURI = propertiesEditionElementURI;
+		propertiesEditionElementURI = newPropertiesEditionElementURI;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, EEFActionsPackage.EDIT_ACTION__PROPERTIES_EDITION_ELEMENT_URI, oldPropertiesEditionElementURI, propertiesEditionElementURI));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public PropertiesEditionElement getComputedPropertiesEditionElement() {
+		PropertiesEditionElement computedPropertiesEditionElement = basicGetComputedPropertiesEditionElement();
+		return computedPropertiesEditionElement != null && computedPropertiesEditionElement.eIsProxy() ? (PropertiesEditionElement)eResolveProxy((InternalEObject)computedPropertiesEditionElement) : computedPropertiesEditionElement;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	public PropertiesEditionElement basicGetComputedPropertiesEditionElement() {
+		return EMFHelper.computeEObject(this, EEFActionsPackage.Literals.EDIT_ACTION__PROPERTIES_EDITION_ELEMENT, EEFActionsPackage.Literals.EDIT_ACTION__PROPERTIES_EDITION_ELEMENT_URI);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public ReferenceableObject getReferenceableObject() {
 		if (referenceableObject != null && referenceableObject.eIsProxy()) {
 			InternalEObject oldReferenceableObject = (InternalEObject)referenceableObject;
@@ -162,9 +263,16 @@ public abstract class EditActionImpl extends EEFActionImpl implements EditAction
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
+			case EEFActionsPackage.EDIT_ACTION__REFERENCE_NAME:
+				return getReferenceName();
 			case EEFActionsPackage.EDIT_ACTION__PROPERTIES_EDITION_ELEMENT:
 				if (resolve) return getPropertiesEditionElement();
 				return basicGetPropertiesEditionElement();
+			case EEFActionsPackage.EDIT_ACTION__PROPERTIES_EDITION_ELEMENT_URI:
+				return getPropertiesEditionElementURI();
+			case EEFActionsPackage.EDIT_ACTION__COMPUTED_PROPERTIES_EDITION_ELEMENT:
+				if (resolve) return getComputedPropertiesEditionElement();
+				return basicGetComputedPropertiesEditionElement();
 			case EEFActionsPackage.EDIT_ACTION__REFERENCEABLE_OBJECT:
 				if (resolve) return getReferenceableObject();
 				return basicGetReferenceableObject();
@@ -180,9 +288,15 @@ public abstract class EditActionImpl extends EEFActionImpl implements EditAction
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
+			case EEFActionsPackage.EDIT_ACTION__REFERENCE_NAME:
+				setReferenceName((String)newValue);
+				return;
 			case EEFActionsPackage.EDIT_ACTION__PROPERTIES_EDITION_ELEMENT:
 				setPropertiesEditionElement((PropertiesEditionElement)newValue);
 				return;
+			case EEFActionsPackage.EDIT_ACTION__PROPERTIES_EDITION_ELEMENT_URI:
+				setPropertiesEditionElementURI((String)newValue);
+				return;
 			case EEFActionsPackage.EDIT_ACTION__REFERENCEABLE_OBJECT:
 				setReferenceableObject((ReferenceableObject)newValue);
 				return;
@@ -198,9 +312,15 @@ public abstract class EditActionImpl extends EEFActionImpl implements EditAction
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
+			case EEFActionsPackage.EDIT_ACTION__REFERENCE_NAME:
+				setReferenceName(REFERENCE_NAME_EDEFAULT);
+				return;
 			case EEFActionsPackage.EDIT_ACTION__PROPERTIES_EDITION_ELEMENT:
 				setPropertiesEditionElement((PropertiesEditionElement)null);
 				return;
+			case EEFActionsPackage.EDIT_ACTION__PROPERTIES_EDITION_ELEMENT_URI:
+				setPropertiesEditionElementURI(PROPERTIES_EDITION_ELEMENT_URI_EDEFAULT);
+				return;
 			case EEFActionsPackage.EDIT_ACTION__REFERENCEABLE_OBJECT:
 				setReferenceableObject((ReferenceableObject)null);
 				return;
@@ -216,12 +336,68 @@ public abstract class EditActionImpl extends EEFActionImpl implements EditAction
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
+			case EEFActionsPackage.EDIT_ACTION__REFERENCE_NAME:
+				return REFERENCE_NAME_EDEFAULT == null ? referenceName != null : !REFERENCE_NAME_EDEFAULT.equals(referenceName);
 			case EEFActionsPackage.EDIT_ACTION__PROPERTIES_EDITION_ELEMENT:
 				return propertiesEditionElement != null;
+			case EEFActionsPackage.EDIT_ACTION__PROPERTIES_EDITION_ELEMENT_URI:
+				return PROPERTIES_EDITION_ELEMENT_URI_EDEFAULT == null ? propertiesEditionElementURI != null : !PROPERTIES_EDITION_ELEMENT_URI_EDEFAULT.equals(propertiesEditionElementURI);
+			case EEFActionsPackage.EDIT_ACTION__COMPUTED_PROPERTIES_EDITION_ELEMENT:
+				return basicGetComputedPropertiesEditionElement() != null;
 			case EEFActionsPackage.EDIT_ACTION__REFERENCEABLE_OBJECT:
 				return referenceableObject != null;
 		}
 		return super.eIsSet(featureID);
 	}
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+		if (baseClass == ReferenceableObject.class) {
+			switch (derivedFeatureID) {
+				case EEFActionsPackage.EDIT_ACTION__REFERENCE_NAME: return EditorPackage.REFERENCEABLE_OBJECT__REFERENCE_NAME;
+				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 == ReferenceableObject.class) {
+			switch (baseFeatureID) {
+				case EditorPackage.REFERENCEABLE_OBJECT__REFERENCE_NAME: return EEFActionsPackage.EDIT_ACTION__REFERENCE_NAME;
+				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(" (referenceName: ");
+		result.append(referenceName);
+		result.append(", propertiesEditionElementURI: ");
+		result.append(propertiesEditionElementURI);
+		result.append(')');
+		return result.toString();
+	}
+
 } //EditActionImpl
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/OpenEEFEditorImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/OpenEEFEditorImpl.java
index d45df9511..d45df9511 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/OpenEEFEditorImpl.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/OpenEEFEditorImpl.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/RemoveImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/RemoveImpl.java
index 0ea3ed0df..0ea3ed0df 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/RemoveImpl.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/RemoveImpl.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/SetAttributeImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/SetAttributeImpl.java
index 9c291b90b..e8091f5e9 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/SetAttributeImpl.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/SetAttributeImpl.java
@@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
 import org.eclipse.emf.eef.modelingBot.EEFActions.EEFActionsPackage;
 import org.eclipse.emf.eef.modelingBot.EEFActions.SetAttribute;
+import org.eclipse.emf.eef.modelingBot.helper.EMFHelper;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,6 +34,8 @@ import org.eclipse.emf.eef.modelingBot.EEFActions.SetAttribute;
  * <ul>
  *   <li>{@link org.eclipse.emf.eef.modelingBot.EEFActions.impl.SetAttributeImpl#getValues <em>Values</em>}</li>
  *   <li>{@link org.eclipse.emf.eef.modelingBot.EEFActions.impl.SetAttributeImpl#getEContainingFeature <em>EContaining Feature</em>}</li>
+ *   <li>{@link org.eclipse.emf.eef.modelingBot.EEFActions.impl.SetAttributeImpl#getEContainingFeatureURI <em>EContaining Feature URI</em>}</li>
+ *   <li>{@link org.eclipse.emf.eef.modelingBot.EEFActions.impl.SetAttributeImpl#getComputedEContainingFeature <em>Computed EContaining Feature</em>}</li>
  * </ul>
  * </p>
  *
@@ -60,6 +63,26 @@ public class SetAttributeImpl extends EditActionImpl implements SetAttribute {
 	protected EStructuralFeature eContainingFeature;
 
 	/**
+	 * The default value of the '{@link #getEContainingFeatureURI() <em>EContaining Feature URI</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getEContainingFeatureURI()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ECONTAINING_FEATURE_URI_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getEContainingFeatureURI() <em>EContaining Feature URI</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getEContainingFeatureURI()
+	 * @generated
+	 * @ordered
+	 */
+	protected String eContainingFeatureURI = ECONTAINING_FEATURE_URI_EDEFAULT;
+
+	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -133,6 +156,46 @@ public class SetAttributeImpl extends EditActionImpl implements SetAttribute {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public String getEContainingFeatureURI() {
+		return eContainingFeatureURI;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setEContainingFeatureURI(String newEContainingFeatureURI) {
+		String oldEContainingFeatureURI = eContainingFeatureURI;
+		eContainingFeatureURI = newEContainingFeatureURI;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, EEFActionsPackage.SET_ATTRIBUTE__ECONTAINING_FEATURE_URI, oldEContainingFeatureURI, eContainingFeatureURI));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EStructuralFeature getComputedEContainingFeature() {
+		EStructuralFeature computedEContainingFeature = basicGetComputedEContainingFeature();
+		return computedEContainingFeature != null && computedEContainingFeature.eIsProxy() ? (EStructuralFeature)eResolveProxy((InternalEObject)computedEContainingFeature) : computedEContainingFeature;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	public EStructuralFeature basicGetComputedEContainingFeature() {
+		return EMFHelper.computeEObject(this, EEFActionsPackage.Literals.SET_ATTRIBUTE__ECONTAINING_FEATURE, EEFActionsPackage.Literals.SET_ATTRIBUTE__ECONTAINING_FEATURE_URI);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
@@ -141,6 +204,11 @@ public class SetAttributeImpl extends EditActionImpl implements SetAttribute {
 			case EEFActionsPackage.SET_ATTRIBUTE__ECONTAINING_FEATURE:
 				if (resolve) return getEContainingFeature();
 				return basicGetEContainingFeature();
+			case EEFActionsPackage.SET_ATTRIBUTE__ECONTAINING_FEATURE_URI:
+				return getEContainingFeatureURI();
+			case EEFActionsPackage.SET_ATTRIBUTE__COMPUTED_ECONTAINING_FEATURE:
+				if (resolve) return getComputedEContainingFeature();
+				return basicGetComputedEContainingFeature();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -161,6 +229,9 @@ public class SetAttributeImpl extends EditActionImpl implements SetAttribute {
 			case EEFActionsPackage.SET_ATTRIBUTE__ECONTAINING_FEATURE:
 				setEContainingFeature((EStructuralFeature)newValue);
 				return;
+			case EEFActionsPackage.SET_ATTRIBUTE__ECONTAINING_FEATURE_URI:
+				setEContainingFeatureURI((String)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -179,6 +250,9 @@ public class SetAttributeImpl extends EditActionImpl implements SetAttribute {
 			case EEFActionsPackage.SET_ATTRIBUTE__ECONTAINING_FEATURE:
 				setEContainingFeature((EStructuralFeature)null);
 				return;
+			case EEFActionsPackage.SET_ATTRIBUTE__ECONTAINING_FEATURE_URI:
+				setEContainingFeatureURI(ECONTAINING_FEATURE_URI_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -195,6 +269,10 @@ public class SetAttributeImpl extends EditActionImpl implements SetAttribute {
 				return values != null && !values.isEmpty();
 			case EEFActionsPackage.SET_ATTRIBUTE__ECONTAINING_FEATURE:
 				return eContainingFeature != null;
+			case EEFActionsPackage.SET_ATTRIBUTE__ECONTAINING_FEATURE_URI:
+				return ECONTAINING_FEATURE_URI_EDEFAULT == null ? eContainingFeatureURI != null : !ECONTAINING_FEATURE_URI_EDEFAULT.equals(eContainingFeatureURI);
+			case EEFActionsPackage.SET_ATTRIBUTE__COMPUTED_ECONTAINING_FEATURE:
+				return basicGetComputedEContainingFeature() != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -211,6 +289,8 @@ public class SetAttributeImpl extends EditActionImpl implements SetAttribute {
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (values: ");
 		result.append(values);
+		result.append(", eContainingFeatureURI: ");
+		result.append(eContainingFeatureURI);
 		result.append(')');
 		return result.toString();
 	}
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/SetReferenceImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/SetReferenceImpl.java
index 750bca622..750bca622 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/SetReferenceImpl.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/SetReferenceImpl.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/UnsetImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/UnsetImpl.java
index 05f28b134..05f28b134 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/UnsetImpl.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/impl/UnsetImpl.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/util/EEFActionsAdapterFactory.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/util/EEFActionsAdapterFactory.java
index 2d529f592..2d529f592 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/util/EEFActionsAdapterFactory.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/util/EEFActionsAdapterFactory.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/util/EEFActionsSwitch.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/util/EEFActionsSwitch.java
index a129f3077..a129f3077 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/util/EEFActionsSwitch.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EEFActions/util/EEFActionsSwitch.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/CloseEditor.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/CloseEditor.java
index b41e9e159..b41e9e159 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/CloseEditor.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/CloseEditor.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/CloseProject.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/CloseProject.java
index 27a2f0f84..27a2f0f84 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/CloseProject.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/CloseProject.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/CreateModel.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/CreateModel.java
index 3e3df2a39..1da373244 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/CreateModel.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/CreateModel.java
@@ -25,6 +25,8 @@ import org.eclipse.emf.eef.extended.editor.ReferenceableObject;
  *   <li>{@link org.eclipse.emf.eef.modelingBot.EclipseActions.CreateModel#getModelName <em>Model Name</em>}</li>
  *   <li>{@link org.eclipse.emf.eef.modelingBot.EclipseActions.CreateModel#getPath <em>Path</em>}</li>
  *   <li>{@link org.eclipse.emf.eef.modelingBot.EclipseActions.CreateModel#getRoot <em>Root</em>}</li>
+ *   <li>{@link org.eclipse.emf.eef.modelingBot.EclipseActions.CreateModel#getComputedRoot <em>Computed Root</em>}</li>
+ *   <li>{@link org.eclipse.emf.eef.modelingBot.EclipseActions.CreateModel#getRootURI <em>Root URI</em>}</li>
  * </ul>
  * </p>
  *
@@ -44,7 +46,7 @@ public interface CreateModel extends EclipseAction, ReferenceableObject {
 	 * @return the value of the '<em>Model Name</em>' attribute.
 	 * @see #setModelName(String)
 	 * @see org.eclipse.emf.eef.modelingBot.EclipseActions.EclipseActionsPackage#getCreateModel_ModelName()
-	 * @model
+	 * @model required="true"
 	 * @generated
 	 */
 	String getModelName();
@@ -70,7 +72,7 @@ public interface CreateModel extends EclipseAction, ReferenceableObject {
 	 * @return the value of the '<em>Path</em>' attribute.
 	 * @see #setPath(String)
 	 * @see org.eclipse.emf.eef.modelingBot.EclipseActions.EclipseActionsPackage#getCreateModel_Path()
-	 * @model
+	 * @model required="true"
 	 * @generated
 	 */
 	String getPath();
@@ -111,4 +113,45 @@ public interface CreateModel extends EclipseAction, ReferenceableObject {
 	 */
 	void setRoot(EClass value);
 
+	/**
+	 * Returns the value of the '<em><b>Computed Root</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Computed Root</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Computed Root</em>' reference.
+	 * @see org.eclipse.emf.eef.modelingBot.EclipseActions.EclipseActionsPackage#getCreateModel_ComputedRoot()
+	 * @model required="true" transient="true" changeable="false" volatile="true" derived="true"
+	 * @generated
+	 */
+	EClass getComputedRoot();
+
+	/**
+	 * Returns the value of the '<em><b>Root URI</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Root URI</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Root URI</em>' attribute.
+	 * @see #setRootURI(String)
+	 * @see org.eclipse.emf.eef.modelingBot.EclipseActions.EclipseActionsPackage#getCreateModel_RootURI()
+	 * @model
+	 * @generated
+	 */
+	String getRootURI();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.eef.modelingBot.EclipseActions.CreateModel#getRootURI <em>Root URI</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Root URI</em>' attribute.
+	 * @see #getRootURI()
+	 * @generated
+	 */
+	void setRootURI(String value);
+
 } // CreateModel
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/CreateProject.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/CreateProject.java
index 0203393a6..d7d7b15d5 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/CreateProject.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/CreateProject.java
@@ -39,7 +39,7 @@ public interface CreateProject extends EclipseAction {
 	 * @return the value of the '<em>Project Name</em>' attribute.
 	 * @see #setProjectName(String)
 	 * @see org.eclipse.emf.eef.modelingBot.EclipseActions.EclipseActionsPackage#getCreateProject_ProjectName()
-	 * @model
+	 * @model required="true"
 	 * @generated
 	 */
 	String getProjectName();
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/EclipseAction.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/EclipseAction.java
index 6f92d38e7..6f92d38e7 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/EclipseAction.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/EclipseAction.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/EclipseActionsFactory.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/EclipseActionsFactory.java
index de631a124..de631a124 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/EclipseActionsFactory.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/EclipseActionsFactory.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/EclipseActionsPackage.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/EclipseActionsPackage.java
index 58cf70086..f969191a9 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/EclipseActionsPackage.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/EclipseActionsPackage.java
@@ -574,13 +574,22 @@ public interface EclipseActionsPackage extends EPackage {
 	int CREATE_MODEL__DOCUMENTATION = ECLIPSE_ACTION__DOCUMENTATION;
 
 	/**
+	 * The feature id for the '<em><b>Reference Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CREATE_MODEL__REFERENCE_NAME = ECLIPSE_ACTION_FEATURE_COUNT + 0;
+
+	/**
 	 * The feature id for the '<em><b>Model Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CREATE_MODEL__MODEL_NAME = ECLIPSE_ACTION_FEATURE_COUNT + 0;
+	int CREATE_MODEL__MODEL_NAME = ECLIPSE_ACTION_FEATURE_COUNT + 1;
 
 	/**
 	 * The feature id for the '<em><b>Path</b></em>' attribute.
@@ -589,7 +598,7 @@ public interface EclipseActionsPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CREATE_MODEL__PATH = ECLIPSE_ACTION_FEATURE_COUNT + 1;
+	int CREATE_MODEL__PATH = ECLIPSE_ACTION_FEATURE_COUNT + 2;
 
 	/**
 	 * The feature id for the '<em><b>Root</b></em>' reference.
@@ -598,7 +607,25 @@ public interface EclipseActionsPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CREATE_MODEL__ROOT = ECLIPSE_ACTION_FEATURE_COUNT + 2;
+	int CREATE_MODEL__ROOT = ECLIPSE_ACTION_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Computed Root</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CREATE_MODEL__COMPUTED_ROOT = ECLIPSE_ACTION_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>Root URI</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CREATE_MODEL__ROOT_URI = ECLIPSE_ACTION_FEATURE_COUNT + 5;
 
 	/**
 	 * The number of structural features of the '<em>Create Model</em>' class.
@@ -607,7 +634,7 @@ public interface EclipseActionsPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CREATE_MODEL_FEATURE_COUNT = ECLIPSE_ACTION_FEATURE_COUNT + 3;
+	int CREATE_MODEL_FEATURE_COUNT = ECLIPSE_ACTION_FEATURE_COUNT + 6;
 
 
 	/**
@@ -852,6 +879,28 @@ public interface EclipseActionsPackage extends EPackage {
 	EReference getCreateModel_Root();
 
 	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.emf.eef.modelingBot.EclipseActions.CreateModel#getComputedRoot <em>Computed Root</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Computed Root</em>'.
+	 * @see org.eclipse.emf.eef.modelingBot.EclipseActions.CreateModel#getComputedRoot()
+	 * @see #getCreateModel()
+	 * @generated
+	 */
+	EReference getCreateModel_ComputedRoot();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.eef.modelingBot.EclipseActions.CreateModel#getRootURI <em>Root URI</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Root URI</em>'.
+	 * @see org.eclipse.emf.eef.modelingBot.EclipseActions.CreateModel#getRootURI()
+	 * @see #getCreateModel()
+	 * @generated
+	 */
+	EAttribute getCreateModel_RootURI();
+
+	/**
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1081,6 +1130,22 @@ public interface EclipseActionsPackage extends EPackage {
 		 */
 		EReference CREATE_MODEL__ROOT = eINSTANCE.getCreateModel_Root();
 
+		/**
+		 * The meta object literal for the '<em><b>Computed Root</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CREATE_MODEL__COMPUTED_ROOT = eINSTANCE.getCreateModel_ComputedRoot();
+
+		/**
+		 * The meta object literal for the '<em><b>Root URI</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CREATE_MODEL__ROOT_URI = eINSTANCE.getCreateModel_RootURI();
+
 	}
 
 } //EclipseActionsPackage
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/OpenPerspective.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/OpenPerspective.java
index e2bc972b4..e2bc972b4 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/OpenPerspective.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/OpenPerspective.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/OpenProject.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/OpenProject.java
index f3daafb14..f3daafb14 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/OpenProject.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/OpenProject.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/Redo.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/Redo.java
index 037f48948..037f48948 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/Redo.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/Redo.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/RemoveProject.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/RemoveProject.java
index 9312ce9e2..9312ce9e2 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/RemoveProject.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/RemoveProject.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/Save.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/Save.java
index 4930edae6..4930edae6 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/Save.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/Save.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/Undo.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/Undo.java
index 96eb16642..96eb16642 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/Undo.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/Undo.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/CloseEditorImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/CloseEditorImpl.java
index d4ed62314..d4ed62314 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/CloseEditorImpl.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/CloseEditorImpl.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/CloseProjectImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/CloseProjectImpl.java
index 001d480f7..001d480f7 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/CloseProjectImpl.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/CloseProjectImpl.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/CreateModelImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/CreateModelImpl.java
index 05ee392f6..0df0dfb0d 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/CreateModelImpl.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/CreateModelImpl.java
@@ -11,14 +11,14 @@
 package org.eclipse.emf.eef.modelingBot.EclipseActions.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.emf.eef.extended.editor.EditorPackage;
+import org.eclipse.emf.eef.extended.editor.ReferenceableObject;
 import org.eclipse.emf.eef.modelingBot.EclipseActions.CreateModel;
 import org.eclipse.emf.eef.modelingBot.EclipseActions.EclipseActionsPackage;
+import org.eclipse.emf.eef.modelingBot.helper.EMFHelper;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,9 +27,12 @@ import org.eclipse.emf.eef.modelingBot.EclipseActions.EclipseActionsPackage;
  * <p>
  * The following features are implemented:
  * <ul>
+ *   <li>{@link org.eclipse.emf.eef.modelingBot.EclipseActions.impl.CreateModelImpl#getReferenceName <em>Reference Name</em>}</li>
  *   <li>{@link org.eclipse.emf.eef.modelingBot.EclipseActions.impl.CreateModelImpl#getModelName <em>Model Name</em>}</li>
  *   <li>{@link org.eclipse.emf.eef.modelingBot.EclipseActions.impl.CreateModelImpl#getPath <em>Path</em>}</li>
  *   <li>{@link org.eclipse.emf.eef.modelingBot.EclipseActions.impl.CreateModelImpl#getRoot <em>Root</em>}</li>
+ *   <li>{@link org.eclipse.emf.eef.modelingBot.EclipseActions.impl.CreateModelImpl#getComputedRoot <em>Computed Root</em>}</li>
+ *   <li>{@link org.eclipse.emf.eef.modelingBot.EclipseActions.impl.CreateModelImpl#getRootURI <em>Root URI</em>}</li>
  * </ul>
  * </p>
  *
@@ -37,6 +40,26 @@ import org.eclipse.emf.eef.modelingBot.EclipseActions.EclipseActionsPackage;
  */
 public class CreateModelImpl extends EclipseActionImpl implements CreateModel {
 	/**
+	 * The default value of the '{@link #getReferenceName() <em>Reference Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getReferenceName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String REFERENCE_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getReferenceName() <em>Reference Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getReferenceName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String referenceName = REFERENCE_NAME_EDEFAULT;
+
+	/**
 	 * The default value of the '{@link #getModelName() <em>Model Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -87,6 +110,26 @@ public class CreateModelImpl extends EclipseActionImpl implements CreateModel {
 	protected EClass root;
 
 	/**
+	 * The default value of the '{@link #getRootURI() <em>Root URI</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getRootURI()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ROOT_URI_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getRootURI() <em>Root URI</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getRootURI()
+	 * @generated
+	 * @ordered
+	 */
+	protected String rootURI = ROOT_URI_EDEFAULT;
+
+	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -110,6 +153,27 @@ public class CreateModelImpl extends EclipseActionImpl implements CreateModel {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public String getReferenceName() {
+		return referenceName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setReferenceName(String newReferenceName) {
+		String oldReferenceName = referenceName;
+		referenceName = newReferenceName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, EclipseActionsPackage.CREATE_MODEL__REFERENCE_NAME, oldReferenceName, referenceName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public String getModelName() {
 		return modelName;
 	}
@@ -190,9 +254,51 @@ public class CreateModelImpl extends EclipseActionImpl implements CreateModel {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EClass getComputedRoot() {
+		EClass computedRoot = basicGetComputedRoot();
+		return computedRoot != null && computedRoot.eIsProxy() ? (EClass)eResolveProxy((InternalEObject)computedRoot) : computedRoot;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated NOT
+	 */
+	public EClass basicGetComputedRoot() {
+		return EMFHelper.computeEObject(this, EclipseActionsPackage.Literals.CREATE_MODEL__ROOT, EclipseActionsPackage.Literals.CREATE_MODEL__ROOT_URI);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getRootURI() {
+		return rootURI;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setRootURI(String newRootURI) {
+		String oldRootURI = rootURI;
+		rootURI = newRootURI;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, EclipseActionsPackage.CREATE_MODEL__ROOT_URI, oldRootURI, rootURI));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
+			case EclipseActionsPackage.CREATE_MODEL__REFERENCE_NAME:
+				return getReferenceName();
 			case EclipseActionsPackage.CREATE_MODEL__MODEL_NAME:
 				return getModelName();
 			case EclipseActionsPackage.CREATE_MODEL__PATH:
@@ -200,6 +306,11 @@ public class CreateModelImpl extends EclipseActionImpl implements CreateModel {
 			case EclipseActionsPackage.CREATE_MODEL__ROOT:
 				if (resolve) return getRoot();
 				return basicGetRoot();
+			case EclipseActionsPackage.CREATE_MODEL__COMPUTED_ROOT:
+				if (resolve) return getComputedRoot();
+				return basicGetComputedRoot();
+			case EclipseActionsPackage.CREATE_MODEL__ROOT_URI:
+				return getRootURI();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -212,6 +323,9 @@ public class CreateModelImpl extends EclipseActionImpl implements CreateModel {
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
+			case EclipseActionsPackage.CREATE_MODEL__REFERENCE_NAME:
+				setReferenceName((String)newValue);
+				return;
 			case EclipseActionsPackage.CREATE_MODEL__MODEL_NAME:
 				setModelName((String)newValue);
 				return;
@@ -221,6 +335,9 @@ public class CreateModelImpl extends EclipseActionImpl implements CreateModel {
 			case EclipseActionsPackage.CREATE_MODEL__ROOT:
 				setRoot((EClass)newValue);
 				return;
+			case EclipseActionsPackage.CREATE_MODEL__ROOT_URI:
+				setRootURI((String)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -233,6 +350,9 @@ public class CreateModelImpl extends EclipseActionImpl implements CreateModel {
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
+			case EclipseActionsPackage.CREATE_MODEL__REFERENCE_NAME:
+				setReferenceName(REFERENCE_NAME_EDEFAULT);
+				return;
 			case EclipseActionsPackage.CREATE_MODEL__MODEL_NAME:
 				setModelName(MODEL_NAME_EDEFAULT);
 				return;
@@ -242,6 +362,9 @@ public class CreateModelImpl extends EclipseActionImpl implements CreateModel {
 			case EclipseActionsPackage.CREATE_MODEL__ROOT:
 				setRoot((EClass)null);
 				return;
+			case EclipseActionsPackage.CREATE_MODEL__ROOT_URI:
+				setRootURI(ROOT_URI_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -254,12 +377,18 @@ public class CreateModelImpl extends EclipseActionImpl implements CreateModel {
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
+			case EclipseActionsPackage.CREATE_MODEL__REFERENCE_NAME:
+				return REFERENCE_NAME_EDEFAULT == null ? referenceName != null : !REFERENCE_NAME_EDEFAULT.equals(referenceName);
 			case EclipseActionsPackage.CREATE_MODEL__MODEL_NAME:
 				return MODEL_NAME_EDEFAULT == null ? modelName != null : !MODEL_NAME_EDEFAULT.equals(modelName);
 			case EclipseActionsPackage.CREATE_MODEL__PATH:
 				return PATH_EDEFAULT == null ? path != null : !PATH_EDEFAULT.equals(path);
 			case EclipseActionsPackage.CREATE_MODEL__ROOT:
 				return root != null;
+			case EclipseActionsPackage.CREATE_MODEL__COMPUTED_ROOT:
+				return basicGetComputedRoot() != null;
+			case EclipseActionsPackage.CREATE_MODEL__ROOT_URI:
+				return ROOT_URI_EDEFAULT == null ? rootURI != null : !ROOT_URI_EDEFAULT.equals(rootURI);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -270,14 +399,50 @@ public class CreateModelImpl extends EclipseActionImpl implements CreateModel {
 	 * @generated
 	 */
 	@Override
+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+		if (baseClass == ReferenceableObject.class) {
+			switch (derivedFeatureID) {
+				case EclipseActionsPackage.CREATE_MODEL__REFERENCE_NAME: return EditorPackage.REFERENCEABLE_OBJECT__REFERENCE_NAME;
+				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 == ReferenceableObject.class) {
+			switch (baseFeatureID) {
+				case EditorPackage.REFERENCEABLE_OBJECT__REFERENCE_NAME: return EclipseActionsPackage.CREATE_MODEL__REFERENCE_NAME;
+				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(" (modelName: ");
+		result.append(" (referenceName: ");
+		result.append(referenceName);
+		result.append(", modelName: ");
 		result.append(modelName);
 		result.append(", path: ");
 		result.append(path);
+		result.append(", rootURI: ");
+		result.append(rootURI);
 		result.append(')');
 		return result.toString();
 	}
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/CreateProjectImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/CreateProjectImpl.java
index e18a57974..e18a57974 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/CreateProjectImpl.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/CreateProjectImpl.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/EclipseActionImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/EclipseActionImpl.java
index 2b643d309..2b643d309 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/EclipseActionImpl.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/EclipseActionImpl.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/EclipseActionsFactoryImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/EclipseActionsFactoryImpl.java
index cefd29f75..cefd29f75 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/EclipseActionsFactoryImpl.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/EclipseActionsFactoryImpl.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/EclipseActionsPackageImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/EclipseActionsPackageImpl.java
index 2f334bbdc..3322106ec 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/EclipseActionsPackageImpl.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/EclipseActionsPackageImpl.java
@@ -421,6 +421,24 @@ public class EclipseActionsPackageImpl extends EPackageImpl implements EclipseAc
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EReference getCreateModel_ComputedRoot() {
+		return (EReference)createModelEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCreateModel_RootURI() {
+		return (EAttribute)createModelEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EclipseActionsFactory getEclipseActionsFactory() {
 		return (EclipseActionsFactory)getEFactoryInstance();
 	}
@@ -478,6 +496,8 @@ public class EclipseActionsPackageImpl extends EPackageImpl implements EclipseAc
 		createEAttribute(createModelEClass, CREATE_MODEL__MODEL_NAME);
 		createEAttribute(createModelEClass, CREATE_MODEL__PATH);
 		createEReference(createModelEClass, CREATE_MODEL__ROOT);
+		createEReference(createModelEClass, CREATE_MODEL__COMPUTED_ROOT);
+		createEAttribute(createModelEClass, CREATE_MODEL__ROOT_URI);
 	}
 
 	/**
@@ -531,7 +551,7 @@ public class EclipseActionsPackageImpl extends EPackageImpl implements EclipseAc
 		initEClass(eclipseActionEClass, EclipseAction.class, "EclipseAction", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
 		initEClass(createProjectEClass, CreateProject.class, "CreateProject", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getCreateProject_ProjectName(), ecorePackage.getEString(), "projectName", null, 0, 1, CreateProject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCreateProject_ProjectName(), ecorePackage.getEString(), "projectName", null, 1, 1, CreateProject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(openPerspectiveEClass, OpenPerspective.class, "OpenPerspective", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getOpenPerspective_Type(), ecorePackage.getEString(), "type", null, 0, 1, OpenPerspective.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -559,9 +579,11 @@ public class EclipseActionsPackageImpl extends EPackageImpl implements EclipseAc
 		initEReference(getOpenEditor_Root(), theEcorePackage.getEClass(), null, "root", null, 0, 1, OpenEditor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(createModelEClass, CreateModel.class, "CreateModel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getCreateModel_ModelName(), ecorePackage.getEString(), "modelName", null, 0, 1, CreateModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getCreateModel_Path(), ecorePackage.getEString(), "path", null, 0, 1, CreateModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCreateModel_ModelName(), ecorePackage.getEString(), "modelName", null, 1, 1, CreateModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCreateModel_Path(), ecorePackage.getEString(), "path", null, 1, 1, CreateModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getCreateModel_Root(), theEcorePackage.getEClass(), null, "root", null, 0, 1, CreateModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getCreateModel_ComputedRoot(), theEcorePackage.getEClass(), null, "computedRoot", null, 1, 1, CreateModel.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCreateModel_RootURI(), ecorePackage.getEString(), "rootURI", null, 0, 1, CreateModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 	}
 
 } //EclipseActionsPackageImpl
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/OpenPerspectiveImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/OpenPerspectiveImpl.java
index 5ceac9f33..5ceac9f33 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/OpenPerspectiveImpl.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/OpenPerspectiveImpl.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/OpenProjectImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/OpenProjectImpl.java
index 879ee3cad..879ee3cad 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/OpenProjectImpl.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/OpenProjectImpl.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/RedoImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/RedoImpl.java
index 04a2ea35a..04a2ea35a 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/RedoImpl.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/RedoImpl.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/RemoveProjectImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/RemoveProjectImpl.java
index 06ca4896b..06ca4896b 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/RemoveProjectImpl.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/RemoveProjectImpl.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/SaveImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/SaveImpl.java
index 984c9ab83..984c9ab83 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/SaveImpl.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/SaveImpl.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/UndoImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/UndoImpl.java
index d1f90d0aa..d1f90d0aa 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/UndoImpl.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/impl/UndoImpl.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/util/EclipseActionsAdapterFactory.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/util/EclipseActionsAdapterFactory.java
index e92adf621..e92adf621 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/util/EclipseActionsAdapterFactory.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/util/EclipseActionsAdapterFactory.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/util/EclipseActionsSwitch.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/util/EclipseActionsSwitch.java
index 868d3e79a..868d3e79a 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/util/EclipseActionsSwitch.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/EclipseActions/util/EclipseActionsSwitch.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/ModelingBot.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/ModelingBot.java
index 7cd3bcc2a..7cd3bcc2a 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/ModelingBot.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/ModelingBot.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/ModelingBotFactory.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/ModelingBotFactory.java
index 61adf323d..61adf323d 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/ModelingBotFactory.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/ModelingBotFactory.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/ModelingBotPackage.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/ModelingBotPackage.java
index aa8465c07..aa8465c07 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/ModelingBotPackage.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/ModelingBotPackage.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/Processing.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/Processing.java
index e634c6855..e634c6855 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/Processing.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/Processing.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/PropertiesView.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/PropertiesView.java
index 7dd61e358..7dd61e358 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/PropertiesView.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/PropertiesView.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/Scenario.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/Scenario.java
index 8d2186e47..011edf71b 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/Scenario.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/Scenario.java
@@ -18,7 +18,7 @@ package org.eclipse.emf.eef.modelingBot;
  *
  *
  * @see org.eclipse.emf.eef.modelingBot.ModelingBotPackage#getScenario()
- * @model
+ * @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='JavaTestExistsForScenarioConstraint'"
  * @generated
  */
 public interface Scenario extends Sequence {
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/Sequence.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/Sequence.java
index 9d98e88ca..9d98e88ca 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/Sequence.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/Sequence.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/SequenceType.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/SequenceType.java
index 1939b8b13..1939b8b13 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/SequenceType.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/SequenceType.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/Wizard.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/Wizard.java
index 59ff8b8a7..59ff8b8a7 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/Wizard.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/Wizard.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/ActionImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/ActionImpl.java
index 34f29019c..34f29019c 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/ActionImpl.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/ActionImpl.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/DetailsPageImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/DetailsPageImpl.java
index f8ad40824..f8ad40824 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/DetailsPageImpl.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/DetailsPageImpl.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/DocumentedElementImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/DocumentedElementImpl.java
index 13d61bc43..13d61bc43 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/DocumentedElementImpl.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/DocumentedElementImpl.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/ModelingBotFactoryImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/ModelingBotFactoryImpl.java
index 1dcc6da9a..1dcc6da9a 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/ModelingBotFactoryImpl.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/ModelingBotFactoryImpl.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/ModelingBotImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/ModelingBotImpl.java
index 1b7653f10..1b7653f10 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/ModelingBotImpl.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/ModelingBotImpl.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/ModelingBotPackageImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/ModelingBotPackageImpl.java
index 2293ea67b..e4e7a2dad 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/ModelingBotPackageImpl.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/ModelingBotPackageImpl.java
@@ -10,12 +10,14 @@
  *******************************************************************************/
 package org.eclipse.emf.eef.modelingBot.impl;
 
+import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 
+import org.eclipse.emf.ecore.EValidator;
 import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 
@@ -46,6 +48,7 @@ import org.eclipse.emf.eef.modelingBot.Scenario;
 import org.eclipse.emf.eef.modelingBot.Sequence;
 import org.eclipse.emf.eef.modelingBot.SequenceType;
 import org.eclipse.emf.eef.modelingBot.Wizard;
+import org.eclipse.emf.eef.modelingBot.util.ModelingBotValidator;
 
 /**
  * <!-- begin-user-doc -->
@@ -188,6 +191,15 @@ public class ModelingBotPackageImpl extends EPackageImpl implements ModelingBotP
 		theEEFActionsPackage.initializePackageContents();
 		theEclipseActionsPackage.initializePackageContents();
 
+		// Register package validator
+		EValidator.Registry.INSTANCE.put
+			(theModelingBotPackage, 
+			 new EValidator.Descriptor() {
+				 public EValidator getEValidator() {
+					 return ModelingBotValidator.INSTANCE;
+				 }
+			 });
+
 		// Mark meta-data to indicate it can't be changed
 		theModelingBotPackage.freeze();
 
@@ -511,6 +523,29 @@ public class ModelingBotPackageImpl extends EPackageImpl implements ModelingBotP
 
 		// Create resource
 		createResource(eNS_URI);
+
+		// Create annotations
+		// http://www.eclipse.org/emf/2002/Ecore
+		createEcoreAnnotations();
+	}
+
+	/**
+	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void createEcoreAnnotations() {
+		String source = "http://www.eclipse.org/emf/2002/Ecore";		
+		addAnnotation
+		  (scenarioEClass, 
+		   source, 
+		   new String[] {
+			 "constraints", "JavaTestExistsForScenarioConstraint"
+		   },
+		   new URI[] {
+			 URI.createURI(eNS_URI).appendFragment("//Scenario")
+		   });
 	}
 
 } //ModelingBotPackageImpl
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/PropertiesViewImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/PropertiesViewImpl.java
index 07ab9f850..07ab9f850 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/PropertiesViewImpl.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/PropertiesViewImpl.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/ScenarioImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/ScenarioImpl.java
index 630e841bb..630e841bb 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/ScenarioImpl.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/ScenarioImpl.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/SequenceImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/SequenceImpl.java
index 265428af4..265428af4 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/SequenceImpl.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/SequenceImpl.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/WizardImpl.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/WizardImpl.java
index ecb3ac585..ecb3ac585 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/WizardImpl.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/impl/WizardImpl.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/util/ModelingBotAdapterFactory.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/util/ModelingBotAdapterFactory.java
index 372270116..372270116 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/util/ModelingBotAdapterFactory.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/util/ModelingBotAdapterFactory.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/util/ModelingBotSwitch.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/util/ModelingBotSwitch.java
index 25bf2ce9b..25bf2ce9b 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/util/ModelingBotSwitch.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/util/ModelingBotSwitch.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/util/ModelingBotValidator.java b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/util/ModelingBotValidator.java
new file mode 100644
index 000000000..1101128e1
--- /dev/null
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src-gen/org/eclipse/emf/eef/modelingBot/util/ModelingBotValidator.java
@@ -0,0 +1,270 @@
+/**
+ */
+package org.eclipse.emf.eef.modelingBot.util;
+
+import java.util.Map;
+
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.DiagnosticChain;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.EObjectValidator;
+import org.eclipse.emf.eef.modelingBot.*;
+import org.eclipse.emf.eef.modelingBot.Action;
+import org.eclipse.emf.eef.modelingBot.DetailsPage;
+import org.eclipse.emf.eef.modelingBot.DocumentedElement;
+import org.eclipse.emf.eef.modelingBot.ModelingBot;
+import org.eclipse.emf.eef.modelingBot.ModelingBotPackage;
+import org.eclipse.emf.eef.modelingBot.Processing;
+import org.eclipse.emf.eef.modelingBot.PropertiesView;
+import org.eclipse.emf.eef.modelingBot.Scenario;
+import org.eclipse.emf.eef.modelingBot.Sequence;
+import org.eclipse.emf.eef.modelingBot.SequenceType;
+import org.eclipse.emf.eef.modelingBot.Wizard;
+import org.eclipse.emf.eef.modelingBot.validation.ModelingBotValidationUtils;
+
+/**
+ * <!-- begin-user-doc --> The <b>Validator</b> for the model. <!-- end-user-doc -->
+ * @see org.eclipse.emf.eef.modelingBot.ModelingBotPackage
+ * @generated
+ */
+public class ModelingBotValidator extends EObjectValidator {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final ModelingBotValidator INSTANCE = new ModelingBotValidator();
+
+	/**
+	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.
+	 * <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * @see org.eclipse.emf.common.util.Diagnostic#getSource()
+	 * @see org.eclipse.emf.common.util.Diagnostic#getCode()
+	 * @generated
+	 */
+	public static final String DIAGNOSTIC_SOURCE = "org.eclipse.emf.eef.modelingBot";
+
+	/**
+	 * A constant with a fixed name that can be used as the base value for additional hand written constants.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 0;
+
+	/**
+	 * A constant with a fixed name that can be used as the base value for additional hand written constants in a derived class.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static final int DIAGNOSTIC_CODE_COUNT = GENERATED_DIAGNOSTIC_CODE_COUNT;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ModelingBotValidator() {
+		super();
+	}
+
+	/**
+	 * Returns the package of this validator switch.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EPackage getEPackage() {
+	  return ModelingBotPackage.eINSTANCE;
+	}
+
+	/**
+	 * Calls <code>validateXXX</code> for the corresponding classifier of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
+		switch (classifierID) {
+			case ModelingBotPackage.SCENARIO:
+				return validateScenario((Scenario)value, diagnostics, context);
+			case ModelingBotPackage.ACTION:
+				return validateAction((Action)value, diagnostics, context);
+			case ModelingBotPackage.SEQUENCE:
+				return validateSequence((Sequence)value, diagnostics, context);
+			case ModelingBotPackage.WIZARD:
+				return validateWizard((Wizard)value, diagnostics, context);
+			case ModelingBotPackage.DOCUMENTED_ELEMENT:
+				return validateDocumentedElement((DocumentedElement)value, diagnostics, context);
+			case ModelingBotPackage.MODELING_BOT:
+				return validateModelingBot((ModelingBot)value, diagnostics, context);
+			case ModelingBotPackage.DETAILS_PAGE:
+				return validateDetailsPage((DetailsPage)value, diagnostics, context);
+			case ModelingBotPackage.PROPERTIES_VIEW:
+				return validatePropertiesView((PropertiesView)value, diagnostics, context);
+			case ModelingBotPackage.PROCESSING:
+				return validateProcessing((Processing)value, diagnostics, context);
+			case ModelingBotPackage.SEQUENCE_TYPE:
+				return validateSequenceType((SequenceType)value, diagnostics, context);
+			default:
+				return true;
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateScenario(Scenario scenario, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
+		if (!validate_NoCircularContainment(scenario, diagnostics, context)) return false;
+		boolean result = validate_EveryMultiplicityConforms(scenario, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(scenario, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(scenario, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(scenario, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(scenario, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(scenario, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(scenario, diagnostics, context);
+		if (result || diagnostics != null) result &= validateScenario_JavaTestExistsForScenarioConstraint(scenario, diagnostics, context);
+		return result;
+	}
+
+	/**
+	 * Validates the JavaTestExistsForScenarioConstraint constraint of '<em>Scenario</em>'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	public boolean validateScenario_JavaTestExistsForScenarioConstraint(Scenario scenario,
+			DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if (diagnostics != null) {
+			if (!ModelingBotValidationUtils.isAssociatedToTest(scenario)) {
+				diagnostics.add(createDiagnostic(Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0,
+						"_UI_GenericConstraint_diagnostic", new Object[] {"JavaTestExistsConstraint",
+								getObjectLabel(scenario, context)
+						}, new Object[] {scenario
+						}, context));
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateAction(Action action, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return validate_EveryDefaultConstraint(action, diagnostics, context);
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateSequence(Sequence sequence, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
+		return validate_EveryDefaultConstraint(sequence, diagnostics, context);
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateWizard(Wizard wizard, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return validate_EveryDefaultConstraint(wizard, diagnostics, context);
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateDocumentedElement(DocumentedElement documentedElement,
+			DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return validate_EveryDefaultConstraint(documentedElement, diagnostics, context);
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateModelingBot(ModelingBot modelingBot, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
+		return validate_EveryDefaultConstraint(modelingBot, diagnostics, context);
+	}
+
+	/**
+	 * Validates the JavaTestExistsConstraint constraint of '<em>Modeling Bot</em>'. <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	public boolean validateModelingBot_JavaTestExistsConstraint(ModelingBot modelingBot,
+			DiagnosticChain diagnostics, Map<Object, Object> context) {
+		// TODO implement the constraint
+		// -> specify the condition that violates the constraint
+		// -> verify the diagnostic details, including severity, code, and message
+		// Ensure that you remove @generated or mark it @generated NOT
+		if (diagnostics != null) {
+			diagnostics.add(createDiagnostic(Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0,
+					"_UI_GenericConstraint_diagnostic", new Object[] {"JavaTestExistsConstraint",
+							getObjectLabel(modelingBot, context)
+					}, new Object[] {modelingBot
+					}, context));
+		}
+		return true;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateDetailsPage(DetailsPage detailsPage, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
+		return validate_EveryDefaultConstraint(detailsPage, diagnostics, context);
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validatePropertiesView(PropertiesView propertiesView, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
+		return validate_EveryDefaultConstraint(propertiesView, diagnostics, context);
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateProcessing(Processing processing, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
+		return validate_EveryDefaultConstraint(processing, diagnostics, context);
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateSequenceType(SequenceType sequenceType, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
+		return true;
+	}
+
+	/**
+	 * Returns the resource locator that will be used to fetch messages for this validator's diagnostics. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		// TODO
+		// Specialize this to return a resource locator for messages specific to this validator.
+		// Ensure that you remove @generated or mark it @generated NOT
+		return super.getResourceLocator();
+	}
+
+} // ModelingBotValidator
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/IModelingBot.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/IModelingBot.java
index ea03b35f9..ea03b35f9 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/IModelingBot.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/IModelingBot.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/batch/BatchModelingBot.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/batch/BatchModelingBot.java
index c36a27501..c36a27501 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/batch/BatchModelingBot.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/batch/BatchModelingBot.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/exception/InputModelInvalidException.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/exception/InputModelInvalidException.java
index d0720b02e..d0720b02e 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/exception/InputModelInvalidException.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/exception/InputModelInvalidException.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/exception/WidgetInvalidException.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/exception/WidgetInvalidException.java
index c5f43c53b..c5f43c53b 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/exception/WidgetInvalidException.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/exception/WidgetInvalidException.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/EEFModelHelper.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/EEFModelHelper.java
index 500e835d7..500e835d7 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/EEFModelHelper.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/EEFModelHelper.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/EMFHelper.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/EMFHelper.java
index fffec3132..5c7e3351f 100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/EMFHelper.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/EMFHelper.java
@@ -10,10 +10,14 @@ import java.util.List;
 import org.eclipse.emf.common.command.Command;

 import org.eclipse.emf.common.notify.AdapterFactory;

 import org.eclipse.emf.common.util.TreeIterator;

+import org.eclipse.emf.common.util.URI;

+import org.eclipse.emf.ecore.EAttribute;

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EPackage;

+import org.eclipse.emf.ecore.EReference;

 import org.eclipse.emf.ecore.EStructuralFeature;

+import org.eclipse.emf.ecore.resource.Resource;

 import org.eclipse.emf.edit.command.CommandActionDelegate;

 import org.eclipse.emf.edit.command.CommandParameter;

 import org.eclipse.emf.edit.command.CreateChildCommand;

@@ -115,17 +119,15 @@ public class EMFHelper {
 	public static String getEditorLabel(PropertiesEditionElement propertiesEditionElement, EObject referenceableObject, EObject container, SequenceType sequenceType) {

 		AdapterFactory adapterFactory = EEFRuntimePlugin.getDefault().getAdapterFactory();

 		EObject target = null;

-		if (SequenceType.DETAILS_PAGE == sequenceType) {

+		if (SequenceType.DETAILS_PAGE == sequenceType || SequenceType.PROPERTIES_VIEW == sequenceType) {

 			target = container;

 		} else if (SequenceType.WIZARD == sequenceType) {

-			if (((EditAction)referenceableObject).getPropertiesEditionElement() != null) {

-				target = (EObject)EEFModelHelper.eGet(container, ((EditAction)referenceableObject).getPropertiesEditionElement().getModel());

+			if (((EditAction)referenceableObject).getComputedPropertiesEditionElement() != null) {

+				target = (EObject)EEFModelHelper.eGet(container, ((EditAction)referenceableObject).getComputedPropertiesEditionElement().getModel());

 			} else {

 				target = container;

 				

 			}

-		}else if (SequenceType.PROPERTIES_VIEW == sequenceType) {

-			target = container;

 		}

 		assertFalse(target == null);

 		EStructuralFeature model = EMFHelper.map(target.eClass().getEPackage(), propertiesEditionElement.getModel());

@@ -145,4 +147,30 @@ public class EMFHelper {
 	}

 	

 

+	/**

+	 * Compute the value of a {@link EReference} following two input EReferences:

+	 * 	- a direct EReference

+	 *  - a URI Attribute

+	 * @param target the source {@link EObject}.

+	 * @param directReferenceFeature the direct {@link EReference}.

+	 * @param uriReferenceFeature the URI {@link EAttribute}.

+	 * @return the resulting {@link EReference}.

+	 */

+	@SuppressWarnings("unchecked")

+	public static <T> T computeEObject(EObject target, EStructuralFeature directReferenceFeature, EStructuralFeature uriReferenceFeature) {

+		if (target.eGet(directReferenceFeature) != null) {

+			return (T) target.eGet(directReferenceFeature);

+		} else if (target.eGet(uriReferenceFeature) != null && !"".equals(target.eGet(uriReferenceFeature))) {

+			URI uri = URI.createURI((String) target.eGet(uriReferenceFeature));

+			if (target.eResource() != null && target.eResource().getResourceSet() != null) {

+				Resource resource = target.eResource().getResourceSet().getResource(uri, true);

+				return (T) resource.getEObject(uri.fragment());

+			} else {

+				//TODO

+			}

+		

+		}

+		return null;

+	}

+	

 }

diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/PropertiesEditionHelper.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/PropertiesEditionHelper.java
index 62bb7a095..2f4eca72d 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/PropertiesEditionHelper.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/PropertiesEditionHelper.java
@@ -208,6 +208,14 @@ public class PropertiesEditionHelper {
 		SWTBotHelper.waitAllUiEvents();
 		String label = ((ElementEditor) propertiesEditionElement.getViews()
 				.get(0)).getQualifiedIdentifier();
+		//Clean all elements that have been already set
+		SWTBotTable table = bot.tableWithId(org.eclipse.emf.eef.runtime.ui.UIConstants.EEF_WIDGET_ID_KEY, label);
+		int rowCount = table.rowCount();
+		for (int i = 0; i < rowCount; i++) {
+			table.select(i);
+			bot.removeButtonReferencesTable(label).click();
+			SWTBotHelper.waitAllUiEvents();
+		}
 		bot.addButtonReferencesTable(label).click();
 		bot.selectInActiveTable(values);
 		clickOkOrCancel(propertiesEditionElement);
@@ -226,6 +234,14 @@ public class PropertiesEditionHelper {
 		SWTBotHelper.waitAllUiEvents();
 		String label = ((ElementEditor) propertiesEditionElement.getViews()
 				.get(0)).getQualifiedIdentifier();
+		//Clean all elements that have been already set
+		SWTBotTable table = bot.tableWithId(org.eclipse.emf.eef.runtime.ui.UIConstants.EEF_WIDGET_ID_KEY, label);
+		int rowCount = table.rowCount();
+		for (int i = 0; i < rowCount; i++) {
+			table.select(i);
+			bot.removeButtonAdvancedReferencesTable(label).click();
+			SWTBotHelper.waitAllUiEvents();
+		}
 		// TODO manage this case with selectInActiveTree(Collection<EObject>)
 		// when EEF will allowed to select multiple elements in a tree
 		for (EObject value : values) {
@@ -249,6 +265,8 @@ public class PropertiesEditionHelper {
 		String label = ((ElementEditor) propertiesEditionElement.getViews()
 				.get(0)).getQualifiedIdentifier();
 		bot.browseButtonFlatReferencesTable(label).click();
+		
+		//Clean all elements that have been already set
 		final SWTBotTable table = bot.table(1);
 		int rowCount = table.rowCount();
 		for (int i = 0; i < rowCount; i++) {
@@ -256,6 +274,7 @@ public class PropertiesEditionHelper {
 			buttonRemove.click();
 			SWTBotHelper.waitAllUiEvents();
 		}
+		
 		bot.selectInActiveTable(values);
 		SWTBotButton buttonAdd = bot.button(0);
 		buttonAdd.click();
@@ -460,11 +479,11 @@ public class PropertiesEditionHelper {
 			if (referenceableObject instanceof Add
 					&& referenceableObject.eContainer() instanceof Wizard) {
 				EStructuralFeature feature = ((Add) referenceableObject)
-						.getEContainingFeature();
+						.getComputedEContainingFeature();
 				EClassifier type = feature.getEType();
 				if (type != null && type instanceof EClass
 						&& ((EClass) type).isAbstract()) {
-					SWTBotRadio radio = bot.radio(((Add) referenceableObject).getType().getName());
+					SWTBotRadio radio = bot.radio(((Add) referenceableObject).getComputedType().getName());
 					WrappedSWTBotRadio wrappedRadio = new WrappedSWTBotRadio(radio);
 					wrappedRadio.click();
 					bot.button(UIConstants.NEXT_BUTTON).click();
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/SWTBotHelper.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/SWTBotHelper.java
index c9355f495..c9355f495 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/SWTBotHelper.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/SWTBotHelper.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/SWTEEFBotHelper.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/SWTEEFBotHelper.java
index 5e2755ed8..01cd74fd3 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/SWTEEFBotHelper.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/SWTEEFBotHelper.java
@@ -16,13 +16,11 @@ import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.withId
 import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.withMnemonic;
 import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.withStyle;
 
-import org.eclipse.emf.eef.modelingBot.Action;
 import org.eclipse.emf.eef.runtime.ui.UIConstants;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Widget;
 import org.eclipse.swtbot.swt.finder.SWTBot;
-import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotButton;
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotRadio;
 import org.hamcrest.Matcher;
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/StringHelper.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/StringHelper.java
index 1f9d4b9b0..1f9d4b9b0 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/StringHelper.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/StringHelper.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/UIConstants.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/UIConstants.java
index 7290a1171..7290a1171 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/UIConstants.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/helper/UIConstants.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/interpreter/ComposedEEFInterpreter.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/interpreter/ComposedEEFInterpreter.java
index 9df82a908..6c318acf7 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/interpreter/ComposedEEFInterpreter.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/interpreter/ComposedEEFInterpreter.java
@@ -13,14 +13,17 @@ package org.eclipse.emf.eef.modelingBot.interpreter;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.Diagnostician;
 import org.eclipse.emf.ecore.util.EcoreUtil;
@@ -103,22 +106,39 @@ public class ComposedEEFInterpreter implements IModelingBotInterpreter {
 		final Resource modelingBotResource = loadModel(path);
 		EcoreUtil.resolveAll(modelingBotResource.getResourceSet());
 		assertFalse("The modeling bot resource is empty.", modelingBotResource.getContents().isEmpty());
-		assertTrue("The modeling bot model contains errors, correct them first", modelingBotResource.getErrors()
-				.isEmpty());
-		final ModelingBot mbot = (ModelingBot)modelingBotResource.getContents().get(0);
-		final Diagnostic diag = Diagnostician.INSTANCE.validate(mbot);
-		assertTrue("The modeling bot model contains errors, correct them first", diag.getSeverity() == Diagnostic.OK);
-		
-		assertNotNull("The modeling bot resource is empty.", mbot);
-		for (IModelingBot bot : modelingBots) {
-			bot.getModelingBotInterpreter().setPropertiesEditionContext(mbot.getPropertiesEditionContext());
-		}
-		for (Sequence sequence : mbot.getSequences()) {
-			if (sequence instanceof Scenario) {
-				final Scenario scenario = (Scenario)sequence;
-				runSequence(scenario);
+		assertTrue("The modeling bot model contains errors, correct them first", modelingBotResource
+				.getErrors().isEmpty());
+
+		List<Scenario> scenarii = new ArrayList<Scenario>();
+		EObject root = modelingBotResource.getContents().get(0);
+		if (root instanceof ModelingBot) {
+			for (Sequence sequence : ((ModelingBot) root).getSequences()) {
+				if (sequence instanceof Scenario) {
+					scenarii.add((Scenario)sequence);
+				}
+			}
+		} else {
+			if (root instanceof Scenario) {
+				scenarii.add((Scenario) root);
 			}
 		}
+		final Diagnostic diag = Diagnostician.INSTANCE.validate(root);
+		if (diag.getSeverity() != Diagnostic.OK) {
+			displayDiag(diag);
+		}
+		assertTrue("The modeling bot model contains errors, correct them first",
+				diag.getSeverity() == Diagnostic.OK);
+		for (Scenario sequence : scenarii) {
+			final Scenario scenario = (Scenario)sequence;
+			runSequence(scenario);
+		}
+	}
+	
+	private void displayDiag(final Diagnostic diag) {
+		System.out.println("Source: " + diag.getSource() + " - Message: " + diag.getMessage() + " - Ex:" + diag.getException());
+		for (Diagnostic subDiag : diag.getChildren()) {
+			displayDiag(subDiag);
+		}
 	}
 
 	/**
@@ -147,22 +167,24 @@ public class ComposedEEFInterpreter implements IModelingBotInterpreter {
 
 	/**
 	 * {@inheritDoc}
+	 * 
 	 * @see org.eclipse.emf.eef.modelingBot.interpreter.IModelingBotInterpreter#preProcessing(org.eclipse.emf.eef.modelingBot.Sequence)
 	 */
 	public void preProcessing(Sequence sequence) {
 		for (IModelingBot iModelingBot : modelingBots) {
 			iModelingBot.getModelingBotInterpreter().preProcessing(sequence);
-		}		
+		}
 	}
 
 	/**
 	 * {@inheritDoc}
+	 * 
 	 * @see org.eclipse.emf.eef.modelingBot.interpreter.IModelingBotInterpreter#postProcessing(org.eclipse.emf.eef.modelingBot.Sequence)
 	 */
 	public void postProcessing(Sequence sequence) {
 		for (IModelingBot iModelingBot : modelingBots) {
 			iModelingBot.getModelingBotInterpreter().postProcessing(sequence);
-		}		
+		}
 	}
 
 	/**
@@ -187,37 +209,25 @@ public class ComposedEEFInterpreter implements IModelingBotInterpreter {
 	}
 
 	/**
-	 * Get the loaded resource.
+	 * Loads the model located at the given uri.
 	 * 
-	 * @param path
-	 *            path of the model
-	 * @return the resource loaded
+	 * @param uri
+	 *            the URI of the model to load. By convention, if giving a path (i.e. an URI with no scheme),
+	 *            then a platform:/plugins URI will be created
+	 * @return a resource containing the loaded model
 	 * @throws IOException
 	 * @throws CoreException
 	 */
-	public Resource loadModel(String path) throws IOException, CoreException {
-		final URI fileURI = URI.createPlatformPluginURI(path, true);
+	public Resource loadModel(String uri) throws IOException, CoreException {
+		URI fileURI = URI.createURI(uri);
+		// If the URI does not contains any scheme
+		// Then by convention we consider it referecences a model located in platform:/plugins
+		if (fileURI.scheme() == null || fileURI.scheme().length() == 0) {
+			fileURI = URI.createPlatformPluginURI(uri, true);
+		}
 		final Resource resource = editingDomain.getResourceSet().getResource(fileURI, true);
 		assertNotNull("The modeling bot resource can not be loaded.", resource);
 		return resource;
 	}
 
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * @see org.eclipse.emf.eef.modelingBot.interpreter.IModelingBotInterpreter#getPropertiesEditionContext()
-	 */
-	public PropertiesEditionContext getPropertiesEditionContext() {
-		return null;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * @see org.eclipse.emf.eef.modelingBot.interpreter.IModelingBotInterpreter#setPropertiesEditionContext(org.eclipse.emf.eef.components.PropertiesEditionContext)
-	 */
-	public void setPropertiesEditionContext(PropertiesEditionContext context) {
-
-	}
-
 }
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/interpreter/EEFInterpreter.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/interpreter/EEFInterpreter.java
index baba016c1..500f87e23 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/interpreter/EEFInterpreter.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/interpreter/EEFInterpreter.java
@@ -15,9 +15,11 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -29,7 +31,6 @@ import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.Diagnostician;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.eef.components.PropertiesEditionContext;
 import org.eclipse.emf.eef.components.PropertiesEditionElement;
 import org.eclipse.emf.eef.extended.editor.ReferenceableObject;
 import org.eclipse.emf.eef.modelingBot.Action;
@@ -99,11 +100,6 @@ public class EEFInterpreter implements IModelingBotInterpreter {
 	private IModelingBot bot;
 
 	/**
-	 * PropertiesEditionContext.
-	 */
-	private PropertiesEditionContext propertiesEditionContext;
-
-	/**
 	 * Collection of Actions already processed.
 	 */
 	private Collection<Action> processedActions = new HashSet<Action>();
@@ -197,20 +193,28 @@ public class EEFInterpreter implements IModelingBotInterpreter {
 		assertFalse("The modeling bot resource is empty.", modelingBotResource.getContents().isEmpty());
 		assertTrue("The modeling bot model contains errors, correct them first", modelingBotResource
 				.getErrors().isEmpty());
-		final ModelingBot mbot = (ModelingBot)modelingBotResource.getContents().get(0);
-		final Diagnostic diag = Diagnostician.INSTANCE.validate(mbot);
+		List<Scenario> scenarii = new ArrayList<Scenario>();
+		EObject root = modelingBotResource.getContents().get(0);
+		if (root instanceof ModelingBot) {
+			for (Sequence sequence : ((ModelingBot) root).getSequences()) {
+				if (sequence instanceof Scenario) {
+					scenarii.add((Scenario)sequence);
+				}
+			}
+		} else {
+			if (root instanceof Scenario) {
+				scenarii.add((Scenario) root);
+			}
+		}
+		final Diagnostic diag = Diagnostician.INSTANCE.validate(root);
 		if (diag.getSeverity() != Diagnostic.OK) {
 			displayDiag(diag);
 		}
 		assertTrue("The modeling bot model contains errors, correct them first",
 				diag.getSeverity() == Diagnostic.OK);
-		assertNotNull("The modeling bot resource is empty.", mbot);
-		propertiesEditionContext = mbot.getPropertiesEditionContext();
-		for (Sequence sequence : mbot.getSequences()) {
-			if (sequence instanceof Scenario) {
-				final Scenario scenario = (Scenario)sequence;
-				runSequence(scenario);
-			}
+		for (Scenario sequence : scenarii) {
+			final Scenario scenario = (Scenario)sequence;
+			runSequence(scenario);
 		}
 	}
 
@@ -283,7 +287,7 @@ public class EEFInterpreter implements IModelingBotInterpreter {
 		if (!processedActions.contains(action)) {
 
 			if (action instanceof EditAction && EEFModelingBotHelper.isFollowingByCancel(action)) {
-				actionsToCancel.add(((EditAction)action).getPropertiesEditionElement());
+				actionsToCancel.add(((EditAction)action).getComputedPropertiesEditionElement());
 //				if (bot instanceof SWTEEFBot) {
 //					processedActions.add(EEFModelingBotHelper.getFollowingCancelAction(action));
 //				}
@@ -301,38 +305,38 @@ public class EEFInterpreter implements IModelingBotInterpreter {
 				}
 			} else if (action instanceof CreateModel) {
 				final EObject addedObject = bot.createModel(((CreateModel)action).getPath(),
-						((CreateModel)action).getModelName(), ((CreateModel)action).getRoot());
+						((CreateModel)action).getModelName(), ((CreateModel)action).getComputedRoot());
 				addModelMap((CreateModel)action, addedObject);
 			} else if (action instanceof Add) {
 				PropertiesEditionElement propertiesEditionElement = ((Add)action)
-						.getPropertiesEditionElement();
+						.getComputedPropertiesEditionElement();
 				if (propertiesEditionElement != null) {
 					final EObject addedObject = bot.add(propertiesEditionElement,
 							((Add)action).getReferenceableObject(), (ReferenceableObject)action,
-							((Add)action).getEContainingFeature(), ((Add)action).getType());
+							((Add)action).getComputedEContainingFeature(), ((Add)action).getComputedType());
 					if (addedObject != null) {
 						addActionMap((Add)action, addedObject);
 					}
 				} else {
 					final EObject addedObject = bot.add(propertiesEditionElement, null,
-							((Add)action).getReferenceableObject(), ((Add)action).getEContainingFeature(),
-							((Add)action).getType());
+							((Add)action).getReferenceableObject(), ((Add)action).getComputedEContainingFeature(),
+							((Add)action).getComputedType());
 					if (addedObject != null) {
 						addActionMap((Add)action, addedObject);
 					}
 				}
 			} else if (action instanceof MoveDown) {
-				bot.moveDown(((MoveDown)action).getPropertiesEditionElement(),
+				bot.moveDown(((MoveDown)action).getComputedPropertiesEditionElement(),
 						((MoveDown)action).getReferenceableObject());
 			} else if (action instanceof MoveUp) {
-				bot.moveUp(((MoveUp)action).getPropertiesEditionElement(),
+				bot.moveUp(((MoveUp)action).getComputedPropertiesEditionElement(),
 						((MoveUp)action).getReferenceableObject());
 			} else if (action instanceof SetAttribute) {
-				bot.setAttribute(((SetAttribute)action).getPropertiesEditionElement(),
+				bot.setAttribute(((SetAttribute)action).getComputedPropertiesEditionElement(),
 						((SetAttribute)action).getReferenceableObject(),
-						((SetAttribute)action).getEContainingFeature(), ((SetAttribute)action).getValues());
+						((SetAttribute)action).getComputedEContainingFeature(), ((SetAttribute)action).getValues());
 			} else if (action instanceof SetReference) {
-				bot.setReference(((SetReference)action).getPropertiesEditionElement(),
+				bot.setReference(((SetReference)action).getComputedPropertiesEditionElement(),
 						((SetReference)action).getReferenceableObject(),
 						((SetReference)action).getEContainingFeature(), ((SetReference)action).getValues());
 			} else if (action instanceof Save) {
@@ -352,19 +356,19 @@ public class EEFInterpreter implements IModelingBotInterpreter {
 					bot.cancel(((Cancel)action).getProcessing());
 				}
 			} else if (action instanceof Unset) {
-				bot.unset(((Unset)action).getPropertiesEditionElement(),
+				bot.unset(((Unset)action).getComputedPropertiesEditionElement(),
 						((Unset)action).getReferenceableObject(), ((Unset)action).getFeature());
 			} else if (action instanceof UnsetAttribute) {
-				bot.unsetAttribute(((UnsetAttribute)action).getPropertiesEditionElement(),
+				bot.unsetAttribute(((UnsetAttribute)action).getComputedPropertiesEditionElement(),
 						((UnsetAttribute)action).getReferenceableObject(),
 						((UnsetAttribute)action).getEContainingFeature(),
 						((UnsetAttribute)action).getValues());
 			} else if (action instanceof UnsetReference) {
-				bot.unsetReference(((UnsetReference)action).getPropertiesEditionElement(),
+				bot.unsetReference(((UnsetReference)action).getComputedPropertiesEditionElement(),
 						((UnsetReference)action).getReferenceableObject(),
 						((UnsetReference)action).getFeature(), ((UnsetReference)action).getValues());
 			} else if (action instanceof Remove) {
-				bot.remove(((Remove)action).getPropertiesEditionElement(),
+				bot.remove(((Remove)action).getComputedPropertiesEditionElement(),
 						((Remove)action).getReferenceableObject());
 				refObjectToEObjectMap.remove(((Remove)action).getReferenceableObject());
 			} else if (action instanceof Undo) {
@@ -384,21 +388,4 @@ public class EEFInterpreter implements IModelingBotInterpreter {
 		refObjectToEObjectMap.put(action, obj);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * @see org.eclipse.emf.eef.modelingBot.interpreter.IModelingBotInterpreter#getPropertiesEditionContext()
-	 */
-	public PropertiesEditionContext getPropertiesEditionContext() {
-		return propertiesEditionContext;
-	}
-
-	/**
-	 * @param pec
-	 *            the propertiesEditionContext to set
-	 */
-	public void setPropertiesEditionContext(PropertiesEditionContext pec) {
-		this.propertiesEditionContext = pec;
-	}
-
 }
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/interpreter/IModelingBotInterpreter.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/interpreter/IModelingBotInterpreter.java
index 028e2d68d..b790179eb 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/interpreter/IModelingBotInterpreter.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/interpreter/IModelingBotInterpreter.java
@@ -60,14 +60,4 @@ public interface IModelingBotInterpreter {
 	 */
 	void postProcessing(Sequence sequence);
 
-	/**
-	 * @return the PropertiesEditionContext
-	 */
-	PropertiesEditionContext getPropertiesEditionContext();
-
-	/**
-	 * @param context propertiesEditionContext to set
-	 */
-	void setPropertiesEditionContext(PropertiesEditionContext context);
-	
 }
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/menu/FirstContextMenuFinder.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/menu/FirstContextMenuFinder.java
index 0d9f20053..0d9f20053 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/menu/FirstContextMenuFinder.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/menu/FirstContextMenuFinder.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/menu/SWTBotContextMenu.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/menu/SWTBotContextMenu.java
index b83ece126..b83ece126 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/menu/SWTBotContextMenu.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/menu/SWTBotContextMenu.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/swtbot/ComposedEEFBot.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/swtbot/ComposedEEFBot.java
index 2a2b45ecf..c52a7e581 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/swtbot/ComposedEEFBot.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/swtbot/ComposedEEFBot.java
@@ -16,19 +16,20 @@ import static org.junit.Assert.fail;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.emf.common.command.BasicCommandStack;
-import org.eclipse.emf.compare.diff.metamodel.DiffGroup;
-import org.eclipse.emf.compare.diff.metamodel.DiffModel;
-import org.eclipse.emf.compare.diff.service.DiffService;
-import org.eclipse.emf.compare.match.metamodel.MatchModel;
-import org.eclipse.emf.compare.match.service.MatchService;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.compare.Comparison;
+import org.eclipse.emf.compare.Diff;
+import org.eclipse.emf.compare.EMFCompare;
+import org.eclipse.emf.compare.EMFCompare.Builder;
+import org.eclipse.emf.compare.match.IMatchEngine;
+import org.eclipse.emf.compare.match.IMatchEngine.Factory.Registry;
+import org.eclipse.emf.compare.match.impl.MatchEngineFactoryImpl;
+import org.eclipse.emf.compare.match.impl.MatchEngineFactoryRegistryImpl;
+import org.eclipse.emf.compare.utils.UseIdentifiers;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
@@ -46,7 +47,6 @@ import org.eclipse.emf.eef.modelingBot.interpreter.ComposedEEFInterpreter;
 import org.eclipse.emf.eef.modelingBot.interpreter.IModelingBotInterpreter;
 import org.eclipse.emf.eef.modelingBot.uri.EEFURIConverter;
 import org.eclipse.emf.eef.runtime.EEFRuntimePlugin;
-import org.eclipse.emf.eef.runtime.impl.utils.EEFUtils;
 
 /**
  * Composed eef bot : SWTEEFbot and BatchModeling bot.
@@ -284,35 +284,18 @@ public class ComposedEEFBot implements IModelingBot {
 
 	public void assertExpectedModelReached(Resource expectedModel, Resource batchModel)
 			throws InterruptedException {
-		final Map<String, Object> options = new HashMap<String, Object>();
-		options.put(org.eclipse.emf.compare.match.MatchOptions.OPTION_IGNORE_XMI_ID, Boolean.TRUE);
-		options.put(org.eclipse.emf.compare.match.MatchOptions.OPTION_DISTINCT_METAMODELS, Boolean.TRUE);
-		final MatchModel match = MatchService.doResourceMatch(batchModel, expectedModel, options);
-		final DiffModel diff = DiffService.doDiff(match);
-		final List<EObject> diffList = EEFUtils.asEObjectList(diff.eAllContents());
-		final Collection<EObject> result = filterAbnormalDiffElement(diffList);
-		if (!result.isEmpty()) {
-			System.out.println(result);
+		Builder builder = EMFCompare.builder();
+		IMatchEngine.Factory matchEngineFactory = new MatchEngineFactoryImpl(UseIdentifiers.NEVER);
+		Registry matchEngineFactoryRegistry = MatchEngineFactoryRegistryImpl.createStandaloneInstance();
+		matchEngineFactoryRegistry.add(matchEngineFactory);
+		builder.setMatchEngineFactoryRegistry(matchEngineFactoryRegistry);
+		Comparison compare = builder.build()
+				.compare(EMFCompare.createDefaultScope(expectedModel, batchModel));
+		EList<Diff> differences = compare.getDifferences();
+		if (!differences.isEmpty()) {
+			System.out.println(differences);
 		}
-		assertTrue("The active model isn't the same that the expected model.", result.isEmpty());
-	}
-
-	/**
-	 * TODO: check this with the EMF Compare team
-	 * 
-	 * @param diffList
-	 *            the list to filter
-	 * @return the list of "good" diff
-	 */
-	private Collection<EObject> filterAbnormalDiffElement(List<EObject> diffList) {
-		final Set<EObject> result = new HashSet<EObject>();
-		for (EObject object : diffList) {
-			if (!(object instanceof DiffGroup))
-				result.add(object);
-			else if (object.eContents().size() > 0)
-				result.addAll(filterAbnormalDiffElement(object.eContents()));
-		}
-		return result;
+		assertTrue("The active model isn't the same that the expected model.", differences.isEmpty());
 	}
 
 	/**
@@ -381,7 +364,7 @@ public class ComposedEEFBot implements IModelingBot {
 
 	public void moveUp(PropertiesEditionElement propertiesEditionElement,
 			ReferenceableObject referenceableObject) {
-		// do nothing	
+		// do nothing
 	}
 
 	public void moveDown(PropertiesEditionElement propertiesEditionElement,
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/swtbot/SWTEEFBot.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/swtbot/SWTEEFBot.java
index af996003e..7e9b7fab4 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/swtbot/SWTEEFBot.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/swtbot/SWTEEFBot.java
@@ -34,6 +34,7 @@ import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.emf.edit.domain.IEditingDomainProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.eef.components.PropertiesEditionComponent;
 import org.eclipse.emf.eef.components.PropertiesEditionElement;
 import org.eclipse.emf.eef.extended.editor.ReferenceableObject;
 import org.eclipse.emf.eef.modelingBot.Action;
@@ -363,7 +364,7 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot {
 		if (sequenceType.equals(SequenceType.PROPERTIES_VIEW)) {
 			final SWTBotTreeItem selectNode = selectNode(editor, container);
 			assertNotNull("No element is selected in the editor", selectNode);
-			initPropertiesViewTab(propertiesEditionElement, selectNode);
+			initTab(propertiesEditionElement);
 		} else if (sequenceType.equals(SequenceType.WIZARD)) {
 			initTab(propertiesEditionElement);
 		}
@@ -462,7 +463,7 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot {
 		assertNotNull("The editor is not opened.", editor);
 		SWTBotHelper.waitAllUiEvents();
 		assertNotNull("The set action must be define in a sequence.", sequenceType);
-		if (sequenceType.equals(SequenceType.DETAILS_PAGE)) {
+		if (sequenceType.equals(SequenceType.DETAILS_PAGE) || sequenceType.equals(SequenceType.PROPERTIES_VIEW)) {
 			final EObject container = getEObjectFromReferenceableEObject(referenceableObject);
 			assertNotNull("No container is found to launch add action.", container);
 			final SWTBotTreeItem selectNode = selectNode(editor, container);
@@ -472,7 +473,7 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot {
 					container, values, sequenceType);
 		} else if (sequenceType.equals(SequenceType.WIZARD)) {
 			EObject containerOfcontainer = null;
-			if (((EditAction)referenceableObject).getPropertiesEditionElement() != null) {
+			if (((EditAction)referenceableObject).getComputedPropertiesEditionElement() != null) {
 				containerOfcontainer = getEObjectFromReferenceableEObject(((EditAction)referenceableObject)
 						.getReferenceableObject());
 			} else {
@@ -484,28 +485,6 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot {
 					containerOfcontainer, values, sequenceType);
 		}
 	}
-	
-	/**
-	 * Select the tab defined in the PEE.
-	 * 
-	 * @param propertiesEditionElement
-	 *            PropertiesEditionElement
-	 */
-	protected void initPropertiesViewTab(PropertiesEditionElement propertiesEditionElement,
-				SWTBotTreeItem selectNode) {
-		assertFalse(propertiesEditionElement.getViews().isEmpty());
-		if (EEFModelHelper.getComponent(propertiesEditionElement).getViews().size() > 1) {
-			final ElementEditor elementEditor = propertiesEditionElement.getViews().get(0);
-			final View view = EEFModelHelper.getView(elementEditor);
-			if (view.getName() != null) {
-				if (selectNode.getText().equals(view.getName())) {
-					SWTBotHelper.selectPropertyTabItem("Base");
-				} else {
-					SWTBotHelper.selectPropertyTabItem(view.getName());
-				}
-			}
-	 	}
-	}
 
 	/**
 	 * Select the tab defined in the PEE.
@@ -518,10 +497,23 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot {
 		if (EEFModelHelper.getComponent(propertiesEditionElement).getViews().size() > 1) {
 			final ElementEditor elementEditor = propertiesEditionElement.getViews().get(0);
 			final View view = EEFModelHelper.getView(elementEditor);
-			if (view.getName() != null) {
-				SWTBotCTabItem cTabItem = cTabItem(view.getName());
-				cTabItem.activate();
-				cTabItem.setFocus();
+			if (view != null) {
+				if (sequenceType.equals(SequenceType.DETAILS_PAGE) || sequenceType.equals(SequenceType.WIZARD)) {					
+					if (view.getName() != null) {
+						SWTBotCTabItem cTabItem = cTabItem(view.getName());
+						cTabItem.activate();
+						cTabItem.setFocus();
+					}
+				} else if (sequenceType.equals(SequenceType.PROPERTIES_VIEW)) {
+					final PropertiesEditionComponent pec = EEFModelHelper.getComponent(propertiesEditionElement);
+					if (pec != null && view.getName() != null) {
+						if (view.getName().equals(pec.getName())) {
+							SWTBotHelper.selectPropertyTabItem("Base");
+						} else {
+							SWTBotHelper.selectPropertyTabItem(view.getName());
+						}
+					}
+				}
 			}
 		}
 	}
@@ -541,7 +533,7 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot {
 		assertNotNull("The editor is not opened.", editor);
 		SWTBotHelper.waitAllUiEvents();
 		assertFalse("The set action must be define in a sequence.", sequenceType == null);
-		if (sequenceType.equals(SequenceType.DETAILS_PAGE)) {
+		if (sequenceType.equals(SequenceType.DETAILS_PAGE) || sequenceType.equals(SequenceType.PROPERTIES_VIEW)) {
 			final EObject container = getEObjectFromReferenceableEObject(referenceableObject);
 			assertNotNull("No container is found to launch set ref action.", container);
 			final SWTBotTreeItem selectNode = selectNode(editor, container);
@@ -616,7 +608,7 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot {
 	public void unsetAdvancedReferencesTable(PropertiesEditionElement propertiesEditionElement,
 			ReferenceableObject referenceableObject, EStructuralFeature eContainingFeature) {
 		final ElementEditor elementEditor = propertiesEditionElement.getViews().get(0);
-		if (sequenceType.equals(SequenceType.DETAILS_PAGE)) {
+		if (sequenceType.equals(SequenceType.DETAILS_PAGE) || sequenceType.equals(SequenceType.PROPERTIES_VIEW)) {
 			propertiesEdition.unsetAdvancedReferencesTable(elementEditor, null);
 		} else if (sequenceType.equals(SequenceType.WIZARD)) {
 			initTab(propertiesEditionElement);
@@ -639,7 +631,7 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot {
 		assertNotNull("The properties edition element is not set.", propertiesEditionElement);
 		assertNotNull("The editor is not opened.", editor);
 		assertFalse(propertiesEditionElement.getViews().isEmpty());
-		if (sequenceType.equals(SequenceType.DETAILS_PAGE)) {
+		if (sequenceType.equals(SequenceType.DETAILS_PAGE) || sequenceType.equals(SequenceType.PROPERTIES_VIEW)) {
 			final EObject container = getEObjectFromReferenceableEObject(referenceableObject);
 			assertNotNull("No container is found to launch add action.", container);
 			final SWTBotTreeItem selectNode = selectNode(editor, container);
@@ -649,7 +641,7 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot {
 					values, sequenceType);
 		} else if (sequenceType.equals(SequenceType.WIZARD)) {
 			EObject containerOfcontainer = null;
-			if (((EditAction)referenceableObject).getPropertiesEditionElement() != null) {
+			if (((EditAction)referenceableObject).getComputedPropertiesEditionElement() != null) {
 				containerOfcontainer = getEObjectFromReferenceableEObject(((EditAction)referenceableObject)
 						.getReferenceableObject());
 			} else {
@@ -678,7 +670,7 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot {
 		assertNotNull("The properties edition element is not set.", propertiesEditionElement);
 		assertNotNull("The editor is not opened.", editor);
 		assertFalse(propertiesEditionElement.getViews().isEmpty());
-		if (sequenceType.equals(SequenceType.DETAILS_PAGE)) {
+		if (sequenceType.equals(SequenceType.DETAILS_PAGE) || sequenceType.equals(SequenceType.PROPERTIES_VIEW)) {
 			final Collection<EObject> objectsToUnset = new ArrayList<EObject>();
 			for (ReferenceableObject value : values) {
 				objectsToUnset.add(getEObjectFromReferenceableEObject(value));
@@ -798,8 +790,7 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot {
 		button(UIConstants.NEXT_BUTTON).click();
 
 		button("Browse Registered Packages...").click();
-		final String nsURI = interpreter.getPropertiesEditionContext().getModel().getEcorePackage()
-				.getNsURI();
+		final String nsURI = root.getEPackage().getNsURI();
 		table().getTableItem(nsURI).select();
 		button(UIConstants.OK_BUTTON).click();
 		button(UIConstants.NEXT_BUTTON).click();
@@ -1391,8 +1382,11 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot {
 		assertNotNull(referenceableObject);
 		EObject eObject = getEObjectFromReferenceableEObject(referenceableObject);
 		assertNotNull(eObject);
-		selectInActiveTable(eObject);
-		buttonWithTooltip(UIConstants.UP_BUTTON).click();
+		SWTBotHelper.waitAllUiEvents();
+		String label = ((ElementEditor) propertiesEditionElement.getViews()
+				.get(0)).getQualifiedIdentifier();
+		selectInTableWithId(org.eclipse.emf.eef.runtime.ui.UIConstants.EEF_WIDGET_ID_KEY, label, eObject);
+		button(UIConstants.UP_BUTTON).click();
 	}
 
 	public void moveDown(PropertiesEditionElement propertiesEditionElement,
@@ -1400,8 +1394,10 @@ public class SWTEEFBot extends SWTWorkbenchBot implements IModelingBot {
 		assertNotNull(referenceableObject);
 		EObject eObject = getEObjectFromReferenceableEObject(referenceableObject);
 		assertNotNull(eObject);
-		selectInActiveTable(eObject);
-		buttonWithTooltip(UIConstants.DOWN_BUTTON).click();
+		String label = ((ElementEditor) propertiesEditionElement.getViews()
+				.get(0)).getQualifiedIdentifier();
+		selectInTableWithId(org.eclipse.emf.eef.runtime.ui.UIConstants.EEF_WIDGET_ID_KEY, label, eObject);
+		button(UIConstants.DOWN_BUTTON).click();
 	}
 
 	
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/testcase/AbstractComposedModelingBotTestCase.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/testcase/AbstractComposedModelingBotTestCase.java
index 52e62ba8a..ef6319cfd 100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/testcase/AbstractComposedModelingBotTestCase.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/testcase/AbstractComposedModelingBotTestCase.java
@@ -52,14 +52,14 @@ public abstract class AbstractComposedModelingBotTestCase extends SWTBotEclipseT
 	 */

 	public void setUp() throws Exception {

 		super.setUp();

-		

+

 		// remove existants projects

 		clearWorkspaceProjects();

 		File file = ResourcesPlugin.getWorkspace().getRoot().getLocation().toFile();

 		if (file.isDirectory()) {

 			deleteFolder(file);

 		}

-		

+

 		PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() {

 

 			public void run() {

@@ -105,6 +105,7 @@ public abstract class AbstractComposedModelingBotTestCase extends SWTBotEclipseT
 		}

 		folder.delete();

 	}

+

 	@Override

 	protected void tearDown() throws Exception {

 		// Close an eventual popup if the test failed and a popup remain opened

@@ -126,7 +127,8 @@ public abstract class AbstractComposedModelingBotTestCase extends SWTBotEclipseT
 	/**

 	 * Test method. call <code>bot.runModelingBot("project/path.to/model.modelingbot");</code>

 	 * 

-	 * @throws Exception if any exception is thrown

+	 * @throws Exception

+	 *             if any exception is thrown

 	 */

 	public abstract void testModelingBot() throws Exception;

 }

diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/testcase/AbstractSWTBotModelingBotTestCase.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/testcase/AbstractSWTBotModelingBotTestCase.java
index f4a86051c..f4a86051c 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/testcase/AbstractSWTBotModelingBotTestCase.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/testcase/AbstractSWTBotModelingBotTestCase.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/uri/EEFURIConverter.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/uri/EEFURIConverter.java
index 88a452f80..88a452f80 100755..100644
--- a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/uri/EEFURIConverter.java
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/uri/EEFURIConverter.java
diff --git a/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/validation/ModelingBotValidationUtils.java b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/validation/ModelingBotValidationUtils.java
new file mode 100644
index 000000000..5a2f2a2c7
--- /dev/null
+++ b/plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/validation/ModelingBotValidationUtils.java
@@ -0,0 +1,80 @@
+/*******************************************************************************

+ * Copyright (c) 2010, 2011 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.emf.eef.modelingBot.validation;

+

+import org.eclipse.core.resources.IProject;

+import org.eclipse.core.resources.ResourcesPlugin;

+import org.eclipse.emf.common.util.URI;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.util.EcoreUtil;

+import org.eclipse.emf.eef.modelingBot.Scenario;

+

+/**

+ * Utility class providing facilities for validating ModelingBot elements.

+ * 

+ * @author <a href="mailto:alex.lagarde@obeo.fr">Alex Lagarde</a>

+ */

+public class ModelingBotValidationUtils {

+

+	/**

+	 * Indicates whether a junit test corresponding to the given element exists.

+	 * 

+	 * @param element

+	 *            the element to test (a Scenario or a ModelingBot)

+	 * @return true if a junit tests corresponding to the given element exists, false otherwise

+	 */

+	public static boolean isAssociatedToTest(EObject element) {

+		boolean isAssociatedToTest = element.eResource() != null;

+		URI uri = EcoreUtil.getURI(element);

+		if (element instanceof Scenario && isAssociatedToTest) {

+			String projectName = getProjectName(uri);

+			IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);

+			if (project.exists()) {

+				isAssociatedToTest = false;

+				String expectedPath = getExpectedPath(project, (Scenario)element);

+				return project.getFile(expectedPath).exists();

+			}

+		}

+		return isAssociatedToTest;

+	}

+

+	/**

+	 * Returns the relative path (from the project) that indicates where should be located the junit test of

+	 * the given scenario.

+	 * 

+	 * @param project

+	 *            the project helding the scenario

+	 * @param scenario

+	 *            the scenario to query

+	 * @return the relative path (from the project) that indicates where should be located the junit test of

+	 *         the given scenario

+	 */

+	public static String getExpectedPath(IProject project, Scenario scenario) {

+		if (project.exists()) {

+			String className = scenario.getName().replace(" ", "");

+			className = className.substring(0, 1).toUpperCase() + className.substring(1);

+			return "src/" + project.getName().replace(".", "/") + "/scenarios/" + className + "Test.java";

+		}

+		return null;

+	}

+

+	/**

+	 * Extracts the project name from the given element {@link URI}.

+	 * 

+	 * @param elementURI

+	 *            the element {@link URI}

+	 * @return the project name from the given element {@link URI}

+	 */

+	public static String getProjectName(URI elementURI) {

+		return elementURI.toString().replace("platform:/resource/", "").replace("platform:/plugin/", "")

+				.replace("intent:/", "").split("/")[0];

+	}

+}