Bug 462873 - Change DMR to use segments

Migrate gen model tooling, stack layout, compound control, and template
view models.

Change-Id: I40a91adc71b2490533fbf7207b3d0b7096da1fb0
Signed-off-by: Lucas Koehler <l.koehler93@gmail.com>
diff --git a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.tooling/viewmodel/CompoundControl.view b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.tooling/viewmodel/CompoundControl.view
index 9170d88..c417276 100644
--- a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.tooling/viewmodel/CompoundControl.view
+++ b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.tooling/viewmodel/CompoundControl.view
@@ -1,9 +1,9 @@
 <?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/170" xmi:id="_qh0foGaPEeWid_wgrZaAaw" name="CompoundControl" ecorePath="/org.eclipse.emf.ecp.view.compoundcontrol.model/model/compoundcontrol.ecore">
+<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:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/200" xmi:id="_qh0foGaPEeWid_wgrZaAaw" name="CompoundControl" ecorePath="/org.eclipse.emf.ecp.view.compoundcontrol.model/model/compoundcontrol.ecore">
   <rootEClass href="http://org/eclipse/emf/ecp/view/compoundcontrol/model#//CompoundControl"/>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_qiHakGaPEeWid_wgrZaAaw" name="Control name">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_qiHakWaPEeWid_wgrZaAaw">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://org/eclipse/emf/ecp/view/model/170#//Element/name"/>
+    <domainModelReference xmi:id="_qiHakWaPEeWid_wgrZaAaw">
+      <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_qiHakXaPEeWid_wgrZaAaw" domainModelFeature="name"/>
     </domainModelReference>
   </children>
 </org.eclipse.emf.ecp.view.model:View>
diff --git a/bundles/org.eclipse.emf.ecp.view.stack.viewmodel/viewmodel/StackLayout.view b/bundles/org.eclipse.emf.ecp.view.stack.viewmodel/viewmodel/StackLayout.view
index ada4e4a..470cc53 100644
--- a/bundles/org.eclipse.emf.ecp.view.stack.viewmodel/viewmodel/StackLayout.view
+++ b/bundles/org.eclipse.emf.ecp.view.stack.viewmodel/viewmodel/StackLayout.view
@@ -1,19 +1,19 @@
 <?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/170" xmi:id="_oSkxcEWAEeWfKJaajyNdyA">
+<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:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/200" xmi:id="_oSkxcEWAEeWfKJaajyNdyA">
   <rootEClass href="http://org/eclipse/emf/ecp/view/stack/model#//StackLayout"/>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_oSlYgEWAEeWfKJaajyNdyA" name="Control name">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_oSlYgUWAEeWfKJaajyNdyA">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://org/eclipse/emf/ecp/view/model/170#//Element/name"/>
+    <domainModelReference xmi:id="_ItQypJhaEeepEKecExmz4A">
+      <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_ItRZsJhaEeepEKecExmz4A" domainModelFeature="name"/>
     </domainModelReference>
   </children>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_oSlYgkWAEeWfKJaajyNdyA" name="Control readonly">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_oSlYg0WAEeWfKJaajyNdyA">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://org/eclipse/emf/ecp/view/model/170#//Element/readonly"/>
+    <domainModelReference xmi:id="_ItQypZhaEeepEKecExmz4A">
+      <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_ItRZsZhaEeepEKecExmz4A" domainModelFeature="readonly"/>
     </domainModelReference>
   </children>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_oSlYhEWAEeWfKJaajyNdyA" name="dmr">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_oSlYhUWAEeWfKJaajyNdyA">
-      <domainModelEFeature xsi:type="ecore:EReference" href="http://org/eclipse/emf/ecp/view/stack/model#//StackLayout/domainModelReference"/>
+    <domainModelReference xmi:id="_ItQypphaEeepEKecExmz4A">
+      <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_ItRZsphaEeepEKecExmz4A" domainModelFeature="domainModelReference"/>
     </domainModelReference>
   </children>
 </org.eclipse.emf.ecp.view.model:View>
diff --git a/bundles/org.eclipse.emf.ecp.view.template.tooling/viewmodel/dmrSelector.view b/bundles/org.eclipse.emf.ecp.view.template.tooling/viewmodel/dmrSelector.view
index 60514b4..eb53304 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.tooling/viewmodel/dmrSelector.view
+++ b/bundles/org.eclipse.emf.ecp.view.template.tooling/viewmodel/dmrSelector.view
@@ -1,9 +1,9 @@
 <?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/170" xmi:id="_l_t-AEWAEeWfKJaajyNdyA" name="DMR Selector View Model" ecorePath="/org.eclipse.emf.ecp.view.template.model/model/domainModelReferenceSelector.ecore">
+<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:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/200" xmi:id="_l_t-AEWAEeWfKJaajyNdyA" name="DMR Selector View Model" ecorePath="/org.eclipse.emf.ecp.view.template.model/model/domainModelReferenceSelector.ecore">
   <rootEClass href="http://www.eclipse.org/emf/ecp/view/template/selector/domainmodelreference/model#//DomainModelReferenceSelector"/>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_l_t-AUWAEeWfKJaajyNdyA">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_l_t-AkWAEeWfKJaajyNdyA">
-      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/ecp/view/template/selector/domainmodelreference/model#//DomainModelReferenceSelector/domainModelReference"/>
+    <domainModelReference xmi:id="_I8loEZhaEeepEKecExmz4A">
+      <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_I8loEphaEeepEKecExmz4A" domainModelFeature="domainModelReference"/>
     </domainModelReference>
   </children>
 </org.eclipse.emf.ecp.view.model:View>
diff --git a/bundles/org.eclipse.emf.ecp.view.template.tooling/viewmodel/template.view b/bundles/org.eclipse.emf.ecp.view.template.tooling/viewmodel/template.view
index 5c2e536..06ae14a 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.tooling/viewmodel/template.view
+++ b/bundles/org.eclipse.emf.ecp.view.template.tooling/viewmodel/template.view
@@ -1,5 +1,5 @@
 <?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:org.eclipse.emf.ecp.view.label.model="http://org/eclipse/emf/ecp/view/label/model" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/170" xmlns:org.eclipse.emf.ecp.view.treemasterview.model="http://org/eclipse/emf/ecp/view/treemasterview/model" xmi:id="_qpBEYEWAEeWfKJaajyNdyA" name="Template View Model">
+<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:org.eclipse.emf.ecp.view.label.model="http://org/eclipse/emf/ecp/view/label/model" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/200" xmlns:org.eclipse.emf.ecp.view.treemasterview.model="http://org/eclipse/emf/ecp/view/treemasterview/model" xmi:id="_qpBEYEWAEeWfKJaajyNdyA" name="Template View Model">
   <rootEClass href="http://org/eclipse/emf/ecp/view/template/model#//ViewTemplate"/>
   <children xsi:type="org.eclipse.emf.ecp.view.treemasterview.model:TreeMasterDetail" xmi:id="_qpBEYUWAEeWfKJaajyNdyA">
     <detailView xmi:id="_qpBEYkWAEeWfKJaajyNdyA">
diff --git a/bundles/org.eclipse.emf.ecp.view.template.tooling/viewmodel/viewModelElementSelector.view b/bundles/org.eclipse.emf.ecp.view.template.tooling/viewmodel/viewModelElementSelector.view
index cd3fb38..b8f8860 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.tooling/viewmodel/viewModelElementSelector.view
+++ b/bundles/org.eclipse.emf.ecp.view.template.tooling/viewmodel/viewModelElementSelector.view
@@ -1,24 +1,24 @@
 <?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/170" xmi:id="_s4z8wEWAEeWfKJaajyNdyA" ecorePath="/org.eclipse.emf.ecp.view.template.model/model/viewModelElementSelector.ecore">

