Bug 547505: Remove unnecessary Ecore path entries

The view models for Ecore elements contain unnecessary Ecore path
entries. They are redundant in the best case and can lead to exceptions
in the worst. These are now removed.

Change-Id: I6ad90b5f756af3daa28c911d0e43054481c59c4a
Signed-off-by: Stefan Dirix <sdirix@eclipsesource.com>

bundles/org.eclipse.emfforms.editor.ecore/simple_viewmodels/EAttribute.view

diff --git a/bundles/org.eclipse.emfforms.editor.ecore/simple_viewmodels/EAttribute.view b/bundles/org.eclipse.emfforms.editor.ecore/simple_viewmodels/EAttribute.view
index 1d7f2d3..03e7143 100644
--- a/bundles/org.eclipse.emfforms.editor.ecore/simple_viewmodels/EAttribute.view
+++ b/bundles/org.eclipse.emfforms.editor.ecore/simple_viewmodels/EAttribute.view
@@ -1,34 +1,33 @@
-<?xml version="1.0" encoding="ASCII"?>
-<org.eclipse.emf.ecp.view.model:View 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" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180">
-  <ecorePaths>/org.eclipse.emf.ecore/model/Ecore.ecore</ecorePaths>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.ecp.view.model:View 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" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_kr6xsHvHEem8B6FFC4bHkQ">
   <rootEClass href="http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control name">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_kr6xsXvHEem8B6FFC4bHkQ" name="Control name">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_kr6xsnvHEem8B6FFC4bHkQ">
       <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//ENamedElement/name"/>
     </domainModelReference>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control eType">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_kr6xs3vHEem8B6FFC4bHkQ" name="Control eType">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_kr6xtHvHEem8B6FFC4bHkQ">
       <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement/eType"/>
     </domainModelReference>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control upperBound">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_kr6xtXvHEem8B6FFC4bHkQ" name="Control upperBound">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_kr6xtnvHEem8B6FFC4bHkQ">
       <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement/upperBound"/>
     </domainModelReference>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control unsettable">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_kr6xt3vHEem8B6FFC4bHkQ" name="Control unsettable">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_kr6xuHvHEem8B6FFC4bHkQ">
       <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature/unsettable"/>
     </domainModelReference>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control ordered">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_kr6xuXvHEem8B6FFC4bHkQ" name="Control ordered">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_kr6xunvHEem8B6FFC4bHkQ">
       <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement/ordered"/>
     </domainModelReference>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control unique">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_kr6xu3vHEem8B6FFC4bHkQ" name="Control unique">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_kr6xvHvHEem8B6FFC4bHkQ">
       <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement/unique"/>
     </domainModelReference>
   </children>

bundles/org.eclipse.emfforms.editor.ecore/simple_viewmodels/EClass.view

diff --git a/bundles/org.eclipse.emfforms.editor.ecore/simple_viewmodels/EClass.view b/bundles/org.eclipse.emfforms.editor.ecore/simple_viewmodels/EClass.view
index af7e5cd..818d46e 100644
--- a/bundles/org.eclipse.emfforms.editor.ecore/simple_viewmodels/EClass.view
+++ b/bundles/org.eclipse.emfforms.editor.ecore/simple_viewmodels/EClass.view
@@ -1,19 +1,18 @@
-<?xml version="1.0" encoding="ASCII"?>
-<org.eclipse.emf.ecp.view.model:View 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" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180">
-  <ecorePaths>/org.eclipse.emf.ecore/model/Ecore.ecore</ecorePaths>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.ecp.view.model:View 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" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_lZ_YoHvHEem8B6FFC4bHkQ">
   <rootEClass href="http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control name">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_lZ_YoXvHEem8B6FFC4bHkQ" name="Control name">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_lZ_YonvHEem8B6FFC4bHkQ">
       <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//ENamedElement/name"/>
     </domainModelReference>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control abstract">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_lZ_Yo3vHEem8B6FFC4bHkQ" name="Control abstract">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_lZ_YpHvHEem8B6FFC4bHkQ">
       <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//EClass/abstract"/>
     </domainModelReference>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control interface">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_lZ_YpXvHEem8B6FFC4bHkQ" name="Control interface">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_lZ_YpnvHEem8B6FFC4bHkQ">
       <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//EClass/interface"/>
     </domainModelReference>
   </children>

