9 files changed, 1566 insertions, 2624 deletions
diff --git a/ONAP Information Model/Common.notation b/ONAP Information Model/Common.notation
index 9dcff66..64c26b2 100644
--- a/ONAP Information Model/Common.notation
+++ b/ONAP Information Model/Common.notation
@@ -4655,37 +4655,6 @@
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_od91vRnMEemlxOdMFpUVvQ" x="981" y="70"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_zGUv8BnWEemlxOdMFpUVvQ" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_zGUv8hnWEemlxOdMFpUVvQ" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_zGUv8xnWEemlxOdMFpUVvQ" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_zGVXABnWEemlxOdMFpUVvQ" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_zGVXARnWEemlxOdMFpUVvQ" type="Class_AttributeCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_zGVXAhnWEemlxOdMFpUVvQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_zGVXAxnWEemlxOdMFpUVvQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_zGVXBBnWEemlxOdMFpUVvQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zGVXBRnWEemlxOdMFpUVvQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_zGVXBhnWEemlxOdMFpUVvQ" visible="false" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_zGVXBxnWEemlxOdMFpUVvQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_zGVXCBnWEemlxOdMFpUVvQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_zGVXCRnWEemlxOdMFpUVvQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zGVXChnWEemlxOdMFpUVvQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_zGVXCxnWEemlxOdMFpUVvQ" visible="false" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_zGVXDBnWEemlxOdMFpUVvQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_zGVXDRnWEemlxOdMFpUVvQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_zGVXDhnWEemlxOdMFpUVvQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zGVXDxnWEemlxOdMFpUVvQ"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_zGfIABnWEemlxOdMFpUVvQ" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_zGfIARnWEemlxOdMFpUVvQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
-        <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zGfIAhnWEemlxOdMFpUVvQ"/>
-      </children>
-      <element xmi:type="uml:Class" href="Service.uml#_mrJV8In9EeiOe-BKGdv_Yg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zGUv8RnWEemlxOdMFpUVvQ" x="460" y="580" width="121" height="81"/>
-    </children>
     <children xmi:type="notation:Shape" xmi:id="_zGiyYBnWEemlxOdMFpUVvQ" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_zGiyYRnWEemlxOdMFpUVvQ"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_zGiyYxnWEemlxOdMFpUVvQ" name="BASE_ELEMENT">
@@ -4925,7 +4894,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_72vX0jqzEemOl5OHBoqS_w"/>
       </children>
       <element xmi:type="uml:Class" href="Ves.uml#_PmIOkH7uEeifJIHxnlj6Cg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_72oqITqzEemOl5OHBoqS_w" x="780" y="440" width="120" height="81"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_72oqITqzEemOl5OHBoqS_w" x="700" y="440" width="120" height="81"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_72ybIDqzEemOl5OHBoqS_w" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_72ybITqzEemOl5OHBoqS_w"/>
@@ -4935,6 +4904,45 @@
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_72ybIjqzEemOl5OHBoqS_w" x="200"/>
     </children>
+    <children xmi:type="notation:Shape" xmi:id="_hRtwsEaKEemmD4xckllxww" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_hRtwskaKEemmD4xckllxww" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_hRtws0aKEemmD4xckllxww" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_hRtwtEaKEemmD4xckllxww" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_hRtwtUaKEemmD4xckllxww" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_hRtwtkaKEemmD4xckllxww"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_hRtwt0aKEemmD4xckllxww"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_hRtwuEaKEemmD4xckllxww"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hRtwuUaKEemmD4xckllxww"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_hRtwukaKEemmD4xckllxww" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_hRtwu0aKEemmD4xckllxww"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_hRtwvEaKEemmD4xckllxww"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_hRtwvUaKEemmD4xckllxww"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hRtwvkaKEemmD4xckllxww"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_hRtwv0aKEemmD4xckllxww" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_hRtwwEaKEemmD4xckllxww"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_hRtwwUaKEemmD4xckllxww"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_hRtwwkaKEemmD4xckllxww"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hRtww0aKEemmD4xckllxww"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_8AWKsEczEemyn_6pFezSzw" visible="false" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_8AWKsUczEemyn_6pFezSzw" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
+        <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8AWKskczEemyn_6pFezSzw"/>
+      </children>
+      <element xmi:type="uml:Class" href="Common.uml#_hRjYoEaKEemmD4xckllxww"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hRtwsUaKEemmD4xckllxww" x="860" y="440" width="121" height="81"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_hR7zIEaKEemmD4xckllxww" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_hR7zIUaKEemmD4xckllxww"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_hR7zI0aKEemmD4xckllxww" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="Common.uml#_hRjYoEaKEemmD4xckllxww"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hR7zIkaKEemmD4xckllxww" x="200"/>
+    </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_-O_j8RnKEemlxOdMFpUVvQ" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_-O_j8hnKEemlxOdMFpUVvQ"/>
     <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_-O_j8xnKEemlxOdMFpUVvQ" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
@@ -4961,17 +4969,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_z6oiwxnLEemlxOdMFpUVvQ"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_z6oixBnLEemlxOdMFpUVvQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_LnxGcBnMEemlxOdMFpUVvQ" type="Generalization_Edge" source="_z6exwBnLEemlxOdMFpUVvQ" target="__F7L8BnKEemlxOdMFpUVvQ">
-      <children xmi:type="notation:DecorationNode" xmi:id="_LnxtgBnMEemlxOdMFpUVvQ" type="Generalization_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_VgISsBnMEemlxOdMFpUVvQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_LnxtgRnMEemlxOdMFpUVvQ" y="39"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_LnxGcRnMEemlxOdMFpUVvQ"/>
-      <element xmi:type="uml:Generalization" href="Common.uml#_Lnrm4BnMEemlxOdMFpUVvQ"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LnxGchnMEemlxOdMFpUVvQ" points="[320, 300, -643984, -643984]$[320, 260, -643984, -643984]$[600, 260, -643984, -643984]$[600, 220, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ln7egBnMEemlxOdMFpUVvQ" id="(0.5,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ln7egRnMEemlxOdMFpUVvQ" id="(0.4968944099378882,1.0)"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_oc2bYBnMEemlxOdMFpUVvQ" type="AssociationClass_Edge" source="__F7L8BnKEemlxOdMFpUVvQ" target="__F7L8BnKEemlxOdMFpUVvQ">
       <children xmi:type="notation:DecorationNode" xmi:id="_oc2bYxnMEemlxOdMFpUVvQ" visible="false" type="AssociationClass_SourceRoleLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_tIlKsBnMEemlxOdMFpUVvQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -5014,27 +5011,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oeNtUxnMEemlxOdMFpUVvQ" id="(0.49606299212598426,0.49606299212598426)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_umRQsBnMEemlxOdMFpUVvQ" id="(0.0,0.39603960396039606)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_zGiyZBnWEemlxOdMFpUVvQ" type="StereotypeCommentLink" source="_zGUv8BnWEemlxOdMFpUVvQ" target="_zGiyYBnWEemlxOdMFpUVvQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_zGiyZRnWEemlxOdMFpUVvQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_zGiyaRnWEemlxOdMFpUVvQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="Service.uml#_mrJV8In9EeiOe-BKGdv_Yg"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zGiyZhnWEemlxOdMFpUVvQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zGiyZxnWEemlxOdMFpUVvQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zGiyaBnWEemlxOdMFpUVvQ"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_RqN6oBnYEemlxOdMFpUVvQ" type="Generalization_Edge" source="_zGUv8BnWEemlxOdMFpUVvQ" target="_myiKYBqXEemOGejS9lsDjA">
-      <children xmi:type="notation:DecorationNode" xmi:id="_RqN6oxnYEemlxOdMFpUVvQ" type="Generalization_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_g-txoBqXEemOGejS9lsDjA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_RqN6pBnYEemlxOdMFpUVvQ" y="40"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_RqN6oRnYEemlxOdMFpUVvQ"/>
-      <element xmi:type="uml:Generalization" href="Service.uml#_Rl1w8BnYEemlxOdMFpUVvQ"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_RqN6ohnYEemlxOdMFpUVvQ" points="[520, 480, -643984, -643984]$[500, 400, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Rza58BnYEemlxOdMFpUVvQ" id="(0.49586776859504134,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Rza58RnYEemlxOdMFpUVvQ" id="(0.49586776859504134,1.0)"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_gnhEUBpwEemOGejS9lsDjA" type="StereotypeCommentLink" source="_gnNiUBpwEemOGejS9lsDjA" target="_gngdQBpwEemOGejS9lsDjA">
       <styles xmi:type="notation:FontStyle" xmi:id="_gnhEURpwEemOGejS9lsDjA"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_gnhEVRpwEemOGejS9lsDjA" name="BASE_ELEMENT">
@@ -5066,17 +5042,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_myrUUxqXEemOGejS9lsDjA"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_myrUVBqXEemOGejS9lsDjA"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_6zaewBqXEemOGejS9lsDjA" type="Generalization_Edge" source="_4v1twDqyEemOl5OHBoqS_w" target="__F7L8BnKEemlxOdMFpUVvQ">
-      <children xmi:type="notation:DecorationNode" xmi:id="_6zaewxqXEemOGejS9lsDjA" type="Generalization_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_7WbFMBqXEemOGejS9lsDjA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_6zaexBqXEemOGejS9lsDjA" y="39"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_6zaewRqXEemOGejS9lsDjA"/>
-      <element xmi:type="uml:Generalization" href="Common.uml#_6vAf4BqXEemOGejS9lsDjA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6zaewhqXEemOGejS9lsDjA" points="[520, 300, -643984, -643984]$[520, 260, -643984, -643984]$[600, 260, -643984, -643984]$[600, 201, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_68HHwBqXEemOGejS9lsDjA" id="(0.49586776859504134,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_68HHwRqXEemOGejS9lsDjA" id="(0.4968944099378882,1.0)"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_2IB-BDqyEemOl5OHBoqS_w" type="StereotypeCommentLink" source="_2HxfUDqyEemOl5OHBoqS_w" target="_2IB-ADqyEemOl5OHBoqS_w">
       <styles xmi:type="notation:FontStyle" xmi:id="_2IB-BTqyEemOl5OHBoqS_w"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2IClEjqyEemOl5OHBoqS_w" name="BASE_ELEMENT">
@@ -5107,28 +5072,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8fi5ujqyEemOl5OHBoqS_w"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8fi5uzqyEemOl5OHBoqS_w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_U1OrIDqzEemOl5OHBoqS_w" type="Generalization_Edge" source="_2HxfUDqyEemOl5OHBoqS_w" target="__F7L8BnKEemlxOdMFpUVvQ">
-      <children xmi:type="notation:DecorationNode" xmi:id="_U1PSMDqzEemOl5OHBoqS_w" type="Generalization_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_V16sEDqzEemOl5OHBoqS_w" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_U1PSMTqzEemOl5OHBoqS_w" x="-1" y="38"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_U1OrITqzEemOl5OHBoqS_w"/>
-      <element xmi:type="uml:Generalization" href="Common.uml#_U01pkDqzEemOl5OHBoqS_w"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_U1OrIjqzEemOl5OHBoqS_w" points="[680, 300, -643984, -643984]$[680, 260, -643984, -643984]$[600, 260, -643984, -643984]$[600, 201, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_U12WMDqzEemOl5OHBoqS_w" id="(0.49586776859504134,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_U12WMTqzEemOl5OHBoqS_w" id="(0.4968944099378882,1.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_Zf_xIDqzEemOl5OHBoqS_w" type="Generalization_Edge" source="_8fa94DqyEemOl5OHBoqS_w" target="__F7L8BnKEemlxOdMFpUVvQ">
-      <children xmi:type="notation:DecorationNode" xmi:id="_Zf_xIzqzEemOl5OHBoqS_w" type="Generalization_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_af1dgDqzEemOl5OHBoqS_w" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Zf_xJDqzEemOl5OHBoqS_w" x="-1" y="38"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_Zf_xITqzEemOl5OHBoqS_w"/>
-      <element xmi:type="uml:Generalization" href="Common.uml#_ZfokwDqzEemOl5OHBoqS_w"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Zf_xIjqzEemOl5OHBoqS_w" points="[840, 300, -643984, -643984]$[840, 260, -643984, -643984]$[600, 260, -643984, -643984]$[600, 201, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Zgan4DqzEemOl5OHBoqS_w" id="(0.49586776859504134,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZgbO8DqzEemOl5OHBoqS_w" id="(0.4968944099378882,1.0)"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_uh3BYDqzEemOl5OHBoqS_w" type="Generalization_Edge" source="_myiKYBqXEemOGejS9lsDjA" target="_4v1twDqyEemOl5OHBoqS_w">
       <children xmi:type="notation:DecorationNode" xmi:id="_uh3ocDqzEemOl5OHBoqS_w" type="Generalization_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_yGFWEDqzEemOl5OHBoqS_w" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -5152,14 +5095,89 @@
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_FUGqIDq0EemOl5OHBoqS_w" type="Generalization_Edge" source="_72oqIDqzEemOl5OHBoqS_w" target="_8fa94DqyEemOl5OHBoqS_w">
       <children xmi:type="notation:DecorationNode" xmi:id="_FUHRMDq0EemOl5OHBoqS_w" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_bx1dEEaJEemmD4xckllxww" name="IS_UPDATED_POSITION" booleanValue="true"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_FUHRMTq0EemOl5OHBoqS_w" y="40"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_FUGqITq0EemOl5OHBoqS_w"/>
       <element xmi:type="uml:Generalization" href="Ves.uml#_FT4nsDq0EemOl5OHBoqS_w"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FUGqIjq0EemOl5OHBoqS_w" points="[840, 440, -643984, -643984]$[840, 381, -643984, -643984]"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FUGqIjq0EemOl5OHBoqS_w" points="[760, 440, -643984, -643984]$[760, 420, -643984, -643984]$[840, 420, -643984, -643984]$[840, 381, -643984, -643984]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FUoOkDq0EemOl5OHBoqS_w" id="(0.5,0.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FUoOkTq0EemOl5OHBoqS_w" id="(0.49586776859504134,1.0)"/>
     </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_hR8aMEaKEemmD4xckllxww" type="StereotypeCommentLink" source="_hRtwsEaKEemmD4xckllxww" target="_hR7zIEaKEemmD4xckllxww">
+      <styles xmi:type="notation:FontStyle" xmi:id="_hR8aMUaKEemmD4xckllxww"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_hR8aNUaKEemmD4xckllxww" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="Common.uml#_hRjYoEaKEemmD4xckllxww"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hR8aMkaKEemmD4xckllxww" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hR8aM0aKEemmD4xckllxww"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hR8aNEaKEemmD4xckllxww"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_jnJXAEaKEemmD4xckllxww" type="Generalization_Edge" source="_hRtwsEaKEemmD4xckllxww" target="_8fa94DqyEemOl5OHBoqS_w">
+      <children xmi:type="notation:DecorationNode" xmi:id="_jnJXA0aKEemmD4xckllxww" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ViQz0Ec2Eemyn_6pFezSzw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_jnJXBEaKEemmD4xckllxww" x="-2" y="37"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_jnJXAUaKEemmD4xckllxww"/>
+      <element xmi:type="uml:Generalization" href="Common.uml#_jm4RQEaKEemmD4xckllxww"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jnJXAkaKEemmD4xckllxww" points="[920, 440, -643984, -643984]$[920, 420, -643984, -643984]$[840, 420, -643984, -643984]$[840, 381, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jnt-wEaKEemmD4xckllxww" id="(0.49586776859504134,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jnt-wUaKEemmD4xckllxww" id="(0.49586776859504134,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_JUqQsEdFEemetJs_SolH_g" type="Generalization_Edge" source="_z6exwBnLEemlxOdMFpUVvQ" target="__F7L8BnKEemlxOdMFpUVvQ">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WL_TMEdrEem0ZK7gRvZmUw" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WL_6QEdrEem0ZK7gRvZmUw" key="routing" value="true"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_JUre0EdFEemetJs_SolH_g" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_W49G4EdrEem0ZK7gRvZmUw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_JUsF4EdFEemetJs_SolH_g" y="39"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_JUqQsUdFEemetJs_SolH_g"/>
+      <element xmi:type="uml:Generalization" href="Common.uml#_JT-7QEdFEemetJs_SolH_g"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_JUqQskdFEemetJs_SolH_g" points="[320, 300, -643984, -643984]$[320, 240, -643984, -643984]$[600, 240, -643984, -643984]$[600, 201, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JVsLcEdFEemetJs_SolH_g" id="(0.5,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JVsLcUdFEemetJs_SolH_g" id="(0.4968944099378882,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_LwNtIEdFEemetJs_SolH_g" type="Generalization_Edge" source="_4v1twDqyEemOl5OHBoqS_w" target="__F7L8BnKEemlxOdMFpUVvQ">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_cQ-7gEdrEem0ZK7gRvZmUw" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cQ-7gUdrEem0ZK7gRvZmUw" key="routing" value="true"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_LwNtI0dFEemetJs_SolH_g" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QfqCgEdrEem0ZK7gRvZmUw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_LwNtJEdFEemetJs_SolH_g" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_LwNtIUdFEemetJs_SolH_g"/>
+      <element xmi:type="uml:Generalization" href="Common.uml#_Lv3H0EdFEemetJs_SolH_g"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LwNtIkdFEemetJs_SolH_g" points="[520, 300, -643984, -643984]$[520, 240, -643984, -643984]$[600, 240, -643984, -643984]$[600, 201, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LxEowEdFEemetJs_SolH_g" id="(0.49586776859504134,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LxEowUdFEemetJs_SolH_g" id="(0.4968944099378882,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_aFGIAEdFEemTDOF2GVSrTg" type="Generalization_Edge" source="_2HxfUDqyEemOl5OHBoqS_w" target="__F7L8BnKEemlxOdMFpUVvQ">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZlUmgEdrEem0ZK7gRvZmUw" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZlVNkEdrEem0ZK7gRvZmUw" key="routing" value="true"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_aFLAgEdFEemTDOF2GVSrTg" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_aDRGwEdrEem0ZK7gRvZmUw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_aFLAgUdFEemTDOF2GVSrTg" y="38"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_aFGIAUdFEemTDOF2GVSrTg"/>
+      <element xmi:type="uml:Generalization" href="Common.uml#_aERBkEdFEemTDOF2GVSrTg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_aFGIAkdFEemTDOF2GVSrTg" points="[680, 300, -643984, -643984]$[680, 240, -643984, -643984]$[600, 240, -643984, -643984]$[600, 201, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aGU3EEdFEemTDOF2GVSrTg" id="(0.49586776859504134,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aGU3EUdFEemTDOF2GVSrTg" id="(0.4968944099378882,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_DuSo0EdrEemxfq65Xb2oRg" type="Generalization_Edge" source="_8fa94DqyEemOl5OHBoqS_w" target="__F7L8BnKEemlxOdMFpUVvQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_DuXhUEdrEemxfq65Xb2oRg" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_PWRYkEdrEem0ZK7gRvZmUw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_DuYIYEdrEemxfq65Xb2oRg" x="-2" y="37"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_DuSo0UdrEemxfq65Xb2oRg"/>
+      <element xmi:type="uml:Generalization" href="Common.uml#_DtbGIEdrEemxfq65Xb2oRg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DuSo0kdrEemxfq65Xb2oRg" points="[840, 300, -643984, -643984]$[840, 240, -643984, -643984]$[600, 240, -643984, -643984]$[600, 201, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DvcfYEdrEemxfq65Xb2oRg" id="(0.49586776859504134,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DvcfYUdrEemxfq65Xb2oRg" id="(0.4968944099378882,1.0)"/>
+    </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_KDSzABp8EemOGejS9lsDjA" type="PapyrusUMLClassDiagram" name="Business Interaction" measurementUnit="Pixel">
     <children xmi:type="notation:Shape" xmi:id="_Q1XjwBp8EemOGejS9lsDjA" type="Class_Shape">
diff --git a/ONAP Information Model/Common.uml b/ONAP Information Model/Common.uml
index 44ffcf0..bf5e201 100644
--- a/ONAP Information Model/Common.uml
+++ b/ONAP Information Model/Common.uml
@@ -1722,10 +1722,14 @@ Permitted Values:&#xD;
           </ownedEnd>
         </packagedElement>
       </packagedElement>
-      <packagedElement xmi:type="uml:Package" xmi:id="_kM4s8BnKEemlxOdMFpUVvQ" name="Diagrams"/>
+      <packagedElement xmi:type="uml:Package" xmi:id="_kM4s8BnKEemlxOdMFpUVvQ" name="Diagrams">
+        <packagedElement xmi:type="uml:Class" xmi:id="_hRjYoEaKEemmD4xckllxww" name="PolicyEvent">
+          <generalization xmi:type="uml:Generalization" xmi:id="_jm4RQEaKEemmD4xckllxww" general="_8fYhoDqyEemOl5OHBoqS_w"/>
+        </packagedElement>
+      </packagedElement>
       <packagedElement xmi:type="uml:Package" xmi:id="_mU1Q4BnKEemlxOdMFpUVvQ" name="ObjectClasses">
         <packagedElement xmi:type="uml:Class" xmi:id="_z6bHYBnLEemlxOdMFpUVvQ" name="Agreement">
-          <generalization xmi:type="uml:Generalization" xmi:id="_Lnrm4BnMEemlxOdMFpUVvQ" general="__F4vsBnKEemlxOdMFpUVvQ"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_JT-7QEdFEemetJs_SolH_g" general="__F4vsBnKEemlxOdMFpUVvQ"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Class" xmi:id="__F4vsBnKEemlxOdMFpUVvQ" name="BusinessInteraction" isAbstract="true">
           <ownedComment xmi:type="uml:Comment" xmi:id="_IIT0YBp5EemOGejS9lsDjA" annotatedElement="__F4vsBnKEemlxOdMFpUVvQ">
@@ -1776,13 +1780,13 @@ Permitted Values:&#xD;
           <ownedEnd xmi:type="uml:Property" xmi:id="_octRcBnMEemlxOdMFpUVvQ" name="businessinteraction" type="__F4vsBnKEemlxOdMFpUVvQ" association="_ocmjwBnMEemlxOdMFpUVvQ"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Class" xmi:id="_4vw1QDqyEemOl5OHBoqS_w" name="Request">
-          <generalization xmi:type="uml:Generalization" xmi:id="_6vAf4BqXEemOGejS9lsDjA" general="__F4vsBnKEemlxOdMFpUVvQ"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_Lv3H0EdFEemetJs_SolH_g" general="__F4vsBnKEemlxOdMFpUVvQ"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Class" xmi:id="_8fYhoDqyEemOl5OHBoqS_w" name="Notification">
-          <generalization xmi:type="uml:Generalization" xmi:id="_ZfokwDqzEemOl5OHBoqS_w" general="__F4vsBnKEemlxOdMFpUVvQ"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_DtbGIEdrEemxfq65Xb2oRg" general="__F4vsBnKEemlxOdMFpUVvQ"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Class" xmi:id="_2HUMUDqyEemOl5OHBoqS_w" name="Response">
-          <generalization xmi:type="uml:Generalization" xmi:id="_U01pkDqzEemOl5OHBoqS_w" general="__F4vsBnKEemlxOdMFpUVvQ"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_aERBkEdFEemTDOF2GVSrTg" general="__F4vsBnKEemlxOdMFpUVvQ"/>
           <nestedClassifier xmi:type="uml:DataType" xmi:id="_4VzdIDqyEemOl5OHBoqS_w" name="DataType1"/>
         </packagedElement>
       </packagedElement>
@@ -3029,24 +3033,12 @@ Permitted Values:&#xD;
   <OpenModel_Profile:OpenModelClass xmi:id="_7T8ZoMGaEeiS695oPTRE1Q">
     <base_Class xmi:type="uml:Class" href="Ves.uml#_7SeaAMGaEeiS695oPTRE1Q"/>
   </OpenModel_Profile:OpenModelClass>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_Tp20k8GbEeiS695oPTRE1Q">
-    <base_StructuralFeature xmi:type="uml:Property" href="Ves.uml#_Tp20ksGbEeiS695oPTRE1Q"/>
-  </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_Tp3bo8GbEeiS695oPTRE1Q">
-    <base_StructuralFeature xmi:type="uml:Property" href="Ves.uml#_Tp3bosGbEeiS695oPTRE1Q"/>
-  </OpenModel_Profile:OpenModelAttribute>
   <OpenModel_Profile:OpenModelClass xmi:id="_n2NkkMWKEeiLjtyU_R81wg">
     <base_Class xmi:type="uml:Class" href="Ves.uml#_n09AUMWKEeiLjtyU_R81wg"/>
   </OpenModel_Profile:OpenModelClass>
   <OpenModel_Profile:OpenModelClass xmi:id="_qX-WscWKEeiLjtyU_R81wg">
     <base_Class xmi:type="uml:Class" href="Ves.uml#_qX-WsMWKEeiLjtyU_R81wg"/>
   </OpenModel_Profile:OpenModelClass>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_IYJwUMWMEeiLjtyU_R81wg">
-    <base_StructuralFeature xmi:type="uml:Property" href="Ves.uml#_IYJJQMWMEeiLjtyU_R81wg"/>
-  </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_IYK-csWMEeiLjtyU_R81wg">
-    <base_StructuralFeature xmi:type="uml:Property" href="Ves.uml#_IYK-ccWMEeiLjtyU_R81wg"/>
-  </OpenModel_Profile:OpenModelAttribute>
   <OpenModel_Profile:OpenModelClass xmi:id="_XoBMwMWMEeiLjtyU_R81wg">
     <base_Class xmi:type="uml:Class" href="Ves.uml#_XoAlsMWMEeiLjtyU_R81wg"/>
   </OpenModel_Profile:OpenModelClass>
@@ -3056,12 +3048,6 @@ Permitted Values:&#xD;
   <OpenModel_Profile:OpenModelAttribute xmi:id="_8DtGsMWMEeiLjtyU_R81wg">
     <base_StructuralFeature xmi:type="uml:Property" href="Ves.uml#_8DsfosWMEeiLjtyU_R81wg"/>
   </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_O1pQ0sWPEeiLjtyU_R81wg">
-    <base_StructuralFeature xmi:type="uml:Property" href="Ves.uml#_O1pQ0cWPEeiLjtyU_R81wg"/>
-  </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_O1v-gcWPEeiLjtyU_R81wg">
-    <base_StructuralFeature xmi:type="uml:Property" href="Ves.uml#_O1v-gMWPEeiLjtyU_R81wg"/>
-  </OpenModel_Profile:OpenModelAttribute>
   <OpenModel_Profile:OpenModelClass xmi:id="_25jHQcWSEeiLjtyU_R81wg">
     <base_Class xmi:type="uml:Class" href="Ves.uml#_25jHQMWSEeiLjtyU_R81wg"/>
   </OpenModel_Profile:OpenModelClass>
@@ -3089,60 +3075,6 @@ Permitted Values:&#xD;
   <OpenModel_Profile:OpenModelClass xmi:id="_7sljAcWTEeiLjtyU_R81wg">
     <base_Class xmi:type="uml:Class" href="Ves.uml#_7sljAMWTEeiLjtyU_R81wg"/>
   </OpenModel_Profile:OpenModelClass>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_QWlos8WbEeiLjtyU_R81wg">
-    <base_StructuralFeature xmi:type="uml:Property" href="Ves.uml#_QWlossWbEeiLjtyU_R81wg"/>
-  </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_QWmPw8WbEeiLjtyU_R81wg">
-    <base_StructuralFeature xmi:type="uml:Property" href="Ves.uml#_QWmPwsWbEeiLjtyU_R81wg"/>
-  </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_Vf4dwMWbEeiLjtyU_R81wg">
-    <base_StructuralFeature xmi:type="uml:Property" href="Ves.uml#_Vf32ssWbEeiLjtyU_R81wg"/>
-  </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_Vf5E0cWbEeiLjtyU_R81wg">
-    <base_StructuralFeature xmi:type="uml:Property" href="Ves.uml#_Vf5E0MWbEeiLjtyU_R81wg"/>
-  </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_Ya5dY8WbEeiLjtyU_R81wg">
-    <base_StructuralFeature xmi:type="uml:Property" href="Ves.uml#_Ya5dYsWbEeiLjtyU_R81wg"/>
-  </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_Ya6EcsWbEeiLjtyU_R81wg">
-    <base_StructuralFeature xmi:type="uml:Property" href="Ves.uml#_Ya6EccWbEeiLjtyU_R81wg"/>
-  </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_ZyRGsMWgEeiLjtyU_R81wg">
-    <base_StructuralFeature xmi:type="uml:Property" href="Ves.uml#_ZyQfosWgEeiLjtyU_R81wg"/>
-  </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_ZyRtwMWgEeiLjtyU_R81wg">
-    <base_StructuralFeature xmi:type="uml:Property" href="Ves.uml#_ZyRGs8WgEeiLjtyU_R81wg"/>
-  </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_oQMv4sWgEeiLjtyU_R81wg">
-    <base_StructuralFeature xmi:type="uml:Property" href="Ves.uml#_oQMv4cWgEeiLjtyU_R81wg"/>
-  </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_oQNW88WgEeiLjtyU_R81wg">
-    <base_StructuralFeature xmi:type="uml:Property" href="Ves.uml#_oQNW8sWgEeiLjtyU_R81wg"/>
-  </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_t-WPYcWpEeiLjtyU_R81wg">
-    <base_StructuralFeature xmi:type="uml:Property" href="Ves.uml#_t-WPYMWpEeiLjtyU_R81wg"/>
-  </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_t-W2csWpEeiLjtyU_R81wg">
-    <base_StructuralFeature xmi:type="uml:Property" href="Ves.uml#_t-W2ccWpEeiLjtyU_R81wg"/>
-  </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_Bw5M08WqEeiLjtyU_R81wg">
-    <base_StructuralFeature xmi:type="uml:Property" href="Ves.uml#_Bw5M0sWqEeiLjtyU_R81wg"/>
-  </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_Bw5z48WqEeiLjtyU_R81wg">
-    <base_StructuralFeature xmi:type="uml:Property" href="Ves.uml#_Bw5z4sWqEeiLjtyU_R81wg"/>
-  </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_MjWp08WqEeiLjtyU_R81wg">
-    <base_StructuralFeature xmi:type="uml:Property" href="Ves.uml#_MjWp0sWqEeiLjtyU_R81wg"/>
-  </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_MjXQ4MWqEeiLjtyU_R81wg">
-    <base_StructuralFeature xmi:type="uml:Property" href="Ves.uml#_MjWp1sWqEeiLjtyU_R81wg"/>
-  </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_f24I88WqEeiLjtyU_R81wg">
-    <base_StructuralFeature xmi:type="uml:Property" href="Ves.uml#_f24I8sWqEeiLjtyU_R81wg"/>
-  </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_f24wA8WqEeiLjtyU_R81wg">
-    <base_StructuralFeature xmi:type="uml:Property" href="Ves.uml#_f24wAsWqEeiLjtyU_R81wg"/>
-  </OpenModel_Profile:OpenModelAttribute>
   <OpenModel_Profile:OpenModelClass xmi:id="_IQ35IMc4EeiRs7MlzxwPhg">
     <base_Class xmi:type="uml:Class" href="Ves.uml#_IO8mgMc4EeiRs7MlzxwPhg"/>
   </OpenModel_Profile:OpenModelClass>
@@ -3212,9 +3144,6 @@ Permitted Values:&#xD;
   <OpenModel_Profile:OpenModelClass xmi:id="_sGIxMEHXEemqbK2aT-9uCA">
     <base_Class xmi:type="uml:Class" href="License.uml#_oURIoMfyEeiEtuRgTYzSUQ"/>
   </OpenModel_Profile:OpenModelClass>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_qEIdMEHXEemqbK2aT-9uCA">
-    <base_StructuralFeature xmi:type="uml:Property" href="License.uml#_CcDw4sfzEeiEtuRgTYzSUQ"/>
-  </OpenModel_Profile:OpenModelAttribute>
   <OpenModel_Profile:OpenModelClass xmi:id="_sGWzoEHXEemqbK2aT-9uCA">
     <base_Class xmi:type="uml:Class" href="License.uml#_4ZDVsMgEEeiEtuRgTYzSUQ"/>
   </OpenModel_Profile:OpenModelClass>
@@ -3341,9 +3270,6 @@ Permitted Values:&#xD;
   <OpenModel_Profile:OpenModelAttribute xmi:id="_x7xgAM41EeixI-embJ5ltQ">
     <base_StructuralFeature xmi:type="uml:Property" href="Ves.uml#_x7w48s41EeixI-embJ5ltQ"/>
   </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_sEZr0EHXEemqbK2aT-9uCA">
-    <base_StructuralFeature xmi:type="uml:Property" href="License.uml#_CcICUMfzEeiEtuRgTYzSUQ"/>
-  </OpenModel_Profile:OpenModelAttribute>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_qfShU9CbEeius9GPYoVrTg">
     <base_StructuralFeature xmi:type="uml:Property" href="Ves.uml#_qfShUtCbEeius9GPYoVrTg"/>
   </OpenModel_Profile:OpenModelAttribute>
@@ -4278,12 +4204,6 @@ Permitted Values:&#xD;
   <OpenModel_Profile:OpenModelAttribute xmi:id="_sHmJwEHXEemqbK2aT-9uCA">
     <base_StructuralFeature xmi:type="uml:Property" href="License.uml#_1cIjwARsEemo7ZzqT33fqQ"/>
   </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_sF9yEEHXEemqbK2aT-9uCA">
-    <base_StructuralFeature xmi:type="uml:Property" href="License.uml#_Eo4YgAUiEemrBZmpgd_POA"/>
-  </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_sF_nQEHXEemqbK2aT-9uCA">
-    <base_StructuralFeature xmi:type="uml:Property" href="License.uml#_Eo94EAUiEemrBZmpgd_POA"/>
-  </OpenModel_Profile:OpenModelAttribute>
   <OpenModel_Profile:Experimental xmi:id="_sHD-QEHXEemqbK2aT-9uCA">
     <base_Element xmi:type="uml:Class" href="License.uml#_EFk28N3tEei-jeeHUjfpLA"/>
   </OpenModel_Profile:Experimental>
@@ -4476,12 +4396,6 @@ Permitted Values:&#xD;
   <OpenModel_Profile:Experimental xmi:id="_EPzwICDMEemw1L3J4dNy4w">
     <base_Element xmi:type="uml:Class" href="Ves.uml#_ATTeUCDMEemw1L3J4dNy4w"/>
   </OpenModel_Profile:Experimental>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_NprpkyDMEemw1L3J4dNy4w">
-    <base_StructuralFeature xmi:type="uml:Property" href="Ves.uml#_NprpkiDMEemw1L3J4dNy4w"/>
-  </OpenModel_Profile:OpenModelAttribute>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_NpsQoyDMEemw1L3J4dNy4w">
-    <base_StructuralFeature xmi:type="uml:Property" href="Ves.uml#_NpsQoiDMEemw1L3J4dNy4w"/>
-  </OpenModel_Profile:OpenModelAttribute>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_onUNUSDPEemw1L3J4dNy4w">
     <base_StructuralFeature xmi:type="uml:Property" href="Ves.uml#_onUNUCDPEemw1L3J4dNy4w"/>
   </OpenModel_Profile:OpenModelAttribute>
@@ -4935,4 +4849,5 @@ Permitted Values:&#xD;
   <OpenModel_Profile:Experimental xmi:id="_O-o3gEUBEemWRYeHGX88Yw" base_Element="_BUajMEUBEemWRYeHGX88Yw"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_jJ_0gDxkEemSdYSKacDoqQ" base_Class="_jJ_NcDxkEemSdYSKacDoqQ"/>
   <OpenModel_Profile:Experimental xmi:id="_oiRO0DxmEemL36iV0V0qOA" base_Element="_jJ_NcDxkEemSdYSKacDoqQ"/>
+  <OpenModel_Profile:OpenModelClass xmi:id="_hRkmwEaKEemmD4xckllxww" base_Class="_hRjYoEaKEemmD4xckllxww"/>
 </xmi:XMI>
diff --git a/ONAP Information Model/License.notation b/ONAP Information Model/License.notation
index 1058250..e54aa28 100644
--- a/ONAP Information Model/License.notation
+++ b/ONAP Information Model/License.notation
@@ -16,33 +16,6 @@
           <element xmi:type="uml:Property" href="License.uml#_KYdhIConEemnoK-fhDe5lw"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_KeR1QSonEemnoK-fhDe5lw"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_mZGhYConEemnoK-fhDe5lw" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_mZMA8ConEemnoK-fhDe5lw" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_mZMA8SonEemnoK-fhDe5lw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mZMA8ionEemnoK-fhDe5lw"/>
-          </children>
-          <element xmi:type="uml:Property" href="Common.uml#_vi4oQOLJEeiKy5JVrA0UGA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_mZHIcConEemnoK-fhDe5lw"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_mZIWkConEemnoK-fhDe5lw" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_mZPEQConEemnoK-fhDe5lw" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_mZPEQSonEemnoK-fhDe5lw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mZPEQionEemnoK-fhDe5lw"/>
-          </children>
-          <element xmi:type="uml:Property" href="Common.uml#_wEHtEOLJEeiKy5JVrA0UGA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_mZIWkSonEemnoK-fhDe5lw"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_mZI9oConEemnoK-fhDe5lw" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_mZRggConEemnoK-fhDe5lw" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_mZRggSonEemnoK-fhDe5lw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mZRggionEemnoK-fhDe5lw"/>
-          </children>
-          <element xmi:type="uml:Property" href="Common.uml#_wj9DsOLJEeiKy5JVrA0UGA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_mZI9oSonEemnoK-fhDe5lw"/>
-        </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_mEznccfyEeiEtuRgTYzSUQ"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_mEzncsfyEeiEtuRgTYzSUQ"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_mEznc8fyEeiEtuRgTYzSUQ"/>
@@ -66,7 +39,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mydiMt3sEei-jeeHUjfpLA"/>
       </children>
       <element xmi:type="uml:Class" href="License.uml#_mEllAMfyEeiEtuRgTYzSUQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mEuu8cfyEeiEtuRgTYzSUQ" x="380" y="20" width="201" height="141"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mEuu8cfyEeiEtuRgTYzSUQ" x="760" y="40" width="301" height="141"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_mFDfEMfyEeiEtuRgTYzSUQ" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_mFDfEcfyEeiEtuRgTYzSUQ"/>
@@ -148,51 +121,6 @@
           <element xmi:type="uml:Property" href="License.uml#_cy77cP_BEeiQG4ZZm0HgYw"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_Jbj-kyooEemnoK-fhDe5lw"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_JbkloCooEemnoK-fhDe5lw" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_Jb3gkCooEemnoK-fhDe5lw" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_Jb3gkSooEemnoK-fhDe5lw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Jb3gkiooEemnoK-fhDe5lw"/>
-          </children>
-          <element xmi:type="uml:Property" href="Common.uml#_mjJf0BpxEemOGejS9lsDjA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_JbkloSooEemnoK-fhDe5lw"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_JbkloiooEemnoK-fhDe5lw" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_Jb8ZECooEemnoK-fhDe5lw" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_Jb8ZESooEemnoK-fhDe5lw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Jb8ZEiooEemnoK-fhDe5lw"/>
-          </children>
-          <element xmi:type="uml:Property" href="Common.uml#_n-rCoBpxEemOGejS9lsDjA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_JbkloyooEemnoK-fhDe5lw"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_JblMsCooEemnoK-fhDe5lw" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_Jb_cYCooEemnoK-fhDe5lw" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_Jb_cYSooEemnoK-fhDe5lw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Jb_cYiooEemnoK-fhDe5lw"/>
-          </children>
-          <element xmi:type="uml:Property" href="Common.uml#_ofCkwBpxEemOGejS9lsDjA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_JblMsSooEemnoK-fhDe5lw"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_JblMsiooEemnoK-fhDe5lw" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_JcCfsCooEemnoK-fhDe5lw" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_JcCfsSooEemnoK-fhDe5lw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JcCfsiooEemnoK-fhDe5lw"/>
-          </children>
-          <element xmi:type="uml:Property" href="Common.uml#_phb14BpxEemOGejS9lsDjA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_JblMsyooEemnoK-fhDe5lw"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_JblMtCooEemnoK-fhDe5lw" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_JcGKECooEemnoK-fhDe5lw" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_JcGKESooEemnoK-fhDe5lw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JcGKEiooEemnoK-fhDe5lw"/>
-          </children>
-          <element xmi:type="uml:Property" href="Common.uml#_tRRrEBp5EemOGejS9lsDjA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_JblMtSooEemnoK-fhDe5lw"/>
-        </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="__DD_hAUhEemrBZmpgd_POA"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="__DD_hQUhEemrBZmpgd_POA"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="__DD_hgUhEemrBZmpgd_POA"/>
@@ -255,7 +183,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_38PRUgUiEemrBZmpgd_POA"/>
       </children>
       <element xmi:type="uml:Class" href="License.uml#_4ZDVsMgEEeiEtuRgTYzSUQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_38JKsQUiEemrBZmpgd_POA" x="860" y="460" width="141"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_38JKsQUiEemrBZmpgd_POA" x="840" y="460" width="141"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_38XNIwUiEemrBZmpgd_POA" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_38XNJAUiEemrBZmpgd_POA"/>
@@ -341,7 +269,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FpfEcgUjEemrBZmpgd_POA"/>
       </children>
       <element xmi:type="uml:Class" href="License.uml#_GlxBwP1oEeisxOMTY1eUug"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FpRCAQUjEemrBZmpgd_POA" x="860" y="580"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FpRCAQUjEemrBZmpgd_POA" x="840" y="580"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_FphgswUjEemrBZmpgd_POA" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_FphgtAUjEemrBZmpgd_POA"/>
@@ -359,33 +287,62 @@
     <children xmi:type="notation:Shape" xmi:id="_8nvt0ConEemnoK-fhDe5lw" type="Comment_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_8nwU4ConEemnoK-fhDe5lw" type="Comment_BodyLabel"/>
       <element xmi:type="uml:Comment" href="License.uml#_8nq1UConEemnoK-fhDe5lw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8nvt0SonEemnoK-fhDe5lw" x="620" y="20"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_APqPsCooEemnoK-fhDe5lw" type="Comment_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_APqPsiooEemnoK-fhDe5lw" type="Comment_BodyLabel"/>
-      <element xmi:type="uml:Comment" href="License.uml#_APpBkCooEemnoK-fhDe5lw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_APqPsSooEemnoK-fhDe5lw" x="600" y="100" width="181" height="81"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_vCCJQCorEemnoK-fhDe5lw" type="Comment_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_vCCJQiorEemnoK-fhDe5lw" type="Comment_BodyLabel"/>
-      <element xmi:type="uml:Comment" href="License.uml#_vCAUECorEemnoK-fhDe5lw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vCCJQSorEemnoK-fhDe5lw" x="640" y="240"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_9kH5sCorEemnoK-fhDe5lw" type="Comment_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_9kIgwCorEemnoK-fhDe5lw" type="Comment_BodyLabel"/>
-      <element xmi:type="uml:Comment" href="License.uml#_9kGrkCorEemnoK-fhDe5lw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9kH5sSorEemnoK-fhDe5lw" x="640" y="320"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8nvt0SonEemnoK-fhDe5lw" x="540" y="40" width="201" height="61"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_1wz48CosEemnoK-fhDe5lw" type="Constraint_PackagedElementShape">
       <children xmi:type="notation:DecorationNode" xmi:id="_1w0gACosEemnoK-fhDe5lw" type="Constraint_NameLabel"/>
       <children xmi:type="notation:DecorationNode" xmi:id="_1w0gASosEemnoK-fhDe5lw" type="Constraint_BodyLabel"/>
       <element xmi:type="uml:Constraint" href="License.uml#_1wxcsCosEemnoK-fhDe5lw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1wz48SosEemnoK-fhDe5lw" x="1060" y="300" width="301" height="61"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1wz48SosEemnoK-fhDe5lw" x="740" y="300" width="301" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_RLEhgEW_Eem3_P23YPx5GQ" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_RLFIkEW_Eem3_P23YPx5GQ" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_RLFIkUW_Eem3_P23YPx5GQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_RLFIkkW_Eem3_P23YPx5GQ" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_RLFIk0W_Eem3_P23YPx5GQ" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_RLFIlEW_Eem3_P23YPx5GQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_RLFIlUW_Eem3_P23YPx5GQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_RLFIlkW_Eem3_P23YPx5GQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RLFIl0W_Eem3_P23YPx5GQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_RLFImEW_Eem3_P23YPx5GQ" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_RLFImUW_Eem3_P23YPx5GQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_RLFImkW_Eem3_P23YPx5GQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_RLFIm0W_Eem3_P23YPx5GQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RLFInEW_Eem3_P23YPx5GQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_RLFInUW_Eem3_P23YPx5GQ" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_RLFInkW_Eem3_P23YPx5GQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_RLFIn0W_Eem3_P23YPx5GQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_RLFIoEW_Eem3_P23YPx5GQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RLFIoUW_Eem3_P23YPx5GQ"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_RLL2QEW_Eem3_P23YPx5GQ" visible="false" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_RLL2QUW_Eem3_P23YPx5GQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
+        <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RLL2QkW_Eem3_P23YPx5GQ"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_RLL2UkW_Eem3_P23YPx5GQ" visible="false" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_RLL2U0W_Eem3_P23YPx5GQ" name="stereotype" stringValue="OpenModel_Profile::Reference"/>
+        <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_949Q4FfpEeak-v4LxEsCQw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RLL2VEW_Eem3_P23YPx5GQ"/>
+      </children>
+      <element xmi:type="uml:Class" href="Party.uml#_eDT94DbaEemP3p_OV1tL7g"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RLEhgUW_Eem3_P23YPx5GQ" x="420" y="40" width="121"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_RLPgoEW_Eem3_P23YPx5GQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_RLPgoUW_Eem3_P23YPx5GQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_RLPgo0W_Eem3_P23YPx5GQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="Party.uml#_eDT94DbaEemP3p_OV1tL7g"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RLPgokW_Eem3_P23YPx5GQ" x="200"/>
     </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_jsJuAcfyEeiEtuRgTYzSUQ" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_jsJuAsfyEeiEtuRgTYzSUQ"/>
     <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_jsJuA8fyEeiEtuRgTYzSUQ" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
-      <owner xmi:type="uml:Package" href="License.uml#_R1nxUMfyEeiEtuRgTYzSUQ"/>
+      <owner xmi:type="uml:Package" href="License.uml#_U1T1kMfyEeiEtuRgTYzSUQ"/>
     </styles>
     <element xmi:type="uml:Package" href="License.uml#_U1T1kMfyEeiEtuRgTYzSUQ"/>
     <edges xmi:type="notation:Connector" xmi:id="_mFEGIMfyEeiEtuRgTYzSUQ" type="StereotypeCommentLink" source="_mEuu8MfyEeiEtuRgTYzSUQ" target="_mFDfEMfyEeiEtuRgTYzSUQ">
@@ -408,37 +365,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tgR6isfyEeiEtuRgTYzSUQ"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tgR6i8fyEeiEtuRgTYzSUQ"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_DBRWwMfzEeiEtuRgTYzSUQ" type="Association_Edge" source="_mEuu8MfyEeiEtuRgTYzSUQ" target="_tgHicMfyEeiEtuRgTYzSUQ">
-      <children xmi:type="notation:DecorationNode" xmi:id="_DBR90MfzEeiEtuRgTYzSUQ" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UHyjsP1lEeisxOMTY1eUug" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_DBR90cfzEeiEtuRgTYzSUQ" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_DBR90sfzEeiEtuRgTYzSUQ" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UH9i0P1lEeisxOMTY1eUug" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_DBR908fzEeiEtuRgTYzSUQ" x="-5" y="13"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_DBR91MfzEeiEtuRgTYzSUQ" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UIHT0P1lEeisxOMTY1eUug" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_DBR91cfzEeiEtuRgTYzSUQ" x="36" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_DBR91sfzEeiEtuRgTYzSUQ" visible="false" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UIRr4P1lEeisxOMTY1eUug" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_DBR918fzEeiEtuRgTYzSUQ" x="-36" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_DBR92MfzEeiEtuRgTYzSUQ" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UIa10P1lEeisxOMTY1eUug" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_DBR92cfzEeiEtuRgTYzSUQ" x="15" y="13"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_DBR92sfzEeiEtuRgTYzSUQ" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UInqIP1lEeisxOMTY1eUug" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_DBR928fzEeiEtuRgTYzSUQ" x="-4" y="-7"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_DBRWwcfzEeiEtuRgTYzSUQ"/>
-      <element xmi:type="uml:Association" href="License.uml#_CcCiwMfzEeiEtuRgTYzSUQ"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DBRWwsfzEeiEtuRgTYzSUQ" points="[570, 80, -643984, -643984]$[820, 80, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DBojIMfzEeiEtuRgTYzSUQ" id="(0.0,0.425531914893617)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DBojIcfzEeiEtuRgTYzSUQ" id="(1.0,0.4)"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="__DPltwUhEemrBZmpgd_POA" type="StereotypeCommentLink" source="__DDYcAUhEemrBZmpgd_POA" target="__DPlswUhEemrBZmpgd_POA">
       <styles xmi:type="notation:FontStyle" xmi:id="__DPluAUhEemrBZmpgd_POA"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="__DQMwQUhEemrBZmpgd_POA" name="BASE_ELEMENT">
@@ -449,37 +375,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__DPlugUhEemrBZmpgd_POA"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__DQMwAUhEemrBZmpgd_POA"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_Ep7hYAUiEemrBZmpgd_POA" type="Association_Edge" source="_mEuu8MfyEeiEtuRgTYzSUQ" target="__DDYcAUhEemrBZmpgd_POA">
-      <children xmi:type="notation:DecorationNode" xmi:id="_Ep8IcAUiEemrBZmpgd_POA" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FJlWYAVlEemrBZmpgd_POA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ep8IcQUiEemrBZmpgd_POA" x="1" y="-18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Ep8IcgUiEemrBZmpgd_POA" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FJsrIAVlEemrBZmpgd_POA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ep8IcwUiEemrBZmpgd_POA" x="-2" y="17"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Ep8IdAUiEemrBZmpgd_POA" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FJz_4AVlEemrBZmpgd_POA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ep8IdQUiEemrBZmpgd_POA" x="24" y="-18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Ep8IdgUiEemrBZmpgd_POA" visible="false" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FJ7UoAVlEemrBZmpgd_POA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ep8IdwUiEemrBZmpgd_POA" x="-23" y="18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Ep8IeAUiEemrBZmpgd_POA" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FKCpYAVlEemrBZmpgd_POA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ep8IeQUiEemrBZmpgd_POA" x="24" y="19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Ep8IegUiEemrBZmpgd_POA" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_FKJXEAVlEemrBZmpgd_POA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ep8IewUiEemrBZmpgd_POA" x="-13" y="-4"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_Ep7hYQUiEemrBZmpgd_POA"/>
-      <element xmi:type="uml:Association" href="License.uml#_Eo0HEAUiEemrBZmpgd_POA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ep7hYgUiEemrBZmpgd_POA" points="[500, 200, -643984, -643984]$[480, 360, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EqcewAUiEemrBZmpgd_POA" id="(0.4975124378109453,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EqcewQUiEemrBZmpgd_POA" id="(0.498220640569395,0.0)"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_38XNJwUiEemrBZmpgd_POA" type="StereotypeCommentLink" source="_38JKsAUiEemrBZmpgd_POA" target="_38XNIwUiEemrBZmpgd_POA">
       <styles xmi:type="notation:FontStyle" xmi:id="_38XNKAUiEemrBZmpgd_POA"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_38XNLAUiEemrBZmpgd_POA" name="BASE_ELEMENT">
@@ -610,7 +505,7 @@
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_p5NYogVoEemrBZmpgd_POA" type="Association_NameLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_uW2BkAVoEemrBZmpgd_POA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_p5NYowVoEemrBZmpgd_POA" x="37" y="-98"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_p5NYowVoEemrBZmpgd_POA" x="-53" y="2"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_p5NYpAVoEemrBZmpgd_POA" visible="false" type="Association_TargetRoleLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_uW-kcAVoEemrBZmpgd_POA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -622,7 +517,7 @@
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_p5NYqAVoEemrBZmpgd_POA" type="Association_SourceMultiplicityLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_uXPDIAVoEemrBZmpgd_POA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_p5NYqQVoEemrBZmpgd_POA" x="51" y="20"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_p5NYqQVoEemrBZmpgd_POA" x="27" y="15"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_p5NYqgVoEemrBZmpgd_POA" type="Association_TargetMultiplicityLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_uXW-8AVoEemrBZmpgd_POA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -637,16 +532,82 @@
     <edges xmi:type="notation:Connector" xmi:id="_Oax4UCotEemnoK-fhDe5lw" type="Constraint_ConstrainedElementEdge" source="_1wz48CosEemnoK-fhDe5lw" target="_FpRCAAUjEemrBZmpgd_POA">
       <styles xmi:type="notation:FontStyle" xmi:id="_Oax4USotEemnoK-fhDe5lw"/>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Oax4UiotEemnoK-fhDe5lw" points="[1291, 320, -643984, -643984]$[1001, 620, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PGiLECotEemnoK-fhDe5lw" id="(0.0,0.32786885245901637)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PGiLESotEemnoK-fhDe5lw" id="(1.0,0.4)"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Oax4UiotEemnoK-fhDe5lw" points="[740, 320, -643984, -643984]$[981, 620, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PGiLECotEemnoK-fhDe5lw" id="(0.19933554817275748,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PGiLESotEemnoK-fhDe5lw" id="(0.0,0.2)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_XByxcCotEemnoK-fhDe5lw" type="Constraint_ConstrainedElementEdge" source="_1wz48CosEemnoK-fhDe5lw" target="_38JKsAUiEemrBZmpgd_POA">
       <styles xmi:type="notation:FontStyle" xmi:id="_XByxcSotEemnoK-fhDe5lw"/>
       <element xsi:nil="true"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XByxciotEemnoK-fhDe5lw" points="[1301, 480, -643984, -643984]$[1001, 500, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XtdkoCotEemnoK-fhDe5lw" id="(0.0,0.32786885245901637)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XtdkoSotEemnoK-fhDe5lw" id="(1.0,0.4)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XtdkoCotEemnoK-fhDe5lw" id="(0.19933554817275748,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XtdkoSotEemnoK-fhDe5lw" id="(0.0,0.4)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_RLPgpEW_Eem3_P23YPx5GQ" type="StereotypeCommentLink" source="_RLEhgEW_Eem3_P23YPx5GQ" target="_RLPgoEW_Eem3_P23YPx5GQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_RLPgpUW_Eem3_P23YPx5GQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_RLPgqUW_Eem3_P23YPx5GQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="Party.uml#_eDT94DbaEemP3p_OV1tL7g"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_RLPgpkW_Eem3_P23YPx5GQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RLPgp0W_Eem3_P23YPx5GQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RLPgqEW_Eem3_P23YPx5GQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_bPiQEEW_Eem3_P23YPx5GQ" type="Association_Edge" source="_tgHicMfyEeiEtuRgTYzSUQ" target="_RLEhgEW_Eem3_P23YPx5GQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_bPi3IEW_Eem3_P23YPx5GQ" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_wJ1fwEW_Eem3_P23YPx5GQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_bPi3IUW_Eem3_P23YPx5GQ" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_bPi3IkW_Eem3_P23YPx5GQ" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_wlQ3gEW_Eem3_P23YPx5GQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_bPi3I0W_Eem3_P23YPx5GQ" x="-5" y="-13"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_bPi3JEW_Eem3_P23YPx5GQ" visible="false" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_xAxHwEW_Eem3_P23YPx5GQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_bPi3JUW_Eem3_P23YPx5GQ" x="76" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_bPi3JkW_Eem3_P23YPx5GQ" visible="false" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_xcQJ4EW_Eem3_P23YPx5GQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_bPi3J0W_Eem3_P23YPx5GQ" x="166" y="107"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_bPi3KEW_Eem3_P23YPx5GQ" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_x38AUEW_Eem3_P23YPx5GQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_bPi3KUW_Eem3_P23YPx5GQ" x="11" y="7"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_bPi3KkW_Eem3_P23YPx5GQ" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_yTTGoEW_Eem3_P23YPx5GQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_bPi3K0W_Eem3_P23YPx5GQ" x="-16" y="7"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_bPiQEUW_Eem3_P23YPx5GQ"/>
+      <element xmi:type="uml:Association" href="License.uml#_avHqoEW_Eem3_P23YPx5GQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_bPiQEkW_Eem3_P23YPx5GQ" points="[273, 100, -643984, -643984]$[780, 100, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cGiwkEW_Eem3_P23YPx5GQ" id="(1.0,0.6)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cGjXoEW_Eem3_P23YPx5GQ" id="(0.0,0.6)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_7widIEW_Eem3_P23YPx5GQ" type="Association_Edge" source="__DDYcAUhEemrBZmpgd_POA" target="_RLEhgEW_Eem3_P23YPx5GQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_7widI0W_Eem3_P23YPx5GQ" type="Association_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_7widJEW_Eem3_P23YPx5GQ" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_7widJUW_Eem3_P23YPx5GQ" type="Association_NameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_7widJkW_Eem3_P23YPx5GQ" x="3" y="-2"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_7widJ0W_Eem3_P23YPx5GQ" visible="false" type="Association_TargetRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_7widKEW_Eem3_P23YPx5GQ" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_7widKUW_Eem3_P23YPx5GQ" visible="false" type="Association_SourceRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_7widKkW_Eem3_P23YPx5GQ" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_7widK0W_Eem3_P23YPx5GQ" type="Association_SourceMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_7widLEW_Eem3_P23YPx5GQ" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_7widLUW_Eem3_P23YPx5GQ" type="Association_TargetMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_7widLkW_Eem3_P23YPx5GQ" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_7widIUW_Eem3_P23YPx5GQ"/>
+      <element xmi:type="uml:Association" href="License.uml#_7QCYIEW_Eem3_P23YPx5GQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7widIkW_Eem3_P23YPx5GQ" points="[580, 240, -643984, -643984]$[541, 100, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8nuj0EW_Eem3_P23YPx5GQ" id="(0.498220640569395,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8nvK4EW_Eem3_P23YPx5GQ" id="(0.49586776859504134,1.0)"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_8LSEcN3tEei-jeeHUjfpLA" type="PapyrusUMLClassDiagram" name="License Key Pools" measurementUnit="Pixel">
@@ -764,15 +725,6 @@
           <element xmi:type="uml:Property" href="Common.uml#_wEHtEOLJEeiKy5JVrA0UGA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_e74yYQOaEemCCMXOyOLwIw"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_e74yYgOaEemCCMXOyOLwIw" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_e8G00AOaEemCCMXOyOLwIw" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_e8G00QOaEemCCMXOyOLwIw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e8G00gOaEemCCMXOyOLwIw"/>
-          </children>
-          <element xmi:type="uml:Property" href="Common.uml#_wj9DsOLJEeiKy5JVrA0UGA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_e74yYwOaEemCCMXOyOLwIw"/>
-        </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_-_hGpt3tEei-jeeHUjfpLA"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_-_hGp93tEei-jeeHUjfpLA"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_-_hGqN3tEei-jeeHUjfpLA"/>
@@ -839,24 +791,6 @@
           <element xmi:type="uml:Property" href="License.uml#_lUfwsAOOEemCCMXOyOLwIw"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_vbtscQ6_EemnO9QINOJnHg"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_vbuTgA6_EemnO9QINOJnHg" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_vb5SoA6_EemnO9QINOJnHg" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_vb5SoQ6_EemnO9QINOJnHg" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vb5Sog6_EemnO9QINOJnHg"/>
-          </children>
-          <element xmi:type="uml:Property" href="Common.uml#_Td26cOLNEeiKy5JVrA0UGA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_vbuTgQ6_EemnO9QINOJnHg"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_vbuTgg6_EemnO9QINOJnHg" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_vb7u4A6_EemnO9QINOJnHg" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_vb7u4Q6_EemnO9QINOJnHg" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vb7u4g6_EemnO9QINOJnHg"/>
-          </children>
-          <element xmi:type="uml:Property" href="Common.uml#_T6QikOLNEeiKy5JVrA0UGA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_vbuTgw6_EemnO9QINOJnHg"/>
-        </children>
         <children xmi:type="notation:Shape" xmi:id="_vbuThg6_EemnO9QINOJnHg" type="Property_ClassAttributeLabel">
           <children xmi:type="notation:DecorationNode" xmi:id="_vcB1gA6_EemnO9QINOJnHg" visible="false" type="StereotypeLabel">
             <styles xmi:type="notation:StringValueStyle" xmi:id="_vcB1gQ6_EemnO9QINOJnHg" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
@@ -875,15 +809,6 @@
           <element xmi:type="uml:Property" href="Common.uml#_wEHtEOLJEeiKy5JVrA0UGA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_vbuTiQ6_EemnO9QINOJnHg"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_vbu6kA6_EemnO9QINOJnHg" type="Property_ClassAttributeLabel" fontColor="10265827">
-          <children xmi:type="notation:DecorationNode" xmi:id="_vcGuAA6_EemnO9QINOJnHg" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_vcGuAQ6_EemnO9QINOJnHg" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vcGuAg6_EemnO9QINOJnHg"/>
-          </children>
-          <element xmi:type="uml:Property" href="Common.uml#_wj9DsOLJEeiKy5JVrA0UGA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_vbu6kQ6_EemnO9QINOJnHg"/>
-        </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="__gY_Et3tEei-jeeHUjfpLA"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="__gY_E93tEei-jeeHUjfpLA"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="__gY_FN3tEei-jeeHUjfpLA"/>
@@ -977,33 +902,6 @@
           <element xmi:type="uml:Property" href="License.uml#_1cIjwARsEemo7ZzqT33fqQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_xbmoYQR-Eemo7ZzqT33fqQ"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_QoZlIASLEemo7ZzqT33fqQ" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_QojWIASLEemo7ZzqT33fqQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_QojWIQSLEemo7ZzqT33fqQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QojWIgSLEemo7ZzqT33fqQ"/>
-          </children>
-          <element xmi:type="uml:Property" href="Common.uml#_vi4oQOLJEeiKy5JVrA0UGA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_QoZlIQSLEemo7ZzqT33fqQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_QoaMMASLEemo7ZzqT33fqQ" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_QolyYASLEemo7ZzqT33fqQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_QolyYQSLEemo7ZzqT33fqQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QolyYgSLEemo7ZzqT33fqQ"/>
-          </children>
-          <element xmi:type="uml:Property" href="Common.uml#_wEHtEOLJEeiKy5JVrA0UGA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_QoaMMQSLEemo7ZzqT33fqQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_QoaMMgSLEemo7ZzqT33fqQ" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_QonnkASLEemo7ZzqT33fqQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_QonnkQSLEemo7ZzqT33fqQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QonnkgSLEemo7ZzqT33fqQ"/>
-          </children>
-          <element xmi:type="uml:Property" href="Common.uml#_wj9DsOLJEeiKy5JVrA0UGA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_QoaMMwSLEemo7ZzqT33fqQ"/>
-        </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_T6CYxN3uEei-jeeHUjfpLA"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_T6CYxd3uEei-jeeHUjfpLA"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_T6CYxt3uEei-jeeHUjfpLA"/>
@@ -1162,7 +1060,7 @@
     <styles xmi:type="notation:StringValueStyle" xmi:id="_8LSEcd3tEei-jeeHUjfpLA" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_8LSEct3tEei-jeeHUjfpLA"/>
     <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_8LSEc93tEei-jeeHUjfpLA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
-      <owner xmi:type="uml:Package" href="License.uml#_R1nxUMfyEeiEtuRgTYzSUQ"/>
+      <owner xmi:type="uml:Package" href="License.uml#_U1T1kMfyEeiEtuRgTYzSUQ"/>
     </styles>
     <element xmi:type="uml:Package" href="License.uml#_U1T1kMfyEeiEtuRgTYzSUQ"/>
     <edges xmi:type="notation:Connector" xmi:id="_-_pCd93tEei-jeeHUjfpLA" type="StereotypeCommentLink" source="_-_hGoN3tEei-jeeHUjfpLA" target="_-_pCc93tEei-jeeHUjfpLA">
@@ -1419,148 +1317,6 @@
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_bkXqAP1lEeisxOMTY1eUug" type="PapyrusUMLClassDiagram" name="Rooting License" measurementUnit="Pixel">
-    <children xmi:type="notation:Shape" xmi:id="_i8KW8P1lEeisxOMTY1eUug" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_i8KW8v1lEeisxOMTY1eUug" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_i8KW8_1lEeisxOMTY1eUug" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_i8KW9P1lEeisxOMTY1eUug" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_i8KW9f1lEeisxOMTY1eUug" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_kI2zkP1lEeisxOMTY1eUug" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_kI7FAP1lEeisxOMTY1eUug" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_kI7FAf1lEeisxOMTY1eUug" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kI7FAv1lEeisxOMTY1eUug"/>
-          </children>
-          <element xmi:type="uml:Property" href="Common.uml#_vi4oQOLJEeiKy5JVrA0UGA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_kI2zkf1lEeisxOMTY1eUug"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_kI4BsP1lEeisxOMTY1eUug" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_kI9hQP1lEeisxOMTY1eUug" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_kI9hQf1lEeisxOMTY1eUug" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kI9hQv1lEeisxOMTY1eUug"/>
-          </children>
-          <element xmi:type="uml:Property" href="Common.uml#_wEHtEOLJEeiKy5JVrA0UGA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_kI4Bsf1lEeisxOMTY1eUug"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_kI4Bsv1lEeisxOMTY1eUug" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_kI_9gP1lEeisxOMTY1eUug" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_kI_9gf1lEeisxOMTY1eUug" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kI_9gv1lEeisxOMTY1eUug"/>
-          </children>
-          <element xmi:type="uml:Property" href="Common.uml#_wj9DsOLJEeiKy5JVrA0UGA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_kI4Bs_1lEeisxOMTY1eUug"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_i8KW9v1lEeisxOMTY1eUug"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_i8KW9_1lEeisxOMTY1eUug"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_i8KW-P1lEeisxOMTY1eUug"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i8KW-f1lEeisxOMTY1eUug"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_i8K-AP1lEeisxOMTY1eUug" visible="false" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_i8K-Af1lEeisxOMTY1eUug"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_i8K-Av1lEeisxOMTY1eUug"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_i8K-A_1lEeisxOMTY1eUug"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i8K-BP1lEeisxOMTY1eUug"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_i8K-Bf1lEeisxOMTY1eUug" visible="false" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_i8K-Bv1lEeisxOMTY1eUug"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_i8K-B_1lEeisxOMTY1eUug"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_i8K-CP1lEeisxOMTY1eUug"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i8K-Cf1lEeisxOMTY1eUug"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_i8S50P1lEeisxOMTY1eUug" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_i8S50f1lEeisxOMTY1eUug" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
-        <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i8S50v1lEeisxOMTY1eUug"/>
-      </children>
-      <element xmi:type="uml:Class" href="Common.uml#_eCjlEOLJEeiKy5JVrA0UGA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i8KW8f1lEeisxOMTY1eUug" x="500" y="20" height="121"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_i8XLQP1lEeisxOMTY1eUug" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_i8XLQf1lEeisxOMTY1eUug"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_i8XLQ_1lEeisxOMTY1eUug" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="Common.uml#_eCjlEOLJEeiKy5JVrA0UGA"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i8XLQv1lEeisxOMTY1eUug" x="200"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_rGZNcP1lEeisxOMTY1eUug" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_rGZ0gP1lEeisxOMTY1eUug" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_rGZ0gf1lEeisxOMTY1eUug" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_rGZ0gv1lEeisxOMTY1eUug" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_rGZ0g_1lEeisxOMTY1eUug" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_uKZxAP1lEeisxOMTY1eUug" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_uKhFwP1lEeisxOMTY1eUug" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_uKhFwf1lEeisxOMTY1eUug" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uKhFwv1lEeisxOMTY1eUug"/>
-          </children>
-          <element xmi:type="uml:Property" href="Common.uml#_Td26cOLNEeiKy5JVrA0UGA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_uKZxAf1lEeisxOMTY1eUug"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_uKaYEP1lEeisxOMTY1eUug" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_uKjiAP1lEeisxOMTY1eUug" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_uKjiAf1lEeisxOMTY1eUug" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uKjiAv1lEeisxOMTY1eUug"/>
-          </children>
-          <element xmi:type="uml:Property" href="Common.uml#_T6QikOLNEeiKy5JVrA0UGA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_uKaYEf1lEeisxOMTY1eUug"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_uKaYFP1lEeisxOMTY1eUug" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_uKnzcP1lEeisxOMTY1eUug" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_uKnzcf1lEeisxOMTY1eUug" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uKnzcv1lEeisxOMTY1eUug"/>
-          </children>
-          <element xmi:type="uml:Property" href="Common.uml#_vi4oQOLJEeiKy5JVrA0UGA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_uKaYFf1lEeisxOMTY1eUug"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_uKa_IP1lEeisxOMTY1eUug" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_uKqPsP1lEeisxOMTY1eUug" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_uKqPsf1lEeisxOMTY1eUug" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uKqPsv1lEeisxOMTY1eUug"/>
-          </children>
-          <element xmi:type="uml:Property" href="Common.uml#_wEHtEOLJEeiKy5JVrA0UGA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_uKa_If1lEeisxOMTY1eUug"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_uKa_Iv1lEeisxOMTY1eUug" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_uKsr8P1lEeisxOMTY1eUug" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_uKsr8f1lEeisxOMTY1eUug" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uKsr8v1lEeisxOMTY1eUug"/>
-          </children>
-          <element xmi:type="uml:Property" href="Common.uml#_wj9DsOLJEeiKy5JVrA0UGA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_uKa_I_1lEeisxOMTY1eUug"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_rGZ0hP1lEeisxOMTY1eUug"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_rGZ0hf1lEeisxOMTY1eUug"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_rGZ0hv1lEeisxOMTY1eUug"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rGZ0h_1lEeisxOMTY1eUug"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_rGZ0iP1lEeisxOMTY1eUug" visible="false" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_rGZ0if1lEeisxOMTY1eUug"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_rGZ0iv1lEeisxOMTY1eUug"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_rGZ0i_1lEeisxOMTY1eUug"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rGZ0jP1lEeisxOMTY1eUug"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_rGZ0jf1lEeisxOMTY1eUug" visible="false" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_rGZ0jv1lEeisxOMTY1eUug"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_rGZ0j_1lEeisxOMTY1eUug"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_rGZ0kP1lEeisxOMTY1eUug"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rGZ0kf1lEeisxOMTY1eUug"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_rGfUEP1lEeisxOMTY1eUug" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_rGfUEf1lEeisxOMTY1eUug" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
-        <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rGfUEv1lEeisxOMTY1eUug"/>
-      </children>
-      <element xmi:type="uml:Class" href="Common.uml#_Qb00MOLKEeiKy5JVrA0UGA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rGZNcf1lEeisxOMTY1eUug" x="200" y="200" width="209" height="161"/>
-    </children>
     <children xmi:type="notation:Shape" xmi:id="_rGiXY_1lEeisxOMTY1eUug" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_rGiXZP1lEeisxOMTY1eUug"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_rGiXZv1lEeisxOMTY1eUug" name="BASE_ELEMENT">
@@ -1598,7 +1354,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UtNvgv1mEeisxOMTY1eUug"/>
       </children>
       <element xmi:type="uml:Class" href="License.uml#_4ZDVsMgEEeiEtuRgTYzSUQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UtHo4f1mEeisxOMTY1eUug" x="20" y="440" width="181"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UtHo4f1mEeisxOMTY1eUug" x="20" y="440" width="161"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_UtPks_1mEeisxOMTY1eUug" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_UtPktP1mEeisxOMTY1eUug"/>
@@ -1703,7 +1459,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hlAE0v1nEeisxOMTY1eUug"/>
       </children>
       <element xmi:type="uml:Class" href="Common.uml#_1POjoOwXEei7-e9MrPJW7Q"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hk4wEf1nEeisxOMTY1eUug" x="840" y="200" width="201"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hk4wEf1nEeisxOMTY1eUug" x="880" y="200" width="201"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_hlDvMP1nEeisxOMTY1eUug" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_hlDvMf1nEeisxOMTY1eUug"/>
@@ -1742,7 +1498,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_knzugv1nEeisxOMTY1eUug"/>
       </children>
       <element xmi:type="uml:Class" href="License.uml#_D_LXMN3xEei-jeeHUjfpLA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_knpWcf1nEeisxOMTY1eUug" x="700" y="440" width="141"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_knpWcf1nEeisxOMTY1eUug" x="740" y="440" width="141"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_kn3Y4P1nEeisxOMTY1eUug" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_kn3Y4f1nEeisxOMTY1eUug"/>
@@ -1781,7 +1537,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w4e18v1nEeisxOMTY1eUug"/>
       </children>
       <element xmi:type="uml:Class" href="License.uml#_oURIoMfyEeiEtuRgTYzSUQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w4YIQf1nEeisxOMTY1eUug" x="240" y="440" width="121"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w4YIQf1nEeisxOMTY1eUug" x="220" y="440" width="121"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_w4grI_1nEeisxOMTY1eUug" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_w4grJP1nEeisxOMTY1eUug"/>
@@ -1820,7 +1576,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ytpn0v1nEeisxOMTY1eUug"/>
       </children>
       <element xmi:type="uml:Class" href="License.uml#_B5kVkN3xEei-jeeHUjfpLA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ytiTEf1nEeisxOMTY1eUug" x="1040" y="440" width="161"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ytiTEf1nEeisxOMTY1eUug" x="1080" y="440" width="161"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_ytsrIP1nEeisxOMTY1eUug" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_ytsrIf1nEeisxOMTY1eUug"/>
@@ -1859,7 +1615,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JMxmcv-8EeiQG4ZZm0HgYw"/>
       </children>
       <element xmi:type="uml:Class" href="License.uml#_T5-uYN3uEei-jeeHUjfpLA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JMhu0f-8EeiQG4ZZm0HgYw" x="880" y="440" width="121"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JMhu0f-8EeiQG4ZZm0HgYw" x="920" y="440" width="121"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_JM1Q0P-8EeiQG4ZZm0HgYw" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_JM1Q0f-8EeiQG4ZZm0HgYw"/>
@@ -1898,7 +1654,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GzhjIgMJEemoQ5ZgWCUg_g"/>
       </children>
       <element xmi:type="uml:Class" href="License.uml#_GlxBwP1oEeisxOMTY1eUug"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GzQdYQMJEemoQ5ZgWCUg_g" x="520" y="440"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GzQdYQMJEemoQ5ZgWCUg_g" x="540" y="440"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_Gzj_YwMJEemoQ5ZgWCUg_g" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_Gzj_ZAMJEemoQ5ZgWCUg_g"/>
@@ -1937,7 +1693,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Udn5EgUhEemrBZmpgd_POA"/>
       </children>
       <element xmi:type="uml:Class" href="License.uml#_mEllAMfyEeiEtuRgTYzSUQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UdWzUQUhEemrBZmpgd_POA" x="780" y="580" width="161"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UdWzUQUhEemrBZmpgd_POA" x="820" y="580" width="161"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_UdsKgAUhEemrBZmpgd_POA" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_UdsKgQUhEemrBZmpgd_POA"/>
@@ -1976,7 +1732,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vFrLkgVqEemrBZmpgd_POA"/>
       </children>
       <element xmi:type="uml:Class" href="License.uml#_Omfk4P2SEeisxOMTY1eUug"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vFiosQVqEemrBZmpgd_POA" x="960" y="580" width="121"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vFiosQVqEemrBZmpgd_POA" x="1000" y="580" width="121"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_vFvdAwVqEemrBZmpgd_POA" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_vFvdBAVqEemrBZmpgd_POA"/>
@@ -1986,43 +1742,96 @@
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vFvdBQVqEemrBZmpgd_POA" x="200"/>
     </children>
+    <children xmi:type="notation:Shape" xmi:id="_m-yYYEWyEem3_P23YPx5GQ" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_m-y_cEWyEem3_P23YPx5GQ" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_m-y_cUWyEem3_P23YPx5GQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_m-y_ckWyEem3_P23YPx5GQ" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_m-zmgEWyEem3_P23YPx5GQ" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_92WmAEWyEem3_P23YPx5GQ" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_92kBYEWyEem3_P23YPx5GQ" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_92kBYUWyEem3_P23YPx5GQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_92kBYkWyEem3_P23YPx5GQ"/>
+          </children>
+          <element xmi:type="uml:Property" href="Common.uml#_Td26cOLNEeiKy5JVrA0UGA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_92WmAUWyEem3_P23YPx5GQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_92X0IEWyEem3_P23YPx5GQ" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_92mdoEWyEem3_P23YPx5GQ" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_92mdoUWyEem3_P23YPx5GQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_92mdokWyEem3_P23YPx5GQ"/>
+          </children>
+          <element xmi:type="uml:Property" href="Common.uml#_T6QikOLNEeiKy5JVrA0UGA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_92X0IUWyEem3_P23YPx5GQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_92YbMEWyEem3_P23YPx5GQ" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_92oS0EWyEem3_P23YPx5GQ" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_92oS0UWyEem3_P23YPx5GQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_92oS0kWyEem3_P23YPx5GQ"/>
+          </children>
+          <element xmi:type="uml:Property" href="Common.uml#_eoc6EDYQEemvTc8tEY2xig"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_92YbMUWyEem3_P23YPx5GQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_92YbMkWyEem3_P23YPx5GQ" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_92qvEEWyEem3_P23YPx5GQ" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_92qvEUWyEem3_P23YPx5GQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_92qvEkWyEem3_P23YPx5GQ"/>
+          </children>
+          <element xmi:type="uml:Property" href="Common.uml#_E4CakDYREemvTc8tEY2xig"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_92YbM0WyEem3_P23YPx5GQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_92YbNEWyEem3_P23YPx5GQ" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_92skQEWyEem3_P23YPx5GQ" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_92skQUWyEem3_P23YPx5GQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_92skQkWyEem3_P23YPx5GQ"/>
+          </children>
+          <element xmi:type="uml:Property" href="Common.uml#_wj9DsOLJEeiKy5JVrA0UGA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_92YbNUWyEem3_P23YPx5GQ"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_m-zmgUWyEem3_P23YPx5GQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_m-zmgkWyEem3_P23YPx5GQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_m-zmg0WyEem3_P23YPx5GQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m-zmhEWyEem3_P23YPx5GQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_m-zmhUWyEem3_P23YPx5GQ" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_m-zmhkWyEem3_P23YPx5GQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_m-zmh0WyEem3_P23YPx5GQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_m-zmiEWyEem3_P23YPx5GQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m-zmiUWyEem3_P23YPx5GQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_m-zmikWyEem3_P23YPx5GQ" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_m-zmi0WyEem3_P23YPx5GQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_m-zmjEWyEem3_P23YPx5GQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_m-zmjUWyEem3_P23YPx5GQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m-zmjkWyEem3_P23YPx5GQ"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_m_Bo8EWyEem3_P23YPx5GQ" visible="false" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_m_Bo8UWyEem3_P23YPx5GQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
+        <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m_Bo8kWyEem3_P23YPx5GQ"/>
+      </children>
+      <element xmi:type="uml:Class" href="Common.uml#_v04t4DFPEemw1_Ys6rcLWw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m-yYYUWyEem3_P23YPx5GQ" x="260" y="200" width="201" height="121"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_m_F6YEWyEem3_P23YPx5GQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_m_F6YUWyEem3_P23YPx5GQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_m_F6Y0WyEem3_P23YPx5GQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="Common.uml#_v04t4DFPEemw1_Ys6rcLWw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m_F6YkWyEem3_P23YPx5GQ" x="200"/>
+    </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_bkXqAf1lEeisxOMTY1eUug" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_bkXqAv1lEeisxOMTY1eUug"/>
     <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_bkXqA_1lEeisxOMTY1eUug" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
-      <owner xmi:type="uml:Package" href="License.uml#_R1nxUMfyEeiEtuRgTYzSUQ"/>
+      <owner xmi:type="uml:Package" href="License.uml#_U1T1kMfyEeiEtuRgTYzSUQ"/>
     </styles>
     <element xmi:type="uml:Package" href="License.uml#_U1T1kMfyEeiEtuRgTYzSUQ"/>
-    <edges xmi:type="notation:Connector" xmi:id="_i8XLRP1lEeisxOMTY1eUug" type="StereotypeCommentLink" source="_i8KW8P1lEeisxOMTY1eUug" target="_i8XLQP1lEeisxOMTY1eUug">
-      <styles xmi:type="notation:FontStyle" xmi:id="_i8XLRf1lEeisxOMTY1eUug"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_i8XLSf1lEeisxOMTY1eUug" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="Common.uml#_eCjlEOLJEeiKy5JVrA0UGA"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_i8XLRv1lEeisxOMTY1eUug" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_i8XLR_1lEeisxOMTY1eUug"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_i8XLSP1lEeisxOMTY1eUug"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_rGiXZ_1lEeisxOMTY1eUug" type="StereotypeCommentLink" source="_rGZNcP1lEeisxOMTY1eUug" target="_rGiXY_1lEeisxOMTY1eUug">
-      <styles xmi:type="notation:FontStyle" xmi:id="_rGiXaP1lEeisxOMTY1eUug"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_rGiXbP1lEeisxOMTY1eUug" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="Common.uml#_Qb00MOLKEeiKy5JVrA0UGA"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rGiXaf1lEeisxOMTY1eUug" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rGiXav1lEeisxOMTY1eUug"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rGiXa_1lEeisxOMTY1eUug"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_s4L7MP1lEeisxOMTY1eUug" type="Generalization_Edge" source="_rGZNcP1lEeisxOMTY1eUug" target="_i8KW8P1lEeisxOMTY1eUug">
-      <children xmi:type="notation:DecorationNode" xmi:id="_s4L7M_1lEeisxOMTY1eUug" type="Generalization_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_qYCrIP2QEeisxOMTY1eUug" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_s4L7NP1lEeisxOMTY1eUug" x="-1" y="39"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_s4L7Mf1lEeisxOMTY1eUug"/>
-      <element xmi:type="uml:Generalization" href="Common.uml#_ZstwwOLKEeiKy5JVrA0UGA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_s4L7Mv1lEeisxOMTY1eUug" points="[300, 200, -643984, -643984]$[300, 180, -643984, -643984]$[580, 180, -643984, -643984]$[580, 141, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0prhkP1lEeisxOMTY1eUug" id="(0.4784688995215311,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pWzQkP2QEeisxOMTY1eUug" id="(0.5319148936170213,1.0)"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_UtPkt_1mEeisxOMTY1eUug" type="StereotypeCommentLink" source="_UtHo4P1mEeisxOMTY1eUug" target="_UtPks_1mEeisxOMTY1eUug">
       <styles xmi:type="notation:FontStyle" xmi:id="_UtPkuP1mEeisxOMTY1eUug"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UtPkvP1mEeisxOMTY1eUug" name="BASE_ELEMENT">
@@ -2053,17 +1862,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hlDvN_1nEeisxOMTY1eUug"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hlDvOP1nEeisxOMTY1eUug"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_i2HHYP1nEeisxOMTY1eUug" type="Generalization_Edge" source="_hk4wEP1nEeisxOMTY1eUug" target="_i8KW8P1lEeisxOMTY1eUug">
-      <children xmi:type="notation:DecorationNode" xmi:id="_i2HHY_1nEeisxOMTY1eUug" type="Generalization_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_rhwsQP2QEeisxOMTY1eUug" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_i2HHZP1nEeisxOMTY1eUug" x="-1" y="38"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_i2HHYf1nEeisxOMTY1eUug"/>
-      <element xmi:type="uml:Generalization" href="Common.uml#_7MZssOwXEei7-e9MrPJW7Q"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_i2HHYv1nEeisxOMTY1eUug" points="[940, 200, -643984, -643984]$[940, 180, -643984, -643984]$[580, 180, -643984, -643984]$[580, 141, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rhj38P2QEeisxOMTY1eUug" id="(0.4975124378109453,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rMSykP2QEeisxOMTY1eUug" id="(0.47337278106508873,1.0)"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_kn3Y5P1nEeisxOMTY1eUug" type="StereotypeCommentLink" source="_knpWcP1nEeisxOMTY1eUug" target="_kn3Y4P1nEeisxOMTY1eUug">
       <styles xmi:type="notation:FontStyle" xmi:id="_kn3Y5f1nEeisxOMTY1eUug"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_kn3Y6f1nEeisxOMTY1eUug" name="BASE_ELEMENT">
@@ -2094,60 +1892,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ytsrJ_1nEeisxOMTY1eUug"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ytsrKP1nEeisxOMTY1eUug"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_YReHUP2QEeisxOMTY1eUug" type="Generalization_Edge" source="_UtHo4P1mEeisxOMTY1eUug" target="_rGZNcP1lEeisxOMTY1eUug">
-      <children xmi:type="notation:DecorationNode" xmi:id="_YReHU_2QEeisxOMTY1eUug" type="Generalization_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cgJHMP2QEeisxOMTY1eUug" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YReHVP2QEeisxOMTY1eUug" x="1" y="37"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_YReHUf2QEeisxOMTY1eUug"/>
-      <element xmi:type="uml:Generalization" href="License.uml#_YQ5fkP2QEeisxOMTY1eUug"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YReHUv2QEeisxOMTY1eUug" points="[120, 440, -643984, -643984]$[120, 380, -643984, -643984]$[300, 380, -643984, -643984]$[300, 341, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YR0soP2QEeisxOMTY1eUug" id="(0.5524861878453039,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YR0sof2QEeisxOMTY1eUug" id="(0.4784688995215311,1.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_ZbNWkP2QEeisxOMTY1eUug" type="Generalization_Edge" source="_w4YIQP1nEeisxOMTY1eUug" target="_rGZNcP1lEeisxOMTY1eUug">
-      <children xmi:type="notation:DecorationNode" xmi:id="_ZbNWk_2QEeisxOMTY1eUug" type="Generalization_StereotypeLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZbNWlP2QEeisxOMTY1eUug" y="40"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_ZbNWkf2QEeisxOMTY1eUug"/>
-      <element xmi:type="uml:Generalization" href="License.uml#_Za7pwP2QEeisxOMTY1eUug"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ZbNWkv2QEeisxOMTY1eUug" points="[300, 440, -643984, -643984]$[300, 341, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZbrQoP2QEeisxOMTY1eUug" id="(0.49586776859504134,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Zbr3sP2QEeisxOMTY1eUug" id="(0.4784688995215311,1.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_a-JI8P2QEeisxOMTY1eUug" type="Generalization_Edge" source="_fCmZgP1nEeisxOMTY1eUug" target="_rGZNcP1lEeisxOMTY1eUug">
-      <children xmi:type="notation:DecorationNode" xmi:id="_a-JI8_2QEeisxOMTY1eUug" type="Generalization_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_fj06oP2QEeisxOMTY1eUug" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_a-JI9P2QEeisxOMTY1eUug" x="-1" y="38"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_a-JI8f2QEeisxOMTY1eUug"/>
-      <element xmi:type="uml:Generalization" href="License.uml#_a9qAwP2QEeisxOMTY1eUug"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_a-JI8v2QEeisxOMTY1eUug" points="[440, 440, -643984, -643984]$[440, 380, -643984, -643984]$[300, 380, -643984, -643984]$[300, 341, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a-gVUP2QEeisxOMTY1eUug" id="(0.49586776859504134,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a-gVUf2QEeisxOMTY1eUug" id="(0.4784688995215311,1.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_2j-cgP2QEeisxOMTY1eUug" type="Generalization_Edge" source="_knpWcP1nEeisxOMTY1eUug" target="_hk4wEP1nEeisxOMTY1eUug">
-      <children xmi:type="notation:DecorationNode" xmi:id="_2j-cg_2QEeisxOMTY1eUug" type="Generalization_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_391ycP2QEeisxOMTY1eUug" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_2j-chP2QEeisxOMTY1eUug" y="40"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_2j-cgf2QEeisxOMTY1eUug"/>
-      <element xmi:type="uml:Generalization" href="License.uml#_2jxBIP2QEeisxOMTY1eUug"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2j-cgv2QEeisxOMTY1eUug" points="[760, 440, -643984, -643984]$[760, 380, -643984, -643984]$[940, 380, -643984, -643984]$[940, 345, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2kYsMP2QEeisxOMTY1eUug" id="(0.425531914893617,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2kYsMf2QEeisxOMTY1eUug" id="(0.4975124378109453,1.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_3SnEIP2QEeisxOMTY1eUug" type="Generalization_Edge" source="_ytiTEP1nEeisxOMTY1eUug" target="_hk4wEP1nEeisxOMTY1eUug">
-      <children xmi:type="notation:DecorationNode" xmi:id="_3SnEI_2QEeisxOMTY1eUug" type="Generalization_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_5IHNMP2QEeisxOMTY1eUug" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_3SnEJP2QEeisxOMTY1eUug" x="-1" y="38"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_3SnEIf2QEeisxOMTY1eUug"/>
-      <element xmi:type="uml:Generalization" href="License.uml#_3ScFAP2QEeisxOMTY1eUug"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3SnEIv2QEeisxOMTY1eUug" points="[1120, 440, -643984, -643984]$[1120, 380, -643984, -643984]$[1020, 380, -643984, -643984]$[940, 380, -643984, -643984]$[940, 345, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3S-QgP2QEeisxOMTY1eUug" id="(0.4968944099378882,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3S-3kP2QEeisxOMTY1eUug" id="(0.4975124378109453,1.0)"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_JM134P-8EeiQG4ZZm0HgYw" type="StereotypeCommentLink" source="_JMhu0P-8EeiQG4ZZm0HgYw" target="_JM1Q0P-8EeiQG4ZZm0HgYw">
       <styles xmi:type="notation:FontStyle" xmi:id="_JM134f-8EeiQG4ZZm0HgYw"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_JM135f-8EeiQG4ZZm0HgYw" name="BASE_ELEMENT">
@@ -2158,17 +1902,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JM134_-8EeiQG4ZZm0HgYw"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JM135P-8EeiQG4ZZm0HgYw"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_lBgRoP-8EeiQG4ZZm0HgYw" type="Generalization_Edge" source="_JMhu0P-8EeiQG4ZZm0HgYw" target="_hk4wEP1nEeisxOMTY1eUug">
-      <children xmi:type="notation:DecorationNode" xmi:id="_lBgRo_-8EeiQG4ZZm0HgYw" type="Generalization_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ZIrL4APBEemCCMXOyOLwIw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_lBgRpP-8EeiQG4ZZm0HgYw" y="39"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_lBgRof-8EeiQG4ZZm0HgYw"/>
-      <element xmi:type="uml:Generalization" href="License.uml#_lAvcoP-8EeiQG4ZZm0HgYw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lBgRov-8EeiQG4ZZm0HgYw" points="[940, 560, -643984, -643984]$[940, 329, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lB7IYP-8EeiQG4ZZm0HgYw" id="(0.49586776859504134,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lB7IYf-8EeiQG4ZZm0HgYw" id="(0.4975124378109453,1.0)"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_GzkmcAMJEemoQ5ZgWCUg_g" type="StereotypeCommentLink" source="_GzQdYAMJEemoQ5ZgWCUg_g" target="_Gzj_YwMJEemoQ5ZgWCUg_g">
       <styles xmi:type="notation:FontStyle" xmi:id="_GzkmcQMJEemoQ5ZgWCUg_g"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_GzkmdQMJEemoQ5ZgWCUg_g" name="BASE_ELEMENT">
@@ -2179,17 +1912,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GzkmcwMJEemoQ5ZgWCUg_g"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GzkmdAMJEemoQ5ZgWCUg_g"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_QhNJYAMJEemoQ5ZgWCUg_g" type="Generalization_Edge" source="_GzQdYAMJEemoQ5ZgWCUg_g" target="_rGZNcP1lEeisxOMTY1eUug">
-      <children xmi:type="notation:DecorationNode" xmi:id="_QhNJYwMJEemoQ5ZgWCUg_g" type="Generalization_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_VxU1kAPBEemCCMXOyOLwIw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QhNJZAMJEemoQ5ZgWCUg_g" x="-2" y="37"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_QhNJYQMJEemoQ5ZgWCUg_g"/>
-      <element xmi:type="uml:Generalization" href="License.uml#_QgjpIAMJEemoQ5ZgWCUg_g"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QhNJYgMJEemoQ5ZgWCUg_g" points="[580, 440, -643984, -643984]$[580, 380, -643984, -643984]$[300, 380, -643984, -643984]$[300, 341, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Qhut0AMJEemoQ5ZgWCUg_g" id="(0.4580152671755725,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Qhut0QMJEemoQ5ZgWCUg_g" id="(0.4784688995215311,1.0)"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_UdtYoAUhEemrBZmpgd_POA" type="StereotypeCommentLink" source="_UdWzUAUhEemrBZmpgd_POA" target="_UdsKgAUhEemrBZmpgd_POA">
       <styles xmi:type="notation:FontStyle" xmi:id="_UdtYoQUhEemrBZmpgd_POA"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_UdtYpQUhEemrBZmpgd_POA" name="BASE_ELEMENT">
@@ -2200,17 +1922,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UdtYowUhEemrBZmpgd_POA"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UdtYpAUhEemrBZmpgd_POA"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_V1vikAUhEemrBZmpgd_POA" type="Generalization_Edge" source="_UdWzUAUhEemrBZmpgd_POA" target="_hk4wEP1nEeisxOMTY1eUug">
-      <children xmi:type="notation:DecorationNode" xmi:id="_V1vikwUhEemrBZmpgd_POA" type="Generalization_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_W-CAUAUhEemrBZmpgd_POA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_V1wJoAUhEemrBZmpgd_POA" y="39"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_V1vikQUhEemrBZmpgd_POA"/>
-      <element xmi:type="uml:Generalization" href="License.uml#_eHdzkP7_EeiZ-fXSiUXhdA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_V1vikgUhEemrBZmpgd_POA" points="[860, 580, -643984, -643984]$[860, 380, -643984, -643984]$[940, 380, -643984, -643984]$[940, 345, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_W-q5gAUhEemrBZmpgd_POA" id="(0.4968944099378882,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_W-q5gQUhEemrBZmpgd_POA" id="(0.4975124378109453,1.0)"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_vFvdBwVqEemrBZmpgd_POA" type="StereotypeCommentLink" source="_vFiosAVqEemrBZmpgd_POA" target="_vFvdAwVqEemrBZmpgd_POA">
       <styles xmi:type="notation:FontStyle" xmi:id="_vFvdCAVqEemrBZmpgd_POA"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vFwEEgVqEemrBZmpgd_POA" name="BASE_ELEMENT">
@@ -2221,16 +1932,15 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vFwEEAVqEemrBZmpgd_POA"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vFwEEQVqEemrBZmpgd_POA"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_oZiCsAV1EemrBZmpgd_POA" type="Generalization_Edge" source="_vFiosAVqEemrBZmpgd_POA" target="_hk4wEP1nEeisxOMTY1eUug">
-      <children xmi:type="notation:DecorationNode" xmi:id="_oZipwAV1EemrBZmpgd_POA" type="Generalization_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ox9w0AV1EemrBZmpgd_POA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_oZipwQV1EemrBZmpgd_POA" x="-1" y="38"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_oZiCsQV1EemrBZmpgd_POA"/>
-      <element xmi:type="uml:Generalization" href="License.uml#_oY-pEAV1EemrBZmpgd_POA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oZiCsgV1EemrBZmpgd_POA" points="[1020, 580, -643984, -643984]$[1020, 380, -643984, -643984]$[940, 380, -643984, -643984]$[940, 345, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oaGqcAV1EemrBZmpgd_POA" id="(0.49586776859504134,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oaHRgAV1EemrBZmpgd_POA" id="(0.4975124378109453,1.0)"/>
+    <edges xmi:type="notation:Connector" xmi:id="_m_GhcEWyEem3_P23YPx5GQ" type="StereotypeCommentLink" source="_m-yYYEWyEem3_P23YPx5GQ" target="_m_F6YEWyEem3_P23YPx5GQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_m_GhcUWyEem3_P23YPx5GQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_m_GhdUWyEem3_P23YPx5GQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="Common.uml#_v04t4DFPEemw1_Ys6rcLWw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_m_GhckWyEem3_P23YPx5GQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_m_Ghc0WyEem3_P23YPx5GQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_m_GhdEWyEem3_P23YPx5GQ"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_7SWz0P1nEeisxOMTY1eUug" type="PapyrusUMLClassDiagram" name="Entitlement Pools" measurementUnit="Pixel">
@@ -2294,24 +2004,6 @@
           <element xmi:type="uml:Property" href="License.uml#_HRGL4P8XEeiZ-fXSiUXhdA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_HRmiMf8XEeiZ-fXSiUXhdA"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_TJJDoAPHEemCCMXOyOLwIw" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_TJMG8APHEemCCMXOyOLwIw" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_TJMG8QPHEemCCMXOyOLwIw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TJMG8gPHEemCCMXOyOLwIw"/>
-          </children>
-          <element xmi:type="uml:Property" href="Common.uml#_Td26cOLNEeiKy5JVrA0UGA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_TJJDoQPHEemCCMXOyOLwIw"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_TJJDogPHEemCCMXOyOLwIw" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_TJOjMAPHEemCCMXOyOLwIw" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_TJOjMQPHEemCCMXOyOLwIw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TJOjMgPHEemCCMXOyOLwIw"/>
-          </children>
-          <element xmi:type="uml:Property" href="Common.uml#_T6QikOLNEeiKy5JVrA0UGA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_TJJDowPHEemCCMXOyOLwIw"/>
-        </children>
         <children xmi:type="notation:Shape" xmi:id="_TJJqtAPHEemCCMXOyOLwIw" type="Property_ClassAttributeLabel">
           <children xmi:type="notation:DecorationNode" xmi:id="_dW7GAARmEemo7ZzqT33fqQ" visible="false" type="StereotypeLabel">
             <styles xmi:type="notation:StringValueStyle" xmi:id="_dW7GAQRmEemo7ZzqT33fqQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
@@ -2330,15 +2022,6 @@
           <element xmi:type="uml:Property" href="Common.uml#_wEHtEOLJEeiKy5JVrA0UGA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_TJJqtwPHEemCCMXOyOLwIw"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_TJJquAPHEemCCMXOyOLwIw" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_TJYUMAPHEemCCMXOyOLwIw" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_TJYUMQPHEemCCMXOyOLwIw" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TJYUMgPHEemCCMXOyOLwIw"/>
-          </children>
-          <element xmi:type="uml:Property" href="Common.uml#_wj9DsOLJEeiKy5JVrA0UGA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_TJJquQPHEemCCMXOyOLwIw"/>
-        </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_D-fdhP1oEeisxOMTY1eUug"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_D-fdhf1oEeisxOMTY1eUug"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_D-gEkP1oEeisxOMTY1eUug"/>
@@ -2372,156 +2055,6 @@
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D-qcov1oEeisxOMTY1eUug" x="200"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_Gl16QP1oEeisxOMTY1eUug" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_Gl2hUP1oEeisxOMTY1eUug" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Gl2hUf1oEeisxOMTY1eUug" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Gl2hUv1oEeisxOMTY1eUug" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_Gl2hU_1oEeisxOMTY1eUug" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_BL3_YP19EeisxOMTY1eUug" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_BL7pwP19EeisxOMTY1eUug" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_BL7pwf19EeisxOMTY1eUug" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BL7pwv19EeisxOMTY1eUug"/>
-          </children>
-          <element xmi:type="uml:Property" href="License.uml#_BLpV4P19EeisxOMTY1eUug"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_BL3_Yf19EeisxOMTY1eUug"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_Bl7eIP19EeisxOMTY1eUug" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_Bl-hcP19EeisxOMTY1eUug" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_Bl-hcf19EeisxOMTY1eUug" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Bl-hcv19EeisxOMTY1eUug"/>
-          </children>
-          <element xmi:type="uml:Property" href="License.uml#_BluCwP19EeisxOMTY1eUug"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Bl7eIf19EeisxOMTY1eUug"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_Ij7yEP19EeisxOMTY1eUug" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_Ij_ccP19EeisxOMTY1eUug" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_Ij_ccf19EeisxOMTY1eUug" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ij_ccv19EeisxOMTY1eUug"/>
-          </children>
-          <element xmi:type="uml:Property" href="License.uml#_IjiJcP19EeisxOMTY1eUug"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Ij7yEf19EeisxOMTY1eUug"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_I9gvsP19EeisxOMTY1eUug" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_I9kaEP19EeisxOMTY1eUug" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_I9kaEf19EeisxOMTY1eUug" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_I9kaEv19EeisxOMTY1eUug"/>
-          </children>
-          <element xmi:type="uml:Property" href="License.uml#_I9Ob0P19EeisxOMTY1eUug"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_I9gvsf19EeisxOMTY1eUug"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_JWZJwP19EeisxOMTY1eUug" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_JWc0IP19EeisxOMTY1eUug" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_JWc0If19EeisxOMTY1eUug" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JWc0Iv19EeisxOMTY1eUug"/>
-          </children>
-          <element xmi:type="uml:Property" href="License.uml#_JWKgQP19EeisxOMTY1eUug"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_JWZJwf19EeisxOMTY1eUug"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_JvF9oP19EeisxOMTY1eUug" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_JvJA8P19EeisxOMTY1eUug" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_JvJA8f19EeisxOMTY1eUug" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JvJA8v19EeisxOMTY1eUug"/>
-          </children>
-          <element xmi:type="uml:Property" href="License.uml#_Ju2tEP19EeisxOMTY1eUug"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_JvF9of19EeisxOMTY1eUug"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_YfCJcP8VEeiZ-fXSiUXhdA" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_YfGa4P8VEeiZ-fXSiUXhdA" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_YfGa4f8VEeiZ-fXSiUXhdA" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YfGa4v8VEeiZ-fXSiUXhdA"/>
-          </children>
-          <element xmi:type="uml:Property" href="License.uml#_YepH4P8VEeiZ-fXSiUXhdA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_YfCJcf8VEeiZ-fXSiUXhdA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="__MFbMAMJEemoQ5ZgWCUg_g" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="__MLh0AMJEemoQ5ZgWCUg_g" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="__MLh0QMJEemoQ5ZgWCUg_g" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="__MLh0gMJEemoQ5ZgWCUg_g"/>
-          </children>
-          <element xmi:type="uml:Property" href="Common.uml#_Td26cOLNEeiKy5JVrA0UGA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="__MFbMQMJEemoQ5ZgWCUg_g"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="__MGCQAMJEemoQ5ZgWCUg_g" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="__MPMMAMJEemoQ5ZgWCUg_g" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="__MPMMQMJEemoQ5ZgWCUg_g" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="__MPMMgMJEemoQ5ZgWCUg_g"/>
-          </children>
-          <element xmi:type="uml:Property" href="Common.uml#_T6QikOLNEeiKy5JVrA0UGA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="__MGCQQMJEemoQ5ZgWCUg_g"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="__MGpUAMJEemoQ5ZgWCUg_g" type="Property_ClassAttributeLabel" fillColor="12560536">
-          <children xmi:type="notation:DecorationNode" xmi:id="__MWg8AMJEemoQ5ZgWCUg_g" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="__MWg8QMJEemoQ5ZgWCUg_g" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="__MWg8gMJEemoQ5ZgWCUg_g"/>
-          </children>
-          <element xmi:type="uml:Property" href="Common.uml#_vi4oQOLJEeiKy5JVrA0UGA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="__MGpUQMJEemoQ5ZgWCUg_g"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="__MGpUgMJEemoQ5ZgWCUg_g" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="__MaLUAMJEemoQ5ZgWCUg_g" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="__MaLUQMJEemoQ5ZgWCUg_g" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="__MaLUgMJEemoQ5ZgWCUg_g"/>
-          </children>
-          <element xmi:type="uml:Property" href="Common.uml#_wEHtEOLJEeiKy5JVrA0UGA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="__MGpUwMJEemoQ5ZgWCUg_g"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="__MGpVAMJEemoQ5ZgWCUg_g" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="__Md1sAMJEemoQ5ZgWCUg_g" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="__Md1sQMJEemoQ5ZgWCUg_g" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="__Md1sgMJEemoQ5ZgWCUg_g"/>
-          </children>
-          <element xmi:type="uml:Property" href="Common.uml#_wj9DsOLJEeiKy5JVrA0UGA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="__MGpVQMJEemoQ5ZgWCUg_g"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_Gl2hVP1oEeisxOMTY1eUug"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_Gl2hVf1oEeisxOMTY1eUug"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Gl2hVv1oEeisxOMTY1eUug"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Gl2hV_1oEeisxOMTY1eUug"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_Gl2hWP1oEeisxOMTY1eUug" visible="false" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_Gl2hWf1oEeisxOMTY1eUug"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_Gl2hWv1oEeisxOMTY1eUug"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Gl2hW_1oEeisxOMTY1eUug"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Gl2hXP1oEeisxOMTY1eUug"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_Gl2hXf1oEeisxOMTY1eUug" visible="false" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_Gl2hXv1oEeisxOMTY1eUug"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_Gl2hX_1oEeisxOMTY1eUug"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Gl2hYP1oEeisxOMTY1eUug"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Gl2hYf1oEeisxOMTY1eUug"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Gl_EMP1oEeisxOMTY1eUug" visible="false" type="StereotypeLabel">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YgkN4P19EeisxOMTY1eUug" source="PapyrusCSSForceValue">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YgkN4f19EeisxOMTY1eUug" key="visible" value="true"/>
-        </eAnnotations>
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_Gl_EMf1oEeisxOMTY1eUug" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
-        <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Gl_EMv1oEeisxOMTY1eUug"/>
-      </children>
-      <element xmi:type="uml:Class" href="License.uml#_GlxBwP1oEeisxOMTY1eUug"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Gl16Qf1oEeisxOMTY1eUug" x="340" y="80" width="361" height="261"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_Gl_rQP1oEeisxOMTY1eUug" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_Gl_rQf1oEeisxOMTY1eUug"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Gl_rQ_1oEeisxOMTY1eUug" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="License.uml#_GlxBwP1oEeisxOMTY1eUug"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Gl_rQv1oEeisxOMTY1eUug" x="200"/>
-    </children>
     <children xmi:type="notation:Shape" xmi:id="_L9LLUP1oEeisxOMTY1eUug" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_L9LyYP1oEeisxOMTY1eUug" type="Class_NameLabel"/>
       <children xmi:type="notation:DecorationNode" xmi:id="_L9LyYf1oEeisxOMTY1eUug" type="Class_FloatingNameLabel">
@@ -2582,33 +2115,6 @@
           <element xmi:type="uml:Property" href="License.uml#_1cIjwARsEemo7ZzqT33fqQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_1co6EQRsEemo7ZzqT33fqQ"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_9_3fYARsEemo7ZzqT33fqQ" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_-AGI4ARsEemo7ZzqT33fqQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_-AGI4QRsEemo7ZzqT33fqQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-AGI4gRsEemo7ZzqT33fqQ"/>
-          </children>
-          <element xmi:type="uml:Property" href="Common.uml#_vi4oQOLJEeiKy5JVrA0UGA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_9_3fYQRsEemo7ZzqT33fqQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_9_4GcARsEemo7ZzqT33fqQ" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_-AJzQARsEemo7ZzqT33fqQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_-AJzQQRsEemo7ZzqT33fqQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-AJzQgRsEemo7ZzqT33fqQ"/>
-          </children>
-          <element xmi:type="uml:Property" href="Common.uml#_wEHtEOLJEeiKy5JVrA0UGA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_9_4GcQRsEemo7ZzqT33fqQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_9_4GcgRsEemo7ZzqT33fqQ" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_-ANdoARsEemo7ZzqT33fqQ" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_-ANdoQRsEemo7ZzqT33fqQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-ANdogRsEemo7ZzqT33fqQ"/>
-          </children>
-          <element xmi:type="uml:Property" href="Common.uml#_wj9DsOLJEeiKy5JVrA0UGA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_9_4GcwRsEemo7ZzqT33fqQ"/>
-        </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_L9LyZP1oEeisxOMTY1eUug"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_L9LyZf1oEeisxOMTY1eUug"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_L9LyZv1oEeisxOMTY1eUug"/>
@@ -2769,10 +2275,122 @@
       <element xmi:type="uml:Comment" href="License.uml#_vaCLACpWEemnoK-fhDe5lw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vaEAMSpWEemnoK-fhDe5lw" x="1020" y="220" width="261"/>
     </children>
+    <children xmi:type="notation:Shape" xmi:id="_P5TjYEXaEem3_P23YPx5GQ" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_P5TjYkXaEem3_P23YPx5GQ" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_P5TjY0XaEem3_P23YPx5GQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_P5TjZEXaEem3_P23YPx5GQ" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_P5TjZUXaEem3_P23YPx5GQ" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_TgyAYEXaEem3_P23YPx5GQ" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_TsW-QEXaEem3_P23YPx5GQ" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_TsW-QUXaEem3_P23YPx5GQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TsW-QkXaEem3_P23YPx5GQ"/>
+          </children>
+          <element xmi:type="uml:Property" href="License.uml#_BLpV4P19EeisxOMTY1eUug"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_TgyAYUXaEem3_P23YPx5GQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_TgyAYkXaEem3_P23YPx5GQ" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_TsYzcEXaEem3_P23YPx5GQ" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_TsYzcUXaEem3_P23YPx5GQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TsYzckXaEem3_P23YPx5GQ"/>
+          </children>
+          <element xmi:type="uml:Property" href="License.uml#_BluCwP19EeisxOMTY1eUug"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_TgyAY0XaEem3_P23YPx5GQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_TgynckXaEem3_P23YPx5GQ" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_Tscd0EXaEem3_P23YPx5GQ" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_Tscd0UXaEem3_P23YPx5GQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tscd0kXaEem3_P23YPx5GQ"/>
+          </children>
+          <element xmi:type="uml:Property" href="License.uml#_I9Ob0P19EeisxOMTY1eUug"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Tgync0XaEem3_P23YPx5GQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_TgyndEXaEem3_P23YPx5GQ" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_TseTAEXaEem3_P23YPx5GQ" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_TseTAUXaEem3_P23YPx5GQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TseTAkXaEem3_P23YPx5GQ"/>
+          </children>
+          <children xmi:type="notation:DecorationNode" xmi:id="_TseTGUXaEem3_P23YPx5GQ" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_TseTGkXaEem3_P23YPx5GQ" name="stereotype" stringValue="OpenModel_Profile::Future"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_QEI7UKVxEeikF6xsfT18UA"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TseTG0XaEem3_P23YPx5GQ"/>
+          </children>
+          <element xmi:type="uml:Property" href="License.uml#_JWKgQP19EeisxOMTY1eUug"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_TgyndUXaEem3_P23YPx5GQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_TgyndkXaEem3_P23YPx5GQ" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_TsgIRkXaEem3_P23YPx5GQ" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_TsgIR0XaEem3_P23YPx5GQ" name="stereotype" stringValue="OpenModel_Profile::Future"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_QEI7UKVxEeikF6xsfT18UA"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TsgISEXaEem3_P23YPx5GQ"/>
+          </children>
+          <children xmi:type="notation:DecorationNode" xmi:id="_TsfhIEXaEem3_P23YPx5GQ" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_TsfhIUXaEem3_P23YPx5GQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TsfhIkXaEem3_P23YPx5GQ"/>
+          </children>
+          <element xmi:type="uml:Property" href="License.uml#_Ju2tEP19EeisxOMTY1eUug"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Tgynd0XaEem3_P23YPx5GQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_TgyncEXaEem3_P23YPx5GQ" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_TsaooEXaEem3_P23YPx5GQ" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_TsaooUXaEem3_P23YPx5GQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TsaookXaEem3_P23YPx5GQ"/>
+          </children>
+          <element xmi:type="uml:Property" href="License.uml#_IjiJcP19EeisxOMTY1eUug"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_TgyncUXaEem3_P23YPx5GQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_TgyneEXaEem3_P23YPx5GQ" type="Property_ClassAttributeLabel">
+          <children xmi:type="notation:DecorationNode" xmi:id="_TsikcEXaEem3_P23YPx5GQ" visible="false" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_TsikcUXaEem3_P23YPx5GQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
+            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TsikckXaEem3_P23YPx5GQ"/>
+          </children>
+          <element xmi:type="uml:Property" href="License.uml#_YepH4P8VEeiZ-fXSiUXhdA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_TgyneUXaEem3_P23YPx5GQ"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_P5TjZkXaEem3_P23YPx5GQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_P5TjZ0XaEem3_P23YPx5GQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_P5TjaEXaEem3_P23YPx5GQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P5TjaUXaEem3_P23YPx5GQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_P5TjakXaEem3_P23YPx5GQ" visible="false" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_P5Tja0XaEem3_P23YPx5GQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_P5TjbEXaEem3_P23YPx5GQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_P5TjbUXaEem3_P23YPx5GQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P5TjbkXaEem3_P23YPx5GQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_P5Tjb0XaEem3_P23YPx5GQ" visible="false" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_P5TjcEXaEem3_P23YPx5GQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_P5TjcUXaEem3_P23YPx5GQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_P5TjckXaEem3_P23YPx5GQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P5Tjc0XaEem3_P23YPx5GQ"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_P5ZC8EXaEem3_P23YPx5GQ" visible="false" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="_P5ZC8UXaEem3_P23YPx5GQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
+        <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P5ZC8kXaEem3_P23YPx5GQ"/>
+      </children>
+      <element xmi:type="uml:Class" href="License.uml#_GlxBwP1oEeisxOMTY1eUug"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P5TjYUXaEem3_P23YPx5GQ" x="320" y="100"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_P5ctUEXaEem3_P23YPx5GQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_P5ctUUXaEem3_P23YPx5GQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_P5ctU0XaEem3_P23YPx5GQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="License.uml#_GlxBwP1oEeisxOMTY1eUug"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P5ctUkXaEem3_P23YPx5GQ" x="200"/>
+    </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_7SWz0f1nEeisxOMTY1eUug" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_7SWz0v1nEeisxOMTY1eUug"/>
     <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_7SWz0_1nEeisxOMTY1eUug" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
-      <owner xmi:type="uml:Package" href="License.uml#_R1nxUMfyEeiEtuRgTYzSUQ"/>
+      <owner xmi:type="uml:Package" href="License.uml#_U1T1kMfyEeiEtuRgTYzSUQ"/>
     </styles>
     <element xmi:type="uml:Package" href="License.uml#_U1T1kMfyEeiEtuRgTYzSUQ"/>
     <edges xmi:type="notation:Connector" xmi:id="_D-qcpP1oEeisxOMTY1eUug" type="StereotypeCommentLink" source="_D-e2cP1oEeisxOMTY1eUug" target="_D-qcoP1oEeisxOMTY1eUug">
@@ -2785,16 +2403,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D-qcp_1oEeisxOMTY1eUug"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D-qcqP1oEeisxOMTY1eUug"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_Gl_rRP1oEeisxOMTY1eUug" type="StereotypeCommentLink" source="_Gl16QP1oEeisxOMTY1eUug" target="_Gl_rQP1oEeisxOMTY1eUug">
-      <styles xmi:type="notation:FontStyle" xmi:id="_Gl_rRf1oEeisxOMTY1eUug"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Gl_rSf1oEeisxOMTY1eUug" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="License.uml#_GlxBwP1oEeisxOMTY1eUug"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Gl_rRv1oEeisxOMTY1eUug" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Gl_rR_1oEeisxOMTY1eUug"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Gl_rSP1oEeisxOMTY1eUug"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_L9THJ_1oEeisxOMTY1eUug" type="StereotypeCommentLink" source="_L9LLUP1oEeisxOMTY1eUug" target="_L9THI_1oEeisxOMTY1eUug">
       <styles xmi:type="notation:FontStyle" xmi:id="_L9THKP1oEeisxOMTY1eUug"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_L9THLP1oEeisxOMTY1eUug" name="BASE_ELEMENT">
@@ -2835,99 +2443,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Y7TOpP1oEeisxOMTY1eUug"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Y7TOpf1oEeisxOMTY1eUug"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="__L5bwP1oEeisxOMTY1eUug" type="Association_Edge" source="_Gl16QP1oEeisxOMTY1eUug" target="_L9LLUP1oEeisxOMTY1eUug">
-      <children xmi:type="notation:DecorationNode" xmi:id="__L5bw_1oEeisxOMTY1eUug" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_EPmmMP1pEeisxOMTY1eUug" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__L5bxP1oEeisxOMTY1eUug" x="1" y="-18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__L5bxf1oEeisxOMTY1eUug" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_EPwXMP1pEeisxOMTY1eUug" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__L5bxv1oEeisxOMTY1eUug" x="-28" y="-13"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__L5bx_1oEeisxOMTY1eUug" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_EP46EP1pEeisxOMTY1eUug" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__L5byP1oEeisxOMTY1eUug" x="59" y="-18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__L5byf1oEeisxOMTY1eUug" visible="false" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_EP_AsP1pEeisxOMTY1eUug" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__L5byv1oEeisxOMTY1eUug" x="-58" y="19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__L5by_1oEeisxOMTY1eUug" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_EQGVcP1pEeisxOMTY1eUug" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__L5bzP1oEeisxOMTY1eUug" x="24" y="-13"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="__L5bzf1oEeisxOMTY1eUug" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_EQNDIP1pEeisxOMTY1eUug" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__L5bzv1oEeisxOMTY1eUug" x="-27" y="-16"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="__L5bwf1oEeisxOMTY1eUug"/>
-      <element xmi:type="uml:Association" href="License.uml#__LoWAP1oEeisxOMTY1eUug"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__L5bwv1oEeisxOMTY1eUug" points="[701, 120, -643984, -643984]$[820, 120, -643984, -643984]$[1000, 120, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__MPaAP1oEeisxOMTY1eUug" id="(1.0,0.1532567049808429)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__MPaAf1oEeisxOMTY1eUug" id="(0.0,0.4975124378109453)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_M9gKcP1pEeisxOMTY1eUug" type="Association_Edge" source="_Gl16QP1oEeisxOMTY1eUug" target="_L9LLUP1oEeisxOMTY1eUug">
-      <children xmi:type="notation:DecorationNode" xmi:id="_M9gxgP1pEeisxOMTY1eUug" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Nuh-wP1pEeisxOMTY1eUug" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_M9gxgf1pEeisxOMTY1eUug" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_M9gxgv1pEeisxOMTY1eUug" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_NuuzEP1pEeisxOMTY1eUug" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_M9gxg_1pEeisxOMTY1eUug" x="1" y="-13"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_M9gxhP1pEeisxOMTY1eUug" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Nu1gwP1pEeisxOMTY1eUug" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_M9gxhf1pEeisxOMTY1eUug" x="94" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_M9gxhv1pEeisxOMTY1eUug" visible="false" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Nu81gP1pEeisxOMTY1eUug" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_M9gxh_1pEeisxOMTY1eUug" x="-92" y="18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_M9gxiP1pEeisxOMTY1eUug" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_NvEKQP1pEeisxOMTY1eUug" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_M9gxif1pEeisxOMTY1eUug" x="24" y="-13"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_M9gxiv1pEeisxOMTY1eUug" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_NvMtIP1pEeisxOMTY1eUug" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_M9gxi_1pEeisxOMTY1eUug" x="-26" y="-16"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_M9gKcf1pEeisxOMTY1eUug"/>
-      <element xmi:type="uml:Association" href="License.uml#_M9Q54P1pEeisxOMTY1eUug"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_M9gKcv1pEeisxOMTY1eUug" points="[701, 180, -643984, -643984]$[1000, 180, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_M92vwP1pEeisxOMTY1eUug" id="(1.0,0.3831417624521073)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_M92vwf1pEeisxOMTY1eUug" id="(0.0,0.7960199004975125)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_GS7TYP1qEeisxOMTY1eUug" type="Association_Edge" source="_Gl16QP1oEeisxOMTY1eUug" target="_NkwNIP1oEeisxOMTY1eUug">
-      <children xmi:type="notation:DecorationNode" xmi:id="_GS7TY_1qEeisxOMTY1eUug" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ODXogP14EeisxOMTY1eUug" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_GS7TZP1qEeisxOMTY1eUug" x="-1" y="-18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_GS7TZf1qEeisxOMTY1eUug" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ODlD4P14EeisxOMTY1eUug" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_GS7TZv1qEeisxOMTY1eUug" x="13" y="-13"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_GS7TZ_1qEeisxOMTY1eUug" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ODvb8P14EeisxOMTY1eUug" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_GS7TaP1qEeisxOMTY1eUug" x="38" y="-18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_GS7Taf1qEeisxOMTY1eUug" visible="false" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OD5M8P14EeisxOMTY1eUug" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_GS7Tav1qEeisxOMTY1eUug" x="-36" y="19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_GS7Ta_1qEeisxOMTY1eUug" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OEC98P14EeisxOMTY1eUug" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_GS7TbP1qEeisxOMTY1eUug" x="24" y="27"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_GS7Tbf1qEeisxOMTY1eUug" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OEMu8P14EeisxOMTY1eUug" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_GS7Tbv1qEeisxOMTY1eUug" x="-36" y="-17"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_GS7TYf1qEeisxOMTY1eUug"/>
-      <element xmi:type="uml:Association" href="License.uml#_GSdZUP1qEeisxOMTY1eUug"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GS7TYv1qEeisxOMTY1eUug" points="[661, 300, -643984, -643984]$[980, 300, -643984, -643984]$[980, 340, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GTR4sP1qEeisxOMTY1eUug" id="(1.0,0.842911877394636)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GTR4sf1qEeisxOMTY1eUug" id="(0.26490066225165565,0.0)"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_J2mOcP1qEeisxOMTY1eUug" type="Association_Edge" source="_D-e2cP1oEeisxOMTY1eUug" target="_QG6A0P1oEeisxOMTY1eUug">
       <children xmi:type="notation:DecorationNode" xmi:id="_J2m1gP1qEeisxOMTY1eUug" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OFYasP14EeisxOMTY1eUug" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -2955,8 +2470,8 @@
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_J2mOcf1qEeisxOMTY1eUug"/>
       <element xmi:type="uml:Association" href="License.uml#_J2HtUP1qEeisxOMTY1eUug"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J2mOcv1qEeisxOMTY1eUug" points="[681, 560, -643984, -643984]$[980, 560, -643984, -643984]$[980, 600, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J3AeIP1qEeisxOMTY1eUug" id="(1.0,0.311284046692607)"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J2mOcv1qEeisxOMTY1eUug" points="[681, 540, -643984, -643984]$[980, 540, -643984, -643984]$[980, 600, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J3AeIP1qEeisxOMTY1eUug" id="(1.0,0.28708133971291866)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J3AeIf1qEeisxOMTY1eUug" id="(0.37267080745341613,0.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_MUmh8P1qEeisxOMTY1eUug" type="Association_Edge" source="_D-e2cP1oEeisxOMTY1eUug" target="_Y7JdoP1oEeisxOMTY1eUug">
@@ -2992,41 +2507,10 @@
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_MUmh8f1qEeisxOMTY1eUug"/>
       <element xmi:type="uml:Association" href="License.uml#_MT7MgP1qEeisxOMTY1eUug"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MUmh8v1qEeisxOMTY1eUug" points="[360, 680, -643984, -643984]$[140, 680, -643984, -643984]$[140, 580, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MU-8cP1qEeisxOMTY1eUug" id="(0.0,0.7782101167315175)"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MUmh8v1qEeisxOMTY1eUug" points="[360, 640, -643984, -643984]$[140, 640, -643984, -643984]$[140, 580, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MU-8cP1qEeisxOMTY1eUug" id="(0.0,0.7655502392344498)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MU-8cf1qEeisxOMTY1eUug" id="(0.4975124378109453,1.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_Oj2AsP1qEeisxOMTY1eUug" type="Association_Edge" source="_Gl16QP1oEeisxOMTY1eUug" target="_D-e2cP1oEeisxOMTY1eUug">
-      <children xmi:type="notation:DecorationNode" xmi:id="_Oj2As_1qEeisxOMTY1eUug" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OIMeIP14EeisxOMTY1eUug" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Oj2AtP1qEeisxOMTY1eUug" x="-1" y="-19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Oj2Atf1qEeisxOMTY1eUug" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OIZ5gP14EeisxOMTY1eUug" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Oj2Atv1qEeisxOMTY1eUug" x="1" y="18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Oj2At_1qEeisxOMTY1eUug" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OInU4P14EeisxOMTY1eUug" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Oj2AuP1qEeisxOMTY1eUug" x="10" y="-18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Oj2Auf1qEeisxOMTY1eUug" visible="false" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OIyUAP14EeisxOMTY1eUug" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Oj2Auv1qEeisxOMTY1eUug" x="-12" y="18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Oj2Au_1qEeisxOMTY1eUug" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OJCLoP14EeisxOMTY1eUug" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Oj2AvP1qEeisxOMTY1eUug" x="11" y="18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Oj2Avf1qEeisxOMTY1eUug" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OJPnAP14EeisxOMTY1eUug" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Oj2Avv1qEeisxOMTY1eUug" x="-13" y="15"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_Oj2Asf1qEeisxOMTY1eUug"/>
-      <element xmi:type="uml:Association" href="License.uml#_OjPjwP1qEeisxOMTY1eUug"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Oj2Asv1qEeisxOMTY1eUug" points="[560, 280, -643984, -643984]$[540, 360, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OkSFkP1qEeisxOMTY1eUug" id="(0.4986149584487535,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OkSFkf1qEeisxOMTY1eUug" id="(0.4984423676012461,0.0)"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_pST8sP2REeisxOMTY1eUug" type="Association_Edge" source="_NkwNIP1oEeisxOMTY1eUug" target="_QG6A0P1oEeisxOMTY1eUug">
       <children xmi:type="notation:DecorationNode" xmi:id="_pST8s_2REeisxOMTY1eUug" type="Association_StereotypeLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_pST8tP2REeisxOMTY1eUug" y="-20"/>
@@ -3052,6 +2536,158 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pS2IMP2REeisxOMTY1eUug" id="(0.6622516556291391,1.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pS2IMf2REeisxOMTY1eUug" id="(0.7453416149068323,0.0)"/>
     </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_P5ctVEXaEem3_P23YPx5GQ" type="StereotypeCommentLink" source="_P5TjYEXaEem3_P23YPx5GQ" target="_P5ctUEXaEem3_P23YPx5GQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_P5ctVUXaEem3_P23YPx5GQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_P5ctWUXaEem3_P23YPx5GQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="License.uml#_GlxBwP1oEeisxOMTY1eUug"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_P5ctVkXaEem3_P23YPx5GQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_P5ctV0XaEem3_P23YPx5GQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_P5ctWEXaEem3_P23YPx5GQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_oKvG8EXaEem3_P23YPx5GQ" type="Association_Edge" source="_P5TjYEXaEem3_P23YPx5GQ" target="_D-e2cP1oEeisxOMTY1eUug">
+      <children xmi:type="notation:DecorationNode" xmi:id="_oKvG80XaEem3_P23YPx5GQ" type="Association_StereotypeLabel">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_p5QeQUXaEem3_P23YPx5GQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_p5QeQkXaEem3_P23YPx5GQ" key="visible" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ejcnIEXbEem3_P23YPx5GQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_oKvG9EXaEem3_P23YPx5GQ" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_oKvG9UXaEem3_P23YPx5GQ" type="Association_NameLabel">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_p5PQIEXaEem3_P23YPx5GQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_p5P3MEXaEem3_P23YPx5GQ" key="visible" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_euXdsEXbEem3_P23YPx5GQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_oKvG9kXaEem3_P23YPx5GQ" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_oKvG90XaEem3_P23YPx5GQ" visible="false" type="Association_TargetRoleLabel">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_p5P3M0XaEem3_P23YPx5GQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_p5QeQEXaEem3_P23YPx5GQ" key="visible" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_e5ZpAEXbEem3_P23YPx5GQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_oKvG-EXaEem3_P23YPx5GQ" x="31" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_oKvG-UXaEem3_P23YPx5GQ" visible="false" type="Association_SourceRoleLabel">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_p5QeRUXaEem3_P23YPx5GQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_p5QeRkXaEem3_P23YPx5GQ" key="visible" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_fEkXMEXbEem3_P23YPx5GQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_oKvG-kXaEem3_P23YPx5GQ" x="-31" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_oKvG-0XaEem3_P23YPx5GQ" type="Association_SourceMultiplicityLabel">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_p5P3MUXaEem3_P23YPx5GQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_p5P3MkXaEem3_P23YPx5GQ" key="visible" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_fP-9AEXbEem3_P23YPx5GQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_oKvG_EXaEem3_P23YPx5GQ" x="31" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_oKvG_UXaEem3_P23YPx5GQ" type="Association_TargetMultiplicityLabel">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_p5QeQ0XaEem3_P23YPx5GQ" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_p5QeREXaEem3_P23YPx5GQ" key="visible" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_fbykYEXbEem3_P23YPx5GQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_oKvG_kXaEem3_P23YPx5GQ" x="-31" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_oKvG8UXaEem3_P23YPx5GQ"/>
+      <element xmi:type="uml:Association" href="License.uml#_OjPjwP1qEeisxOMTY1eUug"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oKvG8kXaEem3_P23YPx5GQ" points="[520, 273, -643984, -643984]$[516, 480, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hxxkUEXbEem3_P23YPx5GQ" id="(0.5089058524173028,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hxxkUUXbEem3_P23YPx5GQ" id="(0.4984423676012461,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_xUlAUEXaEem3_P23YPx5GQ" type="Association_Edge" source="_P5TjYEXaEem3_P23YPx5GQ" target="_L9LLUP1oEeisxOMTY1eUug">
+      <children xmi:type="notation:DecorationNode" xmi:id="_xUlAU0XaEem3_P23YPx5GQ" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_fnTQ0EXbEem3_P23YPx5GQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xUlAVEXaEem3_P23YPx5GQ" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_xUlAVUXaEem3_P23YPx5GQ" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_fzNl4EXbEem3_P23YPx5GQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xUlAVkXaEem3_P23YPx5GQ" x="3" y="-13"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_xUlAV0XaEem3_P23YPx5GQ" visible="false" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_f-21MEXbEem3_P23YPx5GQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xUlAWEXaEem3_P23YPx5GQ" x="43" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_xUlAWUXaEem3_P23YPx5GQ" visible="false" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_gKZW0EXbEem3_P23YPx5GQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xUlAWkXaEem3_P23YPx5GQ" x="-43" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_xUlAW0XaEem3_P23YPx5GQ" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_gVksEEXbEem3_P23YPx5GQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xUlAXEXaEem3_P23YPx5GQ" x="12" y="7"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_xUlAXUXaEem3_P23YPx5GQ" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_gg_R4EXbEem3_P23YPx5GQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xUlAXkXaEem3_P23YPx5GQ" x="-16" y="7"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_xUlAUUXaEem3_P23YPx5GQ"/>
+      <element xmi:type="uml:Association" href="License.uml#__LoWAP1oEeisxOMTY1eUug"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xUlAUkXaEem3_P23YPx5GQ" points="[713, 158, -643984, -643984]$[1000, 133, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_01zrYEXaEem3_P23YPx5GQ" id="(1.0,0.10362694300518134)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hxxkUkXbEem3_P23YPx5GQ" id="(0.0,0.527363184079602)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="__OdhQEXaEem3_P23YPx5GQ" type="Association_Edge" source="_P5TjYEXaEem3_P23YPx5GQ" target="_L9LLUP1oEeisxOMTY1eUug">
+      <children xmi:type="notation:DecorationNode" xmi:id="__OdhQ0XaEem3_P23YPx5GQ" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_gs6OAEXbEem3_P23YPx5GQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__OdhREXaEem3_P23YPx5GQ" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__OeIUEXaEem3_P23YPx5GQ" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_g4Va4EXbEem3_P23YPx5GQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__OeIUUXaEem3_P23YPx5GQ" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__OeIUkXaEem3_P23YPx5GQ" visible="false" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_hDjMYEXbEem3_P23YPx5GQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__OeIU0XaEem3_P23YPx5GQ" x="43" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__OeIVEXaEem3_P23YPx5GQ" visible="false" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_hO6u4EXbEem3_P23YPx5GQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__OeIVUXaEem3_P23YPx5GQ" x="-43" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__OeIVkXaEem3_P23YPx5GQ" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_haeeoEXbEem3_P23YPx5GQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__OeIV0XaEem3_P23YPx5GQ" x="43" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__OeIWEXaEem3_P23YPx5GQ" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_hmAZMEXbEem3_P23YPx5GQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__OeIWUXaEem3_P23YPx5GQ" x="-43" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="__OdhQUXaEem3_P23YPx5GQ"/>
+      <element xmi:type="uml:Association" href="License.uml#_M9Q54P1pEeisxOMTY1eUug"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__OdhQkXaEem3_P23YPx5GQ" points="[713, 158, -643984, -643984]$[1000, 133, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hxxkU0XbEem3_P23YPx5GQ" id="(1.0,0.31088082901554404)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AWk_4EXbEem3_P23YPx5GQ" id="(0.0,0.6965174129353234)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_YJQx8EXbEem3_P23YPx5GQ" type="Association_Edge" source="_P5TjYEXaEem3_P23YPx5GQ" target="_NkwNIP1oEeisxOMTY1eUug">
+      <children xmi:type="notation:DecorationNode" xmi:id="_YJQx80XbEem3_P23YPx5GQ" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_bFpDgEXbEem3_P23YPx5GQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YJQx9EXbEem3_P23YPx5GQ" x="1" y="-18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YJQx9UXbEem3_P23YPx5GQ" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_bRLlIEXbEem3_P23YPx5GQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YJQx9kXbEem3_P23YPx5GQ" y="19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YJQx90XbEem3_P23YPx5GQ" visible="false" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_bcakwEXbEem3_P23YPx5GQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YJQx-EXbEem3_P23YPx5GQ" x="46" y="-18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YJQx-UXbEem3_P23YPx5GQ" visible="false" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_bnZswEXbEem3_P23YPx5GQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YJQx-kXbEem3_P23YPx5GQ" x="-48" y="17"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YJQx-0XbEem3_P23YPx5GQ" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_byneQEXbEem3_P23YPx5GQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YJQx_EXbEem3_P23YPx5GQ" x="47" y="19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YJQx_UXbEem3_P23YPx5GQ" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_b92d4EXbEem3_P23YPx5GQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YJQx_kXbEem3_P23YPx5GQ" x="-47" y="-19"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_YJQx8UXbEem3_P23YPx5GQ"/>
+      <element xmi:type="uml:Association" href="License.uml#_GSdZUP1qEeisxOMTY1eUug"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YJQx8kXbEem3_P23YPx5GQ" points="[713, 280, -643984, -643984]$[980, 280, -643984, -643984]$[980, 340, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a6pUcEXbEem3_P23YPx5GQ" id="(1.0,0.9326424870466321)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a6pUcUXbEem3_P23YPx5GQ" id="(0.2484472049689441,0.0)"/>
+    </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_MmW5IP2SEeisxOMTY1eUug" type="PapyrusUMLClassDiagram" name="Feature Groups" measurementUnit="Pixel">
     <children xmi:type="notation:Shape" xmi:id="_RNdnIP2SEeisxOMTY1eUug" type="Class_Shape">
@@ -3104,11 +2740,6 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_RNdnMv2SEeisxOMTY1eUug"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RNdnM_2SEeisxOMTY1eUug"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_RNifoP2SEeisxOMTY1eUug" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_RNifof2SEeisxOMTY1eUug" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
-        <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RNifov2SEeisxOMTY1eUug"/>
-      </children>
       <element xmi:type="uml:Class" href="License.uml#_Omfk4P2SEeisxOMTY1eUug"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RNdnIf2SEeisxOMTY1eUug" x="380" y="280" height="161"/>
     </children>
@@ -3149,7 +2780,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UmGW4v2SEeisxOMTY1eUug"/>
       </children>
       <element xmi:type="uml:Class" href="License.uml#_GlxBwP1oEeisxOMTY1eUug"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UmAQQf2SEeisxOMTY1eUug" x="1020" y="260" width="161" height="81"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UmAQQf2SEeisxOMTY1eUug" x="880" y="260" width="161" height="81"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_UmHlA_2SEeisxOMTY1eUug" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_UmHlBP2SEeisxOMTY1eUug"/>
@@ -3188,7 +2819,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WNS-Mv2SEeisxOMTY1eUug"/>
       </children>
       <element xmi:type="uml:Class" href="License.uml#_EFk28N3tEei-jeeHUjfpLA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WNMQgf2SEeisxOMTY1eUug" x="980" y="60"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WNMQgf2SEeisxOMTY1eUug" x="840" y="40"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_WNUzY_2SEeisxOMTY1eUug" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_WNUzZP2SEeisxOMTY1eUug"/>
@@ -3254,7 +2885,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ehWfEv2SEeisxOMTY1eUug"/>
       </children>
       <element xmi:type="uml:Class" href="License.uml#_bCM3oP2SEeisxOMTY1eUug"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ehN8Mf2SEeisxOMTY1eUug" x="360" y="20" width="281"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ehN8Mf2SEeisxOMTY1eUug" x="360" y="40" width="281" height="101"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_ehY7U_2SEeisxOMTY1eUug" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_ehY7VP2SEeisxOMTY1eUug"/>
@@ -3332,7 +2963,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mdfPMv2SEeisxOMTY1eUug"/>
       </children>
       <element xmi:type="uml:Class" href="License.uml#_4ZDVsMgEEeiEtuRgTYzSUQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mdTB8f2SEeisxOMTY1eUug" x="1020" y="380" width="161" height="81"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mdTB8f2SEeisxOMTY1eUug" x="880" y="380" width="161" height="81"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_mdhEY_2SEeisxOMTY1eUug" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_mdhEZP2SEeisxOMTY1eUug"/>
@@ -3345,7 +2976,7 @@
     <children xmi:type="notation:Shape" xmi:id="_TLu_sCpKEemnoK-fhDe5lw" type="Comment_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_TLvmwCpKEemnoK-fhDe5lw" type="Comment_BodyLabel"/>
       <element xmi:type="uml:Comment" href="License.uml#_TLsjcCpKEemnoK-fhDe5lw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TLu_sSpKEemnoK-fhDe5lw" x="320" y="580"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TLu_sSpKEemnoK-fhDe5lw" x="300" y="540"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_D6yTQCpMEemnoK-fhDe5lw" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_D6yTQipMEemnoK-fhDe5lw" type="Class_NameLabel"/>
@@ -3376,7 +3007,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D63y0ipMEemnoK-fhDe5lw"/>
       </children>
       <element xmi:type="uml:Class" href="Vnf.uml#_aaEZADOREeiHat9KcP8uWA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D6yTQSpMEemnoK-fhDe5lw" x="60" y="200" width="121"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D6yTQSpMEemnoK-fhDe5lw" x="200" y="200" width="121"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_D67dMypMEemnoK-fhDe5lw" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_D67dNCpMEemnoK-fhDe5lw"/>
@@ -3389,7 +3020,7 @@
     <styles xmi:type="notation:StringValueStyle" xmi:id="_MmW5If2SEeisxOMTY1eUug" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_MmW5Iv2SEeisxOMTY1eUug"/>
     <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_MmW5I_2SEeisxOMTY1eUug" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
-      <owner xmi:type="uml:Package" href="License.uml#_R1nxUMfyEeiEtuRgTYzSUQ"/>
+      <owner xmi:type="uml:Package" href="License.uml#_U1T1kMfyEeiEtuRgTYzSUQ"/>
     </styles>
     <element xmi:type="uml:Package" href="License.uml#_U1T1kMfyEeiEtuRgTYzSUQ"/>
     <edges xmi:type="notation:Connector" xmi:id="_RNkU1_2SEeisxOMTY1eUug" type="StereotypeCommentLink" source="_RNdnIP2SEeisxOMTY1eUug" target="_RNkU0_2SEeisxOMTY1eUug">
@@ -3479,7 +3110,7 @@
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_ulKg8f2SEeisxOMTY1eUug"/>
       <element xmi:type="uml:Association" href="License.uml#_OjPjwP1qEeisxOMTY1eUug"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ulKg8v2SEeisxOMTY1eUug" points="[1080, 300, -643984, -643984]$[1100, 160, -643984, -643984]"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ulKg8v2SEeisxOMTY1eUug" points="[940, 300, -643984, -643984]$[960, 160, -643984, -643984]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vD9VwP2SEeisxOMTY1eUug" id="(0.4968944099378882,0.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vD980P2SEeisxOMTY1eUug" id="(0.47058823529411764,1.0)"/>
     </edges>
@@ -3599,7 +3230,7 @@
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_EEN8EipMEemnoK-fhDe5lw" type="Association_NameLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Wrq_YCpMEemnoK-fhDe5lw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_EEN8EypMEemnoK-fhDe5lw" x="48" y="-13"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_EEN8EypMEemnoK-fhDe5lw" x="-42" y="-33"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_EEN8FCpMEemnoK-fhDe5lw" visible="false" type="Association_TargetRoleLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_WwTnwCpMEemnoK-fhDe5lw" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -3619,7 +3250,7 @@
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_EENVASpMEemnoK-fhDe5lw"/>
       <element xmi:type="uml:Association" href="License.uml#_ph8IIAVoEemrBZmpgd_POA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EENVAipMEemnoK-fhDe5lw" points="[120, 300, -643984, -643984]$[120, 400, -643984, -643984]$[380, 400, -643984, -643984]"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EENVAipMEemnoK-fhDe5lw" points="[200, 300, -643984, -643984]$[260, 400, -643984, -643984]$[380, 400, -643984, -643984]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XCpU8CpMEemnoK-fhDe5lw" id="(0.49586776859504134,1.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XCpU8SpMEemnoK-fhDe5lw" id="(0.0,0.7453416149068323)"/>
     </edges>
@@ -3866,16 +3497,8 @@
     <styles xmi:type="notation:StringValueStyle" xmi:id="_GHVo8QPBEemCCMXOyOLwIw" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_GHVo8gPBEemCCMXOyOLwIw"/>
     <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_GHVo8wPBEemCCMXOyOLwIw" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
-      <owner xmi:type="uml:Package" href="License.uml#_R1nxUMfyEeiEtuRgTYzSUQ"/>
+      <owner xmi:type="uml:Package" href="License.uml#_U1T1kMfyEeiEtuRgTYzSUQ"/>
     </styles>
     <element xmi:type="uml:Package" href="License.uml#_U1T1kMfyEeiEtuRgTYzSUQ"/>
   </notation:Diagram>
-  <notation:Diagram xmi:id="_KOXJAEHYEemqbK2aT-9uCA" type="PapyrusUMLClassDiagram" name="Test" measurementUnit="Pixel">
-    <styles xmi:type="notation:StringValueStyle" xmi:id="_KOXJAUHYEemqbK2aT-9uCA" name="diagram_compatibility_version" stringValue="1.4.0"/>
-    <styles xmi:type="notation:DiagramStyle" xmi:id="_KOXJAkHYEemqbK2aT-9uCA"/>
-    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_KOXJA0HYEemqbK2aT-9uCA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
-      <owner xmi:type="uml:Package" href="License.uml#_R1nxUMfyEeiEtuRgTYzSUQ"/>
-    </styles>
-    <element xmi:type="uml:Package" href="License.uml#_R1nxUMfyEeiEtuRgTYzSUQ"/>
-  </notation:Diagram>
 </xmi:XMI>
diff --git a/ONAP Information Model/License.uml b/ONAP Information Model/License.uml
index 3565662..9e1c00d 100644
--- a/ONAP Information Model/License.uml
+++ b/ONAP Information Model/License.uml
@@ -1,463 +1,440 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<uml:Package xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_R1nxUMfyEeiEtuRgTYzSUQ" name="License" URI="">
-  <packagedElement xmi:type="uml:Package" xmi:id="_U1T1kMfyEeiEtuRgTYzSUQ" name="Diagrams">
-    <ownedComment xmi:type="uml:Comment" xmi:id="_oJ-UAColEemnoK-fhDe5lw">
-      <body>Does a License Agreement have to have at least one feature group?</body>
-    </ownedComment>
-    <ownedComment xmi:type="uml:Comment" xmi:id="_8nq1UConEemnoK-fhDe5lw">
-      <body>Definition of VLM</body>
-    </ownedComment>
-    <ownedComment xmi:type="uml:Comment" xmi:id="_APpBkCooEemnoK-fhDe5lw">
-      <body>Wil the VLM have a name, or just a Vendor Name (do we refine inherited name to VendorName)?</body>
-    </ownedComment>
-    <ownedComment xmi:type="uml:Comment" xmi:id="_vCAUECorEemnoK-fhDe5lw">
-      <body>If Rooted, updates will occur to this class.</body>
-    </ownedComment>
-    <ownedComment xmi:type="uml:Comment" xmi:id="_9kGrkCorEemnoK-fhDe5lw">
-      <body>See description from SAM Doc</body>
-    </ownedComment>
-    <ownedComment xmi:type="uml:Comment" xmi:id="_TLsjcCpKEemnoK-fhDe5lw">
-      <body>There are a bunch of attributes feature group attributes in SAm Definitions - maybe not in SDC??</body>
-    </ownedComment>
-    <ownedComment xmi:type="uml:Comment" xmi:id="_IuXygCpWEemnoK-fhDe5lw">
-      <body>Only EntitlementPoolDesc Currently being used are Name and MRN.   Everything else is optional.</body>
-    </ownedComment>
-    <ownedComment xmi:type="uml:Comment" xmi:id="_vaCLACpWEemnoK-fhDe5lw">
-      <body>Only attributes presently used are name, metric type and metric value.</body>
-    </ownedComment>
-    <ownedComment xmi:type="uml:Comment" xmi:id="_S7n00C7kEem7DJry5UTesQ">
-      <body>What do we do with keyFunction,LicenseKeyType, etc?</body>
-    </ownedComment>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Package" xmi:id="_Whm_UMfyEeiEtuRgTYzSUQ" name="Associations">
-    <packagedElement xmi:type="uml:Association" xmi:id="_CcCiwMfzEeiEtuRgTYzSUQ" name="VLMHasVnfd" memberEnd="_CcDw4sfzEeiEtuRgTYzSUQ _CcICUMfzEeiEtuRgTYzSUQ">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CcDw4MfzEeiEtuRgTYzSUQ" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CcDw4cfzEeiEtuRgTYzSUQ" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_CcDw4sfzEeiEtuRgTYzSUQ" name="vnfd" association="_CcCiwMfzEeiEtuRgTYzSUQ">
-        <type xmi:type="uml:Class" href="Vnf.uml#_aaEZADOREeiHat9KcP8uWA"/>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_lZE3kP1gEeisxOMTY1eUug"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lcU_4P1gEeisxOMTY1eUug" value="*"/>
-      </ownedEnd>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_CcICUMfzEeiEtuRgTYzSUQ" name="velndorlicensemodel (vlm)" type="_mEllAMfyEeiEtuRgTYzSUQ" association="_CcCiwMfzEeiEtuRgTYzSUQ"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_Sj1eAN3yEei-jeeHUjfpLA" name="LicenseKeyDescMadeAvailableAs" memberEnd="_Sj2FEt3yEei-jeeHUjfpLA _Sj3TMN3yEei-jeeHUjfpLA">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Sj2FEN3yEei-jeeHUjfpLA" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Sj2FEd3yEei-jeeHUjfpLA" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_Sj3TMN3yEei-jeeHUjfpLA" name="licensekeydesc" type="_4ZDVsMgEEeiEtuRgTYzSUQ" association="_Sj1eAN3yEei-jeeHUjfpLA"/>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_Sj2FEt3yEei-jeeHUjfpLA" name="licensekeyinstance" type="_D_LXMN3xEei-jeeHUjfpLA" aggregation="composite" association="_Sj1eAN3yEei-jeeHUjfpLA">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_as4TcA6fEemnO9QINOJnHg"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_atQt8A6fEemnO9QINOJnHg" value="*"/>
-      </ownedEnd>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_Q3zaAN3yEei-jeeHUjfpLA" name="LicenseKeyPolDescMadeAvaiableAs" memberEnd="_Q30oIt3yEei-jeeHUjfpLA _Q33EYN3yEei-jeeHUjfpLA">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Q30oIN3yEei-jeeHUjfpLA" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Q30oId3yEei-jeeHUjfpLA" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_Q30oIt3yEei-jeeHUjfpLA" name="licensekeypoolinstance" type="_B5kVkN3xEei-jeeHUjfpLA" association="_Q3zaAN3yEei-jeeHUjfpLA">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hKvdAN3yEei-jeeHUjfpLA"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hLH3gN3yEei-jeeHUjfpLA" value="*"/>
-      </ownedEnd>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_Q33EYN3yEei-jeeHUjfpLA" name="licencekeypooldesc" type="_4ZDVsMgEEeiEtuRgTYzSUQ" association="_Q3zaAN3yEei-jeeHUjfpLA"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_RxSmwN3yEei-jeeHUjfpLA" name="LicenseKeyPolInstanceContainsLicenseKeyInstance" memberEnd="_RxTN0t3yEei-jeeHUjfpLA _RxT04N3yEei-jeeHUjfpLA">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RxTN0N3yEei-jeeHUjfpLA" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RxTN0d3yEei-jeeHUjfpLA" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_RxTN0t3yEei-jeeHUjfpLA" name="licensekeyinstance" type="_D_LXMN3xEei-jeeHUjfpLA" association="_RxSmwN3yEei-jeeHUjfpLA">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mfYmcN3yEei-jeeHUjfpLA"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mfhwYN3yEei-jeeHUjfpLA" value="*"/>
-      </ownedEnd>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_RxT04N3yEei-jeeHUjfpLA" name="licensekeypoolinstance" type="_B5kVkN3xEei-jeeHUjfpLA" association="_RxSmwN3yEei-jeeHUjfpLA"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_sNy3kN3uEei-jeeHUjfpLA" name="LicenseKeyPoolDescHasSPLimits" memberEnd="_sNzeod3uEei-jeeHUjfpLA _sN0Fsd3uEei-jeeHUjfpLA">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sNy3kd3uEei-jeeHUjfpLA" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_sNzeoN3uEei-jeeHUjfpLA" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_sN0Fsd3uEei-jeeHUjfpLA" name="licencekeypooldesc" type="_4ZDVsMgEEeiEtuRgTYzSUQ" association="_sNy3kN3uEei-jeeHUjfpLA"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_43lCkN3uEei-jeeHUjfpLA" name="LicenseKeyPoolDescHasVendorLimits" memberEnd="_43lCk93uEei-jeeHUjfpLA _43qiIN3uEei-jeeHUjfpLA">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_43lCkd3uEei-jeeHUjfpLA" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_43lCkt3uEei-jeeHUjfpLA" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_43qiIN3uEei-jeeHUjfpLA" name="licencekeypooldesc" type="_4ZDVsMgEEeiEtuRgTYzSUQ" association="_43lCkN3uEei-jeeHUjfpLA"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_Hu77kN3zEei-jeeHUjfpLA" memberEnd="_Hu8iot3zEei-jeeHUjfpLA _Hu9wwN3zEei-jeeHUjfpLA">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Hu8ioN3zEei-jeeHUjfpLA" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Hu8iod3zEei-jeeHUjfpLA" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_Hu8iot3zEei-jeeHUjfpLA" name="licencekeypooldesc" type="_4ZDVsMgEEeiEtuRgTYzSUQ" association="_Hu77kN3zEei-jeeHUjfpLA"/>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_Hu9wwN3zEei-jeeHUjfpLA" name="vendorlicensemodel (vlm)" type="_mEllAMfyEeiEtuRgTYzSUQ" association="_Hu77kN3zEei-jeeHUjfpLA"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_J2HtUP1qEeisxOMTY1eUug" name="EntitlementDescMdeAvailableAsEntitlementIntstance" memberEnd="_J2IUYv1qEeisxOMTY1eUug _J2JigP1qEeisxOMTY1eUug">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_J2IUYP1qEeisxOMTY1eUug" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_J2IUYf1qEeisxOMTY1eUug" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_J2IUYv1qEeisxOMTY1eUug" name="entitlementinstance" type="_QG4ysP1oEeisxOMTY1eUug" aggregation="composite" association="_J2HtUP1qEeisxOMTY1eUug">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_sgsJwP18EeisxOMTY1eUug"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_shGZcP18EeisxOMTY1eUug" value="*"/>
-      </ownedEnd>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_J2JigP1qEeisxOMTY1eUug" name="entitlementdesc (purchaseuserights - pur)" type="_EFk28N3tEei-jeeHUjfpLA" association="_J2HtUP1qEeisxOMTY1eUug">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nhGDQP18EeisxOMTY1eUug" value="1"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nhXwEP18EeisxOMTY1eUug" value="1"/>
-      </ownedEnd>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_OjPjwP1qEeisxOMTY1eUug" name="EntitlementPoolDescHasEntitlmentDesc" memberEnd="_OjQK0v1qEeisxOMTY1eUug _OjVDUP1qEeisxOMTY1eUug">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OjQK0P1qEeisxOMTY1eUug" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OjQK0f1qEeisxOMTY1eUug" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_OjQK0v1qEeisxOMTY1eUug" name="entitlementdesc (purchaseuserights - pur)" type="_EFk28N3tEei-jeeHUjfpLA" association="_OjPjwP1qEeisxOMTY1eUug"/>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_OjVDUP1qEeisxOMTY1eUug" name="entitlementpooldesc" type="_GlxBwP1oEeisxOMTY1eUug" association="_OjPjwP1qEeisxOMTY1eUug">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NRvXQP14EeisxOMTY1eUug" value="1"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NR-n0P14EeisxOMTY1eUug" value="*"/>
-      </ownedEnd>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="__LoWAP1oEeisxOMTY1eUug" name="EntitlementPoolDescHasSPPoolLimits" memberEnd="__Lo9Ev1oEeisxOMTY1eUug __Lw44P1oEeisxOMTY1eUug">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__Lo9EP1oEeisxOMTY1eUug" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__Lo9Ef1oEeisxOMTY1eUug" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="__Lw44P1oEeisxOMTY1eUug" name="entitlementpooldesc" type="_GlxBwP1oEeisxOMTY1eUug" association="__LoWAP1oEeisxOMTY1eUug"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_M9Q54P1pEeisxOMTY1eUug" name="EntitlementPoolDescHasVendorPoolLimits" memberEnd="_M9Rg8v1pEeisxOMTY1eUug _M9XAgP1pEeisxOMTY1eUug">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_M9Rg8P1pEeisxOMTY1eUug" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_M9Rg8f1pEeisxOMTY1eUug" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_M9XAgP1pEeisxOMTY1eUug" name="entitlementpooldesc" type="_GlxBwP1oEeisxOMTY1eUug" association="_M9Q54P1pEeisxOMTY1eUug"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_GSdZUP1qEeisxOMTY1eUug" name="EntitlementPoolDescMadeAvailableAsEntitementPoolInstance" memberEnd="_GSdZU_1qEeisxOMTY1eUug _GSiR0P1qEeisxOMTY1eUug">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GSdZUf1qEeisxOMTY1eUug" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GSdZUv1qEeisxOMTY1eUug" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_GSiR0P1qEeisxOMTY1eUug" name="entitlementdesc (purchaseuserights - pur)" type="_GlxBwP1oEeisxOMTY1eUug" association="_GSdZUP1qEeisxOMTY1eUug"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_MT7MgP1qEeisxOMTY1eUug" name="VLMHasEntitlementDesc" memberEnd="_MT7zkf1qEeisxOMTY1eUug _MT_d8P1qEeisxOMTY1eUug">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_MT7Mgf1qEeisxOMTY1eUug" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_MT7zkP1qEeisxOMTY1eUug" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_MT7zkf1qEeisxOMTY1eUug" name="vendorlicensemodel (vlm)" type="_mEllAMfyEeiEtuRgTYzSUQ" association="_MT7MgP1qEeisxOMTY1eUug"/>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_MT_d8P1qEeisxOMTY1eUug" name="entitlementdesc (purchaseuserights - pur)" type="_EFk28N3tEei-jeeHUjfpLA" association="_MT7MgP1qEeisxOMTY1eUug">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_OsImwP16EeisxOMTY1eUug" value="1"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Osa6oP16EeisxOMTY1eUug" value="*"/>
-      </ownedEnd>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_pR8wUP2REeisxOMTY1eUug" name="EntitlementPoolInstanceContainsEntitlementInstance" memberEnd="_pR9XYv2REeisxOMTY1eUug _pR-lgP2REeisxOMTY1eUug">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pR9XYP2REeisxOMTY1eUug" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pR9XYf2REeisxOMTY1eUug" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_pR9XYv2REeisxOMTY1eUug" name="entitlementinstance" type="_QG4ysP1oEeisxOMTY1eUug" association="_pR8wUP2REeisxOMTY1eUug">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xIi5IP2REeisxOMTY1eUug"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xInKkP2REeisxOMTY1eUug" value="*"/>
-      </ownedEnd>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_pR-lgP2REeisxOMTY1eUug" name="entitlementpoolinstance" type="_NkuX8P1oEeisxOMTY1eUug" association="_pR8wUP2REeisxOMTY1eUug"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_n3nbsAVlEemrBZmpgd_POA" name="FeatureGroupHasEntitelmentPoolDesc" memberEnd="_n3oCwgVlEemrBZmpgd_POA _n3op0AVlEemrBZmpgd_POA">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_n3oCwAVlEemrBZmpgd_POA" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n3oCwQVlEemrBZmpgd_POA" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_n3oCwgVlEemrBZmpgd_POA" name="entitlementpooldesc" type="_GlxBwP1oEeisxOMTY1eUug" association="_n3nbsAVlEemrBZmpgd_POA">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5SrkYAVlEemrBZmpgd_POA" value="1"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5S_GYAVlEemrBZmpgd_POA" value="*"/>
-      </ownedEnd>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_n3op0AVlEemrBZmpgd_POA" name="featuregroup" type="_Omfk4P2SEeisxOMTY1eUug" association="_n3nbsAVlEemrBZmpgd_POA">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_y1BkcAVlEemrBZmpgd_POA" value="1"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_y1F14AVlEemrBZmpgd_POA" value="1"/>
-      </ownedEnd>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_mQo20AVlEemrBZmpgd_POA" name="FeatureGroupHasLicenceKeyPoolDesc" memberEnd="_mQqsAAVlEemrBZmpgd_POA _mQrTEAVlEemrBZmpgd_POA">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_mQqE8AVlEemrBZmpgd_POA" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mQqE8QVlEemrBZmpgd_POA" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_mQqsAAVlEemrBZmpgd_POA" name="licencekeypooldesc" type="_4ZDVsMgEEeiEtuRgTYzSUQ" association="_mQo20AVlEemrBZmpgd_POA">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ASB8IAVmEemrBZmpgd_POA"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ASG0oAVmEemrBZmpgd_POA" value="*"/>
-      </ownedEnd>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_mQrTEAVlEemrBZmpgd_POA" name="featuregroup" type="_Omfk4P2SEeisxOMTY1eUug" association="_mQo20AVlEemrBZmpgd_POA"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_Eo0HEAUiEemrBZmpgd_POA" name="VLMHasLicenseAgreement" memberEnd="_Eo4YgAUiEemrBZmpgd_POA _Eo94EAUiEemrBZmpgd_POA">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Eo3xcAUiEemrBZmpgd_POA" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eo3xcQUiEemrBZmpgd_POA" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_Eo4YgAUiEemrBZmpgd_POA" name="licenseagreement" type="_bCM3oP2SEeisxOMTY1eUug" aggregation="shared" association="_Eo0HEAUiEemrBZmpgd_POA">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Y1HoUAUiEemrBZmpgd_POA"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Y1UcoAUiEemrBZmpgd_POA" value="*"/>
-      </ownedEnd>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_Eo94EAUiEemrBZmpgd_POA" name="vendorlicensemodel (vlm)" type="_mEllAMfyEeiEtuRgTYzSUQ" association="_Eo0HEAUiEemrBZmpgd_POA"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_LMfMoAVoEemrBZmpgd_POA" name="LicenseAgreementHasFeatureGroup" memberEnd="_LMgawgVoEemrBZmpgd_POA _LMho4AVoEemrBZmpgd_POA">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_LMgawAVoEemrBZmpgd_POA" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_LMgawQVoEemrBZmpgd_POA" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_LMgawgVoEemrBZmpgd_POA" name="featuregroup" type="_Omfk4P2SEeisxOMTY1eUug" association="_LMfMoAVoEemrBZmpgd_POA">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_S8ZeoAVoEemrBZmpgd_POA" value="1"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_S8p9UAVoEemrBZmpgd_POA" value="*"/>
-      </ownedEnd>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_LMho4AVoEemrBZmpgd_POA" name="licenseagreement" type="_bCM3oP2SEeisxOMTY1eUug" association="_LMfMoAVoEemrBZmpgd_POA">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_JmAXYCpREemnoK-fhDe5lw"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JmopgCpREemnoK-fhDe5lw" value="*"/>
-      </ownedEnd>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_ph8IIAVoEemrBZmpgd_POA" name="VnfHasFeatureGroups" memberEnd="_ph9WQgVoEemrBZmpgd_POA _p41lMAVoEemrBZmpgd_POA">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ph9WQAVoEemrBZmpgd_POA" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ph9WQQVoEemrBZmpgd_POA" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_ph9WQgVoEemrBZmpgd_POA" name="licenseagreement" type="_Omfk4P2SEeisxOMTY1eUug" association="_ph8IIAVoEemrBZmpgd_POA">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yPMzMAVoEemrBZmpgd_POA" value="1"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yPUvAAVoEemrBZmpgd_POA" value="*"/>
-      </ownedEnd>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_p41lMAVoEemrBZmpgd_POA" name="vnfd" association="_ph8IIAVoEemrBZmpgd_POA">
-        <type xmi:type="uml:Class" href="Vnf.uml#_aaEZADOREeiHat9KcP8uWA"/>
-      </ownedEnd>
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:OpenModel_Profile="http:///schemas/OpenModel_Profile/_2Rm7cDkrEemjyLkBMGZA1g/27" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/OpenModel_Profile/_2Rm7cDkrEemjyLkBMGZA1g/27 OpenModel_Profile.profile.uml#_2RzvwDkrEemjyLkBMGZA1g">
+  <uml:Package xmi:id="_R1nxUMfyEeiEtuRgTYzSUQ" name="License" URI="">
+    <packagedElement xmi:type="uml:Package" xmi:id="_U1T1kMfyEeiEtuRgTYzSUQ" name="Diagrams">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_oJ-UAColEemnoK-fhDe5lw">
+        <body>Does a License Agreement have to have at least one feature group?</body>
+      </ownedComment>
+      <ownedComment xmi:type="uml:Comment" xmi:id="_8nq1UConEemnoK-fhDe5lw">
+        <body>VLM is really just a Party&#xD;
+&#xD;
+'Simplified' attributes for this Vendor are VendorName, and Description</body>
+      </ownedComment>
+      <ownedComment xmi:type="uml:Comment" xmi:id="_TLsjcCpKEemnoK-fhDe5lw">
+        <body>There are a bunch of attributes feature group attributes in SAm Definitions - maybe not in SDC??</body>
+      </ownedComment>
+      <ownedComment xmi:type="uml:Comment" xmi:id="_IuXygCpWEemnoK-fhDe5lw">
+        <body>Only EntitlementPoolDesc Currently being used are Name and MRN.   Everything else is optional.</body>
+      </ownedComment>
+      <ownedComment xmi:type="uml:Comment" xmi:id="_vaCLACpWEemnoK-fhDe5lw">
+        <body>Only attributes presently used are name, metric type and metric value.</body>
+      </ownedComment>
+      <ownedComment xmi:type="uml:Comment" xmi:id="_S7n00C7kEem7DJry5UTesQ">
+        <body>What do we do with keyFunction,LicenseKeyType, etc?</body>
+      </ownedComment>
     </packagedElement>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Package" xmi:id="_ZAQzEMfyEeiEtuRgTYzSUQ" name="ObjectClasses">
-    <packagedElement xmi:type="uml:Class" xmi:id="_oURIoMfyEeiEtuRgTYzSUQ" name="Delete LicenseKeyDesc">
-      <generalization xmi:type="uml:Generalization" xmi:id="_Za7pwP2QEeisxOMTY1eUug">
-        <general xmi:type="uml:Class" href="Common.uml#_Qb00MOLKEeiKy5JVrA0UGA"/>
-      </generalization>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_jOvlIAOOEemCCMXOyOLwIw" name="keyFunction+">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_en_GAA6-EemnO9QINOJnHg" annotatedElement="_jOvlIAOOEemCCMXOyOLwIw">
-          <body>Lifecycle stage or state (e.g., Instantiation or Activation) at which the license key is applied to the software.</body>
-        </ownedComment>
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_lUfwsAOOEemCCMXOyOLwIw" name="licenseKeyFile">
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_QVzvcAO-EemCCMXOyOLwIw"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_QV2ywAO-EemCCMXOyOLwIw" value="1"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_UcqsEA6_EemnO9QINOJnHg" name="licenseKeyType">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_3zl9YA6_EemnO9QINOJnHg" annotatedElement="_UcqsEA6_EemnO9QINOJnHg">
-          <body>Valid values: &#xD;
+    <packagedElement xmi:type="uml:Package" xmi:id="_Whm_UMfyEeiEtuRgTYzSUQ" name="Associations">
+      <packagedElement xmi:type="uml:Association" xmi:id="_Sj1eAN3yEei-jeeHUjfpLA" name="LicenseKeyDescMadeAvailableAs" memberEnd="_Sj2FEt3yEei-jeeHUjfpLA _Sj3TMN3yEei-jeeHUjfpLA">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Sj2FEN3yEei-jeeHUjfpLA" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Sj2FEd3yEei-jeeHUjfpLA" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_Sj3TMN3yEei-jeeHUjfpLA" name="licensekeydesc" type="_4ZDVsMgEEeiEtuRgTYzSUQ" association="_Sj1eAN3yEei-jeeHUjfpLA"/>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_Sj2FEt3yEei-jeeHUjfpLA" name="licensekeyinstance" type="_D_LXMN3xEei-jeeHUjfpLA" aggregation="composite" association="_Sj1eAN3yEei-jeeHUjfpLA">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_as4TcA6fEemnO9QINOJnHg"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_atQt8A6fEemnO9QINOJnHg" value="*"/>
+        </ownedEnd>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_Q3zaAN3yEei-jeeHUjfpLA" name="LicenseKeyPolDescMadeAvaiableAs" memberEnd="_Q30oIt3yEei-jeeHUjfpLA _Q33EYN3yEei-jeeHUjfpLA">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Q30oIN3yEei-jeeHUjfpLA" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Q30oId3yEei-jeeHUjfpLA" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_Q30oIt3yEei-jeeHUjfpLA" name="licensekeypoolinstance" type="_B5kVkN3xEei-jeeHUjfpLA" association="_Q3zaAN3yEei-jeeHUjfpLA">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hKvdAN3yEei-jeeHUjfpLA"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hLH3gN3yEei-jeeHUjfpLA" value="*"/>
+        </ownedEnd>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_Q33EYN3yEei-jeeHUjfpLA" name="licencekeypooldesc" type="_4ZDVsMgEEeiEtuRgTYzSUQ" association="_Q3zaAN3yEei-jeeHUjfpLA"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_RxSmwN3yEei-jeeHUjfpLA" name="LicenseKeyPolInstanceContainsLicenseKeyInstance" memberEnd="_RxTN0t3yEei-jeeHUjfpLA _RxT04N3yEei-jeeHUjfpLA">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RxTN0N3yEei-jeeHUjfpLA" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RxTN0d3yEei-jeeHUjfpLA" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_RxTN0t3yEei-jeeHUjfpLA" name="licensekeyinstance" type="_D_LXMN3xEei-jeeHUjfpLA" association="_RxSmwN3yEei-jeeHUjfpLA">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mfYmcN3yEei-jeeHUjfpLA"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mfhwYN3yEei-jeeHUjfpLA" value="*"/>
+        </ownedEnd>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_RxT04N3yEei-jeeHUjfpLA" name="licensekeypoolinstance" type="_B5kVkN3xEei-jeeHUjfpLA" association="_RxSmwN3yEei-jeeHUjfpLA"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_sNy3kN3uEei-jeeHUjfpLA" name="LicenseKeyPoolDescHasSPLimits" memberEnd="_sNzeod3uEei-jeeHUjfpLA _sN0Fsd3uEei-jeeHUjfpLA">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sNy3kd3uEei-jeeHUjfpLA" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_sNzeoN3uEei-jeeHUjfpLA" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_sN0Fsd3uEei-jeeHUjfpLA" name="licencekeypooldesc" type="_4ZDVsMgEEeiEtuRgTYzSUQ" association="_sNy3kN3uEei-jeeHUjfpLA"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_43lCkN3uEei-jeeHUjfpLA" name="LicenseKeyPoolDescHasVendorLimits" memberEnd="_43lCk93uEei-jeeHUjfpLA _43qiIN3uEei-jeeHUjfpLA">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_43lCkd3uEei-jeeHUjfpLA" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_43lCkt3uEei-jeeHUjfpLA" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_43qiIN3uEei-jeeHUjfpLA" name="licencekeypooldesc" type="_4ZDVsMgEEeiEtuRgTYzSUQ" association="_43lCkN3uEei-jeeHUjfpLA"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_Hu77kN3zEei-jeeHUjfpLA" memberEnd="_Hu8iot3zEei-jeeHUjfpLA _Hu9wwN3zEei-jeeHUjfpLA">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Hu8ioN3zEei-jeeHUjfpLA" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Hu8iod3zEei-jeeHUjfpLA" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_Hu8iot3zEei-jeeHUjfpLA" name="licencekeypooldesc" type="_4ZDVsMgEEeiEtuRgTYzSUQ" association="_Hu77kN3zEei-jeeHUjfpLA"/>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_Hu9wwN3zEei-jeeHUjfpLA" name="vendorlicensemodel (vlm)" type="_mEllAMfyEeiEtuRgTYzSUQ" association="_Hu77kN3zEei-jeeHUjfpLA"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_J2HtUP1qEeisxOMTY1eUug" name="EntitlementDescMadeAvailableAsEntitlementIntstance" memberEnd="_J2IUYv1qEeisxOMTY1eUug _J2JigP1qEeisxOMTY1eUug">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_J2IUYP1qEeisxOMTY1eUug" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_J2IUYf1qEeisxOMTY1eUug" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_J2IUYv1qEeisxOMTY1eUug" name="entitlementinstance" type="_QG4ysP1oEeisxOMTY1eUug" aggregation="composite" association="_J2HtUP1qEeisxOMTY1eUug">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_sgsJwP18EeisxOMTY1eUug"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_shGZcP18EeisxOMTY1eUug" value="*"/>
+        </ownedEnd>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_J2JigP1qEeisxOMTY1eUug" name="entitlementdesc (purchaseuserights - pur)" type="_EFk28N3tEei-jeeHUjfpLA" association="_J2HtUP1qEeisxOMTY1eUug">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nhGDQP18EeisxOMTY1eUug" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nhXwEP18EeisxOMTY1eUug" value="1"/>
+        </ownedEnd>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_OjPjwP1qEeisxOMTY1eUug" name="EntitlementPoolDescHasEntitlmentDesc" memberEnd="_OjQK0v1qEeisxOMTY1eUug _OjVDUP1qEeisxOMTY1eUug">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OjQK0P1qEeisxOMTY1eUug" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OjQK0f1qEeisxOMTY1eUug" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_OjQK0v1qEeisxOMTY1eUug" name="entitlementdesc (purchaseuserights - pur)" type="_EFk28N3tEei-jeeHUjfpLA" association="_OjPjwP1qEeisxOMTY1eUug"/>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_OjVDUP1qEeisxOMTY1eUug" name="entitlementpooldesc" type="_GlxBwP1oEeisxOMTY1eUug" association="_OjPjwP1qEeisxOMTY1eUug">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NRvXQP14EeisxOMTY1eUug" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NR-n0P14EeisxOMTY1eUug" value="*"/>
+        </ownedEnd>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="__LoWAP1oEeisxOMTY1eUug" name="EntitlementPoolDescHasSPPoolLimits" memberEnd="__Lo9Ev1oEeisxOMTY1eUug __Lw44P1oEeisxOMTY1eUug">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__Lo9EP1oEeisxOMTY1eUug" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__Lo9Ef1oEeisxOMTY1eUug" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedEnd xmi:type="uml:Property" xmi:id="__Lw44P1oEeisxOMTY1eUug" name="entitlementpooldesc" type="_GlxBwP1oEeisxOMTY1eUug" association="__LoWAP1oEeisxOMTY1eUug"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_M9Q54P1pEeisxOMTY1eUug" name="EntitlementPoolDescHasVendorPoolLimits" memberEnd="_M9Rg8v1pEeisxOMTY1eUug _M9XAgP1pEeisxOMTY1eUug">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_M9Rg8P1pEeisxOMTY1eUug" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_M9Rg8f1pEeisxOMTY1eUug" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_M9XAgP1pEeisxOMTY1eUug" name="entitlementpooldesc" type="_GlxBwP1oEeisxOMTY1eUug" association="_M9Q54P1pEeisxOMTY1eUug"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_GSdZUP1qEeisxOMTY1eUug" name="EntitlementPoolDescMadeAvailableAsEntitementPoolInstance" memberEnd="_GSdZU_1qEeisxOMTY1eUug _GSiR0P1qEeisxOMTY1eUug">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GSdZUf1qEeisxOMTY1eUug" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GSdZUv1qEeisxOMTY1eUug" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_GSiR0P1qEeisxOMTY1eUug" name="entitlementdesc (purchaseuserights - pur)" type="_GlxBwP1oEeisxOMTY1eUug" association="_GSdZUP1qEeisxOMTY1eUug"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_MT7MgP1qEeisxOMTY1eUug" name="VLMHasEntitlementDesc" memberEnd="_MT7zkf1qEeisxOMTY1eUug _MT_d8P1qEeisxOMTY1eUug">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_MT7Mgf1qEeisxOMTY1eUug" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_MT7zkP1qEeisxOMTY1eUug" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_MT7zkf1qEeisxOMTY1eUug" name="vendorlicensemodel (vlm)" type="_mEllAMfyEeiEtuRgTYzSUQ" association="_MT7MgP1qEeisxOMTY1eUug"/>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_MT_d8P1qEeisxOMTY1eUug" name="entitlementdesc (purchaseuserights - pur)" type="_EFk28N3tEei-jeeHUjfpLA" association="_MT7MgP1qEeisxOMTY1eUug">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_OsImwP16EeisxOMTY1eUug" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Osa6oP16EeisxOMTY1eUug" value="*"/>
+        </ownedEnd>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_pR8wUP2REeisxOMTY1eUug" name="EntitlementPoolInstanceContainsEntitlementInstance" memberEnd="_pR9XYv2REeisxOMTY1eUug _pR-lgP2REeisxOMTY1eUug">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pR9XYP2REeisxOMTY1eUug" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pR9XYf2REeisxOMTY1eUug" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_pR9XYv2REeisxOMTY1eUug" name="entitlementinstance" type="_QG4ysP1oEeisxOMTY1eUug" association="_pR8wUP2REeisxOMTY1eUug">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xIi5IP2REeisxOMTY1eUug"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xInKkP2REeisxOMTY1eUug" value="*"/>
+        </ownedEnd>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_pR-lgP2REeisxOMTY1eUug" name="entitlementpoolinstance" type="_NkuX8P1oEeisxOMTY1eUug" association="_pR8wUP2REeisxOMTY1eUug"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_n3nbsAVlEemrBZmpgd_POA" name="FeatureGroupHasEntitelmentPoolDesc" memberEnd="_n3oCwgVlEemrBZmpgd_POA _n3op0AVlEemrBZmpgd_POA">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_n3oCwAVlEemrBZmpgd_POA" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n3oCwQVlEemrBZmpgd_POA" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_n3oCwgVlEemrBZmpgd_POA" name="entitlementpooldesc" type="_GlxBwP1oEeisxOMTY1eUug" association="_n3nbsAVlEemrBZmpgd_POA">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5SrkYAVlEemrBZmpgd_POA" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5S_GYAVlEemrBZmpgd_POA" value="*"/>
+        </ownedEnd>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_n3op0AVlEemrBZmpgd_POA" name="featuregroup" type="_Omfk4P2SEeisxOMTY1eUug" association="_n3nbsAVlEemrBZmpgd_POA">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_y1BkcAVlEemrBZmpgd_POA" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_y1F14AVlEemrBZmpgd_POA" value="1"/>
+        </ownedEnd>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_mQo20AVlEemrBZmpgd_POA" name="FeatureGroupHasLicenceKeyPoolDesc" memberEnd="_mQqsAAVlEemrBZmpgd_POA _mQrTEAVlEemrBZmpgd_POA">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_mQqE8AVlEemrBZmpgd_POA" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mQqE8QVlEemrBZmpgd_POA" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_mQqsAAVlEemrBZmpgd_POA" name="licencekeypooldesc" type="_4ZDVsMgEEeiEtuRgTYzSUQ" association="_mQo20AVlEemrBZmpgd_POA">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ASB8IAVmEemrBZmpgd_POA"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ASG0oAVmEemrBZmpgd_POA" value="*"/>
+        </ownedEnd>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_mQrTEAVlEemrBZmpgd_POA" name="featuregroup" type="_Omfk4P2SEeisxOMTY1eUug" association="_mQo20AVlEemrBZmpgd_POA"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_LMfMoAVoEemrBZmpgd_POA" name="LicenseAgreementHasFeatureGroup" memberEnd="_LMgawgVoEemrBZmpgd_POA _LMho4AVoEemrBZmpgd_POA">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_LMgawAVoEemrBZmpgd_POA" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_LMgawQVoEemrBZmpgd_POA" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_LMgawgVoEemrBZmpgd_POA" name="featuregroup" type="_Omfk4P2SEeisxOMTY1eUug" association="_LMfMoAVoEemrBZmpgd_POA">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_S8ZeoAVoEemrBZmpgd_POA" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_S8p9UAVoEemrBZmpgd_POA" value="*"/>
+        </ownedEnd>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_LMho4AVoEemrBZmpgd_POA" name="licenseagreement" type="_bCM3oP2SEeisxOMTY1eUug" association="_LMfMoAVoEemrBZmpgd_POA">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_JmAXYCpREemnoK-fhDe5lw"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JmopgCpREemnoK-fhDe5lw" value="*"/>
+        </ownedEnd>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_ph8IIAVoEemrBZmpgd_POA" name="VnfHasFeatureGroups" memberEnd="_ph9WQgVoEemrBZmpgd_POA _p41lMAVoEemrBZmpgd_POA">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ph9WQAVoEemrBZmpgd_POA" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ph9WQQVoEemrBZmpgd_POA" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_ph9WQgVoEemrBZmpgd_POA" name="licenseagreement" type="_Omfk4P2SEeisxOMTY1eUug" association="_ph8IIAVoEemrBZmpgd_POA">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yPMzMAVoEemrBZmpgd_POA" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yPUvAAVoEemrBZmpgd_POA" value="*"/>
+        </ownedEnd>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_p41lMAVoEemrBZmpgd_POA" name="vnfd" association="_ph8IIAVoEemrBZmpgd_POA">
+          <type xmi:type="uml:Class" href="Vnf.uml#_aaEZADOREeiHat9KcP8uWA"/>
+        </ownedEnd>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_avHqoEW_Eem3_P23YPx5GQ" name="VendorHasVnfd" memberEnd="_avIRskW_Eem3_P23YPx5GQ _avI4wEW_Eem3_P23YPx5GQ">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_avIRsEW_Eem3_P23YPx5GQ" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_avIRsUW_Eem3_P23YPx5GQ" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_avIRskW_Eem3_P23YPx5GQ" name="vendor" association="_avHqoEW_Eem3_P23YPx5GQ">
+          <type xmi:type="uml:Class" href="Party.uml#_eDT94DbaEemP3p_OV1tL7g"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_lhLfAEW_Eem3_P23YPx5GQ" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lhV3EEW_Eem3_P23YPx5GQ" value="1"/>
+        </ownedEnd>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_avI4wEW_Eem3_P23YPx5GQ" name="vnfd" association="_avHqoEW_Eem3_P23YPx5GQ">
+          <type xmi:type="uml:Class" href="Vnf.uml#_aaEZADOREeiHat9KcP8uWA"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_poJUYEW_Eem3_P23YPx5GQ"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_poddcEW_Eem3_P23YPx5GQ" value="*"/>
+        </ownedEnd>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_7QCYIEW_Eem3_P23YPx5GQ" name="VendorHasLicenseAgreement" memberEnd="_7QC_MkW_Eem3_P23YPx5GQ _7QENUEW_Eem3_P23YPx5GQ">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7QC_MEW_Eem3_P23YPx5GQ" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7QC_MUW_Eem3_P23YPx5GQ" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_7QC_MkW_Eem3_P23YPx5GQ" name="vendor" association="_7QCYIEW_Eem3_P23YPx5GQ">
+          <type xmi:type="uml:Class" href="Party.uml#_eDT94DbaEemP3p_OV1tL7g"/>
+        </ownedEnd>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_7QENUEW_Eem3_P23YPx5GQ" name="licenseagreement" type="_bCM3oP2SEeisxOMTY1eUug" association="_7QCYIEW_Eem3_P23YPx5GQ">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_7kU7MEXBEem3_P23YPx5GQ"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7kc3AEXBEem3_P23YPx5GQ" value="*"/>
+        </ownedEnd>
+      </packagedElement>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Package" xmi:id="_ZAQzEMfyEeiEtuRgTYzSUQ" name="ObjectClasses">
+      <packagedElement xmi:type="uml:Class" xmi:id="_oURIoMfyEeiEtuRgTYzSUQ" name="Delete LicenseKeyDesc">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_jOvlIAOOEemCCMXOyOLwIw" name="keyFunction+">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_en_GAA6-EemnO9QINOJnHg" annotatedElement="_jOvlIAOOEemCCMXOyOLwIw">
+            <body>Lifecycle stage or state (e.g., Instantiation or Activation) at which the license key is applied to the software.</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_lUfwsAOOEemCCMXOyOLwIw" name="licenseKeyFile">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_QVzvcAO-EemCCMXOyOLwIw"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_QV2ywAO-EemCCMXOyOLwIw" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_UcqsEA6_EemnO9QINOJnHg" name="licenseKeyType">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_3zl9YA6_EemnO9QINOJnHg" annotatedElement="_UcqsEA6_EemnO9QINOJnHg">
+            <body>Valid values: &#xD;
 Universal, Unique&#xD;
 Universal - a single license key value that may be used with any number of instances of the software. &#xD;
 Unique - a unique license key value is required for each instance of the software.  &#xD;
 </body>
-        </ownedComment>
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-      </ownedAttribute>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_4ZDVsMgEEeiEtuRgTYzSUQ" name="LicenceKeyPoolDesc">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_yESAsAR4Eemo7ZzqT33fqQ" annotatedElement="_4ZDVsMgEEeiEtuRgTYzSUQ">
-        <body>A License Key Group is created for each type of License Key that is required for the software.   Each License Key Group is assigned a Name and Description for modeling purposes and is uniquely identified by a UUID. In addition, a list of characteristics of the License Key Group are defined.&#xD;
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+        </ownedAttribute>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Class" xmi:id="_4ZDVsMgEEeiEtuRgTYzSUQ" name="LicenceKeyPoolDesc">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_yESAsAR4Eemo7ZzqT33fqQ" annotatedElement="_4ZDVsMgEEeiEtuRgTYzSUQ">
+          <body>A License Key Group is created for each type of License Key that is required for the software.   Each License Key Group is assigned a Name and Description for modeling purposes and is uniquely identified by a UUID. In addition, a list of characteristics of the License Key Group are defined.&#xD;
 The license key group model provides a description to systems like ALTS for the license keys that are provided by a vendor.  ALTS will create a “group” and Purchasing systems (GPS and HP Asset Center) will send the inventory of license keys/files to be held by ALTS in the appropriate group.&#xD;
 Controllers will request license keys from ALTS using the UUID of the group, as directed by the ASDC models for the software (i.e. VFs).&#xD;
 A license key group is not specific to a feature group.  A license key group may be related to multiple feature groups of a software item or even to multiple software items.&#xD;
 </body>
-      </ownedComment>
-      <generalization xmi:type="uml:Generalization" xmi:id="_YQ5fkP2QEeisxOMTY1eUug">
-        <general xmi:type="uml:Class" href="Common.uml#_Qb00MOLKEeiKy5JVrA0UGA"/>
-      </generalization>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_sNzeod3uEei-jeeHUjfpLA" name="_spPooLlimit" type="_T5-uYN3uEei-jeeHUjfpLA" aggregation="composite" association="_sNy3kN3uEei-jeeHUjfpLA">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_qFWGIAR2Eemo7ZzqT33fqQ" annotatedElement="_sNzeod3uEei-jeeHUjfpLA">
-          <body>Pool limits applied by the service provider</body>
-        </ownedComment>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_sNzeo93uEei-jeeHUjfpLA"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sN0FsN3uEei-jeeHUjfpLA" value="*"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_43lCk93uEei-jeeHUjfpLA" name="_vendorPoollimit" type="_T5-uYN3uEei-jeeHUjfpLA" aggregation="composite" association="_43lCkN3uEei-jeeHUjfpLA">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_sL5i8AR2Eemo7ZzqT33fqQ" annotatedElement="_43lCk93uEei-jeeHUjfpLA">
-          <body>Pool limits applied by the vendor.</body>
         </ownedComment>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_43ne0N3uEei-jeeHUjfpLA"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_43os8N3uEei-jeeHUjfpLA" value="*"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_HVtowAOOEemCCMXOyOLwIw" name="poolType" type="_4CYPgAO3EemCCMXOyOLwIw">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_6EuegAR3Eemo7ZzqT33fqQ" annotatedElement="_HVtowAOOEemCCMXOyOLwIw">
-          <body>The license key may be ‘universal’ or ‘unique’ or ‘one-time’.  &#xD;
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_sNzeod3uEei-jeeHUjfpLA" name="_spPooLlimit" type="_T5-uYN3uEei-jeeHUjfpLA" aggregation="composite" association="_sNy3kN3uEei-jeeHUjfpLA">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_qFWGIAR2Eemo7ZzqT33fqQ" annotatedElement="_sNzeod3uEei-jeeHUjfpLA">
+            <body>Pool limits applied by the service provider</body>
+          </ownedComment>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_sNzeo93uEei-jeeHUjfpLA"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sN0FsN3uEei-jeeHUjfpLA" value="*"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_43lCk93uEei-jeeHUjfpLA" name="_vendorPoollimit" type="_T5-uYN3uEei-jeeHUjfpLA" aggregation="composite" association="_43lCkN3uEei-jeeHUjfpLA">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_sL5i8AR2Eemo7ZzqT33fqQ" annotatedElement="_43lCk93uEei-jeeHUjfpLA">
+            <body>Pool limits applied by the vendor.</body>
+          </ownedComment>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_43ne0N3uEei-jeeHUjfpLA"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_43os8N3uEei-jeeHUjfpLA" value="*"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_HVtowAOOEemCCMXOyOLwIw" name="poolType" type="_4CYPgAO3EemCCMXOyOLwIw">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_6EuegAR3Eemo7ZzqT33fqQ" annotatedElement="_HVtowAOOEemCCMXOyOLwIw">
+            <body>The license key may be ‘universal’ or ‘unique’ or ‘one-time’.  &#xD;
 - A ‘universal’ value indicates that the same exact license key (string) may be associated with all instances of the software.  &#xD;
 &#xD;
 - A ‘unique’ value indicates that each instance of the software must be related to a unique license key (string).  When no longer needed, the key may be returned to the license key pool for reuse.&#xD;
 &#xD;
 - A ‘one-time’ value indicates that each instance of the software must be related to a unique license key (string).  When no longer needed, the key may not be reused.&#xD;
 </body>
-        </ownedComment>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_H5MwUAOOEemCCMXOyOLwIw" name="thresholdUnits" type="_F8MvAAMIEemoQ5ZgWCUg_g">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_Z6QQMAR5Eemo7ZzqT33fqQ" annotatedElement="_H5MwUAOOEemCCMXOyOLwIw">
-          <body>Units can be either absolute or a percentage (%).</body>
-        </ownedComment>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_IX2bMAOOEemCCMXOyOLwIw" name="thresholdValue">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_k8kuIAR5Eemo7ZzqT33fqQ" annotatedElement="_IX2bMAOOEemCCMXOyOLwIw">
-          <body>Specified threshold value for the license key pool.</body>
-        </ownedComment>
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_J26aMAOOEemCCMXOyOLwIw" name="startDate">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_vla8IAR5Eemo7ZzqT33fqQ" annotatedElement="_J26aMAOOEemCCMXOyOLwIw">
-          <body>Start date.</body>
-        </ownedComment>
-        <type xmi:type="uml:PrimitiveType" href="Common.uml#_KwZPMP8VEeiZ-fXSiUXhdA"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_LNfyoAOOEemCCMXOyOLwIw" name="expiryDate">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_xKrCsAR5Eemo7ZzqT33fqQ" annotatedElement="_LNfyoAOOEemCCMXOyOLwIw">
-          <body>Expiry date.</body>
-        </ownedComment>
-        <type xmi:type="uml:PrimitiveType" href="Common.uml#_KwZPMP8VEeiZ-fXSiUXhdA"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_LybEoAOOEemCCMXOyOLwIw" name="keyPurchaseIncrements">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_f7yNcAR8Eemo7ZzqT33fqQ" annotatedElement="_LybEoAOOEemCCMXOyOLwIw">
-          <body>Specifies how the key must be purchased.   If in blocks of 1000, the increment would be 1000.</body>
-        </ownedComment>
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_OFmoMAOOEemCCMXOyOLwIw" name="manufactureReferenceNumber">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_1gI8MAR7Eemo7ZzqT33fqQ" annotatedElement="_OFmoMAOOEemCCMXOyOLwIw">
-          <body>Identifier for the entitlement as described by the vendor in their price list / catalog /contract.</body>
-        </ownedComment>
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_X9Q7ECu1EemHS6guZRbYAw"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_X9gLoCu1EemHS6guZRbYAw" value="1"/>
-      </ownedAttribute>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_mEllAMfyEeiEtuRgTYzSUQ" name="VendorLicenseModel (VLM)">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_-q5vECvtEemHS6guZRbYAw" annotatedElement="_mEllAMfyEeiEtuRgTYzSUQ">
-        <body>The Vendor License Model enbables a service provider to track the usage of vendor products used used in resources created in ASDC. &#xD;
+          </ownedComment>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_H5MwUAOOEemCCMXOyOLwIw" name="thresholdUnits" type="_F8MvAAMIEemoQ5ZgWCUg_g">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Z6QQMAR5Eemo7ZzqT33fqQ" annotatedElement="_H5MwUAOOEemCCMXOyOLwIw">
+            <body>Units can be either absolute or a percentage (%).</body>
+          </ownedComment>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_IX2bMAOOEemCCMXOyOLwIw" name="thresholdValue">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_k8kuIAR5Eemo7ZzqT33fqQ" annotatedElement="_IX2bMAOOEemCCMXOyOLwIw">
+            <body>Specified threshold value for the license key pool.</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_J26aMAOOEemCCMXOyOLwIw" name="startDate">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_vla8IAR5Eemo7ZzqT33fqQ" annotatedElement="_J26aMAOOEemCCMXOyOLwIw">
+            <body>Start date.</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="Common.uml#_KwZPMP8VEeiZ-fXSiUXhdA"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_LNfyoAOOEemCCMXOyOLwIw" name="expiryDate">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_xKrCsAR5Eemo7ZzqT33fqQ" annotatedElement="_LNfyoAOOEemCCMXOyOLwIw">
+            <body>Expiry date.</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="Common.uml#_KwZPMP8VEeiZ-fXSiUXhdA"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_LybEoAOOEemCCMXOyOLwIw" name="keyPurchaseIncrements">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_f7yNcAR8Eemo7ZzqT33fqQ" annotatedElement="_LybEoAOOEemCCMXOyOLwIw">
+            <body>Specifies how the key must be purchased.   If in blocks of 1000, the increment would be 1000.</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_OFmoMAOOEemCCMXOyOLwIw" name="manufactureReferenceNumber">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_1gI8MAR7Eemo7ZzqT33fqQ" annotatedElement="_OFmoMAOOEemCCMXOyOLwIw">
+            <body>Identifier for the entitlement as described by the vendor in their price list / catalog /contract.</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_X9Q7ECu1EemHS6guZRbYAw"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_X9gLoCu1EemHS6guZRbYAw" value="1"/>
+        </ownedAttribute>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Class" xmi:id="_mEllAMfyEeiEtuRgTYzSUQ" name="VendorLicenseModel (VLM) - Delete">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_-q5vECvtEemHS6guZRbYAw" annotatedElement="_mEllAMfyEeiEtuRgTYzSUQ">
+          <body>The Vendor License Model enbables a service provider to track the usage of vendor products used used in resources created in ASDC. &#xD;
 &#xD;
 VLM is used to track instaantiations (&quot;entitlements&quot;) of the vendor provided software used by the servi e provider for given resources.  &#xD;
 &#xD;
 </body>
-      </ownedComment>
-      <ownedComment xmi:type="uml:Comment" xmi:id="_BbmVECvuEemHS6guZRbYAw" annotatedElement="_mEllAMfyEeiEtuRgTYzSUQ">
-        <body>A VLM is actually be a &quot;Party&quot;.</body>
-      </ownedComment>
-      <ownedComment xmi:type="uml:Comment" xmi:id="_nPLZkCvvEemHS6guZRbYAw" annotatedElement="_mEllAMfyEeiEtuRgTYzSUQ">
-        <body>There should only be on VLM per vendor (given it appears to be &quot;party&quot;, but there is no restriction.</body>
-      </ownedComment>
-      <generalization xmi:type="uml:Generalization" xmi:id="_eHdzkP7_EeiZ-fXSiUXhdA">
-        <general xmi:type="uml:Class" href="Common.uml#_1POjoOwXEei7-e9MrPJW7Q"/>
-      </generalization>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_KYdhIConEemnoK-fhDe5lw" name="VendorName">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_aSLL0ConEemnoK-fhDe5lw">
-          <body>The name of the vendor providing this resource.</body>
         </ownedComment>
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-      </ownedAttribute>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_EFk28N3tEei-jeeHUjfpLA" name="EntitlementDesc (PurchaseUseRights-PUR)">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_62doQP73EeiZ-fXSiUXhdA" annotatedElement="_EFk28N3tEei-jeeHUjfpLA">
-        <body>Specifies the use rights for the software as described by the license. The use rights may be quantified by various metrics: # users, # software instances,  # units.  Customer RTU is within the customer subscription.   Entitlement is related to how the service provider  purchased the software from the supplier, 1 RTU may equate to 5 instances of the software.   &#xD;
+        <ownedComment xmi:type="uml:Comment" xmi:id="_BbmVECvuEemHS6guZRbYAw" annotatedElement="_mEllAMfyEeiEtuRgTYzSUQ">
+          <body>A VLM is actually be a &quot;Party&quot;.</body>
+        </ownedComment>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_nPLZkCvvEemHS6guZRbYAw" annotatedElement="_mEllAMfyEeiEtuRgTYzSUQ">
+          <body>There should only be on VLM per vendor (given it appears to be &quot;party&quot;, but there is no restriction.</body>
+        </ownedComment>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_KYdhIConEemnoK-fhDe5lw" name="VendorName">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_aFiBcEXHEem3_P23YPx5GQ" annotatedElement="_KYdhIConEemnoK-fhDe5lw">
+            <body>The name of the vendor providing this resource.</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+        </ownedAttribute>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Class" xmi:id="_EFk28N3tEei-jeeHUjfpLA" name="EntitlementDesc (PurchaseUseRights-PUR)">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_62doQP73EeiZ-fXSiUXhdA" annotatedElement="_EFk28N3tEei-jeeHUjfpLA">
+          <body>Specifies the use rights for the software as described by the license. The use rights may be quantified by various metrics: # users, # software instances,  # units.  Customer RTU is within the customer subscription.   Entitlement is related to how the service provider  purchased the software from the supplier, 1 RTU may equate to 5 instances of the software.   &#xD;
 &#xD;
 Either no key, universal key, or unique key per instance required.  &#xD;
 </body>
-      </ownedComment>
-      <generalization xmi:type="uml:Generalization" xmi:id="_a9qAwP2QEeisxOMTY1eUug">
-        <general xmi:type="uml:Class" href="Common.uml#_Qb00MOLKEeiKy5JVrA0UGA"/>
-      </generalization>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_W-tJsP8WEeiZ-fXSiUXhdA" name="manufacturerReferenceNumber">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_dzrbEAPEEemCCMXOyOLwIw" annotatedElement="_W-tJsP8WEeiZ-fXSiUXhdA">
-          <body>Identifier for the entitlement as described by the vendor in their price list / catalog / contract.  </body>
-        </ownedComment>
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_ZaGOEP8WEeiZ-fXSiUXhdA" name="minimumOrderRquirement">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_LrFhMAPIEemCCMXOyOLwIw" annotatedElement="_ZaGOEP8WEeiZ-fXSiUXhdA">
-          <body>The minimum number of entitlements that need to be purchased.  For example, the entitlements must be purchased in a block of 100.  If no minimum is required, the value will be zero.</body>
-        </ownedComment>
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_Z4kSwP8WEeiZ-fXSiUXhdA" name="uniqueReportingRequirements">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_OhJvYAPIEemCCMXOyOLwIw" annotatedElement="_Z4kSwP8WEeiZ-fXSiUXhdA">
-          <body>A list of any reporting requirements on the usage of the software product. (e.g.:  quarterly usage reports are required)</body>
         </ownedComment>
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_RPtAUAPIEemCCMXOyOLwIw"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_RP2KQAPIEemCCMXOyOLwIw" value="*"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_aWtAQP8WEeiZ-fXSiUXhdA" name="licenseType" type="_sckiwP_BEeiQG4ZZm0HgYw">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_CyQkAA64EemnO9QINOJnHg" annotatedElement="_aWtAQP8WEeiZ-fXSiUXhdA">
-          <body>Type of license applicable to the software product. (e.g.:  fixed-term, perpetual, trial, subscription.)  </body>
-        </ownedComment>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_bNYJkP8WEeiZ-fXSiUXhdA" name="licenseDuration" type="_oaES0A64EemnO9QINOJnHg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_HfTh8A64EemnO9QINOJnHg" annotatedElement="_bNYJkP8WEeiZ-fXSiUXhdA">
-          <body>Valid values:&#xD;
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_W-tJsP8WEeiZ-fXSiUXhdA" name="manufacturerReferenceNumber">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_dzrbEAPEEemCCMXOyOLwIw" annotatedElement="_W-tJsP8WEeiZ-fXSiUXhdA">
+            <body>Identifier for the entitlement as described by the vendor in their price list / catalog / contract.  </body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_ZaGOEP8WEeiZ-fXSiUXhdA" name="minimumOrderRquirement">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_LrFhMAPIEemCCMXOyOLwIw" annotatedElement="_ZaGOEP8WEeiZ-fXSiUXhdA">
+            <body>The minimum number of entitlements that need to be purchased.  For example, the entitlements must be purchased in a block of 100.  If no minimum is required, the value will be zero.</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_Z4kSwP8WEeiZ-fXSiUXhdA" name="uniqueReportingRequirements">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_OhJvYAPIEemCCMXOyOLwIw" annotatedElement="_Z4kSwP8WEeiZ-fXSiUXhdA">
+            <body>A list of any reporting requirements on the usage of the software product. (e.g.:  quarterly usage reports are required)</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_RPtAUAPIEemCCMXOyOLwIw"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_RP2KQAPIEemCCMXOyOLwIw" value="*"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_aWtAQP8WEeiZ-fXSiUXhdA" name="licenseType" type="_sckiwP_BEeiQG4ZZm0HgYw">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_CyQkAA64EemnO9QINOJnHg" annotatedElement="_aWtAQP8WEeiZ-fXSiUXhdA">
+            <body>Type of license applicable to the software product. (e.g.:  fixed-term, perpetual, trial, subscription.)  </body>
+          </ownedComment>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_bNYJkP8WEeiZ-fXSiUXhdA" name="licenseDuration" type="_oaES0A64EemnO9QINOJnHg">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_HfTh8A64EemnO9QINOJnHg" annotatedElement="_bNYJkP8WEeiZ-fXSiUXhdA">
+            <body>Valid values:&#xD;
 year, quarter, month, day.&#xD;
 Not applicable when license type is Perpetual.&#xD;
 </body>
-        </ownedComment>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_HRGL4P8XEeiZ-fXSiUXhdA" name="licenseDurationQuantification">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_blIyUA65EemnO9QINOJnHg" annotatedElement="_HRGL4P8XEeiZ-fXSiUXhdA">
-          <body>Number of years, quarters, months, or days for which the license is valid. &#xD;
+          </ownedComment>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_HRGL4P8XEeiZ-fXSiUXhdA" name="licenseDurationQuantification">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_blIyUA65EemnO9QINOJnHg" annotatedElement="_HRGL4P8XEeiZ-fXSiUXhdA">
+            <body>Number of years, quarters, months, or days for which the license is valid. &#xD;
 Not applicable when license type is Perpetual.&#xD;
 </body>
-        </ownedComment>
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
-      </ownedAttribute>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_D_LXMN3xEei-jeeHUjfpLA" name="LicenseKeyInstance">
-      <generalization xmi:type="uml:Generalization" xmi:id="_2jxBIP2QEeisxOMTY1eUug">
-        <general xmi:type="uml:Class" href="Common.uml#_1POjoOwXEei7-e9MrPJW7Q"/>
-      </generalization>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_B5kVkN3xEei-jeeHUjfpLA" name="LicenseKeyPoolInstance">
-      <generalization xmi:type="uml:Generalization" xmi:id="_3ScFAP2QEeisxOMTY1eUug">
-        <general xmi:type="uml:Class" href="Common.uml#_1POjoOwXEei7-e9MrPJW7Q"/>
-      </generalization>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_T5-uYN3uEei-jeeHUjfpLA" name="PoolLimit">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_OA0IkARvEemo7ZzqT33fqQ" annotatedElement="_T5-uYN3uEei-jeeHUjfpLA">
-        <body>A variable set of values that identify the limits that may be imposed by an entitlement instance in the pool.  Multiple constraints may be applicable for an instance of entitlement in the pool.  For example, an entitlement based on GB and number of sessions. Increments, aggregation function, time scope, threshold value may repeat for each metric in the list.&#xD;
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+        </ownedAttribute>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Class" xmi:id="_D_LXMN3xEei-jeeHUjfpLA" name="LicenseKeyInstance"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_B5kVkN3xEei-jeeHUjfpLA" name="LicenseKeyPoolInstance"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_T5-uYN3uEei-jeeHUjfpLA" name="PoolLimit">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_OA0IkARvEemo7ZzqT33fqQ" annotatedElement="_T5-uYN3uEei-jeeHUjfpLA">
+          <body>A variable set of values that identify the limits that may be imposed by an entitlement instance in the pool.  Multiple constraints may be applicable for an instance of entitlement in the pool.  For example, an entitlement based on GB and number of sessions. Increments, aggregation function, time scope, threshold value may repeat for each metric in the list.&#xD;
 &#xD;
 Limits can be applied by the vendor or the service provider.</body>
-      </ownedComment>
-      <generalization xmi:type="uml:Generalization" xmi:id="_lAvcoP-8EeiQG4ZZm0HgYw">
-        <general xmi:type="uml:Class" href="Common.uml#_1POjoOwXEei7-e9MrPJW7Q"/>
-      </generalization>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_tG0BUP-7EeiQG4ZZm0HgYw" name="limitMetricType" type="_FbFaQP4LEeiao-2FtYZWRA">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_erEmwARsEemo7ZzqT33fqQ" annotatedElement="_tG0BUP-7EeiQG4ZZm0HgYw">
-          <body>Specifies if this pool holds entitlements based on usage of the software (number of users), number of sessions, country, line of business, etc.&#xD;
-</body>
-        </ownedComment>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_tntH4P-7EeiQG4ZZm0HgYw" name="limitMetricValue">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_kn0KoARvEemo7ZzqT33fqQ" annotatedElement="_tntH4P-7EeiQG4ZZm0HgYw">
-          <body>The value of some limit being applied.</body>
-        </ownedComment>
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_v5xRIP-7EeiQG4ZZm0HgYw" name="aggregationFunction" type="_UsE8IARuEemo7ZzqT33fqQ">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_BORDIARvEemo7ZzqT33fqQ" annotatedElement="_v5xRIP-7EeiQG4ZZm0HgYw">
-          <body>Type of aggregation being performed (Peak or Average)</body>
         </ownedComment>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hjZ0MAMLEemoQ5ZgWCUg_g"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hjiXEAMLEemoQ5ZgWCUg_g" value="1"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_wXOpMP-7EeiQG4ZZm0HgYw" name="limitUnits" type="_DKi_YAMLEemoQ5ZgWCUg_g">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_uI7UgARvEemo7ZzqT33fqQ" annotatedElement="_wXOpMP-7EeiQG4ZZm0HgYw">
-          <body>The units of the limit (Trunks, Users, Subscribers, Sessions, tentants, Tokens, Seats, TB, GB, MB, ...)</body>
-        </ownedComment>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_yQCk8P-7EeiQG4ZZm0HgYw" name="time">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_O0lpMCpeEemnoK-fhDe5lw" annotatedElement="_yQCk8P-7EeiQG4ZZm0HgYw">
-          <body>Units time is specified in (day, month, hour, minute, second, millisecond.&#xD;
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_tG0BUP-7EeiQG4ZZm0HgYw" name="limitMetricType" type="_FbFaQP4LEeiao-2FtYZWRA">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_erEmwARsEemo7ZzqT33fqQ" annotatedElement="_tG0BUP-7EeiQG4ZZm0HgYw">
+            <body>Specifies if this pool holds entitlements based on usage of the software (number of users), number of sessions, country, line of business, etc.&#xD;
 </body>
-        </ownedComment>
-        <type xmi:type="uml:PrimitiveType" href="Common.uml#_KwZPMP8VEeiZ-fXSiUXhdA"/>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ly2QIAMLEemoQ5ZgWCUg_g"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ly8WwAMLEemoQ5ZgWCUg_g" value="1"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_1cIjwARsEemo7ZzqT33fqQ" name="poolMetricTypeOther">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_F3FTQARtEemo7ZzqT33fqQ" annotatedElement="_1cIjwARsEemo7ZzqT33fqQ">
-          <body>LimitMetricType if Other enumeration is selected.</body>
-        </ownedComment>
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_BYRloARtEemo7ZzqT33fqQ"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BYavkARtEemo7ZzqT33fqQ" value="1"/>
-      </ownedAttribute>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_QG4ysP1oEeisxOMTY1eUug" name="EntitlementInstance">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_BAUicP74EeiZ-fXSiUXhdA" annotatedElement="_QG4ysP1oEeisxOMTY1eUug">
-        <body>Represents an instance of a EntitlementDesc.&#xD;
+          </ownedComment>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_tntH4P-7EeiQG4ZZm0HgYw" name="limitMetricValue">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_kn0KoARvEemo7ZzqT33fqQ" annotatedElement="_tntH4P-7EeiQG4ZZm0HgYw">
+            <body>The value of some limit being applied.</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_v5xRIP-7EeiQG4ZZm0HgYw" name="aggregationFunction" type="_UsE8IARuEemo7ZzqT33fqQ">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_BORDIARvEemo7ZzqT33fqQ" annotatedElement="_v5xRIP-7EeiQG4ZZm0HgYw">
+            <body>Type of aggregation being performed (Peak or Average)</body>
+          </ownedComment>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hjZ0MAMLEemoQ5ZgWCUg_g"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hjiXEAMLEemoQ5ZgWCUg_g" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_wXOpMP-7EeiQG4ZZm0HgYw" name="limitUnits" type="_DKi_YAMLEemoQ5ZgWCUg_g">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_uI7UgARvEemo7ZzqT33fqQ" annotatedElement="_wXOpMP-7EeiQG4ZZm0HgYw">
+            <body>The units of the limit (Trunks, Users, Subscribers, Sessions, tentants, Tokens, Seats, TB, GB, MB, ...)</body>
+          </ownedComment>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yQCk8P-7EeiQG4ZZm0HgYw" name="time">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_O0lpMCpeEemnoK-fhDe5lw" annotatedElement="_yQCk8P-7EeiQG4ZZm0HgYw">
+            <body>Units time is specified in (day, month, hour, minute, second, millisecond.&#xD;
+</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="Common.uml#_KwZPMP8VEeiZ-fXSiUXhdA"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ly2QIAMLEemoQ5ZgWCUg_g"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ly8WwAMLEemoQ5ZgWCUg_g" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_1cIjwARsEemo7ZzqT33fqQ" name="poolMetricTypeOther">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_F3FTQARtEemo7ZzqT33fqQ" annotatedElement="_1cIjwARsEemo7ZzqT33fqQ">
+            <body>LimitMetricType if Other enumeration is selected.</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_BYRloARtEemo7ZzqT33fqQ"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BYavkARtEemo7ZzqT33fqQ" value="1"/>
+        </ownedAttribute>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Class" xmi:id="_QG4ysP1oEeisxOMTY1eUug" name="EntitlementInstance">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_BAUicP74EeiZ-fXSiUXhdA" annotatedElement="_QG4ysP1oEeisxOMTY1eUug">
+          <body>Represents an instance of a EntitlementDesc.&#xD;
 &#xD;
 Specifies the use rights for the software as described by the license. </body>
-      </ownedComment>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_GlxBwP1oEeisxOMTY1eUug" name="EntitlementPoolDesc">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_T6IWgP73EeiZ-fXSiUXhdA" annotatedElement="_GlxBwP1oEeisxOMTY1eUug">
-        <body>An EntitlementPool is created for each type of Entitlement that is required for the software products.&#xD;
+        </ownedComment>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Class" xmi:id="_GlxBwP1oEeisxOMTY1eUug" name="EntitlementPoolDesc">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_T6IWgP73EeiZ-fXSiUXhdA" annotatedElement="_GlxBwP1oEeisxOMTY1eUug">
+          <body>An EntitlementPool is created for each type of Entitlement that is required for the software products.&#xD;
 &#xD;
 An EntitlementPool is not specific to a Feature Group. An Entitlement Pool may be related to multiple Feature Groups of a software product or even to multiple software products.&#xD;
 &#xD;
@@ -477,237 +454,238 @@ An entitlement pool is not specific to a feature group.  An entitlement pool may
 &#xD;
 &#xD;
 </body>
-      </ownedComment>
-      <generalization xmi:type="uml:Generalization" xmi:id="_QgjpIAMJEemoQ5ZgWCUg_g">
-        <general xmi:type="uml:Class" href="Common.uml#_Qb00MOLKEeiKy5JVrA0UGA"/>
-      </generalization>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="__Lo9Ev1oEeisxOMTY1eUug" name="_spPoolLimit" type="_T5-uYN3uEei-jeeHUjfpLA" aggregation="composite" association="__LoWAP1oEeisxOMTY1eUug">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_MfC4AARoEemo7ZzqT33fqQ" annotatedElement="__Lo9Ev1oEeisxOMTY1eUug">
-          <body>Pool limits applied by the service provider</body>
-        </ownedComment>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__LtOgP1oEeisxOMTY1eUug"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__LvqwP1oEeisxOMTY1eUug" value="*"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_M9Rg8v1pEeisxOMTY1eUug" name="_vendorPoolLimit" type="_T5-uYN3uEei-jeeHUjfpLA" aggregation="composite" association="_M9Q54P1pEeisxOMTY1eUug">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_OlV2IARoEemo7ZzqT33fqQ" annotatedElement="_M9Rg8v1pEeisxOMTY1eUug">
-          <body>Pool limits applied by the vendor.</body>
-        </ownedComment>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_M9T9MP1pEeisxOMTY1eUug"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_M9VyYP1pEeisxOMTY1eUug" value="*"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_GSdZU_1qEeisxOMTY1eUug" name="_entitlementpoolinstance" type="_NkuX8P1oEeisxOMTY1eUug" aggregation="composite" association="_GSdZUP1qEeisxOMTY1eUug">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_fqv34ARoEemo7ZzqT33fqQ" annotatedElement="_GSdZU_1qEeisxOMTY1eUug">
-          <body>EntitlementPoolDesc is the basis for an EntitlementPoolInstance.</body>
-        </ownedComment>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_GSf1kP1qEeisxOMTY1eUug"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GShDsP1qEeisxOMTY1eUug" value="1"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_BLpV4P19EeisxOMTY1eUug" name="manufactureReferenceNumber">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_N6jM8APJEemCCMXOyOLwIw" annotatedElement="_BLpV4P19EeisxOMTY1eUug">
-          <body>Identifier for the entitlement as described by the vendor in their price list / catalog /contract.</body>
         </ownedComment>
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_BluCwP19EeisxOMTY1eUug" name="entitlementPurchaseIncrements">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_TBkKEAPJEemCCMXOyOLwIw" annotatedElement="_BluCwP19EeisxOMTY1eUug">
-          <body>This field contains information to tell a Designer how the entitlement must be purchased. For example, if the entitlement must be purchased in blocks of 1000, the increment would be 1000. &#xD;
+        <ownedAttribute xmi:type="uml:Property" xmi:id="__Lo9Ev1oEeisxOMTY1eUug" name="_spPoolLimit" type="_T5-uYN3uEei-jeeHUjfpLA" aggregation="composite" association="__LoWAP1oEeisxOMTY1eUug">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_MfC4AARoEemo7ZzqT33fqQ" annotatedElement="__Lo9Ev1oEeisxOMTY1eUug">
+            <body>Pool limits applied by the service provider</body>
+          </ownedComment>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__LtOgP1oEeisxOMTY1eUug"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__LvqwP1oEeisxOMTY1eUug" value="*"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_M9Rg8v1pEeisxOMTY1eUug" name="_vendorPoolLimit" type="_T5-uYN3uEei-jeeHUjfpLA" aggregation="composite" association="_M9Q54P1pEeisxOMTY1eUug">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_OlV2IARoEemo7ZzqT33fqQ" annotatedElement="_M9Rg8v1pEeisxOMTY1eUug">
+            <body>Pool limits applied by the vendor.</body>
+          </ownedComment>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_M9T9MP1pEeisxOMTY1eUug"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_M9VyYP1pEeisxOMTY1eUug" value="*"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_GSdZU_1qEeisxOMTY1eUug" name="_entitlementpoolinstance" type="_NkuX8P1oEeisxOMTY1eUug" aggregation="composite" association="_GSdZUP1qEeisxOMTY1eUug">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_fqv34ARoEemo7ZzqT33fqQ" annotatedElement="_GSdZU_1qEeisxOMTY1eUug">
+            <body>EntitlementPoolDesc is the basis for an EntitlementPoolInstance.</body>
+          </ownedComment>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_GSf1kP1qEeisxOMTY1eUug"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GShDsP1qEeisxOMTY1eUug" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_BLpV4P19EeisxOMTY1eUug" name="manufactureReferenceNumber">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_N6jM8APJEemCCMXOyOLwIw" annotatedElement="_BLpV4P19EeisxOMTY1eUug">
+            <body>Identifier for the entitlement as described by the vendor in their price list / catalog /contract.</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_BluCwP19EeisxOMTY1eUug" name="entitlementPurchaseIncrements">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_TBkKEAPJEemCCMXOyOLwIw" annotatedElement="_BluCwP19EeisxOMTY1eUug">
+            <body>This field contains information to tell a Designer how the entitlement must be purchased. For example, if the entitlement must be purchased in blocks of 1000, the increment would be 1000. &#xD;
 </body>
-        </ownedComment>
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_cNgCIP4LEeiao-2FtYZWRA"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cNlhsP4LEeiao-2FtYZWRA" value="1"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_IjiJcP19EeisxOMTY1eUug" name="entitlementPoolThresholdValue">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_VUgdEAPJEemCCMXOyOLwIw" annotatedElement="_IjiJcP19EeisxOMTY1eUug">
-          <body>A description of a threshold that will be assessed for some business purpose (e.g. 20% of entitlement pool remains available).  (The threshold of interest to DCAE or Capacity Planning, etc.)  This may be an absolute value or a percentage. For example:&#xD;
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_cNgCIP4LEeiao-2FtYZWRA"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cNlhsP4LEeiao-2FtYZWRA" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_IjiJcP19EeisxOMTY1eUug" name="entitlementPoolThresholdValue">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_VUgdEAPJEemCCMXOyOLwIw" annotatedElement="_IjiJcP19EeisxOMTY1eUug">
+            <body>A description of a threshold that will be assessed for some business purpose (e.g. 20% of entitlement pool remains available).  (The threshold of interest to DCAE or Capacity Planning, etc.)  This may be an absolute value or a percentage. For example:&#xD;
 when 90% of the pool is in-use, trigger an additional purchase of inventory.&#xD;
 </body>
-        </ownedComment>
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_h77kkP4LEeiao-2FtYZWRA"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_h7_2AP4LEeiao-2FtYZWRA" value="1"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_I9Ob0P19EeisxOMTY1eUug" name="entitlementPoolThresholdUnits" type="_F8MvAAMIEemoQ5ZgWCUg_g">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_Y0LB4APJEemCCMXOyOLwIw" annotatedElement="_I9Ob0P19EeisxOMTY1eUug">
-          <body>Specifies the Units for the ThresholdValue.  </body>
-        </ownedComment>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1tdaEAMIEemoQ5ZgWCUg_g"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1tiSkAMIEemoQ5ZgWCUg_g" value="1"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_JWKgQP19EeisxOMTY1eUug" name="entitlementPooPurchaselIncrements">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_wu8jgAPKEemCCMXOyOLwIw" annotatedElement="_JWKgQP19EeisxOMTY1eUug">
-          <body>This field contains information to tell a Designer how the entitlement must be purchased. For example, if the entitlement must be purchased in blocks of 1000, the increment would be 1000. </body>
-        </ownedComment>
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_zNkQMAMIEemoQ5ZgWCUg_g"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zNmscAMIEemoQ5ZgWCUg_g" value="1"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_Ju2tEP19EeisxOMTY1eUug" name="entitlementPoolStartDate">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_9LdHgAPKEemCCMXOyOLwIw" annotatedElement="_Ju2tEP19EeisxOMTY1eUug">
-          <body>Start date</body>
-        </ownedComment>
-        <type xmi:type="uml:PrimitiveType" href="Common.uml#_KwZPMP8VEeiZ-fXSiUXhdA"/>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_zNc7cAMIEemoQ5ZgWCUg_g"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zNgl0AMIEemoQ5ZgWCUg_g" value="1"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_YepH4P8VEeiZ-fXSiUXhdA" name="entitlementPoolExpiryDate">
-        <ownedComment xmi:type="uml:Comment" xmi:id="__weB8APKEemCCMXOyOLwIw" annotatedElement="_YepH4P8VEeiZ-fXSiUXhdA">
-          <body>Expiry date</body>
-        </ownedComment>
-        <type xmi:type="uml:PrimitiveType" href="Common.uml#_KwZPMP8VEeiZ-fXSiUXhdA"/>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_zNUYkAMIEemoQ5ZgWCUg_g"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zNZREAMIEemoQ5ZgWCUg_g" value="1"/>
-      </ownedAttribute>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_NkuX8P1oEeisxOMTY1eUug" name="EntitlementPoolInstance">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_jHhGsP73EeiZ-fXSiUXhdA" annotatedElement="_NkuX8P1oEeisxOMTY1eUug">
-        <body>An EntitlementPool describes the characteristics of a type of entitlement and the behavior of the entitlement instances in the pool.&#xD;
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_h77kkP4LEeiao-2FtYZWRA"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_h7_2AP4LEeiao-2FtYZWRA" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_I9Ob0P19EeisxOMTY1eUug" name="entitlementPoolThresholdUnits" type="_F8MvAAMIEemoQ5ZgWCUg_g">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Y0LB4APJEemCCMXOyOLwIw" annotatedElement="_I9Ob0P19EeisxOMTY1eUug">
+            <body>Specifies the Units for the ThresholdValue.  </body>
+          </ownedComment>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1tdaEAMIEemoQ5ZgWCUg_g"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1tiSkAMIEemoQ5ZgWCUg_g" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_JWKgQP19EeisxOMTY1eUug" name="entitlementPooPurchaselIncrements">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_wu8jgAPKEemCCMXOyOLwIw" annotatedElement="_JWKgQP19EeisxOMTY1eUug">
+            <body>This field contains information to tell a Designer how the entitlement must be purchased. For example, if the entitlement must be purchased in blocks of 1000, the increment would be 1000. </body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_zNkQMAMIEemoQ5ZgWCUg_g"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zNmscAMIEemoQ5ZgWCUg_g" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_Ju2tEP19EeisxOMTY1eUug" name="entitlementPoolStartDate">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_9LdHgAPKEemCCMXOyOLwIw" annotatedElement="_Ju2tEP19EeisxOMTY1eUug">
+            <body>Start date</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="Common.uml#_KwZPMP8VEeiZ-fXSiUXhdA"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_zNc7cAMIEemoQ5ZgWCUg_g"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zNgl0AMIEemoQ5ZgWCUg_g" value="1"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_YepH4P8VEeiZ-fXSiUXhdA" name="entitlementPoolExpiryDate">
+          <ownedComment xmi:type="uml:Comment" xmi:id="__weB8APKEemCCMXOyOLwIw" annotatedElement="_YepH4P8VEeiZ-fXSiUXhdA">
+            <body>Expiry date</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="Common.uml#_KwZPMP8VEeiZ-fXSiUXhdA"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_zNUYkAMIEemoQ5ZgWCUg_g"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zNZREAMIEemoQ5ZgWCUg_g" value="1"/>
+        </ownedAttribute>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Class" xmi:id="_NkuX8P1oEeisxOMTY1eUug" name="EntitlementPoolInstance">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_jHhGsP73EeiZ-fXSiUXhdA" annotatedElement="_NkuX8P1oEeisxOMTY1eUug">
+          <body>An EntitlementPool describes the characteristics of a type of entitlement and the behavior of the entitlement instances in the pool.&#xD;
 &#xD;
 Management of the collection.&#xD;
 </body>
-      </ownedComment>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_Omfk4P2SEeisxOMTY1eUug" name="FeatureGroup">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_jFvgwAVoEemrBZmpgd_POA" annotatedElement="_Omfk4P2SEeisxOMTY1eUug">
-        <body>Feature groups represent a set of the features of the software. Feature groups may be defined by the vendor and/or by the service provider. Software may be related to multiple feature groups.  At least one feature group will be related to software. If no sub-sets are needed, a single feature group will be defined that represents the base or core capabilities of the software.  &#xD;
+        </ownedComment>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Class" xmi:id="_Omfk4P2SEeisxOMTY1eUug" name="FeatureGroup">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_jFvgwAVoEemrBZmpgd_POA" annotatedElement="_Omfk4P2SEeisxOMTY1eUug">
+          <body>Feature groups represent a set of the features of the software. Feature groups may be defined by the vendor and/or by the service provider. Software may be related to multiple feature groups.  At least one feature group will be related to software. If no sub-sets are needed, a single feature group will be defined that represents the base or core capabilities of the software.  &#xD;
 If an Entitlement Pool or License Key Group is associated with a particular Feature Group, the Feature Group becomes a “constraint” for the pool/group.&#xD;
 </body>
-      </ownedComment>
-      <generalization xmi:type="uml:Generalization" xmi:id="_oY-pEAV1EemrBZmpgd_POA">
-        <general xmi:type="uml:Class" href="Common.uml#_1POjoOwXEei7-e9MrPJW7Q"/>
-      </generalization>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_FeFtUCoxEemnoK-fhDe5lw" name="featureGroupName">
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_IkqcsCoxEemnoK-fhDe5lw" name="featureGroupDescription">
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_RF49QCo5EemnoK-fhDe5lw" name="featureGroupPartNumber">
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-      </ownedAttribute>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_bCM3oP2SEeisxOMTY1eUug" name="LicenseAgreement">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_DZlRYCpREemnoK-fhDe5lw" annotatedElement="_bCM3oP2SEeisxOMTY1eUug">
-        <body>An agreement between the service provider and a given vendor granting the service provider to use the vendor's products.   Generally the license agreement is specific to a family of vendor products and/or to some service provider's project/product or product family.   &#xD;
-</body>
-      </ownedComment>
-      <generalization xmi:type="uml:Generalization" xmi:id="_io00wBpwEemOGejS9lsDjA">
-        <general xmi:type="uml:Class" href="Common.uml#_z6bHYBnLEemlxOdMFpUVvQ"/>
-      </generalization>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_cFdxcP_BEeiQG4ZZm0HgYw" name="description">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_w291ICosEemnoK-fhDe5lw" annotatedElement="_cFdxcP_BEeiQG4ZZm0HgYw">
-          <body>License agreement description.</body>
         </ownedComment>
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_ccRu8P_BEeiQG4ZZm0HgYw" name="requirementsAndConstraints">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_q9WWYCosEemnoK-fhDe5lw" annotatedElement="_ccRu8P_BEeiQG4ZZm0HgYw">
-          <body>Free form text.  Includes information such as operating system or hypervisor required for the software.   This may also contain factors to be considered in deployment/placement of the software instances.  These requirements and constraints may need to be abstracted as policies or other business rules.  &#xD;
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_FeFtUCoxEemnoK-fhDe5lw" name="featureGroupName">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_IkqcsCoxEemnoK-fhDe5lw" name="featureGroupDescription">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_RF49QCo5EemnoK-fhDe5lw" name="featureGroupPartNumber">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+        </ownedAttribute>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Class" xmi:id="_bCM3oP2SEeisxOMTY1eUug" name="LicenseAgreement">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_DZlRYCpREemnoK-fhDe5lw" annotatedElement="_bCM3oP2SEeisxOMTY1eUug">
+          <body>An agreement between the service provider and a given vendor granting the service provider to use the vendor's products.   Generally the license agreement is specific to a family of vendor products and/or to some service provider's project/product or product family.   &#xD;
 </body>
         </ownedComment>
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_n-pl8P_BEeiQG4ZZm0HgYw" value="1"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_n-w6sP_BEeiQG4ZZm0HgYw" value="*"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_cy77cP_BEeiQG4ZZm0HgYw" name="licenseTerm" type="_sckiwP_BEeiQG4ZZm0HgYw">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_DqKLMCopEemnoK-fhDe5lw" annotatedElement="_cy77cP_BEeiQG4ZZm0HgYw">
-          <body>Term of the license:&#xD;
+        <generalization xmi:type="uml:Generalization" xmi:id="_io00wBpwEemOGejS9lsDjA">
+          <general xmi:type="uml:Class" href="Common.uml#_z6bHYBnLEemlxOdMFpUVvQ"/>
+        </generalization>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_cFdxcP_BEeiQG4ZZm0HgYw" name="description">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_w291ICosEemnoK-fhDe5lw" annotatedElement="_cFdxcP_BEeiQG4ZZm0HgYw">
+            <body>License agreement description.</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_ccRu8P_BEeiQG4ZZm0HgYw" name="requirementsAndConstraints">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_q9WWYCosEemnoK-fhDe5lw" annotatedElement="_ccRu8P_BEeiQG4ZZm0HgYw">
+            <body>Free form text.  Includes information such as operating system or hypervisor required for the software.   This may also contain factors to be considered in deployment/placement of the software instances.  These requirements and constraints may need to be abstracted as policies or other business rules.  &#xD;
+</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_n-pl8P_BEeiQG4ZZm0HgYw" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_n-w6sP_BEeiQG4ZZm0HgYw" value="*"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_cy77cP_BEeiQG4ZZm0HgYw" name="licenseTerm" type="_sckiwP_BEeiQG4ZZm0HgYw">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_DqKLMCopEemnoK-fhDe5lw" annotatedElement="_cy77cP_BEeiQG4ZZm0HgYw">
+            <body>Term of the license:&#xD;
 -fixed term&#xD;
 -perpetual&#xD;
 -unlimited&#xD;
 -subscription&#xD;
 </body>
-        </ownedComment>
-      </ownedAttribute>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Constraint" xmi:id="_1wxcsCosEemnoK-fhDe5lw" name="EntitlementPool Must Exist Before LicenseKey" constrainedElement="_GlxBwP1oEeisxOMTY1eUug _4ZDVsMgEEeiEtuRgTYzSUQ">
-      <specification xmi:type="uml:OpaqueExpression" xmi:id="_1wzR4CosEemnoK-fhDe5lw" name="constraintSpec">
-        <language>OCL</language>
-        <body>true</body>
-      </specification>
-    </packagedElement>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Package" xmi:id="_bIcAgMfyEeiEtuRgTYzSUQ" name="TypeDefinitions">
-    <packagedElement xmi:type="uml:Enumeration" xmi:id="_FbFaQP4LEeiao-2FtYZWRA" name="EPMetricType">
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_JcMfQP4LEeiao-2FtYZWRA" name="BWTH"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_K1kF8P4LEeiao-2FtYZWRA" name="COUNTRY"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_MMljQP4LEeiao-2FtYZWRA" name="SESSION"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_NWS9UP4LEeiao-2FtYZWRA" name="LOB"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_OUUr0P4LEeiao-2FtYZWRA" name="SITE"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_P-pfoP4LEeiao-2FtYZWRA" name="USAGE"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_RFYeMP4LEeiao-2FtYZWRA" name="OTHER"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Enumeration" xmi:id="_sckiwP_BEeiQG4ZZm0HgYw" name="LicenseTerm">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_lpSNQA64EemnO9QINOJnHg" annotatedElement="_sckiwP_BEeiQG4ZZm0HgYw">
-        <body>Valid values:&#xD;
+          </ownedComment>
+        </ownedAttribute>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Constraint" xmi:id="_1wxcsCosEemnoK-fhDe5lw" name="EntitlementPool Must Exist Before LicenseKey" constrainedElement="_GlxBwP1oEeisxOMTY1eUug _4ZDVsMgEEeiEtuRgTYzSUQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1wzR4CosEemnoK-fhDe5lw" name="constraintSpec">
+          <language>OCL</language>
+          <body>true</body>
+        </specification>
+      </packagedElement>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Package" xmi:id="_bIcAgMfyEeiEtuRgTYzSUQ" name="TypeDefinitions">
+      <packagedElement xmi:type="uml:Enumeration" xmi:id="_FbFaQP4LEeiao-2FtYZWRA" name="EPMetricType">
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_JcMfQP4LEeiao-2FtYZWRA" name="BWTH"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_K1kF8P4LEeiao-2FtYZWRA" name="COUNTRY"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_MMljQP4LEeiao-2FtYZWRA" name="SESSION"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_NWS9UP4LEeiao-2FtYZWRA" name="LOB"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_OUUr0P4LEeiao-2FtYZWRA" name="SITE"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_P-pfoP4LEeiao-2FtYZWRA" name="USAGE"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_RFYeMP4LEeiao-2FtYZWRA" name="OTHER"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Enumeration" xmi:id="_sckiwP_BEeiQG4ZZm0HgYw" name="LicenseTerm">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_lpSNQA64EemnO9QINOJnHg" annotatedElement="_sckiwP_BEeiQG4ZZm0HgYw">
+          <body>Valid values:&#xD;
 year, quarter, month, day.&#xD;
 Not applicable when license type is Perpetual.&#xD;
 </body>
-      </ownedComment>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_wi434P_BEeiQG4ZZm0HgYw" name="FIXED_TERM"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ydBCQP_BEeiQG4ZZm0HgYw" name="PERPETUAL"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_2ICigP_BEeiQG4ZZm0HgYw" name="UNLIMITED"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_3aXtEP_BEeiQG4ZZm0HgYw" name="OTHER"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_bT5CEAPIEemCCMXOyOLwIw" name="TRIAL"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_cn_uQAPIEemCCMXOyOLwIw" name="SUBSCRIPTION"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Enumeration" xmi:id="_DKi_YAMLEemoQ5ZgWCUg_g" name="LimitUnits">
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Fi1FYAMLEemoQ5ZgWCUg_g" name="TRUNKS"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_HYdKQAMLEemoQ5ZgWCUg_g" name="USERS"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_I3FEYAMLEemoQ5ZgWCUg_g" name="SUBSCRIBERS"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_KS6JMAMLEemoQ5ZgWCUg_g" name="SESSIONS"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_LpjMAAMLEemoQ5ZgWCUg_g" name="TENANTS"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_NCNoEAMLEemoQ5ZgWCUg_g" name="TOKENS"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_OBALkAMLEemoQ5ZgWCUg_g" name="SEATS"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_PG3AYAMLEemoQ5ZgWCUg_g" name="TB"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_P2BzgAMLEemoQ5ZgWCUg_g" name="GB"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Q6_3gAMLEemoQ5ZgWCUg_g" name="MB"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_R7jVkAMLEemoQ5ZgWCUg_g" name="OTHER"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Enumeration" xmi:id="_F8MvAAMIEemoQ5ZgWCUg_g" name="ThresholdUnitType">
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_KxiGQAMIEemoQ5ZgWCUg_g" name="ABSOLUTE"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_PXPGEAMIEemoQ5ZgWCUg_g" name="%"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Enumeration" xmi:id="_4CYPgAO3EemCCMXOyOLwIw" name="LicenseKeyGroupType">
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_8VPy4AO3EemCCMXOyOLwIw" name="UNIVERSAL"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_9sQpIAO3EemCCMXOyOLwIw" name="UNIQUE"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="__gFXMAO3EemCCMXOyOLwIw" name="ONE_TIME"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Enumeration" xmi:id="_UsE8IARuEemo7ZzqT33fqQ" name="AggregationTypes">
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_YGemcARuEemo7ZzqT33fqQ" name="PEAK"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Y-w5UARuEemo7ZzqT33fqQ" name="AVERAGE"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Enumeration" xmi:id="_oaES0A64EemnO9QINOJnHg" name="LicenseDuration">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_9MpJ4A64EemnO9QINOJnHg" annotatedElement="_oaES0A64EemnO9QINOJnHg">
-        <body>Units of the entitlement/license term.   Valid values: year, quarter, month, day.&#xD;
+        </ownedComment>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_wi434P_BEeiQG4ZZm0HgYw" name="FIXED_TERM"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ydBCQP_BEeiQG4ZZm0HgYw" name="PERPETUAL"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_2ICigP_BEeiQG4ZZm0HgYw" name="UNLIMITED"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_3aXtEP_BEeiQG4ZZm0HgYw" name="OTHER"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_bT5CEAPIEemCCMXOyOLwIw" name="TRIAL"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_cn_uQAPIEemCCMXOyOLwIw" name="SUBSCRIPTION"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Enumeration" xmi:id="_DKi_YAMLEemoQ5ZgWCUg_g" name="LimitUnits">
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Fi1FYAMLEemoQ5ZgWCUg_g" name="TRUNKS"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_HYdKQAMLEemoQ5ZgWCUg_g" name="USERS"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_I3FEYAMLEemoQ5ZgWCUg_g" name="SUBSCRIBERS"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_KS6JMAMLEemoQ5ZgWCUg_g" name="SESSIONS"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_LpjMAAMLEemoQ5ZgWCUg_g" name="TENANTS"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_NCNoEAMLEemoQ5ZgWCUg_g" name="TOKENS"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_OBALkAMLEemoQ5ZgWCUg_g" name="SEATS"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_PG3AYAMLEemoQ5ZgWCUg_g" name="TB"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_P2BzgAMLEemoQ5ZgWCUg_g" name="GB"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Q6_3gAMLEemoQ5ZgWCUg_g" name="MB"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_R7jVkAMLEemoQ5ZgWCUg_g" name="OTHER"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Enumeration" xmi:id="_F8MvAAMIEemoQ5ZgWCUg_g" name="ThresholdUnitType">
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_KxiGQAMIEemoQ5ZgWCUg_g" name="ABSOLUTE"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_PXPGEAMIEemoQ5ZgWCUg_g" name="%"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Enumeration" xmi:id="_4CYPgAO3EemCCMXOyOLwIw" name="LicenseKeyGroupType">
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_8VPy4AO3EemCCMXOyOLwIw" name="UNIVERSAL"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_9sQpIAO3EemCCMXOyOLwIw" name="UNIQUE"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="__gFXMAO3EemCCMXOyOLwIw" name="ONE_TIME"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Enumeration" xmi:id="_UsE8IARuEemo7ZzqT33fqQ" name="AggregationTypes">
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_YGemcARuEemo7ZzqT33fqQ" name="PEAK"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Y-w5UARuEemo7ZzqT33fqQ" name="AVERAGE"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Enumeration" xmi:id="_oaES0A64EemnO9QINOJnHg" name="LicenseDuration">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_9MpJ4A64EemnO9QINOJnHg" annotatedElement="_oaES0A64EemnO9QINOJnHg">
+          <body>Units of the entitlement/license term.   Valid values: year, quarter, month, day.&#xD;
 &#xD;
 </body>
-      </ownedComment>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_KovioA65EemnO9QINOJnHg" name="YEAR"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_MeFToA65EemnO9QINOJnHg" name="QUARTER"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_OGL54A65EemnO9QINOJnHg" name="MONTH"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_QAd1QA65EemnO9QINOJnHg" name="DAY"/>
-    </packagedElement>
-  </packagedElement>
-  <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_Jha1YEHWEemqbK2aT-9uCA">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sI6YYEHXEemqbK2aT-9uCA" source="PapyrusVersion">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_sI6YYUHXEemqbK2aT-9uCA" key="Version" value="0.2.15"/>
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_sI6YYkHXEemqbK2aT-9uCA" key="Comment" value=""/>
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_sI6YY0HXEemqbK2aT-9uCA" key="Copyright" value=""/>
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_sI6YZEHXEemqbK2aT-9uCA" key="Date" value="2019-02-25"/>
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_sI6YZUHXEemqbK2aT-9uCA" key="Author" value=""/>
-    </eAnnotations>
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Jha1Z0HWEemqbK2aT-9uCA" source="http://www.eclipse.org/uml2/2.0.0/UML">
-      <references xmi:type="ecore:EPackage" href="OpenModel_Profile.profile.uml#_2RzvwDkrEemjyLkBMGZA1g"/>
-    </eAnnotations>
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_JhefwEHWEemqbK2aT-9uCA" source="duplicatedProfile"/>
-    <appliedProfile xmi:type="uml:Profile" href="OpenModel_Profile.profile.uml#_m1xqsHBgEd6FKu9XX1078A"/>
-  </profileApplication>
-  <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_JhjYQEHWEemqbK2aT-9uCA">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_JhjYQUHWEemqbK2aT-9uCA" source="http://www.eclipse.org/uml2/2.0.0/UML">
-      <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>
-    </eAnnotations>
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_JhkmYEHWEemqbK2aT-9uCA" source="duplicatedProfile"/>
-    <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>
-  </profileApplication>
-</uml:Package>
+        </ownedComment>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_KovioA65EemnO9QINOJnHg" name="YEAR"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_MeFToA65EemnO9QINOJnHg" name="QUARTER"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_OGL54A65EemnO9QINOJnHg" name="MONTH"/>
+        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_QAd1QA65EemnO9QINOJnHg" name="DAY"/>
+      </packagedElement>
+    </packagedElement>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_Jha1YEHWEemqbK2aT-9uCA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sI6YYEHXEemqbK2aT-9uCA" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_sI6YYUHXEemqbK2aT-9uCA" key="Version" value="0.2.15"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_sI6YYkHXEemqbK2aT-9uCA" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_sI6YY0HXEemqbK2aT-9uCA" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_sI6YZEHXEemqbK2aT-9uCA" key="Date" value="2019-02-25"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_sI6YZUHXEemqbK2aT-9uCA" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Jha1Z0HWEemqbK2aT-9uCA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="OpenModel_Profile.profile.uml#_2RzvwDkrEemjyLkBMGZA1g"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_JhefwEHWEemqbK2aT-9uCA" source="duplicatedProfile"/>
+      <appliedProfile xmi:type="uml:Profile" href="OpenModel_Profile.profile.uml#_m1xqsHBgEd6FKu9XX1078A"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_JhjYQEHWEemqbK2aT-9uCA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_JhjYQUHWEemqbK2aT-9uCA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_JhkmYEHWEemqbK2aT-9uCA" source="duplicatedProfile"/>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>
+    </profileApplication>
+  </uml:Package>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_7QDmQEW_Eem3_P23YPx5GQ" base_StructuralFeature="_7QC_MkW_Eem3_P23YPx5GQ"/>
+  <OpenModel_Profile:Future xmi:id="_BrQ3sEXXEem3_P23YPx5GQ" base_Element="_BluCwP19EeisxOMTY1eUug"/>
+  <OpenModel_Profile:Future xmi:id="_DUll8EXXEem3_P23YPx5GQ" base_Element="_IjiJcP19EeisxOMTY1eUug"/>
+  <OpenModel_Profile:Future xmi:id="_GlKl4EXXEem3_P23YPx5GQ" base_Element="_I9Ob0P19EeisxOMTY1eUug"/>
+  <OpenModel_Profile:Future xmi:id="_LDRv8EXXEem3_P23YPx5GQ" base_Element="_JWKgQP19EeisxOMTY1eUug"/>
+  <OpenModel_Profile:Future xmi:id="_M-0PkEXXEem3_P23YPx5GQ" base_Element="_Ju2tEP19EeisxOMTY1eUug"/>
+</xmi:XMI>
diff --git a/ONAP Information Model/Party.uml b/ONAP Information Model/Party.uml
index cd7b185..5daa70b 100644
--- a/ONAP Information Model/Party.uml
+++ b/ONAP Information Model/Party.uml
@@ -203,4 +203,10 @@
   <OpenModel_Profile:Reference xmi:id="_7yZfIDbpEemP3p_OV1tL7g" base_Element="_3lu8UDbnEemP3p_OV1tL7g" reference="From TMF SID"/>
   <OpenModel_Profile:Experimental xmi:id="_FC1IsDbqEemP3p_OV1tL7g" base_Element="_99w1YDbnEemP3p_OV1tL7g"/>
   <OpenModel_Profile:Reference xmi:id="_FDcMsDbqEemP3p_OV1tL7g" base_Element="_99w1YDbnEemP3p_OV1tL7g" reference="From TMF SID"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_avI4wUW_Eem3_P23YPx5GQ">
+    <base_StructuralFeature xmi:type="uml:Property" href="License.uml#_avI4wEW_Eem3_P23YPx5GQ"/>
+  </OpenModel_Profile:OpenModelAttribute>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_7QENUUW_Eem3_P23YPx5GQ">
+    <base_StructuralFeature xmi:type="uml:Property" href="License.uml#_7QENUEW_Eem3_P23YPx5GQ"/>
+  </OpenModel_Profile:OpenModelAttribute>
 </xmi:XMI>
diff --git a/ONAP Information Model/Service.notation b/ONAP Information Model/Service.notation
index 7391686..46a02dc 100644
--- a/ONAP Information Model/Service.notation
+++ b/ONAP Information Model/Service.notation
@@ -2602,22 +2602,6 @@
           <element xmi:type="uml:Property" href="Service.uml#_w3sqAD0QEeiWMf5FLWfdLA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_wmExwR9dEemLMI6HKP6Lbw"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_wmFY0B9dEemLMI6HKP6Lbw" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="Service.uml#_7zDkUD0QEeiWMf5FLWfdLA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_wmFY0R9dEemLMI6HKP6Lbw"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_wmFY0h9dEemLMI6HKP6Lbw" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="Service.uml#_N7eiQD0REeiWMf5FLWfdLA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_wmFY0x9dEemLMI6HKP6Lbw"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_wmFY1B9dEemLMI6HKP6Lbw" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="Service.uml#_aLRf8D0REeiWMf5FLWfdLA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_wmFY1R9dEemLMI6HKP6Lbw"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_wmFY1h9dEemLMI6HKP6Lbw" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="Service.uml#_kDBoMD0REeiWMf5FLWfdLA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_wmFY1x9dEemLMI6HKP6Lbw"/>
-        </children>
         <children xmi:type="notation:Shape" xmi:id="_wmFY2B9dEemLMI6HKP6Lbw" type="Property_ClassAttributeLabel">
           <element xmi:type="uml:Property" href="Service.uml#_AuX84D0TEeiWMf5FLWfdLA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_wmFY2R9dEemLMI6HKP6Lbw"/>
@@ -2634,10 +2618,6 @@
           <element xmi:type="uml:Property" href="Service.uml#_GtqJUD0UEeiWMf5FLWfdLA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_wmF_5R9dEemLMI6HKP6Lbw"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_wmF_5h9dEemLMI6HKP6Lbw" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="Service.uml#_VRZfkD0UEeiWMf5FLWfdLA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_wmF_5x9dEemLMI6HKP6Lbw"/>
-        </children>
         <children xmi:type="notation:Shape" xmi:id="_CWVHUB9eEemLMI6HKP6Lbw" type="Property_ClassAttributeLabel" fontColor="16711935">
           <element xmi:type="uml:Property" href="Service.uml#_1Rt9wPL4EeiazPylpq3fUA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_CWVHUR9eEemLMI6HKP6Lbw"/>
@@ -3225,11 +3205,6 @@
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nT-JtR9cEemLMI6HKP6Lbw" x="200"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_QEW9kB9eEemLMI6HKP6Lbw" type="Comment_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_QEW9kh9eEemLMI6HKP6Lbw" type="Comment_BodyLabel"/>
-      <element xmi:type="uml:Comment" href="Service.uml#_QENMkB9eEemLMI6HKP6Lbw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QEW9kR9eEemLMI6HKP6Lbw" x="120" y="-120" width="201" height="81"/>
-    </children>
     <children xmi:type="notation:Shape" xmi:id="_Yz45gB9eEemLMI6HKP6Lbw" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_Yz45gh9eEemLMI6HKP6Lbw" type="Class_NameLabel"/>
       <children xmi:type="notation:DecorationNode" xmi:id="_Yz45gx9eEemLMI6HKP6Lbw" type="Class_FloatingNameLabel">
@@ -3293,45 +3268,6 @@
           <element xmi:type="uml:Property" href="Service.uml#_w3sqAD0QEeiWMf5FLWfdLA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_p6O_8TA0EemfJIA7XFfVEg"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_yElLMDA0EemfJIA7XFfVEg" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_yGlWUDA0EemfJIA7XFfVEg" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_yGlWUTA0EemfJIA7XFfVEg" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yGlWUjA0EemfJIA7XFfVEg"/>
-          </children>
-          <element xmi:type="uml:Property" href="Service.uml#_7zDkUD0QEeiWMf5FLWfdLA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_yElLMTA0EemfJIA7XFfVEg"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_0gbikDA0EemfJIA7XFfVEg" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_0hSeMDA0EemfJIA7XFfVEg" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_0hSeMTA0EemfJIA7XFfVEg" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0hSeMjA0EemfJIA7XFfVEg"/>
-          </children>
-          <element xmi:type="uml:Property" href="Service.uml#_N7eiQD0REeiWMf5FLWfdLA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_0gbikTA0EemfJIA7XFfVEg"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_3uD8MDA0EemfJIA7XFfVEg" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_3wEHUDA0EemfJIA7XFfVEg" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_3wEHUTA0EemfJIA7XFfVEg" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3wEHUjA0EemfJIA7XFfVEg"/>
-          </children>
-          <element xmi:type="uml:Property" href="Service.uml#_aLRf8D0REeiWMf5FLWfdLA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_3uD8MTA0EemfJIA7XFfVEg"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_FrhVkDA1EemfJIA7XFfVEg" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_FtnnUDA1EemfJIA7XFfVEg" visible="false" type="StereotypeLabel">
-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_K-CioDA2EemfJIA7XFfVEg" source="PapyrusCSSForceValue">
-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_K-CioTA2EemfJIA7XFfVEg" key="visible" value="true"/>
-            </eAnnotations>
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_FtnnUTA1EemfJIA7XFfVEg" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FtnnUjA1EemfJIA7XFfVEg"/>
-          </children>
-          <element xmi:type="uml:Property" href="Service.uml#_kDBoMD0REeiWMf5FLWfdLA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_FrhVkTA1EemfJIA7XFfVEg"/>
-        </children>
         <children xmi:type="notation:Shape" xmi:id="_Ly1SEDA1EemfJIA7XFfVEg" type="Property_ClassAttributeLabel">
           <children xmi:type="notation:DecorationNode" xmi:id="_L07j0DA1EemfJIA7XFfVEg" visible="false" type="StereotypeLabel">
             <styles xmi:type="notation:StringValueStyle" xmi:id="_L07j0TA1EemfJIA7XFfVEg" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
@@ -3368,16 +3304,7 @@
           <element xmi:type="uml:Property" href="Service.uml#_GtqJUD0UEeiWMf5FLWfdLA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_WTDvkTA1EemfJIA7XFfVEg"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_Yo6MoDA1EemfJIA7XFfVEg" type="Property_ClassAttributeLabel">
-          <children xmi:type="notation:DecorationNode" xmi:id="_Ypk7ADA1EemfJIA7XFfVEg" visible="false" type="StereotypeLabel">
-            <styles xmi:type="notation:StringValueStyle" xmi:id="_Ypk7ATA1EemfJIA7XFfVEg" name="stereotype" stringValue="OpenModel_Profile::OpenModelAttribute"/>
-            <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_36ZCQHBgEd6FKu9XX1078A"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ypk7AjA1EemfJIA7XFfVEg"/>
-          </children>
-          <element xmi:type="uml:Property" href="Service.uml#_VRZfkD0UEeiWMf5FLWfdLA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Yo6MoTA1EemfJIA7XFfVEg"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_nviNgDA1EemfJIA7XFfVEg" type="Property_ClassAttributeLabel" fontColor="16711935" fontName="Segoe UI">
+        <children xmi:type="notation:Shape" xmi:id="_nviNgDA1EemfJIA7XFfVEg" type="Property_ClassAttributeLabel" fontName="Segoe UI">
           <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rK1PsDA1EemfJIA7XFfVEg" source="PapyrusCSSForceValue">
             <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rK1PsTA1EemfJIA7XFfVEg" key="fontHeight" value="true"/>
             <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rK1PsjA1EemfJIA7XFfVEg" key="bold" value="true"/>
@@ -3425,11 +3352,6 @@
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bHM_8R9eEemLMI6HKP6Lbw" x="200"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_9GTUoCC8Eemw1L3J4dNy4w" type="Comment_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_9GTUoiC8Eemw1L3J4dNy4w" type="Comment_BodyLabel"/>
-      <element xmi:type="uml:Comment" href="Service.uml#_9GRfcCC8Eemw1L3J4dNy4w"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9GTUoSC8Eemw1L3J4dNy4w" x="20" y="580" width="141" height="81"/>
-    </children>
     <children xmi:type="notation:Shape" xmi:id="_nNPngzAvEemfJIA7XFfVEg" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_nNPnhDAvEemfJIA7XFfVEg"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_nNPnhjAvEemfJIA7XFfVEg" name="BASE_ELEMENT">
@@ -3485,40 +3407,6 @@
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AZvWNTEiEemRSoIWRX3jNw" x="200"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_CaxesDJzEembsLjrwaSXHQ" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_CaxesjJzEembsLjrwaSXHQ" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_CaxeszJzEembsLjrwaSXHQ" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_CaxetDJzEembsLjrwaSXHQ" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_CaxetTJzEembsLjrwaSXHQ" visible="false" type="Class_AttributeCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_CaxetjJzEembsLjrwaSXHQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_CaxetzJzEembsLjrwaSXHQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_CaxeuDJzEembsLjrwaSXHQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CaxeuTJzEembsLjrwaSXHQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_CaxeujJzEembsLjrwaSXHQ" visible="false" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_CaxeuzJzEembsLjrwaSXHQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_CaxevDJzEembsLjrwaSXHQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_CaxevTJzEembsLjrwaSXHQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CaxevjJzEembsLjrwaSXHQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_CaxevzJzEembsLjrwaSXHQ" visible="false" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_CaxewDJzEembsLjrwaSXHQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_CaxewTJzEembsLjrwaSXHQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_CaxewjJzEembsLjrwaSXHQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CaxewzJzEembsLjrwaSXHQ"/>
-      </children>
-      <element xmi:type="uml:Class" href="Service.uml#_nrfckI93EeiT7tMsBl6xjA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CaxesTJzEembsLjrwaSXHQ" x="780" y="140" width="121" height="60"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_CbFAszJzEembsLjrwaSXHQ" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_CbFAtDJzEembsLjrwaSXHQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_CbFAtjJzEembsLjrwaSXHQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="Service.uml#_nrfckI93EeiT7tMsBl6xjA"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CbFAtTJzEembsLjrwaSXHQ" x="200"/>
-    </children>
     <children xmi:type="notation:Shape" xmi:id="_h-bLUDJ2Eem5adcA1c6ckw" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_h-k8UDJ2Eem5adcA1c6ckw" type="Class_NameLabel"/>
       <children xmi:type="notation:DecorationNode" xmi:id="_h-k8UTJ2Eem5adcA1c6ckw" type="Class_FloatingNameLabel">
@@ -3843,47 +3731,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AZvWOjEiEemRSoIWRX3jNw"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AZvWOzEiEemRSoIWRX3jNw"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_CbFAtzJzEembsLjrwaSXHQ" type="StereotypeCommentLink" source="_CaxesDJzEembsLjrwaSXHQ" target="_CbFAszJzEembsLjrwaSXHQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_CbFAuDJzEembsLjrwaSXHQ"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_CbFAvDJzEembsLjrwaSXHQ" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="Service.uml#_nrfckI93EeiT7tMsBl6xjA"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_CbFAuTJzEembsLjrwaSXHQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CbFAujJzEembsLjrwaSXHQ"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CbFAuzJzEembsLjrwaSXHQ"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_TcGRsDJzEembsLjrwaSXHQ" type="Association_Edge" source="_nTtrAB9cEemLMI6HKP6Lbw" target="_CaxesDJzEembsLjrwaSXHQ">
-      <children xmi:type="notation:DecorationNode" xmi:id="_TcGRszJzEembsLjrwaSXHQ" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UFdXwDJzEembsLjrwaSXHQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_TcGRtDJzEembsLjrwaSXHQ" x="1" y="-18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_TcGRtTJzEembsLjrwaSXHQ" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UQT84DJzEembsLjrwaSXHQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_TcGRtjJzEembsLjrwaSXHQ" x="29" y="-33"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_TcGRtzJzEembsLjrwaSXHQ" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UeTVkDJzEembsLjrwaSXHQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_TcGRuDJzEembsLjrwaSXHQ" x="9" y="-18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_TcGRuTJzEembsLjrwaSXHQ" visible="false" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Uoa64DJzEembsLjrwaSXHQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_TcGRujJzEembsLjrwaSXHQ" x="-9" y="19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_TcGRuzJzEembsLjrwaSXHQ" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UzIWEDJzEembsLjrwaSXHQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_TcGRvDJzEembsLjrwaSXHQ" x="9" y="19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_TcGRvTJzEembsLjrwaSXHQ" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_U5h5ADJzEembsLjrwaSXHQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_TcGRvjJzEembsLjrwaSXHQ" x="-16" y="-13"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_TcGRsTJzEembsLjrwaSXHQ"/>
-      <element xmi:type="uml:Association" href="Service.uml#_ZzapcJDrEei9Vqs7Ti8Wxg"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TcGRsjJzEembsLjrwaSXHQ" points="[621, 120, -643984, -643984]$[720, 140, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_U_xq8DJzEembsLjrwaSXHQ" id="(1.0,0.8298755186721992)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_U_xq8TJzEembsLjrwaSXHQ" id="(0.0,0.3333333333333333)"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_qoS2EDJ0EembsLjrwaSXHQ" type="Association_Edge" source="_Yz45gB9eEemLMI6HKP6Lbw" target="_AZRcIDEiEemRSoIWRX3jNw">
       <children xmi:type="notation:DecorationNode" xmi:id="_qoS2EzJ0EembsLjrwaSXHQ" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_vYa10DJ3Eem5adcA1c6ckw" name="IS_UPDATED_POSITION" booleanValue="true"/>
diff --git a/ONAP Information Model/Service.uml b/ONAP Information Model/Service.uml
index cfe7f68..59d01f9 100644
--- a/ONAP Information Model/Service.uml
+++ b/ONAP Information Model/Service.uml
@@ -166,8 +166,11 @@
         <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_L-PS4auFEeiRK6iIVq4LZA" source="org.eclipse.papyrus">
           <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_L-PS4quFEeiRK6iIVq4LZA" key="nature" value="UML_Nature"/>
         </eAnnotations>
-        <ownedEnd xmi:type="uml:Property" xmi:id="_L-ZD4quFEeiRK6iIVq4LZA" name="servicecompositeinstance" type="_YBdfEKuDEeiRK6iIVq4LZA" association="_L-PS4KuFEeiRK6iIVq4LZA"/>
-        <ownedEnd xmi:type="uml:Property" xmi:id="_L-PS46uFEeiRK6iIVq4LZA" name="serviceinstance" type="_HFfXUD0QEeiWMf5FLWfdLA" aggregation="shared" association="_L-PS4KuFEeiRK6iIVq4LZA">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_L-ZD4quFEeiRK6iIVq4LZA" name="_servicecompositeinstance" type="_YBdfEKuDEeiRK6iIVq4LZA" association="_L-PS4KuFEeiRK6iIVq4LZA">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NVfm0EDMEemk8dYJl29XCQ" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NVpX0EDMEemk8dYJl29XCQ" value="*"/>
+        </ownedEnd>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_L-PS46uFEeiRK6iIVq4LZA" name="_serviceInstance" type="_HFfXUD0QEeiWMf5FLWfdLA" aggregation="shared" association="_L-PS4KuFEeiRK6iIVq4LZA">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L-ZD4KuFEeiRK6iIVq4LZA" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L-ZD4auFEeiRK6iIVq4LZA" value="*"/>
         </ownedEnd>
@@ -182,13 +185,20 @@
         <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_mD6bQauFEeiRK6iIVq4LZA" source="org.eclipse.papyrus">
           <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mD6bQquFEeiRK6iIVq4LZA" key="nature" value="UML_Nature"/>
         </eAnnotations>
-        <ownedEnd xmi:type="uml:Property" xmi:id="_mEEMQquFEeiRK6iIVq4LZA" name="serviceatomicdescriptor" type="_AAwUkKuCEeiRK6iIVq4LZA" association="_mD6bQKuFEeiRK6iIVq4LZA"/>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_mEEMQquFEeiRK6iIVq4LZA" name="serviceatomicdescriptor" type="_AAwUkKuCEeiRK6iIVq4LZA" association="_mD6bQKuFEeiRK6iIVq4LZA">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_-PpncEYNEem7INgoaq_j-g" annotatedElement="_mEEMQquFEeiRK6iIVq4LZA">
+            <body>sbnd f </body>
+          </ownedComment>
+        </ownedEnd>
       </packagedElement>
       <packagedElement xmi:type="uml:Association" xmi:id="_OGFpEMDiEeiebIKjAGZWdA" name="CharacteristicHasValue" memberEnd="_OGGQIsDiEeiebIKjAGZWdA _OGHeQMDiEeiebIKjAGZWdA">
         <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OGGQIMDiEeiebIKjAGZWdA" source="org.eclipse.papyrus">
           <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OGGQIcDiEeiebIKjAGZWdA" key="nature" value="UML_Nature"/>
         </eAnnotations>
         <ownedEnd xmi:type="uml:Property" xmi:id="_OGGQIsDiEeiebIKjAGZWdA" name="value" type="_HFmo4MDiEeiebIKjAGZWdA" association="_OGFpEMDiEeiebIKjAGZWdA">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_49DscEYNEem7INgoaq_j-g" annotatedElement="_OGGQIsDiEeiebIKjAGZWdA">
+            <body>dbfb</body>
+          </ownedComment>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_oSJdUMGSEeiS695oPTRE1Q"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oSYG0MGSEeiS695oPTRE1Q" value="*"/>
         </ownedEnd>
@@ -374,21 +384,27 @@
         <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hxFscCC7Eemw1L3J4dNy4w" source="org.eclipse.papyrus">
           <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hxFscSC7Eemw1L3J4dNy4w" key="nature" value="UML_Nature"/>
         </eAnnotations>
-        <ownedEnd xmi:type="uml:Property" xmi:id="_hxFsciC7Eemw1L3J4dNy4w" name="servicecompositeinstance" type="_YBdfEKuDEeiRK6iIVq4LZA" aggregation="shared" association="_hxFFYCC7Eemw1L3J4dNy4w">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_qc4zwEDMEemk8dYJl29XCQ" annotatedElement="_hxFFYCC7Eemw1L3J4dNy4w">
+          <body>An implementation of composite Service corresponding to a ServiceCompositeDescriptor.</body>
+        </ownedComment>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_hxFsciC7Eemw1L3J4dNy4w" name="_serviceCompositeInstance" type="_YBdfEKuDEeiRK6iIVq4LZA" aggregation="shared" association="_hxFFYCC7Eemw1L3J4dNy4w">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HDJ0wCC8Eemw1L3J4dNy4w"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HDaTcCC8Eemw1L3J4dNy4w" value="*"/>
         </ownedEnd>
-        <ownedEnd xmi:type="uml:Property" xmi:id="_hxLzECC7Eemw1L3J4dNy4w" name="service compositedescriptor" type="_7SrB0D0VEeiWMf5FLWfdLA" association="_hxFFYCC7Eemw1L3J4dNy4w"/>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_hxLzECC7Eemw1L3J4dNy4w" name="_servicecompositedescriptor" type="_7SrB0D0VEeiWMf5FLWfdLA" association="_hxFFYCC7Eemw1L3J4dNy4w"/>
       </packagedElement>
       <packagedElement xmi:type="uml:Association" xmi:id="_6lxVwCC1Eemw1L3J4dNy4w" name="ServiceDescCompositeComprisedOfServiceDescriptor" memberEnd="_6lzyACC1Eemw1L3J4dNy4w _6l54oCC1Eemw1L3J4dNy4w">
         <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6lzK8CC1Eemw1L3J4dNy4w" source="org.eclipse.papyrus">
           <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6lzK8SC1Eemw1L3J4dNy4w" key="nature" value="UML_Nature"/>
         </eAnnotations>
-        <ownedEnd xmi:type="uml:Property" xmi:id="_6l54oCC1Eemw1L3J4dNy4w" name="service compositedescriptor" type="_7SrB0D0VEeiWMf5FLWfdLA" association="_6lxVwCC1Eemw1L3J4dNy4w">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_k3iU0EDMEemk8dYJl29XCQ" annotatedElement="_6lxVwCC1Eemw1L3J4dNy4w">
+          <body> Describe the nested relationship between multiple Serive Descriptors.</body>
+        </ownedComment>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_6l54oCC1Eemw1L3J4dNy4w" name="servicecompositedescriptor" type="_7SrB0D0VEeiWMf5FLWfdLA" association="_6lxVwCC1Eemw1L3J4dNy4w">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_KkKsICC2Eemw1L3J4dNy4w"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KktesCC2Eemw1L3J4dNy4w" value="*"/>
         </ownedEnd>
-        <ownedEnd xmi:type="uml:Property" xmi:id="_6lzyACC1Eemw1L3J4dNy4w" name="servicedescriptor" type="_Jvy-QD0MEeiWMf5FLWfdLA" aggregation="shared" association="_6lxVwCC1Eemw1L3J4dNy4w">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_6lzyACC1Eemw1L3J4dNy4w" name="_serviceDescriptor" type="_Jvy-QD0MEeiWMf5FLWfdLA" aggregation="shared" association="_6lxVwCC1Eemw1L3J4dNy4w">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_JNo-ECC2Eemw1L3J4dNy4w"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JOddcCC2Eemw1L3J4dNy4w" value="*"/>
         </ownedEnd>
@@ -397,62 +413,30 @@
         <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9m_40CC6Eemw1L3J4dNy4w" source="org.eclipse.papyrus">
           <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9m_40SC6Eemw1L3J4dNy4w" key="nature" value="UML_Nature"/>
         </eAnnotations>
-        <ownedEnd xmi:type="uml:Property" xmi:id="_9nF_cCC6Eemw1L3J4dNy4w" name="serviceatomicdescriptor" type="_AAwUkKuCEeiRK6iIVq4LZA" association="_9m-qsCC6Eemw1L3J4dNy4w"/>
-        <ownedEnd xmi:type="uml:Property" xmi:id="_9nAf4CC6Eemw1L3J4dNy4w" name="serviceatomicinstance" type="_XCul8KuDEeiRK6iIVq4LZA" aggregation="shared" association="_9m-qsCC6Eemw1L3J4dNy4w">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_wt-XUEDMEemk8dYJl29XCQ" annotatedElement="_9m-qsCC6Eemw1L3J4dNy4w">
+          <body> An implementation of atomic Service corresponding to a ServicecAtomicDescriptor.</body>
+        </ownedComment>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_9nF_cCC6Eemw1L3J4dNy4w" name="_serviceatomicdescriptor" type="_AAwUkKuCEeiRK6iIVq4LZA" association="_9m-qsCC6Eemw1L3J4dNy4w"/>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_9nAf4CC6Eemw1L3J4dNy4w" name="_serviceAtomicInstance" type="_XCul8KuDEeiRK6iIVq4LZA" aggregation="shared" association="_9m-qsCC6Eemw1L3J4dNy4w">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_U0AK8CC7Eemw1L3J4dNy4w"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_U0YlcCC7Eemw1L3J4dNy4w" value="*"/>
         </ownedEnd>
       </packagedElement>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_fXNM8DOHEei5Af8DcjrhIQ" name="Diagrams">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_eIxScJAiEei1uKE-hf_HvQ">
-        <body>Some Questions:&#xD;
-1. Do we have a business need to have multiple service catalogs?&#xD;
--&#xD;
-2. Do we have a need to have a service descriptor in a given catalog multiple times for different time periods?&#xD;
--&#xD;
-3. How do we handle moving a descriptor from a test catalog to a production catalog?&#xD;
--&#xD;
-4. What is the attachment class?</body>
-      </ownedComment>
-      <ownedComment xmi:type="uml:Comment" xmi:id="_A-91QJAjEei1uKE-hf_HvQ">
-        <body>Presently, SDC stores the descriptor directly in the catalog.</body>
-      </ownedComment>
-      <ownedComment xmi:type="uml:Comment" xmi:id="_Bs8YsJDrEei9Vqs7Ti8Wxg">
-        <body>I don't think SDC uses the SID Characteristic patern.</body>
-      </ownedComment>
-      <ownedComment xmi:type="uml:Comment" xmi:id="_QENMkB9eEemLMI6HKP6Lbw">
-        <body>Found 4 ServiceDescriptor Objects.   Deleted down to one.</body>
-      </ownedComment>
-      <ownedComment xmi:type="uml:Comment" xmi:id="_9GRfcCC8Eemw1L3J4dNy4w">
-        <body>found 2 ServiceCompositeDescriptors - deleted down to 1</body>
-      </ownedComment>
-      <ownedComment xmi:type="uml:Comment" xmi:id="_ZFF6wCC9Eemw1L3J4dNy4w">
-        <body>Removed recursive associations, given we are using the composite/atomic pattern.</body>
-      </ownedComment>
-      <ownedComment xmi:type="uml:Comment" xmi:id="_ehLI8CC9Eemw1L3J4dNy4w">
-        <body>Do we need this diagram?</body>
-      </ownedComment>
       <packagedElement xmi:type="uml:Association" xmi:id="_OtbCoDAvEemfJIA7XFfVEg" name="ServiceDescriptorMadeAvailableAsServiceInstance" memberEnd="_OtnP4DAvEemfJIA7XFfVEg _OtnP5DAvEemfJIA7XFfVEg">
         <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OthJQDAvEemfJIA7XFfVEg" source="org.eclipse.papyrus">
           <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OthJQTAvEemfJIA7XFfVEg" key="nature" value="UML_Nature"/>
         </eAnnotations>
         <ownedEnd xmi:type="uml:Property" xmi:id="_OtnP5DAvEemfJIA7XFfVEg" name="servicedescriptor" type="_Jvy-QD0MEeiWMf5FLWfdLA" association="_OtbCoDAvEemfJIA7XFfVEg"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_qdIu8DJ0EembsLjrwaSXHQ" name="ServiceCompositeDescriptorReferencesResourceDesc" memberEnd="_qdIu8zJ0EembsLjrwaSXHQ _qdIu9zJ0EembsLjrwaSXHQ">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qdIu8TJ0EembsLjrwaSXHQ" source="org.eclipse.papyrus">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qdIu8jJ0EembsLjrwaSXHQ" key="nature" value="UML_Nature"/>
-        </eAnnotations>
-        <ownedEnd xmi:type="uml:Property" xmi:id="_qdIu9zJ0EembsLjrwaSXHQ" name="service compositedescriptor" type="_7SrB0D0VEeiWMf5FLWfdLA" association="_qdIu8DJ0EembsLjrwaSXHQ">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_OBiJoDJ3Eem5adcA1c6ckw"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OBr6oDJ3Eem5adcA1c6ckw" value="*"/>
-        </ownedEnd>
-      </packagedElement>
       <packagedElement xmi:type="uml:Association" xmi:id="_uulWADJ0EembsLjrwaSXHQ" name="ServiceAtomicDescriptorReferencesResourceDesc" memberEnd="_uuuf8jJ0EembsLjrwaSXHQ _uuuf9jJ0EembsLjrwaSXHQ">
         <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uuuf8DJ0EembsLjrwaSXHQ" source="org.eclipse.papyrus">
           <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uuuf8TJ0EembsLjrwaSXHQ" key="nature" value="UML_Nature"/>
         </eAnnotations>
-        <ownedEnd xmi:type="uml:Property" xmi:id="_uuuf9jJ0EembsLjrwaSXHQ" name="serviceatomicdescriptor" type="_AAwUkKuCEeiRK6iIVq4LZA" association="_uulWADJ0EembsLjrwaSXHQ">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_y4CbIEDMEemk8dYJl29XCQ" annotatedElement="_uulWADJ0EembsLjrwaSXHQ">
+          <body>Resource components of constituting a serivce descriptor. &#xD;
+</body>
+        </ownedComment>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_uuuf9jJ0EembsLjrwaSXHQ" name="_serviceatomicdescriptor" type="_AAwUkKuCEeiRK6iIVq4LZA" association="_uulWADJ0EembsLjrwaSXHQ">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_P_sfcDJ3Eem5adcA1c6ckw"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P_sfcTJ3Eem5adcA1c6ckw" value="*"/>
         </ownedEnd>
@@ -461,7 +445,10 @@
         <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5IznQDJ2Eem5adcA1c6ckw" source="org.eclipse.papyrus">
           <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5IznQTJ2Eem5adcA1c6ckw" key="nature" value="UML_Nature"/>
         </eAnnotations>
-        <ownedEnd xmi:type="uml:Property" xmi:id="_5JGiMjJ2Eem5adcA1c6ckw" name="serviceatomicinstance" type="_XCul8KuDEeiRK6iIVq4LZA" association="_5Ip2QDJ2Eem5adcA1c6ckw">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_-Er5wEDMEemk8dYJl29XCQ" annotatedElement="_5Ip2QDJ2Eem5adcA1c6ckw">
+          <body>Resource instance components of constituting a serivce instance. </body>
+        </ownedComment>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_5JGiMjJ2Eem5adcA1c6ckw" name="_serviceatomicinstance" type="_XCul8KuDEeiRK6iIVq4LZA" association="_5Ip2QDJ2Eem5adcA1c6ckw">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_R6uowDJ3Eem5adcA1c6ckw"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_R64ZwDJ3Eem5adcA1c6ckw" value="*"/>
         </ownedEnd>
@@ -470,13 +457,57 @@
         <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-s0pcTJ2Eem5adcA1c6ckw" source="org.eclipse.papyrus">
           <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-s0pcjJ2Eem5adcA1c6ckw" key="nature" value="UML_Nature"/>
         </eAnnotations>
-        <ownedEnd xmi:type="uml:Property" xmi:id="_-s0pdzJ2Eem5adcA1c6ckw" name="servicecompositeinstance" type="_YBdfEKuDEeiRK6iIVq4LZA" association="_-s0pcDJ2Eem5adcA1c6ckw">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_7K3M8EDMEemk8dYJl29XCQ" annotatedElement="_-s0pcDJ2Eem5adcA1c6ckw">
+          <body>Resource instance components of constituting a serivce instance.&#xD;
+</body>
+        </ownedComment>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_-s0pdzJ2Eem5adcA1c6ckw" name="_servicecompositeinstance" type="_YBdfEKuDEeiRK6iIVq4LZA" association="_-s0pcDJ2Eem5adcA1c6ckw">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_TeHHEDJ3Eem5adcA1c6ckw"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TeQ4EDJ3Eem5adcA1c6ckw" value="*"/>
         </ownedEnd>
       </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_qdIu8DJ0EembsLjrwaSXHQ" name="ServiceCompositeDescriptorReferencesResourceDesc" memberEnd="_qdIu8zJ0EembsLjrwaSXHQ _qdIu9zJ0EembsLjrwaSXHQ">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qdIu8TJ0EembsLjrwaSXHQ" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qdIu8jJ0EembsLjrwaSXHQ" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_smDfsEDMEemk8dYJl29XCQ" annotatedElement="_qdIu8DJ0EembsLjrwaSXHQ">
+          <body>Resource components of constituting a serivce descriptor. &#xD;
+</body>
+        </ownedComment>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_qdIu9zJ0EembsLjrwaSXHQ" name="_service compositedescriptor" type="_7SrB0D0VEeiWMf5FLWfdLA" association="_qdIu8DJ0EembsLjrwaSXHQ">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_OBiJoDJ3Eem5adcA1c6ckw"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OBr6oDJ3Eem5adcA1c6ckw" value="*"/>
+        </ownedEnd>
+      </packagedElement>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Package" xmi:id="_fXNM8DOHEei5Af8DcjrhIQ" name="Diagrams">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_eIxScJAiEei1uKE-hf_HvQ">
+        <body>Some Questions:&#xD;
+1. Do we have a business need to have multiple service catalogs?&#xD;
+-&#xD;
+2. Do we have a need to have a service descriptor in a given catalog multiple times for different time periods?&#xD;
+-&#xD;
+3. How do we handle moving a descriptor from a test catalog to a production catalog?&#xD;
+-&#xD;
+4. What is the attachment class?</body>
+      </ownedComment>
+      <ownedComment xmi:type="uml:Comment" xmi:id="_A-91QJAjEei1uKE-hf_HvQ">
+        <body>Presently, SDC stores the descriptor directly in the catalog.</body>
+      </ownedComment>
+      <ownedComment xmi:type="uml:Comment" xmi:id="_Bs8YsJDrEei9Vqs7Ti8Wxg">
+        <body>I don't think SDC uses the SID Characteristic patern.</body>
+      </ownedComment>
+      <ownedComment xmi:type="uml:Comment" xmi:id="_ZFF6wCC9Eemw1L3J4dNy4w">
+        <body>Removed recursive associations, given we are using the composite/atomic pattern.</body>
+      </ownedComment>
+      <ownedComment xmi:type="uml:Comment" xmi:id="_ehLI8CC9Eemw1L3J4dNy4w">
+        <body>Do we need this diagram?</body>
+      </ownedComment>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Package" xmi:id="_fXNM8TOHEei5Af8DcjrhIQ" name="Interfaces">
+      <packagedElement xmi:type="uml:Package" xmi:id="_-6ecYEYpEem7INgoaq_j-g" name="Interfaces"/>
+      <packagedElement xmi:type="uml:Package" xmi:id="__MmHIEYpEem7INgoaq_j-g" name="CopyOf_Interfaces_1"/>
     </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_fXNM8TOHEei5Af8DcjrhIQ" name="Interfaces"/>
     <packagedElement xmi:type="uml:Package" xmi:id="_fXN0ADOHEei5Af8DcjrhIQ" name="ObjectClasses">
       <packagedElement xmi:type="uml:Class" xmi:id="_13eBMDzEEeiWMf5FLWfdLA" name="Nfpd">
         <ownedComment xmi:type="uml:Comment" xmi:id="_13eBMTzEEeiWMf5FLWfdLA" annotatedElement="_13eBMDzEEeiWMf5FLWfdLA">
@@ -541,17 +572,17 @@ NOTE:  NFV Management and Orchestration functions shall instantiate VNFs from th
         <ownedComment xmi:type="uml:Comment" xmi:id="_R35GwD0MEeiWMf5FLWfdLA" annotatedElement="_Jvy-QD0MEeiWMf5FLWfdLA">
           <body>ServiceDescriptor is used to model the design time representation of a service. </body>
         </ownedComment>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_biWkcD0NEeiWMf5FLWfdLA" name="invariantUuid" visibility="public">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_biWkcD0NEeiWMf5FLWfdLA" name="serviceInvariantId" visibility="public">
           <ownedComment xmi:type="uml:Comment" xmi:id="_nieHYD0NEeiWMf5FLWfdLA" annotatedElement="_biWkcD0NEeiWMf5FLWfdLA">
             <body> Constant identifier of the service model.</body>
           </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="Common.uml#_YQwQ0D0NEeiWMf5FLWfdLA"/>
+          <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_rj6jkD0NEeiWMf5FLWfdLA" name="uuid" visibility="public">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_rj6jkD0NEeiWMf5FLWfdLA" name="serviceId" visibility="public">
           <ownedComment xmi:type="uml:Comment" xmi:id="_xE0nYD0NEeiWMf5FLWfdLA" annotatedElement="_rj6jkD0NEeiWMf5FLWfdLA">
             <body>Versioned identifier of the service model (this uuid is changed for every major version of the service)</body>
           </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="Common.uml#_YQwQ0D0NEeiWMf5FLWfdLA"/>
+          <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_0_MLMD0NEeiWMf5FLWfdLA" name="name" visibility="public">
           <ownedComment xmi:type="uml:Comment" xmi:id="_7nNBAD0NEeiWMf5FLWfdLA" annotatedElement="_0_MLMD0NEeiWMf5FLWfdLA">
@@ -584,6 +615,8 @@ NOTE:  NFV Management and Orchestration functions shall instantiate VNFs from th
             <body>An optional string field defining a generic type (like category) of the service. E.g. this field can be used for defining the service as “TRANSPORT”.</body>
           </ownedComment>
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_M_AjkEYpEem7INgoaq_j-g"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_M_Mw0EYpEem7INgoaq_j-g" value="1"/>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_vyTaID0OEeiWMf5FLWfdLA" name="serviceRole" visibility="public">
           <ownedComment xmi:type="uml:Comment" xmi:id="_221M0D0OEeiWMf5FLWfdLA" annotatedElement="_vyTaID0OEeiWMf5FLWfdLA">
@@ -603,7 +636,10 @@ NOTE:  NFV Management and Orchestration functions shall instantiate VNFs from th
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZzkacJDrEei9Vqs7Ti8Wxg"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Zzm2sJDrEei9Vqs7Ti8Wxg" value="*"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_OtnP4DAvEemfJIA7XFfVEg" name="_serviceinstance" type="_HFfXUD0QEeiWMf5FLWfdLA" association="_OtbCoDAvEemfJIA7XFfVEg">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_OtnP4DAvEemfJIA7XFfVEg" name="_serviceInstance" type="_HFfXUD0QEeiWMf5FLWfdLA" association="_OtbCoDAvEemfJIA7XFfVEg">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_qWGVMEYwEem7INgoaq_j-g" annotatedElement="_OtnP4DAvEemfJIA7XFfVEg">
+            <body>An instance of Service deployment.</body>
+          </ownedComment>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_OtnP4jAvEemfJIA7XFfVEg"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OtnP4zAvEemfJIA7XFfVEg" value="*"/>
         </ownedAttribute>
@@ -623,33 +659,8 @@ NOTE:  NFV Management and Orchestration functions shall instantiate VNFs from th
             <body>The name assigned to the service-instance.</body>
           </ownedComment>
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_7zDkUD0QEeiWMf5FLWfdLA" name="serviceInstanceDescription" visibility="public">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_HeOK8D0REeiWMf5FLWfdLA" annotatedElement="_7zDkUD0QEeiWMf5FLWfdLA">
-            <body>The description assigned to the service-instance.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_N7eiQD0REeiWMf5FLWfdLA" name="modelInvariantUuid" visibility="public">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_Val_MD0REeiWMf5FLWfdLA" annotatedElement="_N7eiQD0REeiWMf5FLWfdLA">
-            <body> Constant identifier of the service model (relationship to service model).</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="Common.uml#_YQwQ0D0NEeiWMf5FLWfdLA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_aLRf8D0REeiWMf5FLWfdLA" name="modelUuid" visibility="public">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_fSIFAD0REeiWMf5FLWfdLA" annotatedElement="_aLRf8D0REeiWMf5FLWfdLA">
-            <body>Versioned identifier of the service model (relationship to service model).</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="Common.uml#_YQwQ0D0NEeiWMf5FLWfdLA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_kDBoMD0REeiWMf5FLWfdLA" name="modelVersion" visibility="public">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_q6434D0REeiWMf5FLWfdLA" annotatedElement="_kDBoMD0REeiWMf5FLWfdLA">
-            <body>The service model version in SDC catalog.</body>
-          </ownedComment>
-          <ownedComment xmi:type="uml:Comment" xmi:id="_9kwX4DA2EemfJIA7XFfVEg">
-            <body>The service model version in SDC catalog.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_oCNEIEYpEem7INgoaq_j-g"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oCTKwEYpEem7INgoaq_j-g" value="1"/>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_AuX84D0TEeiWMf5FLWfdLA" name="serviceType" visibility="public">
           <ownedComment xmi:type="uml:Comment" xmi:id="_HaWFoD0TEeiWMf5FLWfdLA" annotatedElement="_AuX84D0TEeiWMf5FLWfdLA">
@@ -677,67 +688,37 @@ NOTE:  NFV Management and Orchestration functions shall instantiate VNFs from th
           </ownedComment>
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_VRZfkD0UEeiWMf5FLWfdLA" name="serviceComponentInstanceId" visibility="public">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_aeGN8D0UEeiWMf5FLWfdLA" annotatedElement="_VRZfkD0UEeiWMf5FLWfdLA">
-            <body>The service component instance ID that the service instance includes.</body>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_1Rt9wPL4EeiazPylpq3fUA" name="nsStatus">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_3KrVAEDMEemk8dYJl29XCQ" annotatedElement="_1Rt9wPL4EeiazPylpq3fUA">
+            <body>Describe NS instance staus: instantiating(creating the Networek Service instance), active(the existed Network Service instance is under using), terminating(the existed Network Service instance stops using) or etc(healing and other possible status). </body>
           </ownedComment>
-          <type xmi:type="uml:DataType" href="Common.uml#_AuYtcDkBEeiWMf5FLWfdLA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_1Rt9wPL4EeiazPylpq3fUA" name="vfcStatus">
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
         </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_7SrB0D0VEeiWMf5FLWfdLA" name="ServiceCompositeDescriptor">
         <ownedComment xmi:type="uml:Comment" xmi:id="__fC7oD0VEeiWMf5FLWfdLA" annotatedElement="_7SrB0D0VEeiWMf5FLWfdLA">
-          <body>ServcieComponentDescriptor is used to model the design time representation of a service component or network service.</body>
+          <body>ServcieCompositeDescriptor is used to model the design time representation of a service component or network service.</body>
         </ownedComment>
         <generalization xmi:type="uml:Generalization" xmi:id="_yX44MB9eEemLMI6HKP6Lbw" general="_Jvy-QD0MEeiWMf5FLWfdLA"/>
         <generalization xmi:type="uml:Generalization" xmi:id="_0KAlEM4oEeinDdlk3ffduQ" general="_Jvy-QD0MEeiWMf5FLWfdLA"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_cK6DID0WEeiWMf5FLWfdLA" name="invariantUuid" visibility="public">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_jydDUD0WEeiWMf5FLWfdLA" annotatedElement="_cK6DID0WEeiWMf5FLWfdLA">
-            <body>Constant identifier of the Service Component model.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="Common.uml#_YQwQ0D0NEeiWMf5FLWfdLA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_2UO8cD0WEeiWMf5FLWfdLA" name="uuid" visibility="public">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_8T1HYD0WEeiWMf5FLWfdLA" annotatedElement="_2UO8cD0WEeiWMf5FLWfdLA">
-            <body>Versioned identifier of the Service Component model (this uuid is changed for every major version of the service component).</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="Common.uml#_YQwQ0D0NEeiWMf5FLWfdLA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="__IV2YD0WEeiWMf5FLWfdLA" name="name" visibility="public">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_EZV18D0XEeiWMf5FLWfdLA" annotatedElement="__IV2YD0WEeiWMf5FLWfdLA">
-            <body>The name of the service component.</body>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_ejq5Uc4pEeinDdlk3ffduQ" name="_serviceDescriptor" type="_Jvy-QD0MEeiWMf5FLWfdLA" aggregation="shared" association="_ejprMM4pEeinDdlk3ffduQ">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_zQiEIEYxEem7INgoaq_j-g" annotatedElement="_ejq5Uc4pEeinDdlk3ffduQ">
+            <body>Describe the nested relationship between multiple Service Descriptors.</body>
           </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_Fg7JED0XEeiWMf5FLWfdLA" name="description" visibility="public">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_OxqUoD0XEeiWMf5FLWfdLA" annotatedElement="_Fg7JED0XEeiWMf5FLWfdLA">
-            <body>The description of service component.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_SXGKQD0XEeiWMf5FLWfdLA" name="version" visibility="public">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_XoHX8D0XEeiWMf5FLWfdLA" annotatedElement="_SXGKQD0XEeiWMf5FLWfdLA">
-            <body>The version of service component.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_aEn2oD0XEeiWMf5FLWfdLA" name="designer" visibility="public">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_hJTaUD0XEeiWMf5FLWfdLA" annotatedElement="_aEn2oD0XEeiWMf5FLWfdLA">
-            <body>The designer of the service component.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_ejq5Uc4pEeinDdlk3ffduQ" name="servicedescriptor" type="_Jvy-QD0MEeiWMf5FLWfdLA" aggregation="shared" association="_ejprMM4pEeinDdlk3ffduQ">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ej3toM4pEeinDdlk3ffduQ" value="1"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ej3toM4pEeinDdlk3ffduQ"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ej4UsM4pEeinDdlk3ffduQ" value="*"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_AcqQoquGEeiRK6iIVq4LZA" name="servicecompositeinstance" type="_YBdfEKuDEeiRK6iIVq4LZA" association="_AchGsKuGEeiRK6iIVq4LZA">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_AcqQoquGEeiRK6iIVq4LZA" name="_serviceCompositeInstance" type="_YBdfEKuDEeiRK6iIVq4LZA" association="_AchGsKuGEeiRK6iIVq4LZA">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_9mMQYEYxEem7INgoaq_j-g" annotatedElement="_AcqQoquGEeiRK6iIVq4LZA">
+            <body>An implementation of composite Service corresponding to a ServiceCompositeDescriptor.</body>
+          </ownedComment>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AcqQpKuGEeiRK6iIVq4LZA"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AcqQpauGEeiRK6iIVq4LZA" value="*"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_qdIu8zJ0EembsLjrwaSXHQ" name="resourcedesc (resourcespecification)" association="_qdIu8DJ0EembsLjrwaSXHQ">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_qdIu8zJ0EembsLjrwaSXHQ" name="_resourceDesc (resourcespecification)" association="_qdIu8DJ0EembsLjrwaSXHQ">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_K8dK4EYGEem7INgoaq_j-g" annotatedElement="_qdIu8zJ0EembsLjrwaSXHQ">
+            <body>Resource components of constituting a serivce descriptor. </body>
+          </ownedComment>
           <type xmi:type="uml:Class" href="Resource.uml#_DAQisJpXEeidy9iGT_F5-w"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qdIu9TJ0EembsLjrwaSXHQ"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qdIu9jJ0EembsLjrwaSXHQ" value="*"/>
@@ -899,11 +880,17 @@ NOTE:  NFV Management and Orchestration functions shall instantiate VNFs from th
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_AAwUkKuCEeiRK6iIVq4LZA" name="ServiceAtomicDescriptor">
         <generalization xmi:type="uml:Generalization" xmi:id="_xMGpgM4oEeinDdlk3ffduQ" general="_Jvy-QD0MEeiWMf5FLWfdLA"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_mD6bQ6uFEeiRK6iIVq4LZA" name="serviceatomicinstance" type="_XCul8KuDEeiRK6iIVq4LZA" association="_mD6bQKuFEeiRK6iIVq4LZA">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_mD6bQ6uFEeiRK6iIVq4LZA" name="_serviceAtomicInstance" type="_XCul8KuDEeiRK6iIVq4LZA" association="_mD6bQKuFEeiRK6iIVq4LZA">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_xno-QEYyEem7INgoaq_j-g" annotatedElement="_mD6bQ6uFEeiRK6iIVq4LZA">
+            <body>An implementation of atomic Service corresponding to a ServicecAtomicDescriptor.</body>
+          </ownedComment>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mEEMQKuFEeiRK6iIVq4LZA"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mEEMQauFEeiRK6iIVq4LZA" value="*"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_uuuf8jJ0EembsLjrwaSXHQ" name="resourcedesc (resourcespecification)" association="_uulWADJ0EembsLjrwaSXHQ">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_uuuf8jJ0EembsLjrwaSXHQ" name="_resourceDesc (resourcespecification)" association="_uulWADJ0EembsLjrwaSXHQ">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_1aouwEYyEem7INgoaq_j-g" annotatedElement="_uuuf8jJ0EembsLjrwaSXHQ">
+            <body>Resource components of constituting a serivce descriptor. </body>
+          </ownedComment>
           <type xmi:type="uml:Class" href="Resource.uml#_DAQisJpXEeidy9iGT_F5-w"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_uuuf9DJ0EembsLjrwaSXHQ"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uuuf9TJ0EembsLjrwaSXHQ" value="*"/>
@@ -911,7 +898,10 @@ NOTE:  NFV Management and Orchestration functions shall instantiate VNFs from th
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_XCul8KuDEeiRK6iIVq4LZA" name="ServiceAtomicInstance">
         <generalization xmi:type="uml:Generalization" xmi:id="_o4dRYKuDEeiRK6iIVq4LZA" general="_HFfXUD0QEeiWMf5FLWfdLA"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_5IznQjJ2Eem5adcA1c6ckw" name="resourceinstance" association="_5Ip2QDJ2Eem5adcA1c6ckw">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_5IznQjJ2Eem5adcA1c6ckw" name="_resourceInstance" association="_5Ip2QDJ2Eem5adcA1c6ckw">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_KQzFUEYzEem7INgoaq_j-g" annotatedElement="_5IznQjJ2Eem5adcA1c6ckw">
+            <body>Resource instance components of constituting a service instance.</body>
+          </ownedComment>
           <type xmi:type="uml:Class" href="Resource.uml#_hZfC0DEkEemRSoIWRX3jNw"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5JGiMDJ2Eem5adcA1c6ckw"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5JGiMTJ2Eem5adcA1c6ckw" value="*"/>
@@ -960,7 +950,10 @@ NOTE:  NFV Management and Orchestration functions shall instantiate VNFs from th
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_YBdfEKuDEeiRK6iIVq4LZA" name="ServiceCompositeInstance">
         <generalization xmi:type="uml:Generalization" xmi:id="_pmW5MKuDEeiRK6iIVq4LZA" general="_HFfXUD0QEeiWMf5FLWfdLA"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_-s0pczJ2Eem5adcA1c6ckw" name="resourceinstance" association="_-s0pcDJ2Eem5adcA1c6ckw">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_-s0pczJ2Eem5adcA1c6ckw" name="_resourceInstance" association="_-s0pcDJ2Eem5adcA1c6ckw">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_Al8JkEYzEem7INgoaq_j-g" annotatedElement="_-s0pczJ2Eem5adcA1c6ckw">
+            <body>Resource instance components of constituting a service instance.</body>
+          </ownedComment>
           <type xmi:type="uml:Class" href="Resource.uml#_hZfC0DEkEemRSoIWRX3jNw"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-s0pdTJ2Eem5adcA1c6ckw"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-s0pdjJ2Eem5adcA1c6ckw" value="*"/>
@@ -1013,6 +1006,9 @@ NOTE:  NFV Management and Orchestration functions shall instantiate VNFs from th
           <ownedComment xmi:type="uml:Comment" xmi:id="_nT4ykMHEEeiS695oPTRE1Q" annotatedElement="_1_pvIMGSEeiS695oPTRE1Q">
             <body>The value of a given ServiceCharacteristic</body>
           </ownedComment>
+          <ownedComment xmi:type="uml:Comment" xmi:id="_ztURIEYNEem7INgoaq_j-g">
+            <body>The value of a given ServiceCharacteristic</body>
+          </ownedComment>
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
         </ownedAttribute>
       </packagedElement>
@@ -1410,23 +1406,12 @@ If null, then represents to the end of time&#xD;
   <OpenModel_Profile:OpenModelAttribute xmi:id="_5tq3ET0OEeiWMf5FLWfdLA" base_StructuralFeature="_5tq3ED0OEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_HFfXUT0QEeiWMf5FLWfdLA" base_Class="_HFfXUD0QEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_mDaBAD0QEeiWMf5FLWfdLA" base_StructuralFeature="_mDZZ8D0QEeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_w3tRED0QEeiWMf5FLWfdLA" base_StructuralFeature="_w3sqAD0QEeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_7zDkUT0QEeiWMf5FLWfdLA" base_StructuralFeature="_7zDkUD0QEeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_N7eiQT0REeiWMf5FLWfdLA" base_StructuralFeature="_N7eiQD0REeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_aLRf8T0REeiWMf5FLWfdLA" base_StructuralFeature="_aLRf8D0REeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_kDBoMT0REeiWMf5FLWfdLA" base_StructuralFeature="_kDBoMD0REeiWMf5FLWfdLA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_w3tRED0QEeiWMf5FLWfdLA" base_StructuralFeature="_w3sqAD0QEeiWMf5FLWfdLA" support="OPTIONAL"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_AuYj8D0TEeiWMf5FLWfdLA" base_StructuralFeature="_AuX84D0TEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_KWqFwT0TEeiWMf5FLWfdLA" base_StructuralFeature="_KWqFwD0TEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_-fa8kD0TEeiWMf5FLWfdLA" base_StructuralFeature="_-faVgD0TEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_GtqJUT0UEeiWMf5FLWfdLA" base_StructuralFeature="_GtqJUD0UEeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_VRZfkT0UEeiWMf5FLWfdLA" base_StructuralFeature="_VRZfkD0UEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_7Sro4D0VEeiWMf5FLWfdLA" base_Class="_7SrB0D0VEeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_cK6DIT0WEeiWMf5FLWfdLA" base_StructuralFeature="_cK6DID0WEeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_2UO8cT0WEeiWMf5FLWfdLA" base_StructuralFeature="_2UO8cD0WEeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="__IWdcD0WEeiWMf5FLWfdLA" base_StructuralFeature="__IV2YD0WEeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_Fg7JET0XEeiWMf5FLWfdLA" base_StructuralFeature="_Fg7JED0XEeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_SXGKQT0XEeiWMf5FLWfdLA" base_StructuralFeature="_SXGKQD0XEeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_aEodsD0XEeiWMf5FLWfdLA" base_StructuralFeature="_aEn2oD0XEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_IhnyUj25Eeiu6I5JfRTxxQ" base_StructuralFeature="_IhnyUT25Eeiu6I5JfRTxxQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_Ihq1oT25Eeiu6I5JfRTxxQ" base_StructuralFeature="_Ihq1oD25Eeiu6I5JfRTxxQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_g9bZ4D25Eeiu6I5JfRTxxQ" base_StructuralFeature="_g9ay0T25Eeiu6I5JfRTxxQ"/>
@@ -1626,16 +1611,10 @@ If null, then represents to the end of time&#xD;
   <OpenModel_Profile:Preliminary xmi:id="_nIwwIDAvEemfJIA7XFfVEg" base_Element="_OtbCoDAvEemfJIA7XFfVEg"/>
   <OpenModel_Profile:Preliminary xmi:id="_TdYtgDA2EemfJIA7XFfVEg" base_Element="_mDZZ8D0QEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Preliminary xmi:id="_UsGjYDA2EemfJIA7XFfVEg" base_Element="_w3sqAD0QEeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:Preliminary xmi:id="_k63RADA2EemfJIA7XFfVEg" base_Element="_7zDkUD0QEeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:Preliminary xmi:id="_5LMWoDA2EemfJIA7XFfVEg" base_Element="_N7eiQD0REeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:Preliminary xmi:id="_6iwmgDA2EemfJIA7XFfVEg" base_Element="_aLRf8D0REeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:Preliminary xmi:id="_7_ylMDA2EemfJIA7XFfVEg" base_Element="_kDBoMD0REeiWMf5FLWfdLA"/>
-  <ActionLanguage:TextualRepresentation xmi:id="_9k2egDA2EemfJIA7XFfVEg" base_Comment="_9kwX4DA2EemfJIA7XFfVEg" language="org.eclipse.papyrus.uml.textedit.property.xtext.UmlProperty"/>
   <OpenModel_Profile:Preliminary xmi:id="__b-_QDA2EemfJIA7XFfVEg" base_Element="_AuX84D0TEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Preliminary xmi:id="_O3QacDA3EemfJIA7XFfVEg" base_Element="_KWqFwD0TEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Preliminary xmi:id="_P_t3UDA3EemfJIA7XFfVEg" base_Element="_-faVgD0TEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Preliminary xmi:id="_RTRJ4DA3EemfJIA7XFfVEg" base_Element="_GtqJUD0UEeiWMf5FLWfdLA"/>
-  <OpenModel_Profile:Preliminary xmi:id="_SpIwoDA3EemfJIA7XFfVEg" base_Element="_VRZfkD0UEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Experimental xmi:id="_TpSmEDA3EemfJIA7XFfVEg" base_Element="_1Rt9wPL4EeiazPylpq3fUA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_qdIu9DJ0EembsLjrwaSXHQ" base_StructuralFeature="_qdIu8zJ0EembsLjrwaSXHQ"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_qdIu-DJ0EembsLjrwaSXHQ" base_StructuralFeature="_qdIu9zJ0EembsLjrwaSXHQ"/>
@@ -1645,4 +1624,5 @@ If null, then represents to the end of time&#xD;
   <OpenModel_Profile:OpenModelAttribute xmi:id="_5JGiMzJ2Eem5adcA1c6ckw" base_StructuralFeature="_5JGiMjJ2Eem5adcA1c6ckw"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_-s0pdDJ2Eem5adcA1c6ckw" base_StructuralFeature="_-s0pczJ2Eem5adcA1c6ckw"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_-s0peDJ2Eem5adcA1c6ckw" base_StructuralFeature="_-s0pdzJ2Eem5adcA1c6ckw"/>
+  <ActionLanguage:TextualRepresentation xmi:id="_ztgeYEYNEem7INgoaq_j-g" base_Comment="_ztURIEYNEem7INgoaq_j-g" language="org.eclipse.papyrus.uml.textedit.property.xtext.UmlProperty"/>
 </xmi:XMI>
diff --git a/ONAP Information Model/Ves.notation b/ONAP Information Model/Ves.notation
index fab733f..ae3600a 100644
--- a/ONAP Information Model/Ves.notation
+++ b/ONAP Information Model/Ves.notation
@@ -897,10 +897,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_X2pfX4nbEeiOe-BKGdv_Yg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X2pfYInbEeiOe-BKGdv_Yg"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_X21skInbEeiOe-BKGdv_Yg" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_X21skYnbEeiOe-BKGdv_Yg" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="__HaBEEcZEemyn_6pFezSzw" visible="false" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="__HaBEUcZEemyn_6pFezSzw" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X21skonbEeiOe-BKGdv_Yg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__HaBEkcZEemyn_6pFezSzw"/>
       </children>
       <element xmi:type="uml:Class" href="Ves.uml#_PmIOkH7uEeifJIHxnlj6Cg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X2o4QYnbEeiOe-BKGdv_Yg" x="500" y="20" width="161" height="61"/>
@@ -936,13 +936,13 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_7UDHYMGaEeiS695oPTRE1Q"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7UDHYcGaEeiS695oPTRE1Q"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_7UIm4MGaEeiS695oPTRE1Q" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_7UIm4cGaEeiS695oPTRE1Q" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="__Hm1YEcZEemyn_6pFezSzw" visible="false" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="__Hm1YUcZEemyn_6pFezSzw" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7UIm4sGaEeiS695oPTRE1Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__Hm1YkcZEemyn_6pFezSzw"/>
       </children>
       <element xmi:type="uml:Class" href="Ves.uml#_7SeaAMGaEeiS695oPTRE1Q"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7UCgQcGaEeiS695oPTRE1Q" x="200" y="240" width="121" height="61"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7UCgQcGaEeiS695oPTRE1Q" x="200" y="160" width="121" height="61"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_7UIm7sGaEeiS695oPTRE1Q" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_7UIm78GaEeiS695oPTRE1Q"/>
@@ -975,13 +975,13 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_n2mmLcWKEeiLjtyU_R81wg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n2mmLsWKEeiLjtyU_R81wg"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_n2t64MWKEeiLjtyU_R81wg" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_n2t64cWKEeiLjtyU_R81wg" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="__HuxMEcZEemyn_6pFezSzw" visible="false" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="__HuxMUcZEemyn_6pFezSzw" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n2t64sWKEeiLjtyU_R81wg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__HuxMkcZEemyn_6pFezSzw"/>
       </children>
       <element xmi:type="uml:Class" href="Ves.uml#_n09AUMWKEeiLjtyU_R81wg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n2ji0cWKEeiLjtyU_R81wg" x="360" y="240" width="121" height="61"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n2ji0cWKEeiLjtyU_R81wg" x="360" y="160" width="121" height="61"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_n2vwEMWKEeiLjtyU_R81wg" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_n2vwEcWKEeiLjtyU_R81wg"/>
@@ -1014,13 +1014,13 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_qYCBHcWKEeiLjtyU_R81wg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qYCBHsWKEeiLjtyU_R81wg"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_qYHgoMWKEeiLjtyU_R81wg" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_qYHgocWKEeiLjtyU_R81wg" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="__H3UEEcZEemyn_6pFezSzw" visible="false" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="__H3UEUcZEemyn_6pFezSzw" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qYHgosWKEeiLjtyU_R81wg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__H3UEkcZEemyn_6pFezSzw"/>
       </children>
       <element xmi:type="uml:Class" href="Ves.uml#_qX-WsMWKEeiLjtyU_R81wg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qYBaAcWKEeiLjtyU_R81wg" x="520" y="240" width="120" height="61"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qYBaAcWKEeiLjtyU_R81wg" x="520" y="160" width="120" height="61"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_qYKj8MWKEeiLjtyU_R81wg" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_qYKj8cWKEeiLjtyU_R81wg"/>
@@ -1053,10 +1053,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_XoDCAsWMEeiLjtyU_R81wg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XoDCA8WMEeiLjtyU_R81wg"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_XoKWsMWMEeiLjtyU_R81wg" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_XoKWscWMEeiLjtyU_R81wg" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="__H_28EcZEemyn_6pFezSzw" visible="false" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="__H_28UcZEemyn_6pFezSzw" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XoKWssWMEeiLjtyU_R81wg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__H_28kcZEemyn_6pFezSzw"/>
       </children>
       <element xmi:type="uml:Class" href="Ves.uml#_XoAlsMWMEeiLjtyU_R81wg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XoDB8cWMEeiLjtyU_R81wg" x="60" y="20" width="181" height="61"/>
@@ -1098,7 +1098,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_25rDEsWSEeiLjtyU_R81wg"/>
       </children>
       <element xmi:type="uml:Class" href="Ves.uml#_25jHQMWSEeiLjtyU_R81wg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_25kVYcWSEeiLjtyU_R81wg" x="680" y="240" width="121" height="61"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_25kVYcWSEeiLjtyU_R81wg" x="680" y="160" width="121" height="61"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_25rqI8WSEeiLjtyU_R81wg" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_25rqJMWSEeiLjtyU_R81wg"/>
@@ -1137,7 +1137,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_53Ku8sWSEeiLjtyU_R81wg"/>
       </children>
       <element xmi:type="uml:Class" href="Ves.uml#_53AW4MWSEeiLjtyU_R81wg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_53CMEcWSEeiLjtyU_R81wg" x="840" y="240" width="121" height="61"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_53CMEcWSEeiLjtyU_R81wg" x="840" y="160" width="121" height="61"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_53LWB8WSEeiLjtyU_R81wg" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_53LWCMWSEeiLjtyU_R81wg"/>
@@ -1176,7 +1176,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7_1EksWSEeiLjtyU_R81wg"/>
       </children>
       <element xmi:type="uml:Class" href="Ves.uml#_7_tv0MWSEeiLjtyU_R81wg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7_u98cWSEeiLjtyU_R81wg" x="1000" y="240" width="121" height="61"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7_u98cWSEeiLjtyU_R81wg" x="1000" y="160" width="121" height="61"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_7_1rp8WSEeiLjtyU_R81wg" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_7_1rqMWSEeiLjtyU_R81wg"/>
@@ -1215,7 +1215,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w0O5YsWTEeiLjtyU_R81wg"/>
       </children>
       <element xmi:type="uml:Class" href="Ves.uml#_w0GWgMWTEeiLjtyU_R81wg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w0HkocWTEeiLjtyU_R81wg" x="120" y="360" width="141" height="61"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w0HkocWTEeiLjtyU_R81wg" x="120" y="260" width="121" height="61"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_w0Pgc8WTEeiLjtyU_R81wg" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_w0PgdMWTEeiLjtyU_R81wg"/>
@@ -1254,7 +1254,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zinyQsWTEeiLjtyU_R81wg"/>
       </children>
       <element xmi:type="uml:Class" href="Ves.uml#_zieoUMWTEeiLjtyU_R81wg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zigdgcWTEeiLjtyU_R81wg" x="280" y="360" width="121" height="61"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zigdgcWTEeiLjtyU_R81wg" x="280" y="260" width="121" height="61"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_zioZUMWTEeiLjtyU_R81wg" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_zioZUcWTEeiLjtyU_R81wg"/>
@@ -1293,7 +1293,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1ZyIMsWTEeiLjtyU_R81wg"/>
       </children>
       <element xmi:type="uml:Class" href="Ves.uml#_1ZragMWTEeiLjtyU_R81wg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1ZsoocWTEeiLjtyU_R81wg" x="440" y="360" width="121" height="61"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1ZsoocWTEeiLjtyU_R81wg" x="440" y="260" width="121" height="61"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_1ZyvS8WTEeiLjtyU_R81wg" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_1ZyvTMWTEeiLjtyU_R81wg"/>
@@ -1332,7 +1332,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2rH0QsWTEeiLjtyU_R81wg"/>
       </children>
       <element xmi:type="uml:Class" href="Ves.uml#_2rBtoMWTEeiLjtyU_R81wg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2rC7wcWTEeiLjtyU_R81wg" x="600" y="360" width="121" height="61"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2rC7wcWTEeiLjtyU_R81wg" x="600" y="260" width="121" height="61"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_2rIbU8WTEeiLjtyU_R81wg" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_2rIbVMWTEeiLjtyU_R81wg"/>
@@ -1371,7 +1371,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4eHb4sWTEeiLjtyU_R81wg"/>
       </children>
       <element xmi:type="uml:Class" href="Ves.uml#_4d4yYMWTEeiLjtyU_R81wg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4d7OocWTEeiLjtyU_R81wg" x="740" y="360" width="161" height="61"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4d7OocWTEeiLjtyU_R81wg" x="740" y="260" width="161" height="61"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_4eIqAMWTEeiLjtyU_R81wg" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_4eIqAcWTEeiLjtyU_R81wg"/>
@@ -1410,7 +1410,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7svUAsWTEeiLjtyU_R81wg"/>
       </children>
       <element xmi:type="uml:Class" href="Ves.uml#_7sljAMWTEeiLjtyU_R81wg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7snYMcWTEeiLjtyU_R81wg" x="920" y="360" width="120" height="61"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7snYMcWTEeiLjtyU_R81wg" x="920" y="260" width="120" height="61"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_7sv7EMWTEeiLjtyU_R81wg" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_7sv7EcWTEeiLjtyU_R81wg"/>
@@ -1449,7 +1449,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ATazEiDMEemw1L3J4dNy4w"/>
       </children>
       <element xmi:type="uml:Class" href="Ves.uml#_ATTeUCDMEemw1L3J4dNy4w"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ATVTgSDMEemw1L3J4dNy4w" x="1080" y="360" width="121" height="61"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ATVTgSDMEemw1L3J4dNy4w" x="1080" y="260" width="121" height="61"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_ATbaICDMEemw1L3J4dNy4w" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_ATbaISDMEemw1L3J4dNy4w"/>
@@ -1485,40 +1485,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7UJN88GaEeiS695oPTRE1Q"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7UJN9MGaEeiS695oPTRE1Q"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_Tu1bMMGbEeiS695oPTRE1Q" type="Association_Edge" source="_X2o4QInbEeiOe-BKGdv_Yg" target="_7UCgQMGaEeiS695oPTRE1Q">
-      <children xmi:type="notation:DecorationNode" xmi:id="_Tu1bM8GbEeiS695oPTRE1Q" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_DLYUUMG5EeiS695oPTRE1Q" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Tu1bNMGbEeiS695oPTRE1Q" x="-1" y="-19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Tu1bNcGbEeiS695oPTRE1Q" type="Association_NameLabel">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Voy1EMWOEeiLjtyU_R81wg" source="PapyrusCSSForceValue">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VozcIMWOEeiLjtyU_R81wg" key="visible" value="true"/>
-        </eAnnotations>
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_DQe2wMG5EeiS695oPTRE1Q" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Tu1bNsGbEeiS695oPTRE1Q" x="158" y="-67"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Tu1bN8GbEeiS695oPTRE1Q" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_DVfSkMG5EeiS695oPTRE1Q" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Tu1bOMGbEeiS695oPTRE1Q" x="21" y="-19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Tu1bOcGbEeiS695oPTRE1Q" visible="false" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Dabc8MG5EeiS695oPTRE1Q" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Tu1bOsGbEeiS695oPTRE1Q" x="-22" y="18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Tu1bO8GbEeiS695oPTRE1Q" visible="false" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_DfqiQMG5EeiS695oPTRE1Q" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Tu1bPMGbEeiS695oPTRE1Q" x="23" y="18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Tu1bPcGbEeiS695oPTRE1Q" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_DkpI4MG5EeiS695oPTRE1Q" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Tu1bPsGbEeiS695oPTRE1Q" x="-13" y="-31"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_Tu1bMcGbEeiS695oPTRE1Q"/>
-      <element xmi:type="uml:Association" href="Ves.uml#_Tp2NgMGbEeiS695oPTRE1Q"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Tu1bMsGbEeiS695oPTRE1Q" points="[580, 61, -643984, -643984]$[580, 140, -643984, -643984]$[260, 140, -643984, -643984]$[260, 240, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_T4rTsMGbEeiS695oPTRE1Q" id="(0.4968944099378882,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_T4rTscGbEeiS695oPTRE1Q" id="(0.49586776859504134,0.0)"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_n2wXIMWKEeiLjtyU_R81wg" type="StereotypeCommentLink" source="_n2ji0MWKEeiLjtyU_R81wg" target="_n2vwEMWKEeiLjtyU_R81wg">
       <styles xmi:type="notation:FontStyle" xmi:id="_n2wXIcWKEeiLjtyU_R81wg"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_n2w-MMWKEeiLjtyU_R81wg" name="BASE_ELEMENT">
@@ -1539,37 +1505,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qYMZI8WKEeiLjtyU_R81wg"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qYMZJMWKEeiLjtyU_R81wg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_IcePoMWMEeiLjtyU_R81wg" type="Association_Edge" source="_X2o4QInbEeiOe-BKGdv_Yg" target="_n2ji0MWKEeiLjtyU_R81wg">
-      <children xmi:type="notation:DecorationNode" xmi:id="_Ice2sMWMEeiLjtyU_R81wg" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Rcu5wMWNEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ice2scWMEeiLjtyU_R81wg" y="-19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Ice2ssWMEeiLjtyU_R81wg" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Rc-KUMWNEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ice2s8WMEeiLjtyU_R81wg" x="85" y="-27"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Ice2tMWMEeiLjtyU_R81wg" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_RdMz0MWNEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ice2tcWMEeiLjtyU_R81wg" x="26" y="-19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Ice2tsWMEeiLjtyU_R81wg" visible="false" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_RdcEYMWNEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ice2t8WMEeiLjtyU_R81wg" x="-27" y="18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Ice2uMWMEeiLjtyU_R81wg" visible="false" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_RdrU8MWNEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ice2ucWMEeiLjtyU_R81wg" x="26" y="18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Ice2usWMEeiLjtyU_R81wg" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Rd6lgMWNEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ice2u8WMEeiLjtyU_R81wg" x="-13" y="-31"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_IcePocWMEeiLjtyU_R81wg"/>
-      <element xmi:type="uml:Association" href="Ves.uml#_IYFe4MWMEeiLjtyU_R81wg"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IcePosWMEeiLjtyU_R81wg" points="[580, 61, -643984, -643984]$[580, 140, -643984, -643984]$[420, 140, -643984, -643984]$[420, 240, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IlDj4MWMEeiLjtyU_R81wg" id="(0.4968944099378882,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IlDj4cWMEeiLjtyU_R81wg" id="(0.49586776859504134,0.0)"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_XoK9y8WMEeiLjtyU_R81wg" type="StereotypeCommentLink" source="_XoDB8MWMEeiLjtyU_R81wg" target="_XoK9x8WMEeiLjtyU_R81wg">
       <styles xmi:type="notation:FontStyle" xmi:id="_XoK9zMWMEeiLjtyU_R81wg"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XoLk0MWMEeiLjtyU_R81wg" name="BASE_ELEMENT">
@@ -1611,37 +1546,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8EtMQMWMEeiLjtyU_R81wg" id="(0.0,0.32786885245901637)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8EtzUMWMEeiLjtyU_R81wg" id="(1.0,0.32786885245901637)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_O2K1QMWPEeiLjtyU_R81wg" type="Association_Edge" source="_X2o4QInbEeiOe-BKGdv_Yg" target="_qYBaAMWKEeiLjtyU_R81wg">
-      <children xmi:type="notation:DecorationNode" xmi:id="_O2K1Q8WPEeiLjtyU_R81wg" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_2CFlsMWQEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_O2K1RMWPEeiLjtyU_R81wg" x="1" y="-18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_O2LcUMWPEeiLjtyU_R81wg" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_2Ckt4MWQEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_O2LcUcWPEeiLjtyU_R81wg" x="36" y="5"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_O2LcUsWPEeiLjtyU_R81wg" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_2C3o0MWQEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_O2LcU8WPEeiLjtyU_R81wg" x="37" y="-19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_O2LcVMWPEeiLjtyU_R81wg" visible="false" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_2DLK0MWQEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_O2LcVcWPEeiLjtyU_R81wg" x="-37" y="18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_O2LcVsWPEeiLjtyU_R81wg" visible="false" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_2DfT4MWQEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_O2LcV8WPEeiLjtyU_R81wg" x="38" y="17"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_O2LcWMWPEeiLjtyU_R81wg" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_2Dzc8MWQEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_O2LcWcWPEeiLjtyU_R81wg" x="-13" y="-31"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_O2K1QcWPEeiLjtyU_R81wg"/>
-      <element xmi:type="uml:Association" href="Ves.uml#_O1nboMWPEeiLjtyU_R81wg"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_O2K1QsWPEeiLjtyU_R81wg" points="[580, 61, -643984, -643984]$[580, 140, -643984, -643984]$[580, 240, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_O2-GgMWPEeiLjtyU_R81wg" id="(0.4968944099378882,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_O2-GgcWPEeiLjtyU_R81wg" id="(0.5,0.0)"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_25rqJ8WSEeiLjtyU_R81wg" type="StereotypeCommentLink" source="_25kVYMWSEeiLjtyU_R81wg" target="_25rqI8WSEeiLjtyU_R81wg">
       <styles xmi:type="notation:FontStyle" xmi:id="_25rqKMWSEeiLjtyU_R81wg"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_25rqLMWSEeiLjtyU_R81wg" name="BASE_ELEMENT">
@@ -1732,288 +1636,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7sv7F8WTEeiLjtyU_R81wg"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7sv7GMWTEeiLjtyU_R81wg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_QWzrIMWbEeiLjtyU_R81wg" type="Association_Edge" source="_X2o4QInbEeiOe-BKGdv_Yg" target="_25kVYMWSEeiLjtyU_R81wg">
-      <children xmi:type="notation:DecorationNode" xmi:id="_QW0SMMWbEeiLjtyU_R81wg" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_53t1oMWfEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QW0SMcWbEeiLjtyU_R81wg" x="1" y="-18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_QW0SMsWbEeiLjtyU_R81wg" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_5374EMWfEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QW0SM8WbEeiLjtyU_R81wg" x="68" y="27"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_QW0SNMWbEeiLjtyU_R81wg" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_54IsYMWfEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QW0SNcWbEeiLjtyU_R81wg" x="35" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_QW0SNsWbEeiLjtyU_R81wg" visible="false" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_54VgsMWfEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QW0SN8WbEeiLjtyU_R81wg" x="-36" y="19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_QW0SOMWbEeiLjtyU_R81wg" visible="false" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_54jjIMWfEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QW0SOcWbEeiLjtyU_R81wg" x="35" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_QW0SOsWbEeiLjtyU_R81wg" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_54w-gMWfEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QW0SO8WbEeiLjtyU_R81wg" x="-13" y="-31"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_QWzrIcWbEeiLjtyU_R81wg"/>
-      <element xmi:type="uml:Association" href="Ves.uml#_QWlBoMWbEeiLjtyU_R81wg"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QWzrIsWbEeiLjtyU_R81wg" points="[580, 61, -643984, -643984]$[580, 140, -643984, -643984]$[740, 140, -643984, -643984]$[740, 240, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QXUBcMWbEeiLjtyU_R81wg" id="(0.4968944099378882,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QXUBccWbEeiLjtyU_R81wg" id="(0.49586776859504134,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_VgL_wMWbEeiLjtyU_R81wg" type="Association_Edge" source="_X2o4QInbEeiOe-BKGdv_Yg" target="_53CMEMWSEeiLjtyU_R81wg">
-      <children xmi:type="notation:DecorationNode" xmi:id="_VgL_w8WbEeiLjtyU_R81wg" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_-OXFwMWfEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_VgL_xMWbEeiLjtyU_R81wg" x="1" y="-18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_VgL_xcWbEeiLjtyU_R81wg" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_-O0_0MWfEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_VgL_xsWbEeiLjtyU_R81wg" x="138" y="67"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_VgL_x8WbEeiLjtyU_R81wg" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_-PMzQMWfEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_VgL_yMWbEeiLjtyU_R81wg" x="50" y="-19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_VgL_ycWbEeiLjtyU_R81wg" visible="false" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_-Pa1sMWfEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_VgL_ysWbEeiLjtyU_R81wg" x="-51" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_VgL_y8WbEeiLjtyU_R81wg" visible="false" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_-PnqAMWfEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_VgL_zMWbEeiLjtyU_R81wg" x="51" y="18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_VgL_zcWbEeiLjtyU_R81wg" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_-P1scMWfEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_VgL_zsWbEeiLjtyU_R81wg" x="-13" y="-31"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_VgL_wcWbEeiLjtyU_R81wg"/>
-      <element xmi:type="uml:Association" href="Ves.uml#_Vf3PoMWbEeiLjtyU_R81wg"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VgL_wsWbEeiLjtyU_R81wg" points="[580, 61, -643984, -643984]$[580, 140, -643984, -643984]$[900, 140, -643984, -643984]$[900, 240, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VguLQMWbEeiLjtyU_R81wg" id="(0.4968944099378882,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VguLQcWbEeiLjtyU_R81wg" id="(0.49586776859504134,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_YbIG4MWbEeiLjtyU_R81wg" type="Association_Edge" source="_X2o4QInbEeiOe-BKGdv_Yg" target="_7_u98MWSEeiLjtyU_R81wg">
-      <children xmi:type="notation:DecorationNode" xmi:id="_YbIt8MWbEeiLjtyU_R81wg" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_D9QiQMWgEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YbIt8cWbEeiLjtyU_R81wg" x="1" y="-18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_YbIt8sWbEeiLjtyU_R81wg" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_D9eksMWgEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YbIt88WbEeiLjtyU_R81wg" x="212" y="27"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_YbIt9MWbEeiLjtyU_R81wg" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_D9tOMMWgEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YbIt9cWbEeiLjtyU_R81wg" x="70" y="-18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_YbIt9sWbEeiLjtyU_R81wg" visible="false" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_D973sMWgEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YbIt98WbEeiLjtyU_R81wg" x="-72" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_YbIt-MWbEeiLjtyU_R81wg" visible="false" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_D-OyoMWgEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YbIt-cWbEeiLjtyU_R81wg" x="70" y="19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_YbIt-sWbEeiLjtyU_R81wg" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_D-i7sMWgEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YbIt-8WbEeiLjtyU_R81wg" x="-13" y="-31"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_YbIG4cWbEeiLjtyU_R81wg"/>
-      <element xmi:type="uml:Association" href="Ves.uml#_Ya42UMWbEeiLjtyU_R81wg"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YbIG4sWbEeiLjtyU_R81wg" points="[580, 81, -643984, -643984]$[580, 140, -643984, -643984]$[1060, 140, -643984, -643984]$[1060, 240, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ybq5cMWbEeiLjtyU_R81wg" id="(0.4968944099378882,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ybq5ccWbEeiLjtyU_R81wg" id="(0.49586776859504134,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_ZyizgMWgEeiLjtyU_R81wg" type="Association_Edge" source="_X2o4QInbEeiOe-BKGdv_Yg" target="_w0HkoMWTEeiLjtyU_R81wg">
-      <children xmi:type="notation:DecorationNode" xmi:id="_Zyizg8WgEeiLjtyU_R81wg" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cnEJkMWgEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZyizhMWgEeiLjtyU_R81wg" x="1" y="-19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ZyizhcWgEeiLjtyU_R81wg" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cnfnYMWgEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZyizhsWgEeiLjtyU_R81wg" x="171" y="-187"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Zyizh8WgEeiLjtyU_R81wg" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cnuQ4MWgEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZyiziMWgEeiLjtyU_R81wg" x="94" y="-19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ZyizicWgEeiLjtyU_R81wg" visible="false" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cn86YMWgEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZyizisWgEeiLjtyU_R81wg" x="-94" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Zyizi8WgEeiLjtyU_R81wg" type="Association_SourceMultiplicityLabel">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GFZUYCWQEem2wfSvtxnwBQ" source="PapyrusCSSForceValue">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GFZ7cCWQEem2wfSvtxnwBQ" key="visible" value="true"/>
-        </eAnnotations>
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_coK80MWgEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZyizjMWgEeiLjtyU_R81wg" x="26" y="15"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ZyizjcWgEeiLjtyU_R81wg" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_coY_QMWgEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZyizjsWgEeiLjtyU_R81wg" x="-13" y="-31"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_ZyizgcWgEeiLjtyU_R81wg"/>
-      <element xmi:type="uml:Association" href="Ves.uml#_ZyP4kMWgEeiLjtyU_R81wg"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ZyizgsWgEeiLjtyU_R81wg" points="[580, 61, -643984, -643984]$[580, 140, -643984, -643984]$[180, 140, -643984, -643984]$[180, 360, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZzOI8MWgEeiLjtyU_R81wg" id="(0.4968944099378882,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZzOI8cWgEeiLjtyU_R81wg" id="(0.425531914893617,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_oQdOkMWgEeiLjtyU_R81wg" type="Association_Edge" source="_X2o4QInbEeiOe-BKGdv_Yg" target="_zigdgMWTEeiLjtyU_R81wg">
-      <children xmi:type="notation:DecorationNode" xmi:id="_oQdOk8WgEeiLjtyU_R81wg" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_xQ2RAMWgEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_oQdOlMWgEeiLjtyU_R81wg" y="-18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_oQdOlcWgEeiLjtyU_R81wg" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_xRM2UMWgEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_oQdOlsWgEeiLjtyU_R81wg" x="58" y="-187"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_oQdOl8WgEeiLjtyU_R81wg" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_xRa4wMWgEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_oQdOmMWgEeiLjtyU_R81wg" x="70" y="-18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_oQdOmcWgEeiLjtyU_R81wg" visible="false" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_xRqJUMWgEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_oQdOmsWgEeiLjtyU_R81wg" x="-71" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_oQdOm8WgEeiLjtyU_R81wg" visible="false" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_xR4LwMWgEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_oQd1oMWgEeiLjtyU_R81wg" x="70" y="18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_oQd1ocWgEeiLjtyU_R81wg" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_xSIDYMWgEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_oQd1osWgEeiLjtyU_R81wg" x="-13" y="-31"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_oQdOkcWgEeiLjtyU_R81wg"/>
-      <element xmi:type="uml:Association" href="Ves.uml#_oQMI0MWgEeiLjtyU_R81wg"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oQdOksWgEeiLjtyU_R81wg" points="[580, 61, -643984, -643984]$[580, 140, -643984, -643984]$[340, 140, -643984, -643984]$[340, 360, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oRB2UMWgEeiLjtyU_R81wg" id="(0.4968944099378882,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oRB2UcWgEeiLjtyU_R81wg" id="(0.49586776859504134,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_t-XdgMWpEeiLjtyU_R81wg" type="Association_Edge" source="_X2o4QInbEeiOe-BKGdv_Yg" target="_1ZsooMWTEeiLjtyU_R81wg">
-      <children xmi:type="notation:DecorationNode" xmi:id="_t-Xdg8WpEeiLjtyU_R81wg" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_6544wMWpEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_t-YEkMWpEeiLjtyU_R81wg" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_t-YEkcWpEeiLjtyU_R81wg" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_66TIcMWpEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_t-YEksWpEeiLjtyU_R81wg" x="146" y="8"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_t-YEk8WpEeiLjtyU_R81wg" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_66iZAMWpEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_t-YElMWpEeiLjtyU_R81wg" x="50" y="-19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_t-YElcWpEeiLjtyU_R81wg" visible="false" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_66yQoMWpEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_t-YElsWpEeiLjtyU_R81wg" x="-50" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_t-YEl8WpEeiLjtyU_R81wg" visible="false" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_67A6IMWpEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_t-YEmMWpEeiLjtyU_R81wg" x="50" y="19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_t-YEmcWpEeiLjtyU_R81wg" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_67QKsMWpEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_t-YEmsWpEeiLjtyU_R81wg" x="-13" y="-11"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_t-XdgcWpEeiLjtyU_R81wg"/>
-      <element xmi:type="uml:Association" href="Ves.uml#_t-VBQMWpEeiLjtyU_R81wg"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_t-XdgsWpEeiLjtyU_R81wg" points="[580, 61, -643984, -643984]$[580, 140, -643984, -643984]$[500, 140, -643984, -643984]$[500, 360, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_t_AWsMWpEeiLjtyU_R81wg" id="(0.4968944099378882,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_t_AWscWpEeiLjtyU_R81wg" id="(0.49586776859504134,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_BxMu0MWqEeiLjtyU_R81wg" type="Association_Edge" source="_X2o4QInbEeiOe-BKGdv_Yg" target="_2rC7wMWTEeiLjtyU_R81wg">
-      <children xmi:type="notation:DecorationNode" xmi:id="_BxMu08WqEeiLjtyU_R81wg" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_G3GRoMWqEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_BxMu1MWqEeiLjtyU_R81wg" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_BxMu1cWqEeiLjtyU_R81wg" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_G3WJQMWqEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_BxNV4MWqEeiLjtyU_R81wg" x="146" y="3"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_BxNV4cWqEeiLjtyU_R81wg" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_G3lZ0MWqEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_BxNV4sWqEeiLjtyU_R81wg" x="50" y="-19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_BxNV48WqEeiLjtyU_R81wg" visible="false" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_G30qYMWqEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_BxNV5MWqEeiLjtyU_R81wg" x="-50" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_BxNV5cWqEeiLjtyU_R81wg" visible="false" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_G4GXMMWqEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_BxNV5sWqEeiLjtyU_R81wg" x="50" y="18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_BxNV58WqEeiLjtyU_R81wg" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_G4exsMWqEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_BxNV6MWqEeiLjtyU_R81wg" x="-13" y="-31"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_BxMu0cWqEeiLjtyU_R81wg"/>
-      <element xmi:type="uml:Association" href="Ves.uml#_Bw4lwMWqEeiLjtyU_R81wg"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BxMu0sWqEeiLjtyU_R81wg" points="[580, 61, -643984, -643984]$[580, 140, -643984, -643984]$[660, 140, -643984, -643984]$[660, 360, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Bx1oAMWqEeiLjtyU_R81wg" id="(0.4968944099378882,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Bx1oAcWqEeiLjtyU_R81wg" id="(0.49586776859504134,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MjsoEMWqEeiLjtyU_R81wg" type="Association_Edge" source="_X2o4QInbEeiOe-BKGdv_Yg" target="_4d7OoMWTEeiLjtyU_R81wg">
-      <children xmi:type="notation:DecorationNode" xmi:id="_MjsoE8WqEeiLjtyU_R81wg" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_NF3hAMWqEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_MjsoFMWqEeiLjtyU_R81wg" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_MjsoFcWqEeiLjtyU_R81wg" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_NGP7gMWqEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_MjsoFsWqEeiLjtyU_R81wg" x="57" y="187"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_MjsoF8WqEeiLjtyU_R81wg" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_NGgaMMWqEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_MjsoGMWqEeiLjtyU_R81wg" x="63" y="-19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_MjsoGcWqEeiLjtyU_R81wg" visible="false" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_NGyHAMWqEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_MjsoGsWqEeiLjtyU_R81wg" x="-63" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_MjsoG8WqEeiLjtyU_R81wg" visible="false" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_NHFpAMWqEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_MjsoHMWqEeiLjtyU_R81wg" x="63" y="18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_MjsoHcWqEeiLjtyU_R81wg" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_NHWHsMWqEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_MjsoHsWqEeiLjtyU_R81wg" x="-13" y="-31"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_MjsoEcWqEeiLjtyU_R81wg"/>
-      <element xmi:type="uml:Association" href="Ves.uml#_MjWCwMWqEeiLjtyU_R81wg"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MjsoEsWqEeiLjtyU_R81wg" points="[640, 61, -643984, -643984]$[580, 140, -643984, -643984]$[820, 140, -643984, -643984]$[820, 360, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MkWvYMWqEeiLjtyU_R81wg" id="(0.4968944099378882,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MkWvYcWqEeiLjtyU_R81wg" id="(0.4968944099378882,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_f3Kc0MWqEeiLjtyU_R81wg" type="Association_Edge" source="_X2o4QInbEeiOe-BKGdv_Yg" target="_7snYMMWTEeiLjtyU_R81wg">
-      <children xmi:type="notation:DecorationNode" xmi:id="_f3Kc08WqEeiLjtyU_R81wg" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_gW9XMMWqEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_f3Kc1MWqEeiLjtyU_R81wg" x="1" y="-18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_f3Kc1cWqEeiLjtyU_R81wg" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_gXYN8MWqEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_f3Kc1sWqEeiLjtyU_R81wg" x="161" y="187"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_f3Kc18WqEeiLjtyU_R81wg" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_gXosoMWqEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_f3Kc2MWqEeiLjtyU_R81wg" x="84" y="-18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_f3Kc2cWqEeiLjtyU_R81wg" visible="false" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_gX5LUMWqEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_f3Kc2sWqEeiLjtyU_R81wg" x="-85" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_f3Kc28WqEeiLjtyU_R81wg" visible="false" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_gYKREMWqEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_f3Kc3MWqEeiLjtyU_R81wg" x="85" y="18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_f3Kc3cWqEeiLjtyU_R81wg" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_gYaIsMWqEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_f3Kc3sWqEeiLjtyU_R81wg" x="-13" y="-31"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_f3Kc0cWqEeiLjtyU_R81wg"/>
-      <element xmi:type="uml:Association" href="Ves.uml#_f23h4MWqEeiLjtyU_R81wg"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_f3Kc0sWqEeiLjtyU_R81wg" points="[580, 61, -643984, -643984]$[580, 140, -643984, -643984]$[980, 140, -643984, -643984]$[980, 360, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f3z9EMWqEeiLjtyU_R81wg" id="(0.4968944099378882,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f3z9EcWqEeiLjtyU_R81wg" id="(0.5,0.0)"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_ATbaJCDMEemw1L3J4dNy4w" type="StereotypeCommentLink" source="_ATVTgCDMEemw1L3J4dNy4w" target="_ATbaICDMEemw1L3J4dNy4w">
       <styles xmi:type="notation:FontStyle" xmi:id="_ATbaJSDMEemw1L3J4dNy4w"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ATbaKSDMEemw1L3J4dNy4w" name="BASE_ELEMENT">
@@ -2024,36 +1646,145 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ATbaJyDMEemw1L3J4dNy4w"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ATbaKCDMEemw1L3J4dNy4w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_NqEEECDMEemw1L3J4dNy4w" type="Association_Edge" source="_X2o4QInbEeiOe-BKGdv_Yg" target="_ATVTgCDMEemw1L3J4dNy4w">
-      <children xmi:type="notation:DecorationNode" xmi:id="_NqErICDMEemw1L3J4dNy4w" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cTvDMCDMEemw1L3J4dNy4w" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_NqErISDMEemw1L3J4dNy4w" x="1" y="-18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_NqErIiDMEemw1L3J4dNy4w" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cUBXECDMEemw1L3J4dNy4w" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_NqErIyDMEemw1L3J4dNy4w" x="241" y="187"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_NqErJCDMEemw1L3J4dNy4w" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cUSc0CDMEemw1L3J4dNy4w" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_NqErJSDMEemw1L3J4dNy4w" x="58" y="34"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_NqErJiDMEemw1L3J4dNy4w" visible="false" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cUjikCDMEemw1L3J4dNy4w" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_NqErJyDMEemw1L3J4dNy4w" x="-95" y="18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_NqErKCDMEemw1L3J4dNy4w" visible="false" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cU3roCDMEemw1L3J4dNy4w" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_NqErKSDMEemw1L3J4dNy4w" x="59" y="73"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_NqErKiDMEemw1L3J4dNy4w" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cVJ_gCDMEemw1L3J4dNy4w" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_NqErKyDMEemw1L3J4dNy4w" x="-13" y="-31"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_NqEEESDMEemw1L3J4dNy4w"/>
-      <element xmi:type="uml:Association" href="Ves.uml#_NprCgCDMEemw1L3J4dNy4w"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NqEEEiDMEemw1L3J4dNy4w" points="[580, 81, -643984, -643984]$[580, 140, -643984, -643984]$[1140, 140, -643984, -643984]$[1120, 360, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Nq5xkCDMEemw1L3J4dNy4w" id="(0.4968944099378882,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Nq5xkSDMEemw1L3J4dNy4w" id="(0.49586776859504134,0.0)"/>
+    <edges xmi:type="notation:Connector" xmi:id="_GOV74EaIEemmD4xckllxww" type="Generalization_Edge" source="_7UCgQMGaEeiS695oPTRE1Q" target="_X2o4QInbEeiOe-BKGdv_Yg">
+      <children xmi:type="notation:DecorationNode" xmi:id="_GOa0YEaIEemmD4xckllxww" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9KbZcEaJEemmD4xckllxww" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_GOa0YUaIEemmD4xckllxww" x="-1" y="39"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_GOV74UaIEemmD4xckllxww"/>
+      <element xmi:type="uml:Generalization" href="Ves.uml#_GHoP4EaIEemmD4xckllxww"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GOV74kaIEemmD4xckllxww" points="[260, 160, -643984, -643984]$[260, 120, -643984, -643984]$[580, 120, -643984, -643984]$[580, 81, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GbtCcEaIEemmD4xckllxww" id="(0.49586776859504134,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GbtCcUaIEemmD4xckllxww" id="(0.4968944099378882,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_VouIwEaUEem_U-rQUWOmPw" type="Generalization_Edge" source="_n2ji0MWKEeiLjtyU_R81wg" target="_X2o4QInbEeiOe-BKGdv_Yg" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_VovW4EaUEem_U-rQUWOmPw" type="Generalization_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_VovW4UaUEem_U-rQUWOmPw" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_VouIwUaUEem_U-rQUWOmPw"/>
+      <element xmi:type="uml:Generalization" href="Ves.uml#_Vdmd4EaUEem_U-rQUWOmPw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VouIwkaUEem_U-rQUWOmPw" points="[420, 160, -643984, -643984]$[580, 81, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_V-9egEaUEem_U-rQUWOmPw" id="(0.49586776859504134,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_V-9egUaUEem_U-rQUWOmPw" id="(0.4968944099378882,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_ZgC_oEaUEem_U-rQUWOmPw" type="Generalization_Edge" source="_qYBaAMWKEeiLjtyU_R81wg" target="_X2o4QInbEeiOe-BKGdv_Yg">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ZgC_o0aUEem_U-rQUWOmPw" type="Generalization_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZgC_pEaUEem_U-rQUWOmPw" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_ZgC_oUaUEem_U-rQUWOmPw"/>
+      <element xmi:type="uml:Generalization" href="Ves.uml#_ZULt4EaUEem_U-rQUWOmPw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ZgC_okaUEem_U-rQUWOmPw" points="[580, 221, -643984, -643984]$[580, 81, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Z4acUEaUEem_U-rQUWOmPw" id="(0.5,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Z4acUUaUEem_U-rQUWOmPw" id="(0.4968944099378882,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_b1plEEaUEem_U-rQUWOmPw" type="Generalization_Edge" source="_25kVYMWSEeiLjtyU_R81wg" target="_X2o4QInbEeiOe-BKGdv_Yg" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_b1plE0aUEem_U-rQUWOmPw" type="Generalization_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_b1plFEaUEem_U-rQUWOmPw" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_b1plEUaUEem_U-rQUWOmPw"/>
+      <element xmi:type="uml:Generalization" href="Ves.uml#_bp1WoEaUEem_U-rQUWOmPw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_b1plEkaUEem_U-rQUWOmPw" points="[740, 160, -643984, -643984]$[580, 81, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cM3yQEaUEem_U-rQUWOmPw" id="(0.49586776859504134,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cM3yQUaUEem_U-rQUWOmPw" id="(0.4968944099378882,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_4CUPIEaUEemtHYgFzN-tvQ" type="Generalization_Edge" source="_53CMEMWSEeiLjtyU_R81wg" target="_X2o4QInbEeiOe-BKGdv_Yg">
+      <children xmi:type="notation:DecorationNode" xmi:id="_4CYgkEaUEemtHYgFzN-tvQ" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_SBvlkEaVEem3MJDthqMI_w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_4CYgkUaUEemtHYgFzN-tvQ" x="1" y="38"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_4CUPIUaUEemtHYgFzN-tvQ"/>
+      <element xmi:type="uml:Generalization" href="Ves.uml#_32jEAEaUEemtHYgFzN-tvQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4CUPIkaUEemtHYgFzN-tvQ" points="[900, 160, -643984, -643984]$[900, 120, -643984, -643984]$[580, 120, -643984, -643984]$[580, 81, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4anaYEaUEemtHYgFzN-tvQ" id="(0.49586776859504134,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4aoBcEaUEemtHYgFzN-tvQ" id="(0.4968944099378882,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_FPRb0EaZEem3MJDthqMI_w" type="Generalization_Edge" source="_7_u98MWSEeiLjtyU_R81wg" target="_X2o4QInbEeiOe-BKGdv_Yg">
+      <children xmi:type="notation:DecorationNode" xmi:id="_FPVGMEaZEem3MJDthqMI_w" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_HR73IEaZEem3MJDthqMI_w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_FPVtQEaZEem3MJDthqMI_w" x="-1" y="38"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_FPRb0UaZEem3MJDthqMI_w"/>
+      <element xmi:type="uml:Generalization" href="Ves.uml#_FCgyMEaZEem3MJDthqMI_w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FPRb0kaZEem3MJDthqMI_w" points="[1060, 160, -643984, -643984]$[1060, 120, -643984, -643984]$[580, 120, -643984, -643984]$[580, 81, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FnUIYEaZEem3MJDthqMI_w" id="(0.49586776859504134,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FnUvcEaZEem3MJDthqMI_w" id="(0.4968944099378882,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_Juv30EaZEem3MJDthqMI_w" type="Generalization_Edge" source="_w0HkoMWTEeiLjtyU_R81wg" target="_X2o4QInbEeiOe-BKGdv_Yg">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Juwe4EaZEem3MJDthqMI_w" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_LdLvkEaZEem3MJDthqMI_w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Juwe4UaZEem3MJDthqMI_w" x="1" y="38"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_Juv30UaZEem3MJDthqMI_w"/>
+      <element xmi:type="uml:Generalization" href="Ves.uml#_JiXBoEaZEem3MJDthqMI_w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Juv30kaZEem3MJDthqMI_w" points="[180, 260, -643984, -643984]$[180, 120, -643984, -643984]$[580, 120, -643984, -643984]$[580, 81, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KG-xoEaZEem3MJDthqMI_w" id="(0.49586776859504134,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KG-xoUaZEem3MJDthqMI_w" id="(0.4968944099378882,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_PgsoUEaZEem3MJDthqMI_w" type="Generalization_Edge" source="_zigdgMWTEeiLjtyU_R81wg" target="_X2o4QInbEeiOe-BKGdv_Yg">
+      <children xmi:type="notation:DecorationNode" xmi:id="_PgtPYEaZEem3MJDthqMI_w" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QzFdQEaZEem3MJDthqMI_w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_PgtPYUaZEem3MJDthqMI_w" x="1" y="38"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_PgsoUUaZEem3MJDthqMI_w"/>
+      <element xmi:type="uml:Generalization" href="Ves.uml#_PU3y0EaZEem3MJDthqMI_w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PgsoUkaZEem3MJDthqMI_w" points="[340, 360, -643984, -643984]$[340, 120, -643984, -643984]$[580, 120, -643984, -643984]$[580, 81, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_P5KysEaZEem3MJDthqMI_w" id="(0.49586776859504134,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_P5KysUaZEem3MJDthqMI_w" id="(0.4968944099378882,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_SnrAUEaZEem3MJDthqMI_w" type="Generalization_Edge" source="_1ZsooMWTEeiLjtyU_R81wg" target="_X2o4QInbEeiOe-BKGdv_Yg">
+      <children xmi:type="notation:DecorationNode" xmi:id="_SnrAU0aZEem3MJDthqMI_w" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UWfSkEaZEem3MJDthqMI_w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_SnrAVEaZEem3MJDthqMI_w" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_SnrAUUaZEem3MJDthqMI_w"/>
+      <element xmi:type="uml:Generalization" href="Ves.uml#_Sb8RcEaZEem3MJDthqMI_w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SnrAUkaZEem3MJDthqMI_w" points="[500, 360, -643984, -643984]$[500, 120, -643984, -643984]$[580, 120, -643984, -643984]$[580, 81, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_S_NWkEaZEem3MJDthqMI_w" id="(0.49586776859504134,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_S_NWkUaZEem3MJDthqMI_w" id="(0.4968944099378882,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_XMLGQEaZEem3MJDthqMI_w" type="Generalization_Edge" source="_2rC7wMWTEeiLjtyU_R81wg" target="_X2o4QInbEeiOe-BKGdv_Yg">
+      <children xmi:type="notation:DecorationNode" xmi:id="_XMLtUEaZEem3MJDthqMI_w" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ZclCoEaZEem3MJDthqMI_w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_XMLtUUaZEem3MJDthqMI_w" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_XMLGQUaZEem3MJDthqMI_w"/>
+      <element xmi:type="uml:Generalization" href="Ves.uml#_XAezoEaZEem3MJDthqMI_w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XMLGQkaZEem3MJDthqMI_w" points="[660, 260, -643984, -643984]$[660, 120, -643984, -643984]$[580, 120, -643984, -643984]$[580, 81, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xi91oEaZEem3MJDthqMI_w" id="(0.49586776859504134,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xi91oUaZEem3MJDthqMI_w" id="(0.4968944099378882,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_bZTOAEaZEem3MJDthqMI_w" type="Generalization_Edge" source="_4d7OoMWTEeiLjtyU_R81wg" target="_X2o4QInbEeiOe-BKGdv_Yg">
+      <children xmi:type="notation:DecorationNode" xmi:id="_bZT1EEaZEem3MJDthqMI_w" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_c4-4EEaZEem3MJDthqMI_w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_bZT1EUaZEem3MJDthqMI_w" x="-2" y="37"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_bZTOAUaZEem3MJDthqMI_w"/>
+      <element xmi:type="uml:Generalization" href="Ves.uml#_bNb8QEaZEem3MJDthqMI_w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_bZTOAkaZEem3MJDthqMI_w" points="[820, 260, -643984, -643984]$[820, 120, -643984, -643984]$[580, 120, -643984, -643984]$[580, 81, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bwxS0EaZEem3MJDthqMI_w" id="(0.4968944099378882,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bwxS0UaZEem3MJDthqMI_w" id="(0.4968944099378882,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_fqFtwEaZEem3MJDthqMI_w" type="Generalization_Edge" source="_7snYMMWTEeiLjtyU_R81wg" target="_X2o4QInbEeiOe-BKGdv_Yg">
+      <children xmi:type="notation:DecorationNode" xmi:id="_fqFtw0aZEem3MJDthqMI_w" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_g4LRgEaZEem3MJDthqMI_w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_fqGU0EaZEem3MJDthqMI_w" x="1" y="38"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_fqFtwUaZEem3MJDthqMI_w"/>
+      <element xmi:type="uml:Generalization" href="Ves.uml#_ferH8EaZEem3MJDthqMI_w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_fqFtwkaZEem3MJDthqMI_w" points="[980, 260, -643984, -643984]$[980, 120, -643984, -643984]$[580, 120, -643984, -643984]$[580, 81, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gBgvQEaZEem3MJDthqMI_w" id="(0.5,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gBhWUEaZEem3MJDthqMI_w" id="(0.4968944099378882,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_iq-r4EaZEem3MJDthqMI_w" type="Generalization_Edge" source="_ATVTgCDMEemw1L3J4dNy4w" target="_X2o4QInbEeiOe-BKGdv_Yg">
+      <children xmi:type="notation:DecorationNode" xmi:id="_iq-r40aZEem3MJDthqMI_w" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jw0SkEaZEem3MJDthqMI_w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_iq-r5EaZEem3MJDthqMI_w" x="1" y="38"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_iq-r4UaZEem3MJDthqMI_w"/>
+      <element xmi:type="uml:Generalization" href="Ves.uml#_ifa8IEaZEem3MJDthqMI_w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_iq-r4kaZEem3MJDthqMI_w" points="[1140, 260, -643984, -643984]$[1140, 120, -643984, -643984]$[580, 120, -643984, -643984]$[580, 81, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jDItMEaZEem3MJDthqMI_w" id="(0.49586776859504134,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jDItMUaZEem3MJDthqMI_w" id="(0.4968944099378882,1.0)"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_deNk4LHUEeid-vjMcczUWA" type="PapyrusUMLClassDiagram" name="Measurement Domain Entities" measurementUnit="Pixel">
diff --git a/ONAP Information Model/Ves.uml b/ONAP Information Model/Ves.uml
index 057fb80..92be0ea 100644
--- a/ONAP Information Model/Ves.uml
+++ b/ONAP Information Model/Ves.uml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <uml:Package xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_mi5hgIbfEei-x_BD9U-ssQ" name="Ves">
   <packagedElement xmi:type="uml:Package" xmi:id="_rmBdIIbfEei-x_BD9U-ssQ" name="ObjectClasses">
-    <packagedElement xmi:type="uml:Class" xmi:id="_PmIOkH7uEeifJIHxnlj6Cg" name="Event">
+    <packagedElement xmi:type="uml:Class" xmi:id="_PmIOkH7uEeifJIHxnlj6Cg" name="VesEvent">
       <ownedComment xmi:type="uml:Comment" xmi:id="_O8t0wIncEeiOe-BKGdv_Yg" annotatedElement="_PmIOkH7uEeifJIHxnlj6Cg">
         <body>An ONAP event is an aggregation of a header and a message.  Event messages may be published to a message broker by service instances, resource instances, or ONAP platform components.  Service or resource instances may be in support of network infrastructure or customer services.  Interested platforms may subscribe to events on the message broker (e.g. Centralized Testing Platform CTP) may see an event on a service VNF instance and perform an automated test as part of a closed loop management policy.  Events are unique and distinguishable from one another.&#xD;
 &#xD;
@@ -11,90 +11,6 @@ ONAP event messages are serialized as a unicode ASCII character string which may
       <generalization xmi:type="uml:Generalization" xmi:id="_FT4nsDq0EemOl5OHBoqS_w">
         <general xmi:type="uml:Class" href="Common.uml#_8fYhoDqyEemOl5OHBoqS_w"/>
       </generalization>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_Tp20ksGbEeiS695oPTRE1Q" name="_fault" type="_7SeaAMGaEeiS695oPTRE1Q" aggregation="composite" association="_Tp2NgMGbEeiS695oPTRE1Q">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_ot0fEN1REeiRzJu73dYz2w" annotatedElement="_Tp20ksGbEeiS695oPTRE1Q">
-          <body>Fields specific to fault events</body>
-        </ownedComment>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Tp3boMGbEeiS695oPTRE1Q"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Tp3bocGbEeiS695oPTRE1Q" value="1"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_IYJJQMWMEeiLjtyU_R81wg" name="_heartbeat" type="_n09AUMWKEeiLjtyU_R81wg" aggregation="composite" association="_IYFe4MWMEeiLjtyU_R81wg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_qKIFAN1REeiRzJu73dYz2w" annotatedElement="_IYJJQMWMEeiLjtyU_R81wg">
-          <body>Fields specific to heartbeat events</body>
-        </ownedComment>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IYKXYMWMEeiLjtyU_R81wg"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IYK-cMWMEeiLjtyU_R81wg" value="1"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_O1pQ0cWPEeiLjtyU_R81wg" name="_measurement" type="_qX-WsMWKEeiLjtyU_R81wg" aggregation="composite" association="_O1nboMWPEeiLjtyU_R81wg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_sQR5MN1REeiRzJu73dYz2w" annotatedElement="_O1pQ0cWPEeiLjtyU_R81wg">
-          <body>Fields specific to measurement events</body>
-        </ownedComment>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_O1sUIMWPEeiLjtyU_R81wg"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_O1uJUMWPEeiLjtyU_R81wg" value="1"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_QWlossWbEeiLjtyU_R81wg" name="_mobileflow" type="_25jHQMWSEeiLjtyU_R81wg" aggregation="composite" association="_QWlBoMWbEeiLjtyU_R81wg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_ubgaoN1REeiRzJu73dYz2w" annotatedElement="_QWlossWbEeiLjtyU_R81wg">
-          <body>Fields specific to mobility flow events</body>
-        </ownedComment>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_QWmPwMWbEeiLjtyU_R81wg"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_QWmPwcWbEeiLjtyU_R81wg" value="1"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_Vf32ssWbEeiLjtyU_R81wg" name="_notification" type="_53AW4MWSEeiLjtyU_R81wg" aggregation="composite" association="_Vf3PoMWbEeiLjtyU_R81wg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_wOJc8N1REeiRzJu73dYz2w" annotatedElement="_Vf32ssWbEeiLjtyU_R81wg">
-          <body>Fields specific to notification events</body>
-        </ownedComment>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Vf4dwcWbEeiLjtyU_R81wg"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Vf4dwsWbEeiLjtyU_R81wg" value="1"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_Ya5dYsWbEeiLjtyU_R81wg" name="_other" type="_7_tv0MWSEeiLjtyU_R81wg" aggregation="composite" association="_Ya42UMWbEeiLjtyU_R81wg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_x2M_4N1REeiRzJu73dYz2w" annotatedElement="_Ya5dYsWbEeiLjtyU_R81wg">
-          <body>Fields specific to other types of events</body>
-        </ownedComment>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ya5dZMWbEeiLjtyU_R81wg"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ya6EcMWbEeiLjtyU_R81wg" value="1"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_ZyQfosWgEeiLjtyU_R81wg" name="_pnfregistration" type="_w0GWgMWTEeiLjtyU_R81wg" aggregation="composite" association="_ZyP4kMWgEeiLjtyU_R81wg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_zXxgUN1REeiRzJu73dYz2w" annotatedElement="_ZyQfosWgEeiLjtyU_R81wg">
-          <body>Fields specific to pnfRegistration events</body>
-        </ownedComment>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZyRGscWgEeiLjtyU_R81wg"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZyRGssWgEeiLjtyU_R81wg" value="1"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_oQMv4cWgEeiLjtyU_R81wg" name="_sipSignaling" type="_zieoUMWTEeiLjtyU_R81wg" aggregation="composite" association="_oQMI0MWgEeiLjtyU_R81wg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_09CN8N1REeiRzJu73dYz2w" annotatedElement="_oQMv4cWgEeiLjtyU_R81wg">
-          <body>Fields specific to sipSignaling events</body>
-        </ownedComment>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_oQNW8MWgEeiLjtyU_R81wg"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oQNW8cWgEeiLjtyU_R81wg" value="1"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_t-WPYMWpEeiLjtyU_R81wg" name="_statechange" type="_1ZragMWTEeiLjtyU_R81wg" aggregation="composite" association="_t-VBQMWpEeiLjtyU_R81wg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_2dlasN1REeiRzJu73dYz2w" annotatedElement="_t-WPYMWpEeiLjtyU_R81wg">
-          <body>Fields specific to state change events</body>
-        </ownedComment>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t-WPYsWpEeiLjtyU_R81wg"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t-W2cMWpEeiLjtyU_R81wg" value="1"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_Bw5M0sWqEeiLjtyU_R81wg" name="_syslog" type="_2rBtoMWTEeiLjtyU_R81wg" aggregation="composite" association="_Bw4lwMWqEeiLjtyU_R81wg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_4EhjUN1REeiRzJu73dYz2w" annotatedElement="_Bw5M0sWqEeiLjtyU_R81wg">
-          <body>Fields specific to syslog events</body>
-        </ownedComment>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Bw5z4MWqEeiLjtyU_R81wg"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Bw5z4cWqEeiLjtyU_R81wg" value="1"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_MjWp0sWqEeiLjtyU_R81wg" name="_thresholdCrossingAlert" type="_4d4yYMWTEeiLjtyU_R81wg" aggregation="composite" association="_MjWCwMWqEeiLjtyU_R81wg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_6EIqoN1REeiRzJu73dYz2w" annotatedElement="_MjWp0sWqEeiLjtyU_R81wg">
-          <body>Fields specific to threshold crossing alert events</body>
-        </ownedComment>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_MjWp1MWqEeiLjtyU_R81wg"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MjWp1cWqEeiLjtyU_R81wg" value="1"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_f24I8sWqEeiLjtyU_R81wg" name="_voicequality" type="_7sljAMWTEeiLjtyU_R81wg" aggregation="composite" association="_f23h4MWqEeiLjtyU_R81wg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_7oy7UN1REeiRzJu73dYz2w" annotatedElement="_f24I8sWqEeiLjtyU_R81wg">
-          <body>Fields specific to voiceQuality events</body>
-        </ownedComment>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_f24wAMWqEeiLjtyU_R81wg"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_f24wAcWqEeiLjtyU_R81wg" value="1"/>
-      </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_8Dr4ksWMEeiLjtyU_R81wg" name="_commoneventheader" type="_XoAlsMWMEeiLjtyU_R81wg" aggregation="composite" association="_8DrRgMWMEeiLjtyU_R81wg">
         <ownedComment xmi:type="uml:Comment" xmi:id="_nLgXwN1REeiRzJu73dYz2w" annotatedElement="_8Dr4ksWMEeiLjtyU_R81wg">
           <body>Fields common to all events</body>
@@ -102,15 +18,12 @@ ONAP event messages are serialized as a unicode ASCII character string which may
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8DsfoMWMEeiLjtyU_R81wg" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8DsfocWMEeiLjtyU_R81wg" value="1"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_NprpkiDMEemw1L3J4dNy4w" name="_perf3gpp" type="_ATTeUCDMEemw1L3J4dNy4w" aggregation="composite" association="_NprCgCDMEemw1L3J4dNy4w">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NpsQoCDMEemw1L3J4dNy4w"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NpsQoSDMEemw1L3J4dNy4w" value="1"/>
-      </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_7SeaAMGaEeiS695oPTRE1Q" name="Fault">
       <ownedComment xmi:type="uml:Comment" xmi:id="_qgCpQMcZEeiafPHvepnkKQ" annotatedElement="_7SeaAMGaEeiS695oPTRE1Q">
         <body>Fields specific to fault events</body>
       </ownedComment>
+      <generalization xmi:type="uml:Generalization" xmi:id="_GHoP4EaIEemmD4xckllxww" general="_PmIOkH7uEeifJIHxnlj6Cg"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_U98FwIEoEeieQ4zKGFzYtQ" name="alarmAdditionalInformation" type="_yPR44IEoEeieQ4zKGFzYtQ">
         <ownedComment xmi:type="uml:Comment" xmi:id="_1yYHkKZIEeily5uFlujj3Q" annotatedElement="_U98FwIEoEeieQ4zKGFzYtQ">
           <body>Additional alarm information. &#xD;
@@ -177,6 +90,7 @@ Could contain managed object instance as separate key:value; could add probable
       <ownedComment xmi:type="uml:Comment" xmi:id="_LA3yYNE6EeilcYLXtz_Wig" annotatedElement="_n09AUMWKEeiLjtyU_R81wg">
         <body>The heartbeatFields datatype is an optional field block for fields specific to heartbeat events.</body>
       </ownedComment>
+      <generalization xmi:type="uml:Generalization" xmi:id="_Vdmd4EaUEem_U-rQUWOmPw" general="_PmIOkH7uEeifJIHxnlj6Cg"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_fTh9kIFJEeieQ4zKGFzYtQ" name="additionalFields" type="_yPR44IEoEeieQ4zKGFzYtQ">
         <ownedComment xmi:type="uml:Comment" xmi:id="_1FAF0IFJEeieQ4zKGFzYtQ" annotatedElement="_fTh9kIFJEeieQ4zKGFzYtQ">
           <body>Additional expansion fields if needed.&#xD;
@@ -378,6 +292,7 @@ For fault events, startEpochMicrosec is the timestamp of the initial alarm; if t
       <ownedComment xmi:type="uml:Comment" xmi:id="_MzyhgNE6EeilcYLXtz_Wig" annotatedElement="_qX-WsMWKEeiLjtyU_R81wg">
         <body>Fields specific to measurement events</body>
       </ownedComment>
+      <generalization xmi:type="uml:Generalization" xmi:id="_ZULt4EaUEem_U-rQUWOmPw" general="_PmIOkH7uEeifJIHxnlj6Cg"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_MIUQcIFKEeieQ4zKGFzYtQ" name="additionalFields" type="_yPR44IEoEeieQ4zKGFzYtQ">
         <ownedComment xmi:type="uml:Comment" xmi:id="_MqDuwIFOEeieQ4zKGFzYtQ" annotatedElement="_MIUQcIFKEeieQ4zKGFzYtQ">
           <body>Additional measurement fields if needed.&#xD;
@@ -562,6 +477,7 @@ For fault events, startEpochMicrosec is the timestamp of the initial alarm; if t
       <ownedComment xmi:type="uml:Comment" xmi:id="_Omf1QNE6EeilcYLXtz_Wig" annotatedElement="_25jHQMWSEeiLjtyU_R81wg">
         <body>Fields specific to mobility flow events</body>
       </ownedComment>
+      <generalization xmi:type="uml:Generalization" xmi:id="_bp1WoEaUEem_U-rQUWOmPw" general="_PmIOkH7uEeifJIHxnlj6Cg"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_69Dm8JQkEei6kI-JPNdeuw" name="additionalFields" type="_yPR44IEoEeieQ4zKGFzYtQ">
         <ownedComment xmi:type="uml:Comment" xmi:id="_D_EvIJQnEei6kI-JPNdeuw" annotatedElement="_69Dm8JQkEei6kI-JPNdeuw">
           <body>additionalFields - Additional mobileFlow fields if needed.&#xD;
@@ -865,6 +781,7 @@ Note: current data type (String) may be changed to Common Resource Datatype L3Ad
       <ownedComment xmi:type="uml:Comment" xmi:id="_QMUjkNE6EeilcYLXtz_Wig" annotatedElement="_53AW4MWSEeiLjtyU_R81wg">
         <body>Fields specific to notification events</body>
       </ownedComment>
+      <generalization xmi:type="uml:Generalization" xmi:id="_32jEAEaUEemtHYgFzN-tvQ" general="_PmIOkH7uEeifJIHxnlj6Cg"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_sl3TYJQuEei6kI-JPNdeuw" name="additionalFields" type="_yPR44IEoEeieQ4zKGFzYtQ">
         <ownedComment xmi:type="uml:Comment" xmi:id="__TMVMJQuEei6kI-JPNdeuw" annotatedElement="_sl3TYJQuEei6kI-JPNdeuw">
           <body>Additional notification fields if needed.&#xD;
@@ -942,6 +859,7 @@ For example: &quot;inService&quot;, &quot;outOfService&quot;, &quot;maintenance&
       <ownedComment xmi:type="uml:Comment" xmi:id="_Y-AboNE6EeilcYLXtz_Wig" annotatedElement="_7_tv0MWSEeiLjtyU_R81wg">
         <body>The otherFields datatype defines fields for events belonging to the 'other' domain of the commonEventHeader domain enumeration.</body>
       </ownedComment>
+      <generalization xmi:type="uml:Generalization" xmi:id="_FCgyMEaZEem3MJDthqMI_w" general="_PmIOkH7uEeifJIHxnlj6Cg"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_V7c6gJQ6Eei6kI-JPNdeuw" name="arrayofNamedHashMap" type="_sOvPAJQ9Eei6kI-JPNdeuw">
         <ownedComment xmi:type="uml:Comment" xmi:id="_R9EqwLX3EeiFDLhMCq9-Iw" annotatedElement="_V7c6gJQ6Eei6kI-JPNdeuw">
           <body>Array of named hashMaps</body>
@@ -976,6 +894,7 @@ For example: &quot;inService&quot;, &quot;outOfService&quot;, &quot;maintenance&
       <ownedComment xmi:type="uml:Comment" xmi:id="_cNXTkNE6EeilcYLXtz_Wig" annotatedElement="_w0GWgMWTEeiLjtyU_R81wg">
         <body>The pnfRegistrationFields datatype defines fields for events belonging to the 'pnfRegistration' domain of the commonEventHeader domain enumeration; it consists of the following fields:</body>
       </ownedComment>
+      <generalization xmi:type="uml:Generalization" xmi:id="_JiXBoEaZEem3MJDthqMI_w" general="_PmIOkH7uEeifJIHxnlj6Cg"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_wTZ74Jc-Eeis0eUbsDSw0w" name="additionalFields" type="_yPR44IEoEeieQ4zKGFzYtQ">
         <ownedComment xmi:type="uml:Comment" xmi:id="_iLbK0LbKEeiWgvNHCpdNlg" annotatedElement="_wTZ74Jc-Eeis0eUbsDSw0w">
           <body>Additional pnfRegistration fields if needed</body>
@@ -1085,6 +1004,7 @@ For example: &quot;inService&quot;, &quot;outOfService&quot;, &quot;maintenance&
         <body>sipSignalingFields - The sipSignalingFields datatype communicates information about SIP signaling messages, parameters and signaling state.&#xD;
 </body>
       </ownedComment>
+      <generalization xmi:type="uml:Generalization" xmi:id="_PU3y0EaZEem3MJDthqMI_w" general="_PmIOkH7uEeifJIHxnlj6Cg"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_VL2WIJpnEeidy9iGT_F5-w" name="additionalInformation" type="_yPR44IEoEeieQ4zKGFzYtQ">
         <ownedComment xmi:type="uml:Comment" xmi:id="_Kuns0JpoEeidy9iGT_F5-w" annotatedElement="_VL2WIJpnEeidy9iGT_F5-w">
           <body>zdditionalInformation - Additional sipSignalling fields.&#xD;
@@ -1171,6 +1091,7 @@ Note: current data type (String) may be changed to Common Resource Datatype L3Ad
       <ownedComment xmi:type="uml:Comment" xmi:id="_hclKcNE6EeilcYLXtz_Wig" annotatedElement="_1ZragMWTEeiLjtyU_R81wg">
         <body>Fields specific to state change events.</body>
       </ownedComment>
+      <generalization xmi:type="uml:Generalization" xmi:id="_Sb8RcEaZEem3MJDthqMI_w" general="_PmIOkH7uEeifJIHxnlj6Cg"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_JYYzUJzREeiLvPKMh61-Bg" name="additionalFields" type="_yPR44IEoEeieQ4zKGFzYtQ">
         <ownedComment xmi:type="uml:Comment" xmi:id="_FjUJwJzSEeiLvPKMh61-Bg" annotatedElement="_JYYzUJzREeiLvPKMh61-Bg">
           <body>Additional stateChange fields if needed</body>
@@ -1209,6 +1130,7 @@ Note: current data type (String) may be changed to Common Resource Datatype L3Ad
 VES supports both classes of syslog, however VES is only recommended for control logs or for lower volume session logs, less than 60k per hour. High volume session logging should use a file-based transport solution.&#xD;
 </body>
       </ownedComment>
+      <generalization xmi:type="uml:Generalization" xmi:id="_XAezoEaZEem3MJDthqMI_w" general="_PmIOkH7uEeifJIHxnlj6Cg"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_fX1bQJzTEeiLvPKMh61-Bg" name="additionalFields" type="_yPR44IEoEeieQ4zKGFzYtQ">
         <ownedComment xmi:type="uml:Comment" xmi:id="_tMbUkLt0Eeiq-o0aE00M6w" annotatedElement="_fX1bQJzTEeiLvPKMh61-Bg">
           <body>Additional syslog fields if needed Ex:  {“name1”: ”value1”, “name2: “value2” … }</body>
@@ -1893,6 +1815,7 @@ Debug	          7	    debug-level messages&#xD;
       <ownedComment xmi:type="uml:Comment" xmi:id="__uOkANE6EeilcYLXtz_Wig" annotatedElement="_4d4yYMWTEeiLjtyU_R81wg">
         <body>The thresholdCrossingAlertFields datatype consists of the following fields:</body>
       </ownedComment>
+      <generalization xmi:type="uml:Generalization" xmi:id="_bNb8QEaZEem3MJDthqMI_w" general="_PmIOkH7uEeifJIHxnlj6Cg"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_RRq8IKJVEeibfLkXoC-lBg" name="additionalFields" type="_yPR44IEoEeieQ4zKGFzYtQ">
         <ownedComment xmi:type="uml:Comment" xmi:id="_GtNpcKJWEeibfLkXoC-lBg" annotatedElement="_RRq8IKJVEeibfLkXoC-lBg">
           <body>additionalFields - Additional pnfRegistration fields if needed.&#xD;
@@ -2008,6 +1931,7 @@ Debug	          7	    debug-level messages&#xD;
       <ownedComment xmi:type="uml:Comment" xmi:id="_Na2FANE7EeilcYLXtz_Wig" annotatedElement="_7sljAMWTEeiLjtyU_R81wg">
         <body>The voiceQuality class provides statistics related to customer facing voice products; consists of the following fields:</body>
       </ownedComment>
+      <generalization xmi:type="uml:Generalization" xmi:id="_ferH8EaZEem3MJDthqMI_w" general="_PmIOkH7uEeifJIHxnlj6Cg"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_e9yVUNikEeiRnMGpBj3Tnw" name="additionalInformation" type="_yPR44IEoEeieQ4zKGFzYtQ">
         <ownedComment xmi:type="uml:Comment" xmi:id="_wvMlMNkXEei09Y1bp3mjwA" annotatedElement="_e9yVUNikEeiRnMGpBj3Tnw">
           <body>Additional voice quality fields</body>
@@ -3892,6 +3816,7 @@ Field	Type	Required?	Description&#xD;
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_ATTeUCDMEemw1L3J4dNy4w" name="Perf3gpp">
+      <generalization xmi:type="uml:Generalization" xmi:id="_ifa8IEaZEem3MJDthqMI_w" general="_PmIOkH7uEeifJIHxnlj6Cg"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_onUNUCDPEemw1L3J4dNy4w" name="eventAddlFields" type="_yPR44IEoEeieQ4zKGFzYtQ">
         <ownedComment xmi:type="uml:Comment" xmi:id="_9_Mw4CDPEemw1L3J4dNy4w" annotatedElement="_onUNUCDPEemw1L3J4dNy4w">
           <body>Additional key-value pairs if needed</body>
@@ -4687,84 +4612,12 @@ Debug	          7	    debug-level messages&#xD;
     </packagedElement>
   </packagedElement>
   <packagedElement xmi:type="uml:Package" xmi:id="_UgGsIMyIEeicT7FGufu5-g" name="Associations">
-    <packagedElement xmi:type="uml:Association" xmi:id="_f23h4MWqEeiLjtyU_R81wg" name="EventContainsVoiceQuality" memberEnd="_f24I8sWqEeiLjtyU_R81wg _f24wAsWqEeiLjtyU_R81wg">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_f24I8MWqEeiLjtyU_R81wg" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_f24I8cWqEeiLjtyU_R81wg" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_f24wAsWqEeiLjtyU_R81wg" name="event" type="_PmIOkH7uEeifJIHxnlj6Cg" association="_f23h4MWqEeiLjtyU_R81wg"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_MjWCwMWqEeiLjtyU_R81wg" name="EventConainsThresholdCrossingAlert" memberEnd="_MjWp0sWqEeiLjtyU_R81wg _MjWp1sWqEeiLjtyU_R81wg">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_MjWp0MWqEeiLjtyU_R81wg" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_MjWp0cWqEeiLjtyU_R81wg" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_MjWp1sWqEeiLjtyU_R81wg" name="event" type="_PmIOkH7uEeifJIHxnlj6Cg" association="_MjWCwMWqEeiLjtyU_R81wg"/>
-    </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_8DrRgMWMEeiLjtyU_R81wg" name="EventContainsComonEventHeader" memberEnd="_8Dr4ksWMEeiLjtyU_R81wg _8DsfosWMEeiLjtyU_R81wg">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8Dr4kMWMEeiLjtyU_R81wg" source="org.eclipse.papyrus">
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8Dr4kcWMEeiLjtyU_R81wg" key="nature" value="UML_Nature"/>
       </eAnnotations>
       <ownedEnd xmi:type="uml:Property" xmi:id="_8DsfosWMEeiLjtyU_R81wg" name="event" type="_PmIOkH7uEeifJIHxnlj6Cg" association="_8DrRgMWMEeiLjtyU_R81wg"/>
     </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_Tp2NgMGbEeiS695oPTRE1Q" name="EventContainsFault" memberEnd="_Tp20ksGbEeiS695oPTRE1Q _Tp3bosGbEeiS695oPTRE1Q">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Tp20kMGbEeiS695oPTRE1Q" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Tp20kcGbEeiS695oPTRE1Q" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_Tp3bosGbEeiS695oPTRE1Q" name="event" type="_PmIOkH7uEeifJIHxnlj6Cg" association="_Tp2NgMGbEeiS695oPTRE1Q"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_IYFe4MWMEeiLjtyU_R81wg" name="EventContainsHeartbeat" memberEnd="_IYJJQMWMEeiLjtyU_R81wg _IYK-ccWMEeiLjtyU_R81wg">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IYH7IMWMEeiLjtyU_R81wg" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IYH7IcWMEeiLjtyU_R81wg" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_IYK-ccWMEeiLjtyU_R81wg" name="event" type="_PmIOkH7uEeifJIHxnlj6Cg" association="_IYFe4MWMEeiLjtyU_R81wg"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_O1nboMWPEeiLjtyU_R81wg" name="EventContainsMeasurement" memberEnd="_O1pQ0cWPEeiLjtyU_R81wg _O1v-gMWPEeiLjtyU_R81wg">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_O1opwMWPEeiLjtyU_R81wg" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_O1pQ0MWPEeiLjtyU_R81wg" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_O1v-gMWPEeiLjtyU_R81wg" name="event" type="_PmIOkH7uEeifJIHxnlj6Cg" association="_O1nboMWPEeiLjtyU_R81wg"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_QWlBoMWbEeiLjtyU_R81wg" name="EventContainsMobileFlow" memberEnd="_QWlossWbEeiLjtyU_R81wg _QWmPwsWbEeiLjtyU_R81wg">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QWlosMWbEeiLjtyU_R81wg" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QWloscWbEeiLjtyU_R81wg" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_QWmPwsWbEeiLjtyU_R81wg" name="event" type="_PmIOkH7uEeifJIHxnlj6Cg" association="_QWlBoMWbEeiLjtyU_R81wg"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_Vf3PoMWbEeiLjtyU_R81wg" name="EventContainsNotification" memberEnd="_Vf32ssWbEeiLjtyU_R81wg _Vf5E0MWbEeiLjtyU_R81wg">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Vf32sMWbEeiLjtyU_R81wg" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Vf32scWbEeiLjtyU_R81wg" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_Vf5E0MWbEeiLjtyU_R81wg" name="event" type="_PmIOkH7uEeifJIHxnlj6Cg" association="_Vf3PoMWbEeiLjtyU_R81wg"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_Ya42UMWbEeiLjtyU_R81wg" name="EventContainsOther" memberEnd="_Ya5dYsWbEeiLjtyU_R81wg _Ya6EccWbEeiLjtyU_R81wg">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ya5dYMWbEeiLjtyU_R81wg" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ya5dYcWbEeiLjtyU_R81wg" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_Ya6EccWbEeiLjtyU_R81wg" name="event" type="_PmIOkH7uEeifJIHxnlj6Cg" association="_Ya42UMWbEeiLjtyU_R81wg"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_ZyP4kMWgEeiLjtyU_R81wg" name="EventContainsPnfRegistration" memberEnd="_ZyQfosWgEeiLjtyU_R81wg _ZyRGs8WgEeiLjtyU_R81wg">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZyQfoMWgEeiLjtyU_R81wg" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZyQfocWgEeiLjtyU_R81wg" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_ZyRGs8WgEeiLjtyU_R81wg" name="event" type="_PmIOkH7uEeifJIHxnlj6Cg" association="_ZyP4kMWgEeiLjtyU_R81wg"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_oQMI0MWgEeiLjtyU_R81wg" name="EventContainsSipSignaling" memberEnd="_oQMv4cWgEeiLjtyU_R81wg _oQNW8sWgEeiLjtyU_R81wg">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_oQMI0cWgEeiLjtyU_R81wg" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_oQMv4MWgEeiLjtyU_R81wg" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_oQNW8sWgEeiLjtyU_R81wg" name="event" type="_PmIOkH7uEeifJIHxnlj6Cg" association="_oQMI0MWgEeiLjtyU_R81wg"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_t-VBQMWpEeiLjtyU_R81wg" name="EventContainsStateChange" memberEnd="_t-WPYMWpEeiLjtyU_R81wg _t-W2ccWpEeiLjtyU_R81wg">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_t-VoUMWpEeiLjtyU_R81wg" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t-VoUcWpEeiLjtyU_R81wg" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_t-W2ccWpEeiLjtyU_R81wg" name="eventcontainssipsignaling" type="_PmIOkH7uEeifJIHxnlj6Cg" association="_t-VBQMWpEeiLjtyU_R81wg"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_Bw4lwMWqEeiLjtyU_R81wg" name="EventContainsSysLog" memberEnd="_Bw5M0sWqEeiLjtyU_R81wg _Bw5z4sWqEeiLjtyU_R81wg">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Bw5M0MWqEeiLjtyU_R81wg" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bw5M0cWqEeiLjtyU_R81wg" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_Bw5z4sWqEeiLjtyU_R81wg" name="event" type="_PmIOkH7uEeifJIHxnlj6Cg" association="_Bw4lwMWqEeiLjtyU_R81wg"/>
-    </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_322w4MivEeiKReoLXDYvSw" name="MeasurementHasCodecsInUse" memberEnd="_325NIMivEeiKReoLXDYvSw _326bQsivEeiKReoLXDYvSw">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_324mEMivEeiKReoLXDYvSw" source="org.eclipse.papyrus">
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_324mEcivEeiKReoLXDYvSw" key="nature" value="UML_Nature"/>
@@ -4927,15 +4780,6 @@ Debug	          7	    debug-level messages&#xD;
       </eAnnotations>
       <ownedEnd xmi:type="uml:Property" xmi:id="_4Ii74tkYEei09Y1bp3mjwA" name="voicequality" type="_7sljAMWTEeiLjtyU_R81wg" association="_4IhtwNkYEei09Y1bp3mjwA"/>
     </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_NprCgCDMEemw1L3J4dNy4w" name="EventContainsPerf3gpp" memberEnd="_NprpkiDMEemw1L3J4dNy4w _NpsQoiDMEemw1L3J4dNy4w">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NprpkCDMEemw1L3J4dNy4w" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NprpkSDMEemw1L3J4dNy4w" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedComment xmi:type="uml:Comment" xmi:id="_PkTJoCZSEemRA_CB-n5OfQ" annotatedElement="_NprCgCDMEemw1L3J4dNy4w">
-        <body>Fields specific to 3gpp types of events</body>
-      </ownedComment>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_NpsQoiDMEemw1L3J4dNy4w" name="event" type="_PmIOkH7uEeifJIHxnlj6Cg" association="_NprCgCDMEemw1L3J4dNy4w"/>
-    </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_2YIm8CDREemw1L3J4dNy4w" name="Perf3gppContainsMeasDataCollection" memberEnd="_2YJOAiDREemw1L3J4dNy4w _2YJ1EyDREemw1L3J4dNy4w">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2YJOACDREemw1L3J4dNy4w" source="org.eclipse.papyrus">
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2YJOASDREemw1L3J4dNy4w" key="nature" value="UML_Nature"/>