+<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:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/200" xmi:id="_s4z8wEWAEeWfKJaajyNdyA" ecorePath="/org.eclipse.emf.ecp.view.template.model/model/viewModelElementSelector.ecore">

   <rootEClass href="http://www.eclipse.org/emf/ecp/view/template/selector/viewmodelelement/model#//ViewModelElementSelector"/>

   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_s4z8wUWAEeWfKJaajyNdyA" name="Control selectSubclasses">

-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_s4z8wkWAEeWfKJaajyNdyA">

-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/ecp/view/template/selector/viewmodelelement/model#//ViewModelElementSelector/selectSubclasses"/>

+    <domainModelReference xmi:id="_I1T7ZJhaEeepEKecExmz4A">

+      <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_I1T7aJhaEeepEKecExmz4A" domainModelFeature="selectSubclasses"/>

     </domainModelReference>

   </children>

   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_s4z8w0WAEeWfKJaajyNdyA" name="Control classType">

-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_s4z8xEWAEeWfKJaajyNdyA">

-      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/ecp/view/template/selector/viewmodelelement/model#//ViewModelElementSelector/classType"/>

+    <domainModelReference xmi:id="_I1T7ZZhaEeepEKecExmz4A">

+      <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_I1T7aZhaEeepEKecExmz4A" domainModelFeature="classType"/>

     </domainModelReference>

   </children>

   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_s4z8xUWAEeWfKJaajyNdyA" name="Control attribute">

-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_s4z8xkWAEeWfKJaajyNdyA">

-      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/ecp/view/template/selector/viewmodelelement/model#//ViewModelElementSelector/attribute"/>

+    <domainModelReference xmi:id="_I1T7ZphaEeepEKecExmz4A">

+      <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_I1T7aphaEeepEKecExmz4A" domainModelFeature="attribute"/>

     </domainModelReference>

   </children>

   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_s4z8x0WAEeWfKJaajyNdyA" name="Control attributeValue">

-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_s4z8yEWAEeWfKJaajyNdyA">

-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/ecp/view/template/selector/viewmodelelement/model#//ViewModelElementSelector/attributeValue"/>

+    <domainModelReference xmi:id="_I1T7Z5haEeepEKecExmz4A">

+      <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_I1T7a5haEeepEKecExmz4A" domainModelFeature="attributeValue"/>

     </domainModelReference>

   </children>

 </org.eclipse.emf.ecp.view.model:View>

diff --git a/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenAnnotation.view b/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenAnnotation.view
index 3e59d56..16f7c7e 100644
--- a/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenAnnotation.view
+++ b/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenAnnotation.view
@@ -1,34 +1,34 @@
 <?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/170" ecorePath="/org.eclipse.emf.codegen.ecore/model/GenModel.ecore">
+<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:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/200" xmi:id="_XQgK4JhgEeexUOv286lk0A" ecorePath="/org.eclipse.emf.codegen.ecore/model/GenModel.ecore">
   <rootEClass href="http://www.eclipse.org/emf/2002/GenModel#//GenAnnotation"/>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control genAnnotations">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
-      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/2002/GenModel#//GenBase/genAnnotations"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_XQgK4ZhgEeexUOv286lk0A" name="Control genAnnotations">
+    <domainModelReference xmi:id="_XQ2wN5hgEeexUOv286lk0A">
+      <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_XQ3XRZhgEeexUOv286lk0A" domainModelFeature="genAnnotations"/>
     </domainModelReference>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control source">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenAnnotation/source"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_XQgK45hgEeexUOv286lk0A" name="Control source">
+    <domainModelReference xmi:id="_XQ3XQJhgEeexUOv286lk0A">
+      <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_XQ3XRphgEeexUOv286lk0A" domainModelFeature="source"/>
     </domainModelReference>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control details">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
-      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/2002/GenModel#//GenAnnotation/details"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_XQgK5ZhgEeexUOv286lk0A" name="Control details">
+    <domainModelReference xmi:id="_XQ3XQZhgEeexUOv286lk0A">
+      <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_XQ3XR5hgEeexUOv286lk0A" domainModelFeature="details"/>
     </domainModelReference>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control genBase">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
-      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/2002/GenModel#//GenAnnotation/genBase"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_XQgK55hgEeexUOv286lk0A" name="Control genBase">
+    <domainModelReference xmi:id="_XQ3XQphgEeexUOv286lk0A">
+      <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_XQ3XSJhgEeexUOv286lk0A" domainModelFeature="genBase"/>
     </domainModelReference>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control references">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
-      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/2002/GenModel#//GenAnnotation/references"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_XQgK6ZhgEeexUOv286lk0A" name="Control references">
+    <domainModelReference xmi:id="_XQ3XQ5hgEeexUOv286lk0A">
+      <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_XQ3XSZhgEeexUOv286lk0A" domainModelFeature="references"/>
     </domainModelReference>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control contents">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
-      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/2002/GenModel#//GenAnnotation/contents"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_XQgK65hgEeexUOv286lk0A" name="Control contents">
+    <domainModelReference xmi:id="_XQ3XRJhgEeexUOv286lk0A">
+      <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_XQ3XSphgEeexUOv286lk0A" domainModelFeature="contents"/>
     </domainModelReference>
   </children>
 </org.eclipse.emf.ecp.view.model:View>
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenClass.view b/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenClass.view
index a9c27e4..97c6b40 100644
--- a/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenClass.view
+++ b/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenClass.view
@@ -1,19 +1,19 @@
 <?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/170" ecorePath="/org.eclipse.emf.codegen.ecore/model/GenModel.ecore">
+<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:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/200" xmi:id="_X08UsJhgEeexUOv286lk0A" ecorePath="/org.eclipse.emf.codegen.ecore/model/GenModel.ecore">
   <rootEClass href="http://www.eclipse.org/emf/2002/GenModel#//GenClass"/>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control image">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenClass/image"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_X08UsZhgEeexUOv286lk0A" name="Control image">
+    <domainModelReference xmi:id="_X1FepJhgEeexUOv286lk0A">
+      <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X1Fep5hgEeexUOv286lk0A" domainModelFeature="image"/>
     </domainModelReference>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control provider">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenClass/provider"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_X08Us5hgEeexUOv286lk0A" name="Control provider">
+    <domainModelReference xmi:id="_X1FepZhgEeexUOv286lk0A">
+      <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X1FeqJhgEeexUOv286lk0A" domainModelFeature="provider"/>
     </domainModelReference>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control dynamic">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenClass/dynamic"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_X08UtZhgEeexUOv286lk0A" name="Control dynamic">
+    <domainModelReference xmi:id="_X1FepphgEeexUOv286lk0A">
+      <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X1FeqZhgEeexUOv286lk0A" domainModelFeature="dynamic"/>
     </domainModelReference>
   </children>
 </org.eclipse.emf.ecp.view.model:View>
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenDataType.view b/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenDataType.view
index 521cad2..e2c192f 100644
--- a/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenDataType.view
+++ b/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenDataType.view
@@ -1,9 +1,9 @@
 <?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/170" ecorePath="/org.eclipse.emf.codegen.ecore/model/GenModel.ecore">
+<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:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/200" xmi:id="_Xhw6AJhgEeexUOv286lk0A" ecorePath="/org.eclipse.emf.codegen.ecore/model/GenModel.ecore">
   <rootEClass href="http://www.eclipse.org/emf/2002/GenModel#//GenDataType"/>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control ecoreDataType" readonly="true">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