bundles/org.eclipse.emfforms.editor.ecore/simple_viewmodels/EDataType.view

diff --git a/bundles/org.eclipse.emfforms.editor.ecore/simple_viewmodels/EDataType.view b/bundles/org.eclipse.emfforms.editor.ecore/simple_viewmodels/EDataType.view
index fa34707..7eedf36 100644
--- a/bundles/org.eclipse.emfforms.editor.ecore/simple_viewmodels/EDataType.view
+++ b/bundles/org.eclipse.emfforms.editor.ecore/simple_viewmodels/EDataType.view
@@ -1,19 +1,18 @@
-<?xml version="1.0" encoding="ASCII"?>
-<org.eclipse.emf.ecp.view.model:View 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" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180">
-  <ecorePaths>/org.eclipse.emf.ecore/model/Ecore.ecore</ecorePaths>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.ecp.view.model:View 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" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_mDx8gHvHEem8B6FFC4bHkQ">
   <rootEClass href="http://www.eclipse.org/emf/2002/Ecore#//EDataType"/>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control name">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_mDx8gXvHEem8B6FFC4bHkQ" name="Control name">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_mDx8gnvHEem8B6FFC4bHkQ">
       <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//ENamedElement/name"/>
     </domainModelReference>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control serializable">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_mDx8g3vHEem8B6FFC4bHkQ" name="Control serializable">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_mDx8hHvHEem8B6FFC4bHkQ">
       <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//EDataType/serializable"/>
     </domainModelReference>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control instanceTypeName">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_mDx8hXvHEem8B6FFC4bHkQ" name="Control instanceTypeName">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_mDx8hnvHEem8B6FFC4bHkQ">
       <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//EClassifier/instanceClassName"/>
     </domainModelReference>
   </children>

bundles/org.eclipse.emfforms.editor.ecore/simple_viewmodels/EEnum.view

diff --git a/bundles/org.eclipse.emfforms.editor.ecore/simple_viewmodels/EEnum.view b/bundles/org.eclipse.emfforms.editor.ecore/simple_viewmodels/EEnum.view
index 79061c7..3fe018f 100644
--- a/bundles/org.eclipse.emfforms.editor.ecore/simple_viewmodels/EEnum.view
+++ b/bundles/org.eclipse.emfforms.editor.ecore/simple_viewmodels/EEnum.view
@@ -1,24 +1,23 @@
-<?xml version="1.0" encoding="ASCII"?>
-<org.eclipse.emf.ecp.view.model:View 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" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmlns:org.eclipse.emf.ecp.view.table.model="http://org/eclipse/emf/ecp/view/table/model/150">
-  <ecorePaths>/org.eclipse.emf.ecore/model/Ecore.ecore</ecorePaths>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.ecp.view.model:View 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" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmlns:org.eclipse.emf.ecp.view.table.model="http://org/eclipse/emf/ecp/view/table/model/150" xmi:id="_mqCEMHvHEem8B6FFC4bHkQ">
   <rootEClass href="http://www.eclipse.org/emf/2002/Ecore#//EEnum"/>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control name">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_mqCrQHvHEem8B6FFC4bHkQ" name="Control name">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_mqCrQXvHEem8B6FFC4bHkQ">
       <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//ENamedElement/name"/>
     </domainModelReference>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.table.model:TableControl">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.table.model:TableDomainModelReference">
