From 8a79b55644f5d2b97be94dcb42ad36b4e0a0a99e Mon Sep 17 00:00:00 2001
From: eparovyshnaya <elena.parovyshnaya@gmail.com>
Date: Sun, 17 Mar 2024 19:45:04 +0300
Subject: [PATCH] [#1319] Operator: UserGrant does not have proper EMF Form

---
 .../viewmodels/EvaluationInstructions.view    |  30 +--
 .../viewmodels/FeatureGrant.view              | 120 ++++++-----
 .../viewmodels/FloatingLicenseAccess.view     |  40 ++--
 .../viewmodels/FloatingLicenseRequisites.view |  80 ++++----
 .../viewmodels/FloatingServer.view            |  30 +--
 .../viewmodels/FloatingServerConnection.view  |  40 ++--
 .../viewmodels/LicensePlan.view               |  50 ++---
 .../viewmodels/LicensePlanFeature.view        |  50 ++---
 .../viewmodels/PersonalFeatureGrant.view      | 142 ++++++-------
 .../viewmodels/PersonalLicensePack.view       | 192 +++++++++---------
 .../viewmodels/ProductRef.view                |  30 +--
 .../viewmodels/UserGrant.view                 |  41 ++--
 .../viewmodels/ValidityPeriodClosed.view      |  30 +--
 .../viewmodels/VersionMatch.view              |  30 +--
 14 files changed, 456 insertions(+), 449 deletions(-)

diff --git a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/EvaluationInstructions.view b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/EvaluationInstructions.view
index 3d400f2d2..1d5138398 100644
--- a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/EvaluationInstructions.view
+++ b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/EvaluationInstructions.view
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_4ROBgBrKEeuMV_ofZRuPaw" name="EvaluationInstructions">
-  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//EvaluationInstructions"/>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4RRE0BrKEeuMV_ofZRuPaw" name="Control type">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4RRE0RrKEeuMV_ofZRuPaw">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//EvaluationInstructions/type"/>
-    </domainModelReference>
-  </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4RRE0hrKEeuMV_ofZRuPaw" name="Control expression">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4RRE0xrKEeuMV_ofZRuPaw">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//EvaluationInstructions/expression"/>
-    </domainModelReference>
-  </children>
-  <ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
-</org.eclipse.emf.ecp.view.model:View>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_4ROBgBrKEeuMV_ofZRuPaw" name="Evaluation Instructions">
+  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//EvaluationInstructions"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4RRE0BrKEeuMV_ofZRuPaw" name="Control type">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4RRE0RrKEeuMV_ofZRuPaw">
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//EvaluationInstructions/type"/>
+    </domainModelReference>
+  </children>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4RRE0hrKEeuMV_ofZRuPaw" name="Control expression">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4RRE0xrKEeuMV_ofZRuPaw">
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//EvaluationInstructions/expression"/>
+    </domainModelReference>
+  </children>
+  <ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
+</org.eclipse.emf.ecp.view.model:View>
diff --git a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FeatureGrant.view b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FeatureGrant.view
index 60f99e665..b62e844ca 100644
--- a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FeatureGrant.view
+++ b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FeatureGrant.view
@@ -1,62 +1,58 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.group.model="http://org/eclipse/emf/ecp/view/group/model" xmlns:org.eclipse.emf.ecp.view.horizontal.model="http://org/eclipse/emf/ecp/view/horizontal/model" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="__u4qcL-xEeuw7f5-0ea7hA" name="FeatureGrant">
-  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureGrant"/>
-  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_QYRzYMEXEeuw7f5-0ea7hA" name="General">
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="__u874L-xEeuw7f5-0ea7hA" name="Control identifier">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="__u874b-xEeuw7f5-0ea7hA">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureGrant/identifier"/>
-      </domainModelReference>
-    </children>
-    <children xsi:type="org.eclipse.emf.ecp.view.horizontal.model:HorizontalLayout" xmi:id="_ZiL-MMEXEeuw7f5-0ea7hA">
-      <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="__u876L-xEeuw7f5-0ea7hA" name="Control capacity">
-        <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="__u876b-xEeuw7f5-0ea7hA">
-          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureGrant/capacity"/>
-        </domainModelReference>
-      </children>
-      <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="__u875r-xEeuw7f5-0ea7hA" name="Control vivid">
-        <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="__u8757-xEeuw7f5-0ea7hA">
-          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureGrant/vivid"/>
-        </domainModelReference>
-      </children>
-    </children>
-  </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_TrvvQMEXEeuw7f5-0ea7hA" name="Feature">
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="__u874r-xEeuw7f5-0ea7hA" name="FeatureRef identifier">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_qYmhsMEXEeuw7f5-0ea7hA">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureRef/identifier"/>
-        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureGrant/feature"/>
-      </domainModelReference>
-    </children>
-    <children xsi:type="org.eclipse.emf.ecp.view.horizontal.model:HorizontalLayout" xmi:id="_my9QsMEXEeuw7f5-0ea7hA">
-      <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_q7vD8MEXEeuw7f5-0ea7hA" name="VersionMatch version">
-        <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_vVU6YMEXEeuw7f5-0ea7hA">
-          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//VersionMatch/version"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureGrant/feature"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureRef/versionMatch"/>
-        </domainModelReference>
-      </children>
-      <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_rXTloMEXEeuw7f5-0ea7hA" name="VersionMatch version">
-        <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_xua4sMEXEeuw7f5-0ea7hA">
-          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//VersionMatch/rule"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureGrant/feature"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureRef/versionMatch"/>
-        </domainModelReference>
-      </children>
-    </children>
-  </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_cESukMEXEeuw7f5-0ea7hA" name="Valid">
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="__u875L-xEeuw7f5-0ea7hA" name="from">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="__u875b-xEeuw7f5-0ea7hA">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ValidityPeriodClosed/from"/>
-        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureGrant/valid"/>
-      </domainModelReference>
-    </children>
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_iLlc8MEXEeuw7f5-0ea7hA" name="until">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_ju_JYMEXEeuw7f5-0ea7hA">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ValidityPeriodClosed/until"/>
-        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureGrant/valid"/>
-      </domainModelReference>
-    </children>
-  </children>
-  <ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
-</org.eclipse.emf.ecp.view.model:View>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.group.model="http://org/eclipse/emf/ecp/view/group/model" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="__u4qcL-xEeuw7f5-0ea7hA" name="Feature Grant">
+  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureGrant"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_QYRzYMEXEeuw7f5-0ea7hA" name="General" groupType="Collapsible">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="__u874L-xEeuw7f5-0ea7hA" name="identifier" readonly="true">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="__u874b-xEeuw7f5-0ea7hA">
+        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureGrant/identifier"/>
+      </domainModelReference>
+    </children>
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="__u876L-xEeuw7f5-0ea7hA" name="capacity">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="__u876b-xEeuw7f5-0ea7hA">
+        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureGrant/capacity"/>
+      </domainModelReference>
+    </children>
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="__u875r-xEeuw7f5-0ea7hA" name="vivid">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="__u8757-xEeuw7f5-0ea7hA">
+        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureGrant/vivid"/>
+      </domainModelReference>
+    </children>
+  </children>
+  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_TrvvQMEXEeuw7f5-0ea7hA" name="Feature" groupType="Collapsible" collapsed="true">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="__u874r-xEeuw7f5-0ea7hA" name="identifier" readonly="true">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_qYmhsMEXEeuw7f5-0ea7hA">
+        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureRef/identifier"/>
+        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureGrant/feature"/>
+      </domainModelReference>
+    </children>
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_q7vD8MEXEeuw7f5-0ea7hA" name="version" readonly="true">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_vVU6YMEXEeuw7f5-0ea7hA">
+        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//VersionMatch/version"/>
+        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureGrant/feature"/>
+        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureRef/versionMatch"/>
+      </domainModelReference>
+    </children>
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_rXTloMEXEeuw7f5-0ea7hA" name="rule" readonly="true">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_xua4sMEXEeuw7f5-0ea7hA">
+        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//VersionMatch/rule"/>
+        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureGrant/feature"/>
+        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureRef/versionMatch"/>
+      </domainModelReference>
+    </children>
+  </children>
+  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_cESukMEXEeuw7f5-0ea7hA" name="Valid" groupType="Collapsible">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="__u875L-xEeuw7f5-0ea7hA" name="from">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="__u875b-xEeuw7f5-0ea7hA">
+        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ValidityPeriodClosed/from"/>
+        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureGrant/valid"/>
+      </domainModelReference>
+    </children>
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_iLlc8MEXEeuw7f5-0ea7hA" name="until">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_ju_JYMEXEeuw7f5-0ea7hA">
+        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ValidityPeriodClosed/until"/>
+        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureGrant/valid"/>
+      </domainModelReference>
+    </children>
+  </children>
+  <ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
+</org.eclipse.emf.ecp.view.model:View>
diff --git a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FloatingLicenseAccess.view b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FloatingLicenseAccess.view
index 844ecb1c2..16f9fa335 100644
--- a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FloatingLicenseAccess.view
+++ b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FloatingLicenseAccess.view
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_4RiKkBrKEeuMV_ofZRuPaw" name="FloatingLicenseAccess">
-  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingLicenseAccess"/>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4Rkm0BrKEeuMV_ofZRuPaw" name="Control user">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4Rkm0RrKEeuMV_ofZRuPaw">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingLicenseAccess/user"/>
-    </domainModelReference>
-  </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4Rkm0hrKEeuMV_ofZRuPaw" name="Control server">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4Rkm0xrKEeuMV_ofZRuPaw">
-      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingLicenseAccess/server"/>
-    </domainModelReference>
-  </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4Rkm1BrKEeuMV_ofZRuPaw" name="Control originLicensePack">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4Rkm1RrKEeuMV_ofZRuPaw">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingLicenseAccess/originLicensePack"/>
-    </domainModelReference>
-  </children>
-  <ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
-</org.eclipse.emf.ecp.view.model:View>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_4RiKkBrKEeuMV_ofZRuPaw" name="Floating License Access">
+  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingLicenseAccess"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4Rkm0BrKEeuMV_ofZRuPaw" name="Control user">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4Rkm0RrKEeuMV_ofZRuPaw">
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingLicenseAccess/user"/>
+    </domainModelReference>
+  </children>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4Rkm0hrKEeuMV_ofZRuPaw" name="Control server">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4Rkm0xrKEeuMV_ofZRuPaw">
+      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingLicenseAccess/server"/>
+    </domainModelReference>
+  </children>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4Rkm1BrKEeuMV_ofZRuPaw" name="Control originLicensePack">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4Rkm1RrKEeuMV_ofZRuPaw">
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingLicenseAccess/originLicensePack"/>
+    </domainModelReference>
+  </children>
+  <ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
+</org.eclipse.emf.ecp.view.model:View>
diff --git a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FloatingLicenseRequisites.view b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FloatingLicenseRequisites.view
index 4e43e4253..7c37755b5 100644
--- a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FloatingLicenseRequisites.view
+++ b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FloatingLicenseRequisites.view
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_EpDbML-uEeuw7f5-0ea7hA" name="FloatingLicenseRequisites">
-  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingLicenseRequisites"/>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_EpUg8L-uEeuw7f5-0ea7hA" name="Control identifier">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_EpVIAL-uEeuw7f5-0ea7hA">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/identifier"/>
-    </domainModelReference>
-  </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_EpVIAb-uEeuw7f5-0ea7hA" name="Control issueDate">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_EpVIAr-uEeuw7f5-0ea7hA">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/issueDate"/>
-    </domainModelReference>
-  </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_EpVIA7-uEeuw7f5-0ea7hA" name="Control plan">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_EpVIBL-uEeuw7f5-0ea7hA">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/plan"/>
-    </domainModelReference>
-  </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_EpVIBb-uEeuw7f5-0ea7hA" name="Control product">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_EpVIBr-uEeuw7f5-0ea7hA">
-      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/product"/>
-    </domainModelReference>
-  </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_EpVIB7-uEeuw7f5-0ea7hA" name="Control valid">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_EpVICL-uEeuw7f5-0ea7hA">
-      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/valid"/>
-    </domainModelReference>
-  </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_EpVICb-uEeuw7f5-0ea7hA" name="Control signature">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_EpVICr-uEeuw7f5-0ea7hA">
-      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/signature"/>
-    </domainModelReference>
-  </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_EpVIC7-uEeuw7f5-0ea7hA" name="Control company">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_EpVIDL-uEeuw7f5-0ea7hA">
-      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingLicenseRequisites/company"/>
-    </domainModelReference>
-  </children>
-  <ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
-</org.eclipse.emf.ecp.view.model:View>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_EpDbML-uEeuw7f5-0ea7hA" name="Floating License Requisites">
+  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingLicenseRequisites"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_EpUg8L-uEeuw7f5-0ea7hA" name="Control identifier">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_EpVIAL-uEeuw7f5-0ea7hA">
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/identifier"/>
+    </domainModelReference>
+  </children>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_EpVIAb-uEeuw7f5-0ea7hA" name="Control issueDate">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_EpVIAr-uEeuw7f5-0ea7hA">
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/issueDate"/>
+    </domainModelReference>
+  </children>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_EpVIA7-uEeuw7f5-0ea7hA" name="Control plan">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_EpVIBL-uEeuw7f5-0ea7hA">
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/plan"/>
+    </domainModelReference>
+  </children>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_EpVIBb-uEeuw7f5-0ea7hA" name="Control product">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_EpVIBr-uEeuw7f5-0ea7hA">
+      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/product"/>
+    </domainModelReference>
+  </children>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_EpVIB7-uEeuw7f5-0ea7hA" name="Control valid">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_EpVICL-uEeuw7f5-0ea7hA">
+      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/valid"/>
+    </domainModelReference>
+  </children>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_EpVICb-uEeuw7f5-0ea7hA" name="Control signature">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_EpVICr-uEeuw7f5-0ea7hA">
+      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/signature"/>
+    </domainModelReference>
+  </children>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_EpVIC7-uEeuw7f5-0ea7hA" name="Control company">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_EpVIDL-uEeuw7f5-0ea7hA">
+      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingLicenseRequisites/company"/>
+    </domainModelReference>
+  </children>
+  <ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
+</org.eclipse.emf.ecp.view.model:View>
diff --git a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FloatingServer.view b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FloatingServer.view
index fe231e44a..b15499e71 100644
--- a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FloatingServer.view
+++ b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FloatingServer.view
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_4QdMgBrKEeuMV_ofZRuPaw" name="FloatingServer">
-  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingServer"/>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4Qg24BrKEeuMV_ofZRuPaw" name="Name">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4Qg24RrKEeuMV_ofZRuPaw">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingServer/identifier"/>
-    </domainModelReference>
-  </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4Qg24hrKEeuMV_ofZRuPaw" name="Authentication expression">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4Qg24xrKEeuMV_ofZRuPaw">
-      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingServer/authentication"/>
-    </domainModelReference>
-  </children>
-  <ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
-</org.eclipse.emf.ecp.view.model:View>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_4QdMgBrKEeuMV_ofZRuPaw" name="Floating Server">
+  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingServer"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4Qg24BrKEeuMV_ofZRuPaw" name="Name">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4Qg24RrKEeuMV_ofZRuPaw">
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingServer/identifier"/>
+    </domainModelReference>
+  </children>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4Qg24hrKEeuMV_ofZRuPaw" name="Authentication expression">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4Qg24xrKEeuMV_ofZRuPaw">
+      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingServer/authentication"/>
+    </domainModelReference>
+  </children>
+  <ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
+</org.eclipse.emf.ecp.view.model:View>
diff --git a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FloatingServerConnection.view b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FloatingServerConnection.view
index 1bb2124b1..43394f8b2 100644
--- a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FloatingServerConnection.view
+++ b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FloatingServerConnection.view
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_4RrUgBrKEeuMV_ofZRuPaw" name="FloatingServerConnection">
-  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingServerConnection"/>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4RuX0BrKEeuMV_ofZRuPaw" name="Control ip">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4RuX0RrKEeuMV_ofZRuPaw">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingServerConnection/ip"/>
-    </domainModelReference>
-  </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4RuX0hrKEeuMV_ofZRuPaw" name="Control port">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4RuX0xrKEeuMV_ofZRuPaw">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingServerConnection/port"/>
-    </domainModelReference>
-  </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4RuX1BrKEeuMV_ofZRuPaw" name="Control authentication">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4RuX1RrKEeuMV_ofZRuPaw">
-      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingServerConnection/authentication"/>
-    </domainModelReference>
-  </children>
-  <ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
-</org.eclipse.emf.ecp.view.model:View>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_4RrUgBrKEeuMV_ofZRuPaw" name="Floating Server Connection">
+  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingServerConnection"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4RuX0BrKEeuMV_ofZRuPaw" name="Control ip">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4RuX0RrKEeuMV_ofZRuPaw">
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingServerConnection/ip"/>
+    </domainModelReference>
+  </children>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4RuX0hrKEeuMV_ofZRuPaw" name="Control port">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4RuX0xrKEeuMV_ofZRuPaw">
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingServerConnection/port"/>
+    </domainModelReference>
+  </children>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4RuX1BrKEeuMV_ofZRuPaw" name="Control authentication">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4RuX1RrKEeuMV_ofZRuPaw">
+      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingServerConnection/authentication"/>
+    </domainModelReference>
+  </children>
+  <ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
+</org.eclipse.emf.ecp.view.model:View>
diff --git a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/LicensePlan.view b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/LicensePlan.view
index f07a4c00a..d0c883052 100644
--- a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/LicensePlan.view
+++ b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/LicensePlan.view
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_PPv1MIdmEemHgffLhDrdUQ" name="LicensePlan">
-  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicensePlan"/>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_PP2i4IdmEemHgffLhDrdUQ" name="Control identifier">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_PP2i4YdmEemHgffLhDrdUQ">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicensePlan/identifier"/>
-    </domainModelReference>
-  </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_PP2i4odmEemHgffLhDrdUQ" name="Control name">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_PP2i44dmEemHgffLhDrdUQ">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicensePlan/name"/>
-    </domainModelReference>
-  </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_PP2i5IdmEemHgffLhDrdUQ" name="Control description">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_PP2i5YdmEemHgffLhDrdUQ">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicensePlan/description"/>
-    </domainModelReference>
-  </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_9cX1gP6MEeuGytDyYvaNeQ" name="agreements">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_DSQq0P6NEeuGytDyYvaNeQ">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicensePlan/agreements"/>
-    </domainModelReference>
-  </children>
-  <ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
-</org.eclipse.emf.ecp.view.model:View>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_PPv1MIdmEemHgffLhDrdUQ" name="License Plan">
+  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicensePlan"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_PP2i4IdmEemHgffLhDrdUQ" name="Control identifier">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_PP2i4YdmEemHgffLhDrdUQ">
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicensePlan/identifier"/>
+    </domainModelReference>
+  </children>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_PP2i4odmEemHgffLhDrdUQ" name="Control name">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_PP2i44dmEemHgffLhDrdUQ">
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicensePlan/name"/>
+    </domainModelReference>
+  </children>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_PP2i5IdmEemHgffLhDrdUQ" name="Control description">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_PP2i5YdmEemHgffLhDrdUQ">
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicensePlan/description"/>
+    </domainModelReference>
+  </children>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_9cX1gP6MEeuGytDyYvaNeQ" name="agreements">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_DSQq0P6NEeuGytDyYvaNeQ">
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicensePlan/agreements"/>
+    </domainModelReference>
+  </children>
+  <ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
+</org.eclipse.emf.ecp.view.model:View>
diff --git a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/LicensePlanFeature.view b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/LicensePlanFeature.view
index 185754931..b4fd5bd8a 100644
--- a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/LicensePlanFeature.view
+++ b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/LicensePlanFeature.view
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_PmBwAL-3Eeuw7f5-0ea7hA" name="LicensePlanFeature">
-  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicensePlanFeature"/>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_ATqWwMBHEeuw7f5-0ea7hA" name="FeatureRef Identifier">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_C-tnwMBHEeuw7f5-0ea7hA">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureRef/identifier"/>
-      <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicensePlanFeature/feature"/>
-    </domainModelReference>
-  </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Ga8eEMBHEeuw7f5-0ea7hA" name="VersionMatch version">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_IltFcMBHEeuw7f5-0ea7hA">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//VersionMatch/version"/>
-      <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicensePlanFeature/feature"/>
-      <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureRef/versionMatch"/>
-    </domainModelReference>
-  </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_OdTyAMBHEeuw7f5-0ea7hA" name="VersionMathc rule">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_QQBFwMBHEeuw7f5-0ea7hA">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//VersionMatch/rule"/>
-      <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicensePlanFeature/feature"/>
-      <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureRef/versionMatch"/>
-    </domainModelReference>
-  </children>
-  <ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
-</org.eclipse.emf.ecp.view.model:View>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_PmBwAL-3Eeuw7f5-0ea7hA" name="Licens Plan Feature">
+  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicensePlanFeature"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_ATqWwMBHEeuw7f5-0ea7hA" name="FeatureRef Identifier">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_C-tnwMBHEeuw7f5-0ea7hA">
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureRef/identifier"/>
+      <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicensePlanFeature/feature"/>
+    </domainModelReference>
+  </children>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Ga8eEMBHEeuw7f5-0ea7hA" name="VersionMatch version">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_IltFcMBHEeuw7f5-0ea7hA">
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//VersionMatch/version"/>
+      <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicensePlanFeature/feature"/>
+      <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureRef/versionMatch"/>
+    </domainModelReference>
+  </children>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_OdTyAMBHEeuw7f5-0ea7hA" name="VersionMathc rule">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_QQBFwMBHEeuw7f5-0ea7hA">
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//VersionMatch/rule"/>
+      <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicensePlanFeature/feature"/>
+      <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureRef/versionMatch"/>
+    </domainModelReference>
+  </children>
+  <ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
+</org.eclipse.emf.ecp.view.model:View>
diff --git a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/PersonalFeatureGrant.view b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/PersonalFeatureGrant.view
index 1b8a83ef0..b6c587f41 100644
--- a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/PersonalFeatureGrant.view
+++ b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/PersonalFeatureGrant.view
@@ -1,71 +1,71 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.group.model="http://org/eclipse/emf/ecp/view/group/model" xmlns:org.eclipse.emf.ecp.view.horizontal.model="http://org/eclipse/emf/ecp/view/horizontal/model" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_Aa4foMB0Eeuw7f5-0ea7hA" name="PersonalFeatureGrant">
-  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalFeatureGrant"/>
-  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_WECuQMEVEeuw7f5-0ea7hA" name="General">
-    <children xsi:type="org.eclipse.emf.ecp.view.horizontal.model:HorizontalLayout" xmi:id="_YKy_YMEVEeuw7f5-0ea7hA">
-      <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Aa9YIMB0Eeuw7f5-0ea7hA" name="Control identifier" readonly="true">
-        <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Aa9YIcB0Eeuw7f5-0ea7hA">
-          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalFeatureGrant/identifier"/>
-        </domainModelReference>
-      </children>
-      <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Aa9YKMB0Eeuw7f5-0ea7hA" name="Control capacity">
-        <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Aa9YKcB0Eeuw7f5-0ea7hA">
-          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalFeatureGrant/capacity"/>
-        </domainModelReference>
-      </children>
-    </children>
-  </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_aIv50MEVEeuw7f5-0ea7hA" name="Feature">
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_zKrtQMEVEeuw7f5-0ea7hA" name="FeatureRef identifier" readonly="true">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_104CoMEVEeuw7f5-0ea7hA">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureRef/identifier"/>
-        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalFeatureGrant/feature"/>
-      </domainModelReference>
-    </children>
-    <children xsi:type="org.eclipse.emf.ecp.view.horizontal.model:HorizontalLayout" xmi:id="_RezzEMEWEeuw7f5-0ea7hA">
-      <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_IS9ukMEWEeuw7f5-0ea7hA" name="VersionMatch version" readonly="true">
-        <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_K1G7MMEWEeuw7f5-0ea7hA">
-          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//VersionMatch/version"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalFeatureGrant/feature"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureRef/versionMatch"/>
-        </domainModelReference>
-      </children>
-      <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NWU6wMEWEeuw7f5-0ea7hA" name="VersionMatch rule">
-        <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Q2t4UMEWEeuw7f5-0ea7hA">
-          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//VersionMatch/rule"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalFeatureGrant/feature"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureRef/versionMatch"/>
-        </domainModelReference>
-      </children>
-    </children>
-  </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_aKyEsMEWEeuw7f5-0ea7hA" name="Valid">
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Aa9YJMB0Eeuw7f5-0ea7hA" name="from">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Aa9YJcB0Eeuw7f5-0ea7hA">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ValidityPeriodClosed/from"/>
-        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalFeatureGrant/valid"/>
-      </domainModelReference>
-    </children>
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_1TJZIMEWEeuw7f5-0ea7hA" name="to">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_3hrGMMEWEeuw7f5-0ea7hA">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ValidityPeriodClosed/until"/>
-        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalFeatureGrant/valid"/>
-      </domainModelReference>
-    </children>
-  </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_gHHgQMEWEeuw7f5-0ea7hA" name="User Authentication">
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_mkmhEMEWEeuw7f5-0ea7hA" name="EvaluationInstrutions type">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_oNXOoMEWEeuw7f5-0ea7hA">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//EvaluationInstructions/type"/>
-        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalFeatureGrant/userAuthentication"/>
-      </domainModelReference>
-    </children>
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_sOmPcMEWEeuw7f5-0ea7hA" name="EvaluationInstrutions expression">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_vdLEQMEWEeuw7f5-0ea7hA">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//EvaluationInstructions/expression"/>
-        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalFeatureGrant/userAuthentication"/>
-      </domainModelReference>
-    </children>
-  </children>
-  <ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
-</org.eclipse.emf.ecp.view.model:View>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.group.model="http://org/eclipse/emf/ecp/view/group/model" xmlns:org.eclipse.emf.ecp.view.horizontal.model="http://org/eclipse/emf/ecp/view/horizontal/model" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_Aa4foMB0Eeuw7f5-0ea7hA" name="Personal Feature Grant">
+  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalFeatureGrant"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_WECuQMEVEeuw7f5-0ea7hA" name="General">
+    <children xsi:type="org.eclipse.emf.ecp.view.horizontal.model:HorizontalLayout" xmi:id="_YKy_YMEVEeuw7f5-0ea7hA">
+      <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Aa9YIMB0Eeuw7f5-0ea7hA" name="Control identifier" readonly="true">
+        <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Aa9YIcB0Eeuw7f5-0ea7hA">
+          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalFeatureGrant/identifier"/>
+        </domainModelReference>
+      </children>
+      <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Aa9YKMB0Eeuw7f5-0ea7hA" name="Control capacity">
+        <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Aa9YKcB0Eeuw7f5-0ea7hA">
+          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalFeatureGrant/capacity"/>
+        </domainModelReference>
+      </children>
+    </children>
+  </children>
+  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_aIv50MEVEeuw7f5-0ea7hA" name="Feature">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_zKrtQMEVEeuw7f5-0ea7hA" name="FeatureRef identifier" readonly="true">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_104CoMEVEeuw7f5-0ea7hA">
+        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureRef/identifier"/>
+        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalFeatureGrant/feature"/>
+      </domainModelReference>
+    </children>
+    <children xsi:type="org.eclipse.emf.ecp.view.horizontal.model:HorizontalLayout" xmi:id="_RezzEMEWEeuw7f5-0ea7hA">
+      <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_IS9ukMEWEeuw7f5-0ea7hA" name="VersionMatch version" readonly="true">
+        <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_K1G7MMEWEeuw7f5-0ea7hA">
+          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//VersionMatch/version"/>
+          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalFeatureGrant/feature"/>
+          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureRef/versionMatch"/>
+        </domainModelReference>
+      </children>
+      <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NWU6wMEWEeuw7f5-0ea7hA" name="VersionMatch rule">
+        <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Q2t4UMEWEeuw7f5-0ea7hA">
+          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//VersionMatch/rule"/>
+          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalFeatureGrant/feature"/>
+          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureRef/versionMatch"/>
+        </domainModelReference>
+      </children>
+    </children>
+  </children>
+  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_aKyEsMEWEeuw7f5-0ea7hA" name="Valid">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Aa9YJMB0Eeuw7f5-0ea7hA" name="from">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Aa9YJcB0Eeuw7f5-0ea7hA">
+        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ValidityPeriodClosed/from"/>
+        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalFeatureGrant/valid"/>
+      </domainModelReference>
+    </children>
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_1TJZIMEWEeuw7f5-0ea7hA" name="to">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_3hrGMMEWEeuw7f5-0ea7hA">
+        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ValidityPeriodClosed/until"/>
+        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalFeatureGrant/valid"/>
+      </domainModelReference>
+    </children>
+  </children>
+  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_gHHgQMEWEeuw7f5-0ea7hA" name="User Authentication">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_mkmhEMEWEeuw7f5-0ea7hA" name="EvaluationInstrutions type">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_oNXOoMEWEeuw7f5-0ea7hA">
+        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//EvaluationInstructions/type"/>
+        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalFeatureGrant/userAuthentication"/>
+      </domainModelReference>
+    </children>
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_sOmPcMEWEeuw7f5-0ea7hA" name="EvaluationInstrutions expression">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_vdLEQMEWEeuw7f5-0ea7hA">
+        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//EvaluationInstructions/expression"/>
+        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalFeatureGrant/userAuthentication"/>
+      </domainModelReference>
+    </children>
+  </children>
+  <ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
+</org.eclipse.emf.ecp.view.model:View>
diff --git a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/PersonalLicensePack.view b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/PersonalLicensePack.view
index 3337b0b18..45d644972 100644
--- a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/PersonalLicensePack.view
+++ b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/PersonalLicensePack.view
@@ -1,96 +1,96 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.group.model="http://org/eclipse/emf/ecp/view/group/model" xmlns:org.eclipse.emf.ecp.view.horizontal.model="http://org/eclipse/emf/ecp/view/horizontal/model" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_h7uaUL_KEeuw7f5-0ea7hA" name="PersonalLicensePack">
-  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicensePack"/>
-  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_K-c2wMBNEeuw7f5-0ea7hA" name="General">
-    <children xsi:type="org.eclipse.emf.ecp.view.horizontal.model:HorizontalLayout" xmi:id="_gPNeoMBNEeuw7f5-0ea7hA">
-      <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="__QurYMBMEeuw7f5-0ea7hA" name="identifier">
-        <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_JuzMwMBNEeuw7f5-0ea7hA">
-          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/identifier"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicensePack/license"/>
-        </domainModelReference>
-      </children>
-      <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_No1ZYMBNEeuw7f5-0ea7hA" name="issueDate">
-        <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Pr42QMBNEeuw7f5-0ea7hA">
-          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/issueDate"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicensePack/license"/>
-        </domainModelReference>
-      </children>
-      <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Z0gsEMBNEeuw7f5-0ea7hA" name="plan">
-        <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_bd0MMMBNEeuw7f5-0ea7hA">
-          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/plan"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicensePack/license"/>
-        </domainModelReference>
-      </children>
-    </children>
-  </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_fI5Q4L_LEeuw7f5-0ea7hA" name="Product">
-    <children xsi:type="org.eclipse.emf.ecp.view.horizontal.model:HorizontalLayout" xmi:id="_h1Cw0MBJEeuw7f5-0ea7hA">
-      <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_gHVPEL_LEeuw7f5-0ea7hA" name="ProductRef identifier">
-        <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_lbX7kL_LEeuw7f5-0ea7hA">
-          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ProductRef/identifier"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicensePack/license"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/product"/>
-        </domainModelReference>
-      </children>
-      <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_pGqhkL_LEeuw7f5-0ea7hA" name="ProductRef version">
-        <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_rURooL_LEeuw7f5-0ea7hA">
-          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ProductRef/version"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicensePack/license"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/product"/>
-        </domainModelReference>
-      </children>
-    </children>
-  </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_k8m-sMBJEeuw7f5-0ea7hA" name="Valid">
-    <children xsi:type="org.eclipse.emf.ecp.view.horizontal.model:HorizontalLayout" xmi:id="_0PMX8MBJEeuw7f5-0ea7hA">
-      <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_pu0JcMBJEeuw7f5-0ea7hA" name="ValidityPeriodOpen from">
-        <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_ydaRQMBJEeuw7f5-0ea7hA">
-          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ValidityPeriodClosed/from"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicensePack/license"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/valid"/>
-        </domainModelReference>
-      </children>
-      <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_ExIyMMBIEeuw7f5-0ea7hA" name="ValidityPeriodClosed to">
-        <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_ZUruwMBIEeuw7f5-0ea7hA">
-          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ValidityPeriodClosed/until"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicensePack/license"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/valid"/>
-        </domainModelReference>
-      </children>
-    </children>
-  </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_zUl0EMBNEeuw7f5-0ea7hA" name="User">
-    <children xsi:type="org.eclipse.emf.ecp.view.horizontal.model:HorizontalLayout" xmi:id="_22plkMBNEeuw7f5-0ea7hA">
-      <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_0MzOcMBNEeuw7f5-0ea7hA" name="UserRef identifier">
-        <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_5MfbkMBNEeuw7f5-0ea7hA">
-          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//UserRef/identifier"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicensePack/license"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicenseRequisites/user"/>
-        </domainModelReference>
-      </children>
-      <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_7G22gMBNEeuw7f5-0ea7hA" name="UserRef name">
-        <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_9IunoMBNEeuw7f5-0ea7hA">
-          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//UserRef/name"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicensePack/license"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicenseRequisites/user"/>
-        </domainModelReference>
-      </children>
-    </children>
-  </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_XCODQMBQEeuw7f5-0ea7hA" name="Grants">
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_XJB2EMB1Eeuw7f5-0ea7hA" labelAlignment="None">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Zz5g4MB1Eeuw7f5-0ea7hA">
-        <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicensePack/grants"/>
-      </domainModelReference>
-    </children>
-  </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_WPwy8MBNEeuw7f5-0ea7hA" name="Signature">
-    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_h064MMBNEeuw7f5-0ea7hA" name="Signature">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_kryiMMBOEeuw7f5-0ea7hA">
-        <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/signature"/>
-        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicensePack/license"/>
-      </domainModelReference>
-    </children>
-  </children>
-  <ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
-</org.eclipse.emf.ecp.view.model:View>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.group.model="http://org/eclipse/emf/ecp/view/group/model" xmlns:org.eclipse.emf.ecp.view.horizontal.model="http://org/eclipse/emf/ecp/view/horizontal/model" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_h7uaUL_KEeuw7f5-0ea7hA" name="Personal License Pack">
+  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicensePack"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_K-c2wMBNEeuw7f5-0ea7hA" name="General">
+    <children xsi:type="org.eclipse.emf.ecp.view.horizontal.model:HorizontalLayout" xmi:id="_gPNeoMBNEeuw7f5-0ea7hA">
+      <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="__QurYMBMEeuw7f5-0ea7hA" name="identifier">
+        <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_JuzMwMBNEeuw7f5-0ea7hA">
+          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/identifier"/>
+          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicensePack/license"/>
+        </domainModelReference>
+      </children>
+      <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_No1ZYMBNEeuw7f5-0ea7hA" name="issueDate">
+        <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Pr42QMBNEeuw7f5-0ea7hA">
+          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/issueDate"/>
+          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicensePack/license"/>
+        </domainModelReference>
+      </children>
+      <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Z0gsEMBNEeuw7f5-0ea7hA" name="plan">
+        <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_bd0MMMBNEeuw7f5-0ea7hA">
+          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/plan"/>
+          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicensePack/license"/>
+        </domainModelReference>
+      </children>
+    </children>
+  </children>
+  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_fI5Q4L_LEeuw7f5-0ea7hA" name="Product">
+    <children xsi:type="org.eclipse.emf.ecp.view.horizontal.model:HorizontalLayout" xmi:id="_h1Cw0MBJEeuw7f5-0ea7hA">
+      <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_gHVPEL_LEeuw7f5-0ea7hA" name="ProductRef identifier">
+        <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_lbX7kL_LEeuw7f5-0ea7hA">
+          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ProductRef/identifier"/>
+          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicensePack/license"/>
+          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/product"/>
+        </domainModelReference>
+      </children>
+      <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_pGqhkL_LEeuw7f5-0ea7hA" name="ProductRef version">
+        <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_rURooL_LEeuw7f5-0ea7hA">
+          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ProductRef/version"/>
+          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicensePack/license"/>
+          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/product"/>
+        </domainModelReference>
+      </children>
+    </children>
+  </children>
+  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_k8m-sMBJEeuw7f5-0ea7hA" name="Valid">
+    <children xsi:type="org.eclipse.emf.ecp.view.horizontal.model:HorizontalLayout" xmi:id="_0PMX8MBJEeuw7f5-0ea7hA">
+      <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_pu0JcMBJEeuw7f5-0ea7hA" name="ValidityPeriodOpen from">
+        <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_ydaRQMBJEeuw7f5-0ea7hA">
+          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ValidityPeriodClosed/from"/>
+          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicensePack/license"/>
+          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/valid"/>
+        </domainModelReference>
+      </children>
+      <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_ExIyMMBIEeuw7f5-0ea7hA" name="ValidityPeriodClosed to">
+        <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_ZUruwMBIEeuw7f5-0ea7hA">
+          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ValidityPeriodClosed/until"/>
+          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicensePack/license"/>
+          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/valid"/>
+        </domainModelReference>
+      </children>
+    </children>
+  </children>
+  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_zUl0EMBNEeuw7f5-0ea7hA" name="User">
+    <children xsi:type="org.eclipse.emf.ecp.view.horizontal.model:HorizontalLayout" xmi:id="_22plkMBNEeuw7f5-0ea7hA">
+      <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_0MzOcMBNEeuw7f5-0ea7hA" name="UserRef identifier">
+        <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_5MfbkMBNEeuw7f5-0ea7hA">
+          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//UserRef/identifier"/>
+          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicensePack/license"/>
+          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicenseRequisites/user"/>
+        </domainModelReference>
+      </children>
+      <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_7G22gMBNEeuw7f5-0ea7hA" name="UserRef name">
+        <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_9IunoMBNEeuw7f5-0ea7hA">
+          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//UserRef/name"/>
+          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicensePack/license"/>
+          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicenseRequisites/user"/>
+        </domainModelReference>
+      </children>
+    </children>
+  </children>
+  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_XCODQMBQEeuw7f5-0ea7hA" name="Grants">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_XJB2EMB1Eeuw7f5-0ea7hA" labelAlignment="None">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Zz5g4MB1Eeuw7f5-0ea7hA">
+        <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicensePack/grants"/>
+      </domainModelReference>
+    </children>
+  </children>
+  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_WPwy8MBNEeuw7f5-0ea7hA" name="Signature">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_h064MMBNEeuw7f5-0ea7hA" name="Signature">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_kryiMMBOEeuw7f5-0ea7hA">
+        <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/signature"/>
+        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicensePack/license"/>
+      </domainModelReference>
+    </children>
+  </children>
+  <ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
+</org.eclipse.emf.ecp.view.model:View>
diff --git a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/ProductRef.view b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/ProductRef.view
index e62350622..b7804a86e 100644
--- a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/ProductRef.view
+++ b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/ProductRef.view
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_4QTbgBrKEeuMV_ofZRuPaw" name="ProductRef">
-  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ProductRef"/>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4QWe0BrKEeuMV_ofZRuPaw" name="Control product" readonly="true">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_hSdHwL-yEeuw7f5-0ea7hA">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ProductRef/identifier"/>
-    </domainModelReference>
-  </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4QWe0hrKEeuMV_ofZRuPaw" name="Control version" readonly="true">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4QWe0xrKEeuMV_ofZRuPaw">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ProductRef/version"/>
-    </domainModelReference>
-  </children>
-  <ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
-</org.eclipse.emf.ecp.view.model:View>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_4QTbgBrKEeuMV_ofZRuPaw" name="Product Reference">
+  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ProductRef"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4QWe0BrKEeuMV_ofZRuPaw" name="Control product" readonly="true">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_hSdHwL-yEeuw7f5-0ea7hA">
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ProductRef/identifier"/>
+    </domainModelReference>
+  </children>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4QWe0hrKEeuMV_ofZRuPaw" name="Control version" readonly="true">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4QWe0xrKEeuMV_ofZRuPaw">
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ProductRef/version"/>
+    </domainModelReference>
+  </children>
+  <ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
+</org.eclipse.emf.ecp.view.model:View>
diff --git a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/UserGrant.view b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/UserGrant.view
index e8e712374..a10a5af04 100644
--- a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/UserGrant.view
+++ b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/UserGrant.view
@@ -1,15 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_4QnkkBrKEeuMV_ofZRuPaw" name="UserGrant">
-  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//UserGrant"/>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4Qqn4BrKEeuMV_ofZRuPaw" name="Control user" readonly="true">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4Qqn4RrKEeuMV_ofZRuPaw">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//UserGrant/user"/>
-    </domainModelReference>
-  </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4Qqn4hrKEeuMV_ofZRuPaw" name="Control authentication">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4Qqn4xrKEeuMV_ofZRuPaw">
-      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//UserGrant/authentication"/>
-    </domainModelReference>
-  </children>
-  <ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
-</org.eclipse.emf.ecp.view.model:View>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.group.model="http://org/eclipse/emf/ecp/view/group/model" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_4QnkkBrKEeuMV_ofZRuPaw" name="User Grant">
+  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//UserGrant"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_fH8eQOR7Ee66ErHQg5rqcg" name="User" groupType="Collapsible">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4Qqn4BrKEeuMV_ofZRuPaw" name="user" readonly="true">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4Qqn4RrKEeuMV_ofZRuPaw">
+        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//UserGrant/user"/>
+      </domainModelReference>
+    </children>
+  </children>
+  <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_iJHJMOR7Ee66ErHQg5rqcg" name="Authentication" groupType="Collapsible">
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_iJHJMeR7Ee66ErHQg5rqcg" name="type">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_lMTNYOR7Ee66ErHQg5rqcg">
+        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//EvaluationInstructions/type"/>
+        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//UserGrant/authentication"/>
+      </domainModelReference>
+    </children>
+    <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_nFzssOR7Ee66ErHQg5rqcg" name="expression">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_pbvCQOR7Ee66ErHQg5rqcg">
+        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//EvaluationInstructions/expression"/>
+        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//UserGrant/authentication"/>
+      </domainModelReference>
+    </children>
+  </children>
+  <ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
+</org.eclipse.emf.ecp.view.model:View>
diff --git a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/ValidityPeriodClosed.view b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/ValidityPeriodClosed.view
index bb48da212..511f15a10 100644
--- a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/ValidityPeriodClosed.view
+++ b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/ValidityPeriodClosed.view
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_4REQgBrKEeuMV_ofZRuPaw" name="ValidityPeriodClosed">
-  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ValidityPeriodClosed"/>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4RGswBrKEeuMV_ofZRuPaw" name="Control from">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4RGswRrKEeuMV_ofZRuPaw">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ValidityPeriodClosed/from"/>
-    </domainModelReference>
-  </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4RGswhrKEeuMV_ofZRuPaw" name="Control until">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4RGswxrKEeuMV_ofZRuPaw">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ValidityPeriodClosed/until"/>
-    </domainModelReference>
-  </children>
-  <ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
-</org.eclipse.emf.ecp.view.model:View>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_4REQgBrKEeuMV_ofZRuPaw" name="Validity Period">
+  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ValidityPeriodClosed"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4RGswBrKEeuMV_ofZRuPaw" name="Control from">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4RGswRrKEeuMV_ofZRuPaw">
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ValidityPeriodClosed/from"/>
+    </domainModelReference>
+  </children>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4RGswhrKEeuMV_ofZRuPaw" name="Control until">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4RGswxrKEeuMV_ofZRuPaw">
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ValidityPeriodClosed/until"/>
+    </domainModelReference>
+  </children>
+  <ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
+</org.eclipse.emf.ecp.view.model:View>
diff --git a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/VersionMatch.view b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/VersionMatch.view
index 23f7fdfa4..880bffd90 100644
--- a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/VersionMatch.view
+++ b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/VersionMatch.view
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_4RXygBrKEeuMV_ofZRuPaw" name="VersionMatch">
-  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//VersionMatch"/>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4Ra10BrKEeuMV_ofZRuPaw" name="Control version" readonly="true">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4Ra10RrKEeuMV_ofZRuPaw">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//VersionMatch/version"/>
-    </domainModelReference>
-  </children>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4Ra10hrKEeuMV_ofZRuPaw" name="Control rule">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4Ra10xrKEeuMV_ofZRuPaw">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//VersionMatch/rule"/>
-    </domainModelReference>
-  </children>
-  <ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
-</org.eclipse.emf.ecp.view.model:View>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_4RXygBrKEeuMV_ofZRuPaw" name="Version Match">
+  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//VersionMatch"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4Ra10BrKEeuMV_ofZRuPaw" name="Control version" readonly="true">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4Ra10RrKEeuMV_ofZRuPaw">
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//VersionMatch/version"/>
+    </domainModelReference>
+  </children>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4Ra10hrKEeuMV_ofZRuPaw" name="Control rule">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4Ra10xrKEeuMV_ofZRuPaw">
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//VersionMatch/rule"/>
+    </domainModelReference>
+  </children>
+  <ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
+</org.eclipse.emf.ecp.view.model:View>