-      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/2002/GenModel#//GenDataType/ecoreDataType"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Xhw6AZhgEeexUOv286lk0A" name="Control ecoreDataType" readonly="true">
+    <domainModelReference xmi:id="_XiAxophgEeexUOv286lk0A">
+      <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_XiAxo5hgEeexUOv286lk0A" domainModelFeature="ecoreDataType"/>
     </domainModelReference>
   </children>
 </org.eclipse.emf.ecp.view.model:View>
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenEnum.view b/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenEnum.view
index 8bb382b..7d73e2d 100644
--- a/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenEnum.view
+++ b/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenEnum.view
@@ -1,9 +1,9 @@
 <?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/170" ecorePath="/org.eclipse.emf.codegen.ecore/model/GenModel.ecore">
+<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:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/200" xmi:id="_Xr008JhgEeexUOv286lk0A" ecorePath="/org.eclipse.emf.codegen.ecore/model/GenModel.ecore">
   <rootEClass href="http://www.eclipse.org/emf/2002/GenModel#//GenEnum"/>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control typeSafeEnumCompatible">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenEnum/typeSafeEnumCompatible"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Xr1cAJhgEeexUOv286lk0A" name="Control typeSafeEnumCompatible">
+    <domainModelReference xmi:id="_XsC3YphgEeexUOv286lk0A">
+      <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_XsC3Y5hgEeexUOv286lk0A" domainModelFeature="typeSafeEnumCompatible"/>
     </domainModelReference>
   </children>
 </org.eclipse.emf.ecp.view.model:View>
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenEnumLiteral.view b/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenEnumLiteral.view
index 01bc088..5c3f6ab 100644
--- a/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenEnumLiteral.view
+++ b/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenEnumLiteral.view
@@ -1,9 +1,9 @@
 <?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/170" ecorePath="/org.eclipse.emf.codegen.ecore/model/GenModel.ecore">
+<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:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/200" xmi:id="_XniK0JhgEeexUOv286lk0A" ecorePath="/org.eclipse.emf.codegen.ecore/model/GenModel.ecore">
   <rootEClass href="http://www.eclipse.org/emf/2002/GenModel#//GenEnumLiteral"/>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control ecoreEnumLiteral" readonly="true">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
-      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/2002/GenModel#//GenEnumLiteral/ecoreEnumLiteral"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_XniK0ZhgEeexUOv286lk0A" name="Control ecoreEnumLiteral" readonly="true">
+    <domainModelReference xmi:id="_Xnw0UphgEeexUOv286lk0A">
+      <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_Xnw0U5hgEeexUOv286lk0A" domainModelFeature="ecoreEnumLiteral"/>
     </domainModelReference>
   </children>
 </org.eclipse.emf.ecp.view.model:View>
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenFeature.view b/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenFeature.view
index d9693f6..c97f74a 100644
--- a/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenFeature.view
+++ b/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenFeature.view
@@ -1,49 +1,49 @@
 <?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/170" ecorePath="/org.eclipse.emf.codegen.ecore/model/GenModel.ecore">
+<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:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/200" xmi:id="_XwMXkJhgEeexUOv286lk0A" ecorePath="/org.eclipse.emf.codegen.ecore/model/GenModel.ecore">
   <rootEClass href="http://www.eclipse.org/emf/2002/GenModel#//GenFeature"/>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control children">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenFeature/children"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_XwOMwJhgEeexUOv286lk0A" name="Control children">
+    <domainModelReference xmi:id="_XwoceZhgEeexUOv286lk0A">
+      <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_XwocgphgEeexUOv286lk0A" domainModelFeature="children"/>
     </domainModelReference>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control createChild">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenFeature/createChild"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_XwTsUJhgEeexUOv286lk0A" name="Control createChild">
+    <domainModelReference xmi:id="_XwocephgEeexUOv286lk0A">
+      <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_Xwocg5hgEeexUOv286lk0A" domainModelFeature="createChild"/>
     </domainModelReference>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control notify">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenFeature/notify"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_XwTsUphgEeexUOv286lk0A" name="Control notify">
+    <domainModelReference xmi:id="_Xwoce5hgEeexUOv286lk0A">
+      <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_XwochJhgEeexUOv286lk0A" domainModelFeature="notify"/>
     </domainModelReference>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control propertyCategory">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenFeature/propertyCategory"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_XwTsVJhgEeexUOv286lk0A" name="Control propertyCategory">
+    <domainModelReference xmi:id="_XwocfJhgEeexUOv286lk0A">
+      <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_XwochZhgEeexUOv286lk0A" domainModelFeature="propertyCategory"/>
     </domainModelReference>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control propertyDescription">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenFeature/propertyDescription"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_XwTsVphgEeexUOv286lk0A" name="Control propertyDescription">
+    <domainModelReference xmi:id="_XwocfZhgEeexUOv286lk0A">
+      <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_XwochphgEeexUOv286lk0A" domainModelFeature="propertyDescription"/>
     </domainModelReference>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control propertyFilterFlags">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenFeature/propertyFilterFlags"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_XwTsWJhgEeexUOv286lk0A" name="Control propertyFilterFlags">
+    <domainModelReference xmi:id="_XwocfphgEeexUOv286lk0A">
+      <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_Xwoch5hgEeexUOv286lk0A" domainModelFeature="propertyFilterFlags"/>
     </domainModelReference>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control propertyMultiLine">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenFeature/propertyMultiLine"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_XwTsWphgEeexUOv286lk0A" name="Control propertyMultiLine">
+    <domainModelReference xmi:id="_Xwocf5hgEeexUOv286lk0A">
+      <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_XwociJhgEeexUOv286lk0A" domainModelFeature="propertyMultiLine"/>
     </domainModelReference>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control propertySortChoices">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenFeature/propertySortChoices"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_XwUTYJhgEeexUOv286lk0A" name="Control propertySortChoices">
+    <domainModelReference xmi:id="_XwocgJhgEeexUOv286lk0A">
+      <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_XwociZhgEeexUOv286lk0A" domainModelFeature="propertySortChoices"/>
     </domainModelReference>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control property">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenFeature/property"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_XwUTYphgEeexUOv286lk0A" name="Control property">
+    <domainModelReference xmi:id="_XwocgZhgEeexUOv286lk0A">
+      <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_XwociphgEeexUOv286lk0A" domainModelFeature="property"/>
     </domainModelReference>
   </children>
 </org.eclipse.emf.ecp.view.model:View>
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenModel.view b/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenModel.view
index 6584e54..e9c499c 100644
--- a/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenModel.view
+++ b/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenModel.view
@@ -1,414 +1,414 @@
 <?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/170" xmi:id="_NnpN8MppEeWH8LG8MOZQNQ" ecorePath="/org.eclipse.emf.codegen.ecore/model/GenModel.ecore">
+<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: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/200" xmi:id="_NnpN8MppEeWH8LG8MOZQNQ" ecorePath="/org.eclipse.emf.codegen.ecore/model/GenModel.ecore">
   <rootEClass href="http://www.eclipse.org/emf/2002/GenModel#//GenModel"/>