-      <columnDomainModelReferences xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+  <children xsi:type="org.eclipse.emf.ecp.view.table.model:TableControl" xmi:id="_mqCrQnvHEem8B6FFC4bHkQ">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.table.model:TableDomainModelReference" xmi:id="_mqCrQ3vHEem8B6FFC4bHkQ">
+      <columnDomainModelReferences xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_mqCrRHvHEem8B6FFC4bHkQ">
         <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//EEnumLiteral/value"/>
       </columnDomainModelReferences>
-      <columnDomainModelReferences xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+      <columnDomainModelReferences xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_mqCrRXvHEem8B6FFC4bHkQ">
         <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//ENamedElement/name"/>
       </columnDomainModelReferences>
-      <columnDomainModelReferences xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+      <columnDomainModelReferences xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_mqCrRnvHEem8B6FFC4bHkQ">
         <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//EEnumLiteral/literal"/>
       </columnDomainModelReferences>
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_mqCrR3vHEem8B6FFC4bHkQ">
         <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/2002/Ecore#//EEnum/eLiterals"/>
       </domainModelReference>
     </domainModelReference>

bundles/org.eclipse.emfforms.editor.ecore/simple_viewmodels/EPackage.view

diff --git a/bundles/org.eclipse.emfforms.editor.ecore/simple_viewmodels/EPackage.view b/bundles/org.eclipse.emfforms.editor.ecore/simple_viewmodels/EPackage.view
index 9621636..fe6cc33 100644
--- a/bundles/org.eclipse.emfforms.editor.ecore/simple_viewmodels/EPackage.view
+++ b/bundles/org.eclipse.emfforms.editor.ecore/simple_viewmodels/EPackage.view
@@ -1,19 +1,18 @@
-<?xml version="1.0" encoding="ASCII"?>
-<org.eclipse.emf.ecp.view.model:View 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" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180">
-  <ecorePaths>/org.eclipse.emf.ecore/model/Ecore.ecore</ecorePaths>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.ecp.view.model:View 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" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_naw9kHvHEem8B6FFC4bHkQ">
   <rootEClass href="http://www.eclipse.org/emf/2002/Ecore#//EPackage"/>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control name">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_naw9kXvHEem8B6FFC4bHkQ" name="Control name">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_naw9knvHEem8B6FFC4bHkQ">
       <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//ENamedElement/name"/>
     </domainModelReference>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control nsURI">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_naw9k3vHEem8B6FFC4bHkQ" name="Control nsURI">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_naxkoHvHEem8B6FFC4bHkQ">
       <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage/nsURI"/>
     </domainModelReference>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control nsPrefix">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_naxkoXvHEem8B6FFC4bHkQ" name="Control nsPrefix">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_naxkonvHEem8B6FFC4bHkQ">
       <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage/nsPrefix"/>
     </domainModelReference>
   </children>

bundles/org.eclipse.emfforms.editor.ecore/simple_viewmodels/EReference.view

diff --git a/bundles/org.eclipse.emfforms.editor.ecore/simple_viewmodels/EReference.view b/bundles/org.eclipse.emfforms.editor.ecore/simple_viewmodels/EReference.view
index 658f0eb..aa816dc 100644
--- a/bundles/org.eclipse.emfforms.editor.ecore/simple_viewmodels/EReference.view
+++ b/bundles/org.eclipse.emfforms.editor.ecore/simple_viewmodels/EReference.view
@@ -1,24 +1,23 @@
-<?xml version="1.0" encoding="ASCII"?>
-<org.eclipse.emf.ecp.view.model:View 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" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180">
-  <ecorePaths>/org.eclipse.emf.ecore/model/Ecore.ecore</ecorePaths>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.ecp.view.model:View 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" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_oLPYQHvHEem8B6FFC4bHkQ">
   <rootEClass href="http://www.eclipse.org/emf/2002/Ecore#//EReference"/>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control name">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_oLPYQXvHEem8B6FFC4bHkQ" name="Control name">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_oLP_UHvHEem8B6FFC4bHkQ">
       <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//ENamedElement/name"/>
     </domainModelReference>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control eType">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_oLP_UXvHEem8B6FFC4bHkQ" name="Control eType">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_oLP_UnvHEem8B6FFC4bHkQ">
       <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement/eType"/>
     </domainModelReference>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control upperBound">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_oLP_U3vHEem8B6FFC4bHkQ" name="Control upperBound">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_oLP_VHvHEem8B6FFC4bHkQ">
       <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement/upperBound"/>
     </domainModelReference>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control containment">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_oLP_VXvHEem8B6FFC4bHkQ" name="Control containment">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_oLP_VnvHEem8B6FFC4bHkQ">
       <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//EReference/containment"/>
     </domainModelReference>
   </children>