-  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_Nnp1AMppEeWH8LG8MOZQNQ" name="All" groupType="Collapsible" collapsed="true">
+  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_Nnp1AMppEeWH8LG8MOZQNQ" name="All" collapsed="true" groupType="Collapsible">
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Nnp1AcppEeWH8LG8MOZQNQ" name="Control bundleManifest">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Nnp1AsppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/bundleManifest"/>
+      <domainModelReference xmi:id="_X-q4sZhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGm5hgEeexUOv286lk0A" domainModelFeature="bundleManifest"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Nnp1A8ppEeWH8LG8MOZQNQ" name="Control complianceLevel">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Nnp1BMppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/complianceLevel"/>
+      <domainModelReference xmi:id="_X-q4sphgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGnJhgEeexUOv286lk0A" domainModelFeature="complianceLevel"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Nnp1BcppEeWH8LG8MOZQNQ" name="Control copyrightFields">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Nnp1BsppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/copyrightFields"/>
+      <domainModelReference xmi:id="_X-q4s5hgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGnZhgEeexUOv286lk0A" domainModelFeature="copyrightFields"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Nnp1B8ppEeWH8LG8MOZQNQ" name="Control copyrightText">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Nnp1CMppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/copyrightText"/>
+      <domainModelReference xmi:id="_X-q4tJhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGnphgEeexUOv286lk0A" domainModelFeature="copyrightText"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Nnp1CcppEeWH8LG8MOZQNQ" name="Control language">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Nnp1CsppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/language"/>
+      <domainModelReference xmi:id="_X-q4tZhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGn5hgEeexUOv286lk0A" domainModelFeature="language"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Nnp1C8ppEeWH8LG8MOZQNQ" name="Control modelName">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Nnp1DMppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/modelName"/>
+      <domainModelReference xmi:id="_X-q4tphgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGoJhgEeexUOv286lk0A" domainModelFeature="modelName"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Nnp1DcppEeWH8LG8MOZQNQ" name="Control nonNLSMarkers">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Nnp1DsppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/nonNLSMarkers"/>
+      <domainModelReference xmi:id="_X-q4t5hgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGoZhgEeexUOv286lk0A" domainModelFeature="nonNLSMarkers"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Nnp1D8ppEeWH8LG8MOZQNQ" name="Control oSGiCompatible">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Nnp1EMppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/oSGiCompatible"/>
+      <domainModelReference xmi:id="_X-q4uJhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGophgEeexUOv286lk0A" domainModelFeature="oSGiCompatible"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Nnp1EcppEeWH8LG8MOZQNQ" name="Control runtimeCompatibility">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Nnp1EsppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/runtimeCompatibility"/>
+      <domainModelReference xmi:id="_X-q4uZhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGo5hgEeexUOv286lk0A" domainModelFeature="runtimeCompatibility"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Nnp1E8ppEeWH8LG8MOZQNQ" name="Control runtimeJar">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Nnp1FMppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/runtimeJar"/>
+      <domainModelReference xmi:id="_X-q4uphgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGpJhgEeexUOv286lk0A" domainModelFeature="runtimeJar"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Nnp1FcppEeWH8LG8MOZQNQ" name="Control runtimePlatform">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Nnp1FsppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/runtimePlatform"/>
+      <domainModelReference xmi:id="_X-q4u5hgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGpZhgEeexUOv286lk0A" domainModelFeature="runtimePlatform"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Nnp1F8ppEeWH8LG8MOZQNQ" name="Control runtimeVersion">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Nnp1GMppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/runtimeVersion"/>
+      <domainModelReference xmi:id="_X-q4vJhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGpphgEeexUOv286lk0A" domainModelFeature="runtimeVersion"/>
       </domainModelReference>
     </children>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_NnqcEMppEeWH8LG8MOZQNQ" name="Edit" groupType="Collapsible" collapsed="true">
+  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_NnqcEMppEeWH8LG8MOZQNQ" name="Edit" collapsed="true" groupType="Collapsible">
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnqcEcppEeWH8LG8MOZQNQ" name="Control colorProviders">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_NnqcEsppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/colorProviders"/>
+      <domainModelReference xmi:id="_X-q4vZhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGp5hgEeexUOv286lk0A" domainModelFeature="colorProviders"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnqcE8ppEeWH8LG8MOZQNQ" name="Control creationCommands">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_NnqcFMppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/creationCommands"/>
+      <domainModelReference xmi:id="_X-q4vphgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGqJhgEeexUOv286lk0A" domainModelFeature="creationCommands"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnqcFcppEeWH8LG8MOZQNQ" name="Control creationIcons">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_NnqcFsppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/creationIcons"/>
+      <domainModelReference xmi:id="_X-q4v5hgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGqZhgEeexUOv286lk0A" domainModelFeature="creationIcons"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnqcF8ppEeWH8LG8MOZQNQ" name="Control editDirectory">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_NnqcGMppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/editDirectory"/>
+      <domainModelReference xmi:id="_X-q4wJhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGqphgEeexUOv286lk0A" domainModelFeature="editDirectory"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnqcGcppEeWH8LG8MOZQNQ" name="Control editPluginClass">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_NnqcGsppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/editPluginClass"/>
+      <domainModelReference xmi:id="_X-q4wZhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGq5hgEeexUOv286lk0A" domainModelFeature="editPluginClass"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnqcG8ppEeWH8LG8MOZQNQ" name="Control editPluginID">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_NnqcHMppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/editPluginID"/>
+      <domainModelReference xmi:id="_X-rfgJhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGrJhgEeexUOv286lk0A" domainModelFeature="editPluginID"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnqcHcppEeWH8LG8MOZQNQ" name="Control editPluginVariables">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_NnqcHsppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/editPluginVariables"/>
+      <domainModelReference xmi:id="_X-rfgZhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGrZhgEeexUOv286lk0A" domainModelFeature="editPluginVariables"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnqcH8ppEeWH8LG8MOZQNQ" name="Control fontProviders">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_NnrDIMppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/fontProviders"/>
+      <domainModelReference xmi:id="_X-rfgphgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGrphgEeexUOv286lk0A" domainModelFeature="fontProviders"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnrDIcppEeWH8LG8MOZQNQ" name="Control optimizedHasChildren">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_NnrDIsppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/optimizedHasChildren"/>
+      <domainModelReference xmi:id="_X-rfg5hgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGr5hgEeexUOv286lk0A" domainModelFeature="optimizedHasChildren"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnrDI8ppEeWH8LG8MOZQNQ" name="Control providerRootExtendsClass">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_NnrDJMppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/providerRootExtendsClass"/>
+      <domainModelReference xmi:id="_X-rfhJhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGsJhgEeexUOv286lk0A" domainModelFeature="providerRootExtendsClass"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnrDJcppEeWH8LG8MOZQNQ" name="Control styleProviders">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_NnrDJsppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/styleProviders"/>
+      <domainModelReference xmi:id="_X-rfhZhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGsZhgEeexUOv286lk0A" domainModelFeature="styleProviders"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnrDJ8ppEeWH8LG8MOZQNQ" name="Control tableProviders">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_NnrDKMppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/tableProviders"/>
+      <domainModelReference xmi:id="_X-rfhphgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGsphgEeexUOv286lk0A" domainModelFeature="tableProviders"/>
       </domainModelReference>
     </children>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_NnrDKcppEeWH8LG8MOZQNQ" name="Editor" groupType="Collapsible" collapsed="true">