bundles/org.eclipse.emfforms.editor.ecore/viewmodels/EAttribute.view

diff --git a/bundles/org.eclipse.emfforms.editor.ecore/viewmodels/EAttribute.view b/bundles/org.eclipse.emfforms.editor.ecore/viewmodels/EAttribute.view
index 3509325..e511f77 100644
--- a/bundles/org.eclipse.emfforms.editor.ecore/viewmodels/EAttribute.view
+++ b/bundles/org.eclipse.emfforms.editor.ecore/viewmodels/EAttribute.view
@@ -1,67 +1,66 @@
-<?xml version="1.0" encoding="ASCII"?>
-<org.eclipse.emf.ecp.view.model:View 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" xmlns:org.eclipse.emf.ecp.view.group.model="http://org/eclipse/emf/ecp/view/group/model" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180">
-  <ecorePaths>/org.eclipse.emf.ecore/model/Ecore.ecore</ecorePaths>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.ecp.view.model:View 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" xmlns:org.eclipse.emf.ecp.view.group.model="http://org/eclipse/emf/ecp/view/group/model" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_pMmHkHvHEem8B6FFC4bHkQ">
   <rootEClass href="http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/>
-  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" name="Standard" groupType="Collapsible">
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control name">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_pMmHkXvHEem8B6FFC4bHkQ" name="Standard" groupType="Collapsible">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_pMmHknvHEem8B6FFC4bHkQ" name="Control name">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_pMmHk3vHEem8B6FFC4bHkQ">
         <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//ENamedElement/name"/>
       </domainModelReference>
     </children>
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control eType">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_pMmHlHvHEem8B6FFC4bHkQ" name="Control eType">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_pMmHlXvHEem8B6FFC4bHkQ">
         <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement/eType"/>
       </domainModelReference>
     </children>
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control upperBound">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_pMmHlnvHEem8B6FFC4bHkQ" name="Control upperBound">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_pMmHl3vHEem8B6FFC4bHkQ">
         <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement/upperBound"/>
       </domainModelReference>
     </children>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" name="Advanced" groupType="Collapsible" collapsed="true">
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control unsettable">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_pMmHmHvHEem8B6FFC4bHkQ" name="Advanced" groupType="Collapsible" collapsed="true">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_pMmHmXvHEem8B6FFC4bHkQ" name="Control unsettable">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_pMmHmnvHEem8B6FFC4bHkQ">
         <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature/unsettable"/>
       </domainModelReference>
     </children>
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control ordered">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_pMmHm3vHEem8B6FFC4bHkQ" name="Control ordered">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_pMmHnHvHEem8B6FFC4bHkQ">
         <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement/ordered"/>
       </domainModelReference>
     </children>
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control unique">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_pMmHnXvHEem8B6FFC4bHkQ" name="Control unique">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_pMmHnnvHEem8B6FFC4bHkQ">
         <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement/unique"/>
       </domainModelReference>
     </children>
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control changeable">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_pMmHn3vHEem8B6FFC4bHkQ" name="Control changeable">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_pMmHoHvHEem8B6FFC4bHkQ">
         <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature/changeable"/>
       </domainModelReference>
     </children>
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control volatile">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_pMmHoXvHEem8B6FFC4bHkQ" name="Control volatile">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_pMmHonvHEem8B6FFC4bHkQ">
         <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature/volatile"/>
       </domainModelReference>
     </children>
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control transient">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_pMmHo3vHEem8B6FFC4bHkQ" name="Control transient">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_pMmHpHvHEem8B6FFC4bHkQ">
         <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature/transient"/>
       </domainModelReference>
     </children>
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control defaultValueLiteral">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_pMmHpXvHEem8B6FFC4bHkQ" name="Control defaultValueLiteral">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_pMmHpnvHEem8B6FFC4bHkQ">
         <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature/defaultValueLiteral"/>
       </domainModelReference>
     </children>
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control derived">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_pMmHp3vHEem8B6FFC4bHkQ" name="Control derived">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_pMmHqHvHEem8B6FFC4bHkQ">
         <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature/derived"/>
       </domainModelReference>
     </children>
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control iD">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_pMmHqXvHEem8B6FFC4bHkQ" name="Control iD">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_pMmHqnvHEem8B6FFC4bHkQ">
         <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//EAttribute/iD"/>
       </domainModelReference>
     </children>