+  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_NnrDKcppEeWH8LG8MOZQNQ" name="Editor" collapsed="true" groupType="Collapsible">
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnrDKsppEeWH8LG8MOZQNQ" name="Control creationSubmenus">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_NnrDK8ppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/creationSubmenus"/>
+      <domainModelReference xmi:id="_X-rfh5hgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGs5hgEeexUOv286lk0A" domainModelFeature="creationSubmenus"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnrDLMppEeWH8LG8MOZQNQ" name="Control decoration">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_NnrDLcppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/decoration"/>
+      <domainModelReference xmi:id="_X-rfiJhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGtJhgEeexUOv286lk0A" domainModelFeature="decoration"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnrDLsppEeWH8LG8MOZQNQ" name="Control editorDirectory">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_NnrDL8ppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/editorDirectory"/>
+      <domainModelReference xmi:id="_X-rfiZhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGtZhgEeexUOv286lk0A" domainModelFeature="editorDirectory"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnrDMMppEeWH8LG8MOZQNQ" name="Control editorPluginClass">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_NnrDMcppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/editorPluginClass"/>
+      <domainModelReference xmi:id="_X-rfiphgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGtphgEeexUOv286lk0A" domainModelFeature="editorPluginClass"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnrDMsppEeWH8LG8MOZQNQ" name="Control editorPluginID">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_NnrDM8ppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/editorPluginID"/>
+      <domainModelReference xmi:id="_X-rfi5hgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGt5hgEeexUOv286lk0A" domainModelFeature="editorPluginID"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnrDNMppEeWH8LG8MOZQNQ" name="Control editorPluginVariables">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_NnrDNcppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/editorPluginVariables"/>
+      <domainModelReference xmi:id="_X-rfjJhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGuJhgEeexUOv286lk0A" domainModelFeature="editorPluginVariables"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnrDNsppEeWH8LG8MOZQNQ" name="Control richAjaxPlatform">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_NnrDN8ppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/richAjaxPlatform"/>
+      <domainModelReference xmi:id="_X-rfjZhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGuZhgEeexUOv286lk0A" domainModelFeature="richAjaxPlatform"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnrDOMppEeWH8LG8MOZQNQ" name="Control richClientPlatform">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_NnrDOcppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/richClientPlatform"/>
+      <domainModelReference xmi:id="_X-rfjphgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGuphgEeexUOv286lk0A" domainModelFeature="richClientPlatform"/>
       </domainModelReference>
     </children>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_NnrqMMppEeWH8LG8MOZQNQ" name="Model" groupType="Collapsible" collapsed="true">
+  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_NnrqMMppEeWH8LG8MOZQNQ" name="Model" collapsed="true" groupType="Collapsible">
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NntfYMppEeWH8LG8MOZQNQ" name="Control arrayAccessors">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_NnuGcMppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/arrayAccessors"/>
+      <domainModelReference xmi:id="_X-rfj5hgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGu5hgEeexUOv286lk0A" domainModelFeature="arrayAccessors"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnuGccppEeWH8LG8MOZQNQ" name="Control binaryCompatibleReflectiveMethods">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_NnutgMppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/binaryCompatibleReflectiveMethods"/>
+      <domainModelReference xmi:id="_X-rfkJhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGvJhgEeexUOv286lk0A" domainModelFeature="binaryCompatibleReflectiveMethods"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnvUkMppEeWH8LG8MOZQNQ" name="Control classNamePattern">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_NnvUkcppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/classNamePattern"/>
+      <domainModelReference xmi:id="_X-rfkZhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGvZhgEeexUOv286lk0A" domainModelFeature="classNamePattern"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnvUksppEeWH8LG8MOZQNQ" name="Control featureDelegation">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_NnvUk8ppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/featureDelegation"/>
+      <domainModelReference xmi:id="_X-rfkphgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGvphgEeexUOv286lk0A" domainModelFeature="featureDelegation"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnvUlMppEeWH8LG8MOZQNQ" name="Control generateSchema">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_NnvUlcppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/generateSchema"/>
+      <domainModelReference xmi:id="_X-rfk5hgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGv5hgEeexUOv286lk0A" domainModelFeature="generateSchema"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnvUlsppEeWH8LG8MOZQNQ" name="Control interfaceNamePattern">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_NnvUl8ppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/interfaceNamePattern"/>
+      <domainModelReference xmi:id="_X-rflJhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGwJhgEeexUOv286lk0A" domainModelFeature="interfaceNamePattern"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnvUmMppEeWH8LG8MOZQNQ" name="Control minimalReflectiveMethods">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Nnv7oMppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/minimalReflectiveMethods"/>
+      <domainModelReference xmi:id="_X-rflZhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGwZhgEeexUOv286lk0A" domainModelFeature="minimalReflectiveMethods"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnwisMppEeWH8LG8MOZQNQ" name="Control modelDirectory">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_NnwiscppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/modelDirectory"/>
+      <domainModelReference xmi:id="_X-rflphgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGwphgEeexUOv286lk0A" domainModelFeature="modelDirectory"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnwissppEeWH8LG8MOZQNQ" name="Control modelPluginClass">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Nnwis8ppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/modelPluginClass"/>
+      <domainModelReference xmi:id="_X-rfl5hgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGw5hgEeexUOv286lk0A" domainModelFeature="modelPluginClass"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnwitMppEeWH8LG8MOZQNQ" name="Control modelPluginID">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_NnwitcppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/modelPluginID"/>
+      <domainModelReference xmi:id="_X-rfmJhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGxJhgEeexUOv286lk0A" domainModelFeature="modelPluginID"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnwitsppEeWH8LG8MOZQNQ" name="Control modelPluginVariables">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Nnwit8ppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/modelPluginVariables"/>
+      <domainModelReference xmi:id="_X-rfmZhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGxZhgEeexUOv286lk0A" domainModelFeature="modelPluginVariables"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnwiuMppEeWH8LG8MOZQNQ" name="Control operationReflection">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_NnwiucppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/operationReflection"/>
+      <domainModelReference xmi:id="_X-rfmphgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGxphgEeexUOv286lk0A" domainModelFeature="operationReflection"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnwiusppEeWH8LG8MOZQNQ" name="Control suppressContainment">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Nnwiu8ppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/suppressContainment"/>
+      <domainModelReference xmi:id="_X-rfm5hgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGx5hgEeexUOv286lk0A" domainModelFeature="suppressContainment"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnwivMppEeWH8LG8MOZQNQ" name="Control suppressEMFMetaData">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_NnwivcppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/suppressEMFMetaData"/>
+      <domainModelReference xmi:id="_X-rfnJhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGyJhgEeexUOv286lk0A" domainModelFeature="suppressEMFMetaData"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnwivsppEeWH8LG8MOZQNQ" name="Control suppressEMFModelTags">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Nnwiv8ppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/suppressEMFModelTags"/>
+      <domainModelReference xmi:id="_X-rfnZhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGyZhgEeexUOv286lk0A" domainModelFeature="suppressEMFModelTags"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnwiwMppEeWH8LG8MOZQNQ" name="Control suppressGenModelAnnotations">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_NnwiwcppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/suppressGenModelAnnotations"/>
+      <domainModelReference xmi:id="_X-rfnphgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGyphgEeexUOv286lk0A" domainModelFeature="suppressGenModelAnnotations"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnwiwsppEeWH8LG8MOZQNQ" name="Control suppressInterfaces">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Nnwiw8ppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/suppressInterfaces"/>
+      <domainModelReference xmi:id="_X-rfn5hgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGy5hgEeexUOv286lk0A" domainModelFeature="suppressInterfaces"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnxJwMppEeWH8LG8MOZQNQ" name="Control suppressNotification">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_NnxJwcppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/suppressNotification"/>
+      <domainModelReference xmi:id="_X-rfoJhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGzJhgEeexUOv286lk0A" domainModelFeature="suppressNotification"/>
       </domainModelReference>
     </children>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_NnxJwsppEeWH8LG8MOZQNQ" name="Model Class Defaults" groupType="Collapsible" collapsed="true">
+  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_NnxJwsppEeWH8LG8MOZQNQ" name="Model Class Defaults" collapsed="true" groupType="Collapsible">
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnxJw8ppEeWH8LG8MOZQNQ" name="Control publicConstructors">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_NnxJxMppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/publicConstructors"/>
+      <domainModelReference xmi:id="_X-rfoZhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGzZhgEeexUOv286lk0A" domainModelFeature="publicConstructors"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnxJxcppEeWH8LG8MOZQNQ" name="Control rootExtendsClass">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_NnxJxsppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/rootExtendsClass"/>
+      <domainModelReference xmi:id="_X-rfophgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGzphgEeexUOv286lk0A" domainModelFeature="rootExtendsClass"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnxJx8ppEeWH8LG8MOZQNQ" name="Control rootExtendsInterface">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_NnxJyMppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/rootExtendsInterface"/>
+      <domainModelReference xmi:id="_X-rfo5hgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sGz5hgEeexUOv286lk0A" domainModelFeature="rootExtendsInterface"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnxJycppEeWH8LG8MOZQNQ" name="Control rootImplementsInterface">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_NnxJysppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/rootImplementsInterface"/>
+      <domainModelReference xmi:id="_X-rfpJhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sG0JhgEeexUOv286lk0A" domainModelFeature="rootImplementsInterface"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnxJy8ppEeWH8LG8MOZQNQ" name="Control staticPackages">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_NnxJzMppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/staticPackages"/>
+      <domainModelReference xmi:id="_X-rfpZhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sG0ZhgEeexUOv286lk0A" domainModelFeature="staticPackages"/>
       </domainModelReference>
     </children>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_NnxJzcppEeWH8LG8MOZQNQ" name="Model Feature Defaults" groupType="Collapsible" collapsed="true">
+  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_NnxJzcppEeWH8LG8MOZQNQ" name="Model Feature Defaults" collapsed="true" groupType="Collapsible">
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnxJzsppEeWH8LG8MOZQNQ" name="Control booleanFlagsField">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_NnxJz8ppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/booleanFlagsField"/>
+      <domainModelReference xmi:id="_X-rfpphgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sG0phgEeexUOv286lk0A" domainModelFeature="booleanFlagsField"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnxJ0MppEeWH8LG8MOZQNQ" name="Control booleanFlagsReservedBits">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_NnxJ0cppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/booleanFlagsReservedBits"/>
+      <domainModelReference xmi:id="_X-rfp5hgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sG05hgEeexUOv286lk0A" domainModelFeature="booleanFlagsReservedBits"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnxJ0sppEeWH8LG8MOZQNQ" name="Control featureMapWrapperClass">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_NnxJ08ppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/featureMapWrapperClass"/>
+      <domainModelReference xmi:id="_X-rfqJhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sG1JhgEeexUOv286lk0A" domainModelFeature="featureMapWrapperClass"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Nnxw0MppEeWH8LG8MOZQNQ" name="Control featureMapWrapperInterface">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Nnxw0cppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/featureMapWrapperInterface"/>
+      <domainModelReference xmi:id="_X-rfqZhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sG1ZhgEeexUOv286lk0A" domainModelFeature="featureMapWrapperInterface"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Nnxw0sppEeWH8LG8MOZQNQ" name="Control featureMapWrapperInternalInterface">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Nnxw08ppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/featureMapWrapperInternalInterface"/>
+      <domainModelReference xmi:id="_X-rfqphgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sG1phgEeexUOv286lk0A" domainModelFeature="featureMapWrapperInternalInterface"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Nnxw1MppEeWH8LG8MOZQNQ" name="Control packedEnums">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Nnxw1cppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/packedEnums"/>
+      <domainModelReference xmi:id="_X-rfq5hgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sG15hgEeexUOv286lk0A" domainModelFeature="packedEnums"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Nnxw1sppEeWH8LG8MOZQNQ" name="Control suppressEMFTypes">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Nnxw18ppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/suppressEMFTypes"/>
+      <domainModelReference xmi:id="_X-rfrJhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-stoJhgEeexUOv286lk0A" domainModelFeature="suppressEMFTypes"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Nnxw2MppEeWH8LG8MOZQNQ" name="Control suppressUnsettable">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Nnxw2cppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/suppressUnsettable"/>
+      <domainModelReference xmi:id="_X-rfrZhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-stoZhgEeexUOv286lk0A" domainModelFeature="suppressUnsettable"/>
       </domainModelReference>
     </children>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_Nnxw2sppEeWH8LG8MOZQNQ" name="Templates &amp; Merge" groupType="Collapsible" collapsed="true">
+  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_Nnxw2sppEeWH8LG8MOZQNQ" name="Templates &amp; Merge" collapsed="true" groupType="Collapsible">
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Nnxw28ppEeWH8LG8MOZQNQ" name="Control cleanup">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Nnxw3MppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/cleanup"/>
+      <domainModelReference xmi:id="_X-rfrphgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-stophgEeexUOv286lk0A" domainModelFeature="cleanup"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Nnxw3cppEeWH8LG8MOZQNQ" name="Control codeFormatting">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Nnxw3sppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/codeFormatting"/>
+      <domainModelReference xmi:id="_X-rfr5hgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-sto5hgEeexUOv286lk0A" domainModelFeature="codeFormatting"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Nnxw38ppEeWH8LG8MOZQNQ" name="Control commentFormatting">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Nnxw4MppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/commentFormatting"/>
+      <domainModelReference xmi:id="_X-rfsJhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-stpJhgEeexUOv286lk0A" domainModelFeature="commentFormatting"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Nnxw4cppEeWH8LG8MOZQNQ" name="Control dynamicTemplates">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Nnxw4sppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/dynamicTemplates"/>
+      <domainModelReference xmi:id="_X-rfsZhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-stpZhgEeexUOv286lk0A" domainModelFeature="dynamicTemplates"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Nnxw48ppEeWH8LG8MOZQNQ" name="Control facadeHelperClass">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Nnxw5MppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/facadeHelperClass"/>
+      <domainModelReference xmi:id="_X-rfsphgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-stpphgEeexUOv286lk0A" domainModelFeature="facadeHelperClass"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Nnxw5cppEeWH8LG8MOZQNQ" name="Control forceOverwrite">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Nnxw5sppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/forceOverwrite"/>
+      <domainModelReference xmi:id="_X-sGkJhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-stp5hgEeexUOv286lk0A" domainModelFeature="forceOverwrite"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Nnxw58ppEeWH8LG8MOZQNQ" name="Control importOrganizing">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Nnxw6MppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/importOrganizing"/>
+      <domainModelReference xmi:id="_X-sGkZhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-stqJhgEeexUOv286lk0A" domainModelFeature="importOrganizing"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Nnxw6cppEeWH8LG8MOZQNQ" name="Control pluginKey">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Nnxw6sppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/pluginKey"/>
+      <domainModelReference xmi:id="_X-sGkphgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-stqZhgEeexUOv286lk0A" domainModelFeature="pluginKey"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Nnxw68ppEeWH8LG8MOZQNQ" name="Control redirection">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Nnxw7MppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/redirection"/>
+      <domainModelReference xmi:id="_X-sGk5hgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-stqphgEeexUOv286lk0A" domainModelFeature="redirection"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Nnxw7cppEeWH8LG8MOZQNQ" name="Control templateDirectory">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Nnxw7sppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/templateDirectory"/>
+      <domainModelReference xmi:id="_X-sGlJhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-stq5hgEeexUOv286lk0A" domainModelFeature="templateDirectory"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Nnxw78ppEeWH8LG8MOZQNQ" name="Control templatePluginVariables">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Nnxw8MppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/templatePluginVariables"/>
+      <domainModelReference xmi:id="_X-sGlZhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-strJhgEeexUOv286lk0A" domainModelFeature="templatePluginVariables"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NnyX4MppEeWH8LG8MOZQNQ" name="Control updateClasspath">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Nny-8MppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/updateClasspath"/>
+      <domainModelReference xmi:id="_X-sGlphgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-strZhgEeexUOv286lk0A" domainModelFeature="updateClasspath"/>
       </domainModelReference>
     </children>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_Nny-8cppEeWH8LG8MOZQNQ" name="Tests" groupType="Collapsible" collapsed="true">