bundles/org.eclipse.emfforms.editor.ecore/viewmodels/EClass.view

diff --git a/bundles/org.eclipse.emfforms.editor.ecore/viewmodels/EClass.view b/bundles/org.eclipse.emfforms.editor.ecore/viewmodels/EClass.view
index b721b0d..14356e4 100644
--- a/bundles/org.eclipse.emfforms.editor.ecore/viewmodels/EClass.view
+++ b/bundles/org.eclipse.emfforms.editor.ecore/viewmodels/EClass.view
@@ -1,33 +1,32 @@
-<?xml version="1.0" encoding="ASCII"?>
-<org.eclipse.emf.ecp.view.model:View 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" xmlns:org.eclipse.emf.ecp.view.group.model="http://org/eclipse/emf/ecp/view/group/model" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmlns:org.eclipse.emfforms.view.annotation.model="http://org/eclipse/emf/emfforms/view/annotation/model">
-  <ecorePaths>/org.eclipse.emf.ecore/model/Ecore.ecore</ecorePaths>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.ecp.view.model:View 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" xmlns:org.eclipse.emf.ecp.view.group.model="http://org/eclipse/emf/ecp/view/group/model" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmlns:org.eclipse.emfforms.view.annotation.model="http://org/eclipse/emf/emfforms/view/annotation/model" xmi:id="_qPnq0HvHEem8B6FFC4bHkQ">
   <rootEClass href="http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
-  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" name="Standard" groupType="Collapsible">
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control name">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_qPnq0XvHEem8B6FFC4bHkQ" name="Standard" groupType="Collapsible">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_qPnq0nvHEem8B6FFC4bHkQ" name="Control name">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_qPnq03vHEem8B6FFC4bHkQ">
         <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//ENamedElement/name"/>
       </domainModelReference>
     </children>
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control abstract">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_qPnq1HvHEem8B6FFC4bHkQ" name="Control abstract">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_qPnq1XvHEem8B6FFC4bHkQ">
         <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//EClass/abstract"/>
       </domainModelReference>
     </children>
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control interface">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_qPnq1nvHEem8B6FFC4bHkQ" name="Control interface">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_qPnq13vHEem8B6FFC4bHkQ">
         <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//EClass/interface"/>
       </domainModelReference>
     </children>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" name="Advanced" groupType="Collapsible" collapsed="true">
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control instanceTypeName">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_qPnq2HvHEem8B6FFC4bHkQ" name="Advanced" groupType="Collapsible" collapsed="true">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_qPnq2XvHEem8B6FFC4bHkQ" name="Control instanceTypeName">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_qPnq2nvHEem8B6FFC4bHkQ">
         <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//EClassifier/instanceTypeName"/>
       </domainModelReference>
     </children>
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control eSuperTypes">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_qPnq23vHEem8B6FFC4bHkQ" name="Control eSuperTypes">
       <attachments xsi:type="org.eclipse.emfforms.view.annotation.model:Annotation" xmi:id="_daJUECwYEeip59ApHUyEXQ" key="hideAddNewButton"/>
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_qPnq3HvHEem8B6FFC4bHkQ">
         <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/2002/Ecore#//EClass/eSuperTypes"/>
       </domainModelReference>
     </children>

bundles/org.eclipse.emfforms.editor.ecore/viewmodels/EDataType.view

diff --git a/bundles/org.eclipse.emfforms.editor.ecore/viewmodels/EDataType.view b/bundles/org.eclipse.emfforms.editor.ecore/viewmodels/EDataType.view
index fa34707..9aeb150 100644
--- a/bundles/org.eclipse.emfforms.editor.ecore/viewmodels/EDataType.view
+++ b/bundles/org.eclipse.emfforms.editor.ecore/viewmodels/EDataType.view
@@ -1,19 +1,18 @@
-<?xml version="1.0" encoding="ASCII"?>
-<org.eclipse.emf.ecp.view.model:View 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" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180">
-  <ecorePaths>/org.eclipse.emf.ecore/model/Ecore.ecore</ecorePaths>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.ecp.view.model:View 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" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_qyyCQHvHEem8B6FFC4bHkQ">
   <rootEClass href="http://www.eclipse.org/emf/2002/Ecore#//EDataType"/>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control name">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_qyyCQXvHEem8B6FFC4bHkQ" name="Control name">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_qyyCQnvHEem8B6FFC4bHkQ">
       <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//ENamedElement/name"/>
     </domainModelReference>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control serializable">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_qyyCQ3vHEem8B6FFC4bHkQ" name="Control serializable">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_qyyCRHvHEem8B6FFC4bHkQ">
       <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//EDataType/serializable"/>
     </domainModelReference>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control instanceTypeName">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_qyyCRXvHEem8B6FFC4bHkQ" name="Control instanceTypeName">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_qyyCRnvHEem8B6FFC4bHkQ">
       <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//EClassifier/instanceClassName"/>
     </domainModelReference>
   </children>

bundles/org.eclipse.emfforms.editor.ecore/viewmodels/EEnum.view

diff --git a/bundles/org.eclipse.emfforms.editor.ecore/viewmodels/EEnum.view b/bundles/org.eclipse.emfforms.editor.ecore/viewmodels/EEnum.view
index 79061c7..d2d8df5 100644
--- a/bundles/org.eclipse.emfforms.editor.ecore/viewmodels/EEnum.view
+++ b/bundles/org.eclipse.emfforms.editor.ecore/viewmodels/EEnum.view
@@ -1,24 +1,23 @@
-<?xml version="1.0" encoding="ASCII"?>
-<org.eclipse.emf.ecp.view.model:View 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" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmlns:org.eclipse.emf.ecp.view.table.model="http://org/eclipse/emf/ecp/view/table/model/150">
-  <ecorePaths>/org.eclipse.emf.ecore/model/Ecore.ecore</ecorePaths>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.ecp.view.model:View 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" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmlns:org.eclipse.emf.ecp.view.table.model="http://org/eclipse/emf/ecp/view/table/model/150" xmi:id="_rW5b8HvHEem8B6FFC4bHkQ">
   <rootEClass href="http://www.eclipse.org/emf/2002/Ecore#//EEnum"/>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control name">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_rW5b8XvHEem8B6FFC4bHkQ" name="Control name">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_rW5b8nvHEem8B6FFC4bHkQ">
       <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//ENamedElement/name"/>
     </domainModelReference>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.table.model:TableControl">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.table.model:TableDomainModelReference">
-      <columnDomainModelReferences xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+  <children xsi:type="org.eclipse.emf.ecp.view.table.model:TableControl" xmi:id="_rW5b83vHEem8B6FFC4bHkQ">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.table.model:TableDomainModelReference" xmi:id="_rW5b9HvHEem8B6FFC4bHkQ">
+      <columnDomainModelReferences xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_rW5b9XvHEem8B6FFC4bHkQ">
         <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//EEnumLiteral/value"/>
       </columnDomainModelReferences>