+  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_Nny-8cppEeWH8LG8MOZQNQ" name="Tests" collapsed="true" groupType="Collapsible">
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Nny-8sppEeWH8LG8MOZQNQ" name="Control testsDirectory">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Nny-88ppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/testsDirectory"/>
+      <domainModelReference xmi:id="_X-sGl5hgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-strphgEeexUOv286lk0A" domainModelFeature="testsDirectory"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Nny-9MppEeWH8LG8MOZQNQ" name="Control testsPluginID">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Nny-9cppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/testsPluginID"/>
+      <domainModelReference xmi:id="_X-sGmJhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-str5hgEeexUOv286lk0A" domainModelFeature="testsPluginID"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Nny-9sppEeWH8LG8MOZQNQ" name="Control testsPluginVariables">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Nny-98ppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/testsPluginVariables"/>
+      <domainModelReference xmi:id="_X-sGmZhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-stsJhgEeexUOv286lk0A" domainModelFeature="testsPluginVariables"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Nny--MppEeWH8LG8MOZQNQ" name="Control testSuiteClass">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Nny--cppEeWH8LG8MOZQNQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenModel/testSuiteClass"/>
+      <domainModelReference xmi:id="_X-sGmphgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X-stsZhgEeexUOv286lk0A" domainModelFeature="testSuiteClass"/>
       </domainModelReference>
     </children>
   </children>
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenOperation.view b/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenOperation.view
index 2a1a5a7..1832b01 100644
--- a/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenOperation.view
+++ b/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenOperation.view
@@ -1,4 +1,4 @@
 <?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:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/170" ecorePath="/org.eclipse.emf.codegen.ecore/model/GenModel.ecore">
+<org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/200" xmi:id="_XcR9EJhgEeexUOv286lk0A" ecorePath="/org.eclipse.emf.codegen.ecore/model/GenModel.ecore">
   <rootEClass href="http://www.eclipse.org/emf/2002/GenModel#//GenOperation"/>
 </org.eclipse.emf.ecp.view.model:View>
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenPackage.view b/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenPackage.view
index d8f57db..b8552f4 100644
--- a/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenPackage.view
+++ b/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenPackage.view
@@ -1,130 +1,130 @@
 <?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/170" xmi:id="_abLBEOn1EeW9hu2dEFzGzw" ecorePath="/org.eclipse.emf.codegen.ecore/model/GenModel.ecore">
+<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: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/200" xmi:id="_abLBEOn1EeW9hu2dEFzGzw" ecorePath="/org.eclipse.emf.codegen.ecore/model/GenModel.ecore">
   <rootEClass href="http://www.eclipse.org/emf/2002/GenModel#//GenPackage"/>
   <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_hj8akOn1EeW9hu2dEFzGzw" name="All">
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_pv69gOn1EeW9hu2dEFzGzw" name="Control basePackage">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_pv69gen1EeW9hu2dEFzGzw">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenPackage/basePackage"/>
+      <domainModelReference xmi:id="_X5RbLphgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X5SCMphgEeexUOv286lk0A" domainModelFeature="basePackage"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_pwAdEOn1EeW9hu2dEFzGzw" name="Control prefix">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_pwAdEen1EeW9hu2dEFzGzw">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenPackage/prefix"/>
+      <domainModelReference xmi:id="_X5RbL5hgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X5SCM5hgEeexUOv286lk0A" domainModelFeature="prefix"/>
       </domainModelReference>
     </children>
   </children>
   <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_abLBEen1EeW9hu2dEFzGzw" name="Edit">
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_abLoIOn1EeW9hu2dEFzGzw" name="Control childCreationExtenders">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_abLoIen1EeW9hu2dEFzGzw">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenPackage/childCreationExtenders"/>
+      <domainModelReference xmi:id="_X5RbMJhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X5SCNJhgEeexUOv286lk0A" domainModelFeature="childCreationExtenders"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_abLoIun1EeW9hu2dEFzGzw" name="Control disposableProviderFactory">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_abLoI-n1EeW9hu2dEFzGzw">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenPackage/disposableProviderFactory"/>
+      <domainModelReference xmi:id="_X5RbMZhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X5SCNZhgEeexUOv286lk0A" domainModelFeature="disposableProviderFactory"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_abLoJOn1EeW9hu2dEFzGzw" name="Control extensibleProviderFactory">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_abLoJen1EeW9hu2dEFzGzw">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenPackage/extensibleProviderFactory"/>
+      <domainModelReference xmi:id="_X5RbMphgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X5SCNphgEeexUOv286lk0A" domainModelFeature="extensibleProviderFactory"/>
       </domainModelReference>
     </children>
   </children>
   <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_abLoJun1EeW9hu2dEFzGzw" name="Editor">
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_abLoJ-n1EeW9hu2dEFzGzw" name="Control generateModelWizard">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_abLoKOn1EeW9hu2dEFzGzw">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenPackage/generateModelWizard"/>
+      <domainModelReference xmi:id="_X5SCIJhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X5SCN5hgEeexUOv286lk0A" domainModelFeature="generateModelWizard"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_abLoKen1EeW9hu2dEFzGzw" name="Control multipleEditorPages">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_abLoKun1EeW9hu2dEFzGzw">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenPackage/multipleEditorPages"/>
+      <domainModelReference xmi:id="_X5SCIZhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X5SCOJhgEeexUOv286lk0A" domainModelFeature="multipleEditorPages"/>
       </domainModelReference>
     </children>
   </children>
   <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_abLoK-n1EeW9hu2dEFzGzw" name="Model">
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_abLoLOn1EeW9hu2dEFzGzw" name="Control adapterFactory">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_abLoLen1EeW9hu2dEFzGzw">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenPackage/adapterFactory"/>
+      <domainModelReference xmi:id="_X5SCIphgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X5SCOZhgEeexUOv286lk0A" domainModelFeature="adapterFactory"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_abLoLun1EeW9hu2dEFzGzw" name="Control contentTypeIdentifier">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_abLoL-n1EeW9hu2dEFzGzw">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenPackage/contentTypeIdentifier"/>
+      <domainModelReference xmi:id="_X5SCI5hgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X5SCOphgEeexUOv286lk0A" domainModelFeature="contentTypeIdentifier"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_abLoMOn1EeW9hu2dEFzGzw" name="Control dataTypeConverters">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_abLoMen1EeW9hu2dEFzGzw">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenPackage/dataTypeConverters"/>
+      <domainModelReference xmi:id="_X5SCJJhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X5SCO5hgEeexUOv286lk0A" domainModelFeature="dataTypeConverters"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_abLoMun1EeW9hu2dEFzGzw" name="Control fileExtensions">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_abLoM-n1EeW9hu2dEFzGzw">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenPackage/fileExtensions"/>
+      <domainModelReference xmi:id="_X5SCJZhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X5SCPJhgEeexUOv286lk0A" domainModelFeature="fileExtensions"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_abLoNOn1EeW9hu2dEFzGzw" name="Control loadInitialization">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_abLoNen1EeW9hu2dEFzGzw">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenPackage/loadInitialization"/>
+      <domainModelReference xmi:id="_X5SCJphgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X5SCPZhgEeexUOv286lk0A" domainModelFeature="loadInitialization"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_abLoNun1EeW9hu2dEFzGzw" name="Control literalsInterface">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_abLoN-n1EeW9hu2dEFzGzw">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenPackage/literalsInterface"/>
+      <domainModelReference xmi:id="_X5SCJ5hgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X5SCPphgEeexUOv286lk0A" domainModelFeature="literalsInterface"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_abLoOOn1EeW9hu2dEFzGzw" name="Control publicationLocation">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_abLoOen1EeW9hu2dEFzGzw">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenPackage/publicationLocation"/>
+      <domainModelReference xmi:id="_X5SCKJhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X5SCP5hgEeexUOv286lk0A" domainModelFeature="publicationLocation"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_abMPMOn1EeW9hu2dEFzGzw" name="Control resource">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_abMPMen1EeW9hu2dEFzGzw">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenPackage/resource"/>
+      <domainModelReference xmi:id="_X5SCKZhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X5SCQJhgEeexUOv286lk0A" domainModelFeature="resource"/>
       </domainModelReference>
     </children>
   </children>
   <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_abMPMun1EeW9hu2dEFzGzw" name="Package Suffixes">
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_abMPM-n1EeW9hu2dEFzGzw" name="Control interfacePackageSuffix">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_abMPNOn1EeW9hu2dEFzGzw">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenPackage/interfacePackageSuffix"/>
+      <domainModelReference xmi:id="_X5SCKphgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X5SCQZhgEeexUOv286lk0A" domainModelFeature="interfacePackageSuffix"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_abMPNen1EeW9hu2dEFzGzw" name="Control metaDataPackageSuffix">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_abMPNun1EeW9hu2dEFzGzw">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenPackage/metaDataPackageSuffix"/>
+      <domainModelReference xmi:id="_X5SCK5hgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X5SCQphgEeexUOv286lk0A" domainModelFeature="metaDataPackageSuffix"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_abMPN-n1EeW9hu2dEFzGzw" name="Control providerPackageSuffix">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_abMPOOn1EeW9hu2dEFzGzw">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenPackage/providerPackageSuffix"/>
+      <domainModelReference xmi:id="_X5SCLJhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X5SCQ5hgEeexUOv286lk0A" domainModelFeature="providerPackageSuffix"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_abMPOen1EeW9hu2dEFzGzw" name="Control testsPackageSuffix">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_abMPOun1EeW9hu2dEFzGzw">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenPackage/testsPackageSuffix"/>
+      <domainModelReference xmi:id="_X5SCLZhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X5SCRJhgEeexUOv286lk0A" domainModelFeature="testsPackageSuffix"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_abMPO-n1EeW9hu2dEFzGzw" name="Control utilityPackageSuffix">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_abMPPOn1EeW9hu2dEFzGzw">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenPackage/utilityPackageSuffix"/>
+      <domainModelReference xmi:id="_X5SCLphgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X5SCRZhgEeexUOv286lk0A" domainModelFeature="utilityPackageSuffix"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_abMPPen1EeW9hu2dEFzGzw" name="Control classPackageSuffix">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_abMPPun1EeW9hu2dEFzGzw">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenPackage/classPackageSuffix"/>
+      <domainModelReference xmi:id="_X5SCL5hgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X5SCRphgEeexUOv286lk0A" domainModelFeature="classPackageSuffix"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_abMPP-n1EeW9hu2dEFzGzw" name="Control presentationPackageSuffix">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_abMPQOn1EeW9hu2dEFzGzw">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenPackage/presentationPackageSuffix"/>
+      <domainModelReference xmi:id="_X5SCMJhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X5SCR5hgEeexUOv286lk0A" domainModelFeature="presentationPackageSuffix"/>
       </domainModelReference>
     </children>
   </children>
   <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_abMPQen1EeW9hu2dEFzGzw" name="Tests">
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_abMPQun1EeW9hu2dEFzGzw" name="Control generateExampleClass">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_abMPQ-n1EeW9hu2dEFzGzw">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/GenModel#//GenPackage/generateExampleClass"/>
+      <domainModelReference xmi:id="_X5SCMZhgEeexUOv286lk0A">
+        <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_X5SCSJhgEeexUOv286lk0A" domainModelFeature="generateExampleClass"/>
       </domainModelReference>
     </children>
   </children>
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenParameter.view b/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenParameter.view
index 36fbee9..188d53e 100644
--- a/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenParameter.view
+++ b/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenParameter.view
@@ -1,19 +1,19 @@
 <?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/170" ecorePath="/org.eclipse.emf.codegen.ecore/model/GenModel.ecore">