-      <columnDomainModelReferences xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+      <columnDomainModelReferences xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_rW5b9nvHEem8B6FFC4bHkQ">
         <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//ENamedElement/name"/>
       </columnDomainModelReferences>
-      <columnDomainModelReferences xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+      <columnDomainModelReferences xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_rW5b93vHEem8B6FFC4bHkQ">
         <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//EEnumLiteral/literal"/>
       </columnDomainModelReferences>
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_rW5b-HvHEem8B6FFC4bHkQ">
         <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/2002/Ecore#//EEnum/eLiterals"/>
       </domainModelReference>
     </domainModelReference>

bundles/org.eclipse.emfforms.editor.ecore/viewmodels/EPackage.view

diff --git a/bundles/org.eclipse.emfforms.editor.ecore/viewmodels/EPackage.view b/bundles/org.eclipse.emfforms.editor.ecore/viewmodels/EPackage.view
index 9621636..085f1d5 100644
--- a/bundles/org.eclipse.emfforms.editor.ecore/viewmodels/EPackage.view
+++ b/bundles/org.eclipse.emfforms.editor.ecore/viewmodels/EPackage.view
@@ -1,19 +1,18 @@
-<?xml version="1.0" encoding="ASCII"?>
-<org.eclipse.emf.ecp.view.model:View 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" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180">
-  <ecorePaths>/org.eclipse.emf.ecore/model/Ecore.ecore</ecorePaths>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.ecp.view.model:View 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" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_sNN_8HvHEem8B6FFC4bHkQ">
   <rootEClass href="http://www.eclipse.org/emf/2002/Ecore#//EPackage"/>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control name">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_sNOnAHvHEem8B6FFC4bHkQ" name="Control name">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_sNOnAXvHEem8B6FFC4bHkQ">
       <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//ENamedElement/name"/>
     </domainModelReference>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control nsURI">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_sNOnAnvHEem8B6FFC4bHkQ" name="Control nsURI">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_sNOnA3vHEem8B6FFC4bHkQ">
       <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage/nsURI"/>
     </domainModelReference>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control nsPrefix">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_sNOnBHvHEem8B6FFC4bHkQ" name="Control nsPrefix">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_sNOnBXvHEem8B6FFC4bHkQ">
       <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage/nsPrefix"/>
     </domainModelReference>
   </children>

bundles/org.eclipse.emfforms.editor.ecore/viewmodels/EReference.view

diff --git a/bundles/org.eclipse.emfforms.editor.ecore/viewmodels/EReference.view b/bundles/org.eclipse.emfforms.editor.ecore/viewmodels/EReference.view
index ec4c3e3..9789f79 100644
--- a/bundles/org.eclipse.emfforms.editor.ecore/viewmodels/EReference.view
+++ b/bundles/org.eclipse.emfforms.editor.ecore/viewmodels/EReference.view
@@ -1,87 +1,86 @@
-<?xml version="1.0" encoding="ASCII"?>
-<org.eclipse.emf.ecp.view.model:View 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" xmlns:org.eclipse.emf.ecp.view.group.model="http://org/eclipse/emf/ecp/view/group/model" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180">
-  <ecorePaths>/org.eclipse.emf.ecore/model/Ecore.ecore</ecorePaths>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.ecp.view.model:View 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" xmlns:org.eclipse.emf.ecp.view.group.model="http://org/eclipse/emf/ecp/view/group/model" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_tArdMHvHEem8B6FFC4bHkQ">
   <rootEClass href="http://www.eclipse.org/emf/2002/Ecore#//EReference"/>
-  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" name="Standard" groupType="Collapsible">
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control name">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_tArdMXvHEem8B6FFC4bHkQ" name="Standard" groupType="Collapsible">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_tArdMnvHEem8B6FFC4bHkQ" name="Control name">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_tArdM3vHEem8B6FFC4bHkQ">
         <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//ENamedElement/name"/>
       </domainModelReference>
     </children>
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control eType">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_tAsEQHvHEem8B6FFC4bHkQ" name="Control eType">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_tAsEQXvHEem8B6FFC4bHkQ">
         <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement/eType"/>
       </domainModelReference>
     </children>
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control upperBound">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_tAsEQnvHEem8B6FFC4bHkQ" name="Control upperBound">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_tAsEQ3vHEem8B6FFC4bHkQ">
         <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement/upperBound"/>
       </domainModelReference>
     </children>
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control containment">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_tAsERHvHEem8B6FFC4bHkQ" name="Control containment">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_tAsERXvHEem8B6FFC4bHkQ">
         <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//EReference/containment"/>
       </domainModelReference>
     </children>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" name="Advanced" groupType="Collapsible" collapsed="true">
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control changeable">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_tAsERnvHEem8B6FFC4bHkQ" name="Advanced" groupType="Collapsible" collapsed="true">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_tAsER3vHEem8B6FFC4bHkQ" name="Control changeable">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_tAsESHvHEem8B6FFC4bHkQ">
         <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature/changeable"/>
       </domainModelReference>
     </children>
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control unsettable">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_tAsESXvHEem8B6FFC4bHkQ" name="Control unsettable">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_tAsESnvHEem8B6FFC4bHkQ">
         <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature/unsettable"/>
       </domainModelReference>
     </children>
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control ordered">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_tAsES3vHEem8B6FFC4bHkQ" name="Control ordered">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_tAsETHvHEem8B6FFC4bHkQ">
         <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement/ordered"/>
       </domainModelReference>
     </children>
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control unique">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_tAsETXvHEem8B6FFC4bHkQ" name="Control unique">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_tAsETnvHEem8B6FFC4bHkQ">
         <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement/unique"/>
       </domainModelReference>
     </children>
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control eOpposite">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_tAsET3vHEem8B6FFC4bHkQ" name="Control eOpposite">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_tAsEUHvHEem8B6FFC4bHkQ">
         <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/2002/Ecore#//EReference/eOpposite"/>
       </domainModelReference>
     </children>
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control container" readonly="true">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_tAsEUXvHEem8B6FFC4bHkQ" name="Control container" readonly="true">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_tAsEUnvHEem8B6FFC4bHkQ">
         <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//EReference/container"/>
       </domainModelReference>
     </children>
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control defaultValueLiteral">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_tAsEU3vHEem8B6FFC4bHkQ" name="Control defaultValueLiteral">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_tAsEVHvHEem8B6FFC4bHkQ">
         <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature/defaultValueLiteral"/>
       </domainModelReference>
     </children>
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control derived">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_tAsEVXvHEem8B6FFC4bHkQ" name="Control derived">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_tAsEVnvHEem8B6FFC4bHkQ">
         <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature/derived"/>
       </domainModelReference>
     </children>
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control eKeys">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_tAsEV3vHEem8B6FFC4bHkQ" name="Control eKeys">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_tAsEWHvHEem8B6FFC4bHkQ">
         <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/2002/Ecore#//EReference/eKeys"/>
       </domainModelReference>
     </children>
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control resolveProxies">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_tAsEWXvHEem8B6FFC4bHkQ" name="Control resolveProxies">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_tAsEWnvHEem8B6FFC4bHkQ">
         <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//EReference/resolveProxies"/>
       </domainModelReference>
     </children>
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control transient">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_tAsEW3vHEem8B6FFC4bHkQ" name="Control transient">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_tAsEXHvHEem8B6FFC4bHkQ">
         <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature/transient"/>
       </domainModelReference>
     </children>
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control volatile">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_tAsEXXvHEem8B6FFC4bHkQ" name="Control volatile">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_tAsEXnvHEem8B6FFC4bHkQ">
         <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature/volatile"/>
       </domainModelReference>
     </children>