+<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:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/200" xmi:id="_XXF7EJhgEeexUOv286lk0A" ecorePath="/org.eclipse.emf.codegen.ecore/model/GenModel.ecore">
   <rootEClass href="http://www.eclipse.org/emf/2002/GenModel#//GenParameter"/>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control genAnnotations">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
-      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/2002/GenModel#//GenBase/genAnnotations"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_XXF7EZhgEeexUOv286lk0A" name="Control genAnnotations">
+    <domainModelReference xmi:id="_XXSvZJhgEeexUOv286lk0A">
+      <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_XXSvZ5hgEeexUOv286lk0A" domainModelFeature="genAnnotations"/>
     </domainModelReference>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control genOperation">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
-      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/2002/GenModel#//GenParameter/genOperation"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_XXF7E5hgEeexUOv286lk0A" name="Control genOperation">
+    <domainModelReference xmi:id="_XXSvZZhgEeexUOv286lk0A">
+      <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_XXSvaJhgEeexUOv286lk0A" domainModelFeature="genOperation"/>
     </domainModelReference>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control ecoreParameter">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
-      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/2002/GenModel#//GenParameter/ecoreParameter"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_XXF7FZhgEeexUOv286lk0A" name="Control ecoreParameter">
+    <domainModelReference xmi:id="_XXSvZphgEeexUOv286lk0A">
+      <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_XXTWcJhgEeexUOv286lk0A" domainModelFeature="ecoreParameter"/>
     </domainModelReference>
   </children>
 </org.eclipse.emf.ecp.view.model:View>
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenTypeParameter.view b/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenTypeParameter.view
index 7610516..6ceb818 100644
--- a/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenTypeParameter.view
+++ b/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenTypeParameter.view
@@ -1,14 +1,14 @@
 <?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/170" ecorePath="/org.eclipse.emf.codegen.ecore/model/GenModel.ecore">
+<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:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/200" xmi:id="_XHFJIJhgEeexUOv286lk0A" ecorePath="/org.eclipse.emf.codegen.ecore/model/GenModel.ecore">
   <rootEClass href="http://www.eclipse.org/emf/2002/GenModel#//GenTypeParameter"/>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control genAnnotations">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
-      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/2002/GenModel#//GenBase/genAnnotations"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_XHJakJhgEeexUOv286lk0A" name="Control genAnnotations">
+    <domainModelReference xmi:id="_XI5HA5hgEeexUOv286lk0A">
+      <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_XI5HBZhgEeexUOv286lk0A" domainModelFeature="genAnnotations"/>
     </domainModelReference>
   </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control ecoreTypeParameter">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
-      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/2002/GenModel#//GenTypeParameter/ecoreTypeParameter"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_XHJakphgEeexUOv286lk0A" name="Control ecoreTypeParameter">
+    <domainModelReference xmi:id="_XI5HBJhgEeexUOv286lk0A">
+      <segments xsi:type="org.eclipse.emf.ecp.view.model:FeatureDomainModelReferenceSegment" xmi:id="_XI5HBphgEeexUOv286lk0A" domainModelFeature="ecoreTypeParameter"/>
     </domainModelReference>
   </children>
 </org.eclipse.emf.ecp.view.model:View>