4 files changed, 263 insertions, 725 deletions
diff --git a/papyrus/ONAP Information Model/Resource.notation b/papyrus/ONAP Information Model/Resource.notation
index 2260f44..f62ca7b 100644
--- a/papyrus/ONAP Information Model/Resource.notation
+++ b/papyrus/ONAP Information Model/Resource.notation
@@ -255,45 +255,6 @@
     <element xsi:nil="true"/>
     <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pRUrFT2rEeiu6I5JfRTxxQ" x="200"/>
   </children>
-  <children xmi:type="notation:Shape" xmi:id="_6JwEUKb0Eeixw5Ke5QD1pQ" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_6J84oKb0Eeixw5Ke5QD1pQ" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_6J9fsKb0Eeixw5Ke5QD1pQ" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_6J9fsab0Eeixw5Ke5QD1pQ" y="15"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_6J9fsqb0Eeixw5Ke5QD1pQ" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_6J9fs6b0Eeixw5Ke5QD1pQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_6J9ftKb0Eeixw5Ke5QD1pQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_6J9ftab0Eeixw5Ke5QD1pQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6J9ftqb0Eeixw5Ke5QD1pQ"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_6J9ft6b0Eeixw5Ke5QD1pQ" visible="false" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_6J9fuKb0Eeixw5Ke5QD1pQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_6J9fuab0Eeixw5Ke5QD1pQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_6J9fuqb0Eeixw5Ke5QD1pQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6J9fu6b0Eeixw5Ke5QD1pQ"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_6J9fvKb0Eeixw5Ke5QD1pQ" visible="false" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_6J9fvab0Eeixw5Ke5QD1pQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_6J9fvqb0Eeixw5Ke5QD1pQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_6J9fv6b0Eeixw5Ke5QD1pQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6J9fwKb0Eeixw5Ke5QD1pQ"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_6KUsEKb0Eeixw5Ke5QD1pQ" visible="false" type="StereotypeLabel">
-      <styles xmi:type="notation:StringValueStyle" xmi:id="_6KUsEab0Eeixw5Ke5QD1pQ" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
-      <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6KUsEqb0Eeixw5Ke5QD1pQ"/>
-    </children>
-    <element xmi:type="uml:Class" href="Vnf.uml#_AmzWYDQtEeixv_sLOod4lQ"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6JwEUab0Eeixw5Ke5QD1pQ" x="180" y="640"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_6KdO8Kb0Eeixw5Ke5QD1pQ" type="StereotypeComment">
-    <styles xmi:type="notation:TitleStyle" xmi:id="_6KdO8ab0Eeixw5Ke5QD1pQ"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_6KdO86b0Eeixw5Ke5QD1pQ" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_AmzWYDQtEeixv_sLOod4lQ"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6KdO8qb0Eeixw5Ke5QD1pQ" x="200"/>
-  </children>
   <children xmi:type="notation:Shape" xmi:id="_8LGBwK0aEeirrO9guYUuGw" type="Class_Shape">
     <children xmi:type="notation:DecorationNode" xmi:id="_8LcAAK0aEeirrO9guYUuGw" type="Class_NameLabel"/>
     <children xmi:type="notation:DecorationNode" xmi:id="_8LcnEK0aEeirrO9guYUuGw" type="Class_FloatingNameLabel">
@@ -499,47 +460,6 @@
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wg86gD2rEeiu6I5JfRTxxQ" id="(1.0,0.5970149253731343)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wg86gT2rEeiu6I5JfRTxxQ" id="(1.0,0.4)"/>
   </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_6KdO9Kb0Eeixw5Ke5QD1pQ" type="StereotypeCommentLink" source="_6JwEUKb0Eeixw5Ke5QD1pQ" target="_6KdO8Kb0Eeixw5Ke5QD1pQ">
-    <styles xmi:type="notation:FontStyle" xmi:id="_6KdO9ab0Eeixw5Ke5QD1pQ"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_6KqDQqb0Eeixw5Ke5QD1pQ" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="Vnf.uml#_AmzWYDQtEeixv_sLOod4lQ"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6KdO9qb0Eeixw5Ke5QD1pQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6KqDQKb0Eeixw5Ke5QD1pQ"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6KqDQab0Eeixw5Ke5QD1pQ"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_G3dtEKb1Eeixw5Ke5QD1pQ" type="Association_Edge" source="_6JwEUKb0Eeixw5Ke5QD1pQ" target="_Bcnm4D2rEeiu6I5JfRTxxQ" routing="Rectilinear">
-    <children xmi:type="notation:DecorationNode" xmi:id="_G3eUIKb1Eeixw5Ke5QD1pQ" type="Association_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Cqo04K0XEeirrO9guYUuGw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_G3eUIab1Eeixw5Ke5QD1pQ" y="-20"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_G3eUIqb1Eeixw5Ke5QD1pQ" type="Association_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_CsIpsK0XEeirrO9guYUuGw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_G3eUI6b1Eeixw5Ke5QD1pQ" x="3" y="68"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_G3eUJKb1Eeixw5Ke5QD1pQ" visible="false" type="Association_TargetRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Ct3vEK0XEeirrO9guYUuGw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_G3eUJab1Eeixw5Ke5QD1pQ" x="9" y="-20"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_G3e7MKb1Eeixw5Ke5QD1pQ" visible="false" type="Association_SourceRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_CvXj4K0XEeirrO9guYUuGw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_G3e7Mab1Eeixw5Ke5QD1pQ" x="-9" y="20"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_G3e7Mqb1Eeixw5Ke5QD1pQ" type="Association_SourceMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Cw2KkK0XEeirrO9guYUuGw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_G3e7M6b1Eeixw5Ke5QD1pQ" x="9" y="20"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_G3e7NKb1Eeixw5Ke5QD1pQ" type="Association_TargetMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_CylP8K0XEeirrO9guYUuGw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_G3e7Nab1Eeixw5Ke5QD1pQ" x="-9" y="-20"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_G3dtEab1Eeixw5Ke5QD1pQ"/>
-    <element xmi:type="uml:Association" href="Vnf.uml#_LOOBADQtEeixv_sLOod4lQ"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_G3dtEqb1Eeixw5Ke5QD1pQ" points="[260, 640, -643984, -643984]$[260, 580, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_C03u8K0XEeirrO9guYUuGw" id="(0.8,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_C049EK0XEeirrO9guYUuGw" id="(0.5809128630705395,1.0)"/>
-  </edges>
   <edges xmi:type="notation:Connector" xmi:id="_8P2l8K0aEeirrO9guYUuGw" type="StereotypeCommentLink" source="_8LGBwK0aEeirrO9guYUuGw" target="_8PmHQK0aEeirrO9guYUuGw">
     <styles xmi:type="notation:FontStyle" xmi:id="_8P2l8a0aEeirrO9guYUuGw"/>
     <styles xmi:type="notation:EObjectValueStyle" xmi:id="_8QEoYa0aEeirrO9guYUuGw" name="BASE_ELEMENT">
@@ -561,4 +481,66 @@
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JH52cK0bEeirrO9guYUuGw" id="(1.0,0.5445544554455446)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JH6dgK0bEeirrO9guYUuGw" id="(0.0,0.594059405940594)"/>
   </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_iQ_cgLAVEei3l9EE3oQfMw" type="Association_Edge" source="_Bcnm4D2rEeiu6I5JfRTxxQ" target="_3XpM4D2oEeiu6I5JfRTxxQ">
+    <children xmi:type="notation:DecorationNode" xmi:id="_iRB4wLAVEei3l9EE3oQfMw" type="Association_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jaD9YLAVEei3l9EE3oQfMw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_iRB4wbAVEei3l9EE3oQfMw" y="-20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_iRCf0LAVEei3l9EE3oQfMw" type="Association_NameLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jayWILAVEei3l9EE3oQfMw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_iRCf0bAVEei3l9EE3oQfMw" y="20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_iRCf0rAVEei3l9EE3oQfMw" visible="false" type="Association_TargetRoleLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jbeSoLAVEei3l9EE3oQfMw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_iRCf07AVEei3l9EE3oQfMw" x="45" y="-20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_iRCf1LAVEei3l9EE3oQfMw" visible="false" type="Association_SourceRoleLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jcBsQLAVEei3l9EE3oQfMw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_iRCf1bAVEei3l9EE3oQfMw" x="-45" y="20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_iRCf1rAVEei3l9EE3oQfMw" type="Association_SourceMultiplicityLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jcu24LAVEei3l9EE3oQfMw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_iRCf17AVEei3l9EE3oQfMw" x="45" y="20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_iRCf2LAVEei3l9EE3oQfMw" type="Association_TargetMultiplicityLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jdTeoLAVEei3l9EE3oQfMw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_iRCf2bAVEei3l9EE3oQfMw" x="-45" y="-20"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_iQ_cgbAVEei3l9EE3oQfMw"/>
+    <element xmi:type="uml:Association" href="Service.uml#_iP0-4LAVEei3l9EE3oQfMw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_iQ_cgrAVEei3l9EE3oQfMw" points="[361, 540, -643984, -643984]$[540, 540, -643984, -643984]$[540, 421, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iSuh4LAVEei3l9EE3oQfMw" id="(1.0,0.6)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iSuh4bAVEei3l9EE3oQfMw" id="(0.2631578947368421,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_i0X2YLAVEei3l9EE3oQfMw" type="Association_Edge" source="_3XpM4D2oEeiu6I5JfRTxxQ" target="_pPk-oD2rEeiu6I5JfRTxxQ">
+    <children xmi:type="notation:DecorationNode" xmi:id="_i0YdcLAVEei3l9EE3oQfMw" type="Association_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_8MacsLAVEei3l9EE3oQfMw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_i0YdcbAVEei3l9EE3oQfMw" x="-1" y="-18"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_i0YdcrAVEei3l9EE3oQfMw" type="Association_NameLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_8M7aELAVEei3l9EE3oQfMw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_i0Ydc7AVEei3l9EE3oQfMw" x="47" y="27"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_i0YddLAVEei3l9EE3oQfMw" visible="false" type="Association_TargetRoleLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_8NbJULAVEei3l9EE3oQfMw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_i0ZEgLAVEei3l9EE3oQfMw" x="48" y="-20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_i0ZEgbAVEei3l9EE3oQfMw" visible="false" type="Association_SourceRoleLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_8OA_MLAVEei3l9EE3oQfMw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_i0ZEgrAVEei3l9EE3oQfMw" x="-47" y="20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_i0ZEg7AVEei3l9EE3oQfMw" type="Association_SourceMultiplicityLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_8Olm8LAVEei3l9EE3oQfMw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_i0ZEhLAVEei3l9EE3oQfMw" x="48" y="20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_i0ZEhbAVEei3l9EE3oQfMw" type="Association_TargetMultiplicityLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_8PLc0LAVEei3l9EE3oQfMw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_i0ZEhrAVEei3l9EE3oQfMw" x="-48" y="-17"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_i0X2YbAVEei3l9EE3oQfMw"/>
+    <element xmi:type="uml:Association" href="Service.uml#_iznocLAVEei3l9EE3oQfMw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_i0X2YrAVEei3l9EE3oQfMw" points="[660, 421, -643984, -643984]$[660, 520, -643984, -643984]$[660, 540, -643984, -643984]$[760, 540, -643984, -643984]$[820, 540, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_i19KwLAVEei3l9EE3oQfMw" id="(0.6578947368421053,1.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_i19x0LAVEei3l9EE3oQfMw" id="(0.0,0.6)"/>
+  </edges>
 </notation:Diagram>
diff --git a/papyrus/ONAP Information Model/Resource.uml b/papyrus/ONAP Information Model/Resource.uml
index 3a0b972..e46bbc2 100644
--- a/papyrus/ONAP Information Model/Resource.uml
+++ b/papyrus/ONAP Information Model/Resource.uml
@@ -149,10 +149,10 @@ For all attributes in this class the Producer is SDC and the Consumer is SDC/UUI
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_13WFaTzEEeiWMf5FLWfdLA" name="virtualLinkDf" type="_kEZBoTzEEeiWMf5FLWfdLA">
           <ownedComment xmi:type="uml:Comment" xmi:id="_13WFajzEEeiWMf5FLWfdLA" annotatedElement="_13WFaTzEEeiWMf5FLWfdLA">
-            <body>Specifies properties for instantiating a VL according to a specific flavour.</body>
+            <body>Specifies properties for instantiating a VL according to a specific flavour.  </body>
           </ownedComment>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_13WFazzEEeiWMf5FLWfdLA" value="1"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_13WFbDzEEeiWMf5FLWfdLA" value="*"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_13WFbDzEEeiWMf5FLWfdLA" value="1"/>
         </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_13gdcDzEEeiWMf5FLWfdLA" name="NsDf">
@@ -471,24 +471,6 @@ NOTE 2:	A minimum set of external stimulus includes: the receipt of request mess
         <ownedComment xmi:type="uml:Comment" xmi:id="_kEZoSTzEEeiWMf5FLWfdLA" annotatedElement="_kEZoSDzEEeiWMf5FLWfdLA">
           <body>The MonitoredData datatype identifies information to be monitored during the lifetime of a network service instance.</body>
         </ownedComment>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_kEZoSjzEEeiWMf5FLWfdLA" name="vnfIndicatorInfo">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_kEZoSzzEEeiWMf5FLWfdLA" annotatedElement="_kEZoSjzEEeiWMf5FLWfdLA">
-            <body>Uniquely identifies the VNF Indicator class.&#xD;
-One and only one of the attributes shall be included (i.e. there is a XOR relationship between the attributes).</body>
-          </ownedComment>
-          <type xmi:type="uml:DataType" href="Service.uml#_kEZoUjzEEeiWMf5FLWfdLA"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kEZoTDzEEeiWMf5FLWfdLA"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kEZoTTzEEeiWMf5FLWfdLA" value="1"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_kEZoTjzEEeiWMf5FLWfdLA" name="monitoringParameter">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_kEZoTzzEEeiWMf5FLWfdLA" annotatedElement="_kEZoTjzEEeiWMf5FLWfdLA">
-            <body>Specifies the virtualised resource related performance metric to be monitored on an NS level or VNF level.&#xD;
-One and only one of the attributes shall be included (i.e. there is a XOR relationship between the attributes).</body>
-          </ownedComment>
-          <type xmi:type="uml:DataType" href="../NfvInformationModel/NfvModel.uml#_cSwAAATLEea-RJOoE5lL-w"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kEZoUDzEEeiWMf5FLWfdLA"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kEZoUTzEEeiWMf5FLWfdLA" value="1"/>
-        </ownedAttribute>
       </packagedElement>
     </packagedElement>
     <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_nRfaQKe3Eeixw5Ke5QD1pQ">
@@ -509,4 +491,7 @@ One and only one of the attributes shall be included (i.e. there is a XOR relati
   <OpenModel_Profile:Preliminary xmi:id="_xlOWoK0XEeirrO9guYUuGw" base_Element="_13KfNjzEEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Preliminary xmi:id="_1I1nUK0XEeirrO9guYUuGw" base_Element="_13LGQDzEEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Preliminary xmi:id="_4TtA0K0XEeirrO9guYUuGw" base_Element="_13LGQjzEEeiWMf5FLWfdLA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_izpdoLAVEei3l9EE3oQfMw">
+    <base_StructuralFeature xmi:type="uml:Property" href="Service.uml#_izo2krAVEei3l9EE3oQfMw"/>
+  </OpenModel_Profile:OpenModelAttribute>
 </xmi:XMI>
diff --git a/papyrus/ONAP Information Model/Service.notation b/papyrus/ONAP Information Model/Service.notation
index 3d1f27d..abf8e22 100644
--- a/papyrus/ONAP Information Model/Service.notation
+++ b/papyrus/ONAP Information Model/Service.notation
@@ -4191,64 +4191,6 @@
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_7RESUKuBEeiRK6iIVq4LZA" type="PapyrusUMLClassDiagram" name="GeneralServiceModelforR4" measurementUnit="Pixel">
-    <children xmi:type="notation:Shape" xmi:id="_9OY6oKuBEeiRK6iIVq4LZA" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_9OiroKuBEeiRK6iIVq4LZA" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_9OiroauBEeiRK6iIVq4LZA" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_9OiroquBEeiRK6iIVq4LZA" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_9Oiro6uBEeiRK6iIVq4LZA" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_sySiUKuGEeiRK6iIVq4LZA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="Service.uml#_syJ_cKuGEeiRK6iIVq4LZA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_sySiUauGEeiRK6iIVq4LZA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_16kVcKuGEeiRK6iIVq4LZA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="Service.uml#_16bLgKuGEeiRK6iIVq4LZA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_16kVcauGEeiRK6iIVq4LZA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_A5AY8KuHEeiRK6iIVq4LZA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="Service.uml#_A42n8KuHEeiRK6iIVq4LZA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_A5AY8auHEeiRK6iIVq4LZA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_FBzaUKuHEeiRK6iIVq4LZA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="Service.uml#_FBppUKuHEeiRK6iIVq4LZA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_FBzaUauHEeiRK6iIVq4LZA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_MoLV0auHEeiRK6iIVq4LZA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="Service.uml#_MoCL4KuHEeiRK6iIVq4LZA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_MoLV0quHEeiRK6iIVq4LZA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_QZ3ewKuHEeiRK6iIVq4LZA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="Service.uml#_QZuU0KuHEeiRK6iIVq4LZA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_QZ3ewauHEeiRK6iIVq4LZA"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_9OirpKuBEeiRK6iIVq4LZA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_9OirpauBEeiRK6iIVq4LZA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_9OirpquBEeiRK6iIVq4LZA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9Oirp6uBEeiRK6iIVq4LZA"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_9OirqKuBEeiRK6iIVq4LZA" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_9OirqauBEeiRK6iIVq4LZA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_9OirqquBEeiRK6iIVq4LZA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_9Oirq6uBEeiRK6iIVq4LZA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9OirrKuBEeiRK6iIVq4LZA"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_9OirrauBEeiRK6iIVq4LZA" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_9OirrquBEeiRK6iIVq4LZA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_9Oirr6uBEeiRK6iIVq4LZA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_9OirsKuBEeiRK6iIVq4LZA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9OirsauBEeiRK6iIVq4LZA"/>
-      </children>
-      <element xmi:type="uml:Class" href="Service.uml#_9NzEwKuBEeiRK6iIVq4LZA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9OY6oauBEeiRK6iIVq4LZA" x="-40" y="40" width="333" height="181"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_9PlNc6uBEeiRK6iIVq4LZA" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_9PlNdKuBEeiRK6iIVq4LZA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_9PlNdquBEeiRK6iIVq4LZA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="Service.uml#_9NzEwKuBEeiRK6iIVq4LZA"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9PlNdauBEeiRK6iIVq4LZA" x="343" y="113"/>
-    </children>
     <children xmi:type="notation:Shape" xmi:id="_ABDPgKuCEeiRK6iIVq4LZA" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_ABDPgquCEeiRK6iIVq4LZA" type="Class_NameLabel"/>
       <children xmi:type="notation:DecorationNode" xmi:id="_ABDPg6uCEeiRK6iIVq4LZA" type="Class_FloatingNameLabel">
@@ -4258,30 +4200,6 @@
         <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_plP-kKuGEeiRK6iIVq4LZA" source="PapyrusCSSForceValue">
           <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_plP-kauGEeiRK6iIVq4LZA" key="collapsed" value="true"/>
         </eAnnotations>
-        <children xmi:type="notation:Shape" xmi:id="_mlxVsKuGEeiRK6iIVq4LZA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="Service.uml#_mloLwKuGEeiRK6iIVq4LZA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_mlxVsauGEeiRK6iIVq4LZA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_4n3pM6uGEeiRK6iIVq4LZA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="Service.uml#_4n3pMKuGEeiRK6iIVq4LZA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_4n3pNKuGEeiRK6iIVq4LZA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_-4QpMKuGEeiRK6iIVq4LZA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="Service.uml#_-4G4MKuGEeiRK6iIVq4LZA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_-4QpMauGEeiRK6iIVq4LZA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_DrE38KuHEeiRK6iIVq4LZA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="Service.uml#_Dq7G8KuHEeiRK6iIVq4LZA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_DrE38auHEeiRK6iIVq4LZA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_LXQggKuHEeiRK6iIVq4LZA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="Service.uml#_LXHWkKuHEeiRK6iIVq4LZA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_LXQggauHEeiRK6iIVq4LZA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_PjB9YKuHEeiRK6iIVq4LZA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="Service.uml#_Pi4zcKuHEeiRK6iIVq4LZA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_PjB9YauHEeiRK6iIVq4LZA"/>
-        </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_ABDPhquCEeiRK6iIVq4LZA"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_ABDPh6uCEeiRK6iIVq4LZA"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_ABDPiKuCEeiRK6iIVq4LZA"/>
@@ -4300,7 +4218,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ABDPk6uCEeiRK6iIVq4LZA"/>
       </children>
       <element xmi:type="uml:Class" href="Service.uml#_AAwUkKuCEeiRK6iIVq4LZA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ABDPgauCEeiRK6iIVq4LZA" x="-240" y="280" height="181"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ABDPgauCEeiRK6iIVq4LZA" x="-440" y="300" height="181"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_ABWxi6uCEeiRK6iIVq4LZA" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_ABWxjKuCEeiRK6iIVq4LZA"/>
@@ -4316,30 +4234,6 @@
         <layoutConstraint xmi:type="notation:Location" xmi:id="_OfrcRKuCEeiRK6iIVq4LZA" y="15"/>
       </children>
       <children xmi:type="notation:BasicCompartment" xmi:id="_OfrcRauCEeiRK6iIVq4LZA" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_XHb_cKuGEeiRK6iIVq4LZA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="Service.uml#_XHS1gKuGEeiRK6iIVq4LZA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_XHb_cauGEeiRK6iIVq4LZA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_5hPhM6uGEeiRK6iIVq4LZA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="Service.uml#_5hPhMKuGEeiRK6iIVq4LZA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_5hPhNKuGEeiRK6iIVq4LZA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="__iIso6uGEeiRK6iIVq4LZA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="Service.uml#__iIsoKuGEeiRK6iIVq4LZA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="__iIspKuGEeiRK6iIVq4LZA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_ED0IEauHEeiRK6iIVq4LZA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="Service.uml#_EDq-IKuHEeiRK6iIVq4LZA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_ED0IEquHEeiRK6iIVq4LZA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_Ltw8AKuHEeiRK6iIVq4LZA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="Service.uml#_LtnyEKuHEeiRK6iIVq4LZA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Ltw8AauHEeiRK6iIVq4LZA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_P4pBAKuHEeiRK6iIVq4LZA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="Service.uml#_P4fQAKuHEeiRK6iIVq4LZA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_P4pBAauHEeiRK6iIVq4LZA"/>
-        </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_OfrcRquCEeiRK6iIVq4LZA"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_OfrcR6uCEeiRK6iIVq4LZA"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_OfrcSKuCEeiRK6iIVq4LZA"/>
@@ -4470,22 +4364,70 @@
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YBwaEKuDEeiRK6iIVq4LZA" x="200"/>
     </children>
+    <children xmi:type="notation:Shape" xmi:id="_CVtgAK0SEei2W47ZDLIFGA" type="Class_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_CV3RAK0SEei2W47ZDLIFGA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_CV3RAa0SEei2W47ZDLIFGA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CV3RAq0SEei2W47ZDLIFGA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_CV3RA60SEei2W47ZDLIFGA" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_U2D1wK0SEei2W47ZDLIFGA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="Service.uml#_U1UO4K0SEei2W47ZDLIFGA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_U2D1wa0SEei2W47ZDLIFGA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_V-xxUK0SEei2W47ZDLIFGA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="Service.uml#_V-onYK0SEei2W47ZDLIFGA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_V-xxUa0SEei2W47ZDLIFGA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_W4ckQK0SEei2W47ZDLIFGA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="Service.uml#_W4TaUK0SEei2W47ZDLIFGA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_W4ckQa0SEei2W47ZDLIFGA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_v-zksK0SEei2W47ZDLIFGA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="Service.uml#_v-DWwK0SEei2W47ZDLIFGA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_v-zksa0SEei2W47ZDLIFGA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_3DzRcK0SEei2W47ZDLIFGA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="Service.uml#_3DWlgK0SEei2W47ZDLIFGA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_3DzRca0SEei2W47ZDLIFGA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_AqxywK0TEei2W47ZDLIFGA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="Service.uml#_Ap5B8K0TEei2W47ZDLIFGA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Aqxywa0TEei2W47ZDLIFGA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_CV3RBK0SEei2W47ZDLIFGA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_CV3RBa0SEei2W47ZDLIFGA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_CV3RBq0SEei2W47ZDLIFGA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CV3RB60SEei2W47ZDLIFGA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_CV3RCK0SEei2W47ZDLIFGA" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_CV3RCa0SEei2W47ZDLIFGA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_CV3RCq0SEei2W47ZDLIFGA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_CV3RC60SEei2W47ZDLIFGA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CV3RDK0SEei2W47ZDLIFGA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_CV3RDa0SEei2W47ZDLIFGA" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_CV3RDq0SEei2W47ZDLIFGA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_CV3RD60SEei2W47ZDLIFGA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_CV3REK0SEei2W47ZDLIFGA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CV3REa0SEei2W47ZDLIFGA"/>
+      </children>
+      <element xmi:type="uml:Class" href="Service.uml#_CUXcMK0SEei2W47ZDLIFGA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CVtgAa0SEei2W47ZDLIFGA" x="-140" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_CWKL8K0SEei2W47ZDLIFGA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_CWKL8a0SEei2W47ZDLIFGA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_CWKL860SEei2W47ZDLIFGA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="Service.uml#_CUXcMK0SEei2W47ZDLIFGA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CWKL8q0SEei2W47ZDLIFGA" x="200"/>
+    </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_7RESUauBEeiRK6iIVq4LZA" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_7RESUquBEeiRK6iIVq4LZA"/>
     <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_7RESU6uBEeiRK6iIVq4LZA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
       <owner xmi:type="uml:Package" href="Service.uml#_fXNM8DOHEei5Af8DcjrhIQ"/>
     </styles>
     <element xmi:type="uml:Package" href="Service.uml#_fXNM8DOHEei5Af8DcjrhIQ"/>
-    <edges xmi:type="notation:Connector" xmi:id="_9PlNd6uBEeiRK6iIVq4LZA" type="StereotypeCommentLink" source="_9OY6oKuBEeiRK6iIVq4LZA" target="_9PlNc6uBEeiRK6iIVq4LZA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_9PlNeKuBEeiRK6iIVq4LZA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_9PlNfKuBEeiRK6iIVq4LZA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="Service.uml#_9NzEwKuBEeiRK6iIVq4LZA"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9PlNeauBEeiRK6iIVq4LZA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9PlNequBEeiRK6iIVq4LZA"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9PlNe6uBEeiRK6iIVq4LZA"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_ABWxj6uCEeiRK6iIVq4LZA" type="StereotypeCommentLink" source="_ABDPgKuCEeiRK6iIVq4LZA" target="_ABWxi6uCEeiRK6iIVq4LZA">
       <styles xmi:type="notation:FontStyle" xmi:id="_ABWxkKuCEeiRK6iIVq4LZA"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ABWxlKuCEeiRK6iIVq4LZA" name="BASE_ELEMENT">
@@ -4496,16 +4438,16 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ABWxkquCEeiRK6iIVq4LZA"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ABWxk6uCEeiRK6iIVq4LZA"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_FxoHAKuCEeiRK6iIVq4LZA" type="Generalization_Edge" source="_ABDPgKuCEeiRK6iIVq4LZA" target="_9OY6oKuBEeiRK6iIVq4LZA">
+    <edges xmi:type="notation:Connector" xmi:id="_FxoHAKuCEeiRK6iIVq4LZA" type="Generalization_Edge" source="_ABDPgKuCEeiRK6iIVq4LZA" target="_CVtgAK0SEei2W47ZDLIFGA">
       <children xmi:type="notation:DecorationNode" xmi:id="_FxoHA6uCEeiRK6iIVq4LZA" type="Generalization_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_7p5zoKuCEeiRK6iIVq4LZA" name="IS_UPDATED_POSITION" booleanValue="true"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_FxoHBKuCEeiRK6iIVq4LZA" y="39"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_FxoHAauCEeiRK6iIVq4LZA"/>
       <element xmi:type="uml:Generalization" href="Service.uml#_FxeWAKuCEeiRK6iIVq4LZA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FxoHAquCEeiRK6iIVq4LZA" points="[-80, 280, -643984, -643984]$[220, 221, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FyN84KuCEeiRK6iIVq4LZA" id="(0.5574912891986062,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FyN84auCEeiRK6iIVq4LZA" id="(0.24024024024024024,1.0)"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FxoHAquCEeiRK6iIVq4LZA" points="[-360, 300, -643984, -643984]$[-80, 231, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FyN84KuCEeiRK6iIVq4LZA" id="(0.5263157894736842,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FyN84auCEeiRK6iIVq4LZA" id="(0.20905923344947736,1.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_Of-XQquCEeiRK6iIVq4LZA" type="StereotypeCommentLink" source="_OfrcQKuCEeiRK6iIVq4LZA" target="_Of-XPquCEeiRK6iIVq4LZA">
       <styles xmi:type="notation:FontStyle" xmi:id="_Of-XQ6uCEeiRK6iIVq4LZA"/>
@@ -4517,7 +4459,7 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Of-XRauCEeiRK6iIVq4LZA"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Of-XRquCEeiRK6iIVq4LZA"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_qUXrMKuCEeiRK6iIVq4LZA" type="Generalization_Edge" source="_OfrcQKuCEeiRK6iIVq4LZA" target="_9OY6oKuBEeiRK6iIVq4LZA">
+    <edges xmi:type="notation:Connector" xmi:id="_qUXrMKuCEeiRK6iIVq4LZA" type="Generalization_Edge" source="_OfrcQKuCEeiRK6iIVq4LZA" target="_CVtgAK0SEei2W47ZDLIFGA">
       <children xmi:type="notation:DecorationNode" xmi:id="_qUqmIquCEeiRK6iIVq4LZA" type="Generalization_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Yj-18KuGEeiRK6iIVq4LZA" name="IS_UPDATED_POSITION" booleanValue="true"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_qUqmI6uCEeiRK6iIVq4LZA" y="39"/>
@@ -4525,39 +4467,8 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_qUqmIKuCEeiRK6iIVq4LZA"/>
       <element xmi:type="uml:Generalization" href="Service.uml#_qUEJMKuCEeiRK6iIVq4LZA"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qUqmIauCEeiRK6iIVq4LZA" points="[240, 280, -643984, -643984]$[260, 221, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qVaNAKuCEeiRK6iIVq4LZA" id="(0.13937282229965156,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qVaNAauCEeiRK6iIVq4LZA" id="(0.4804804804804805,1.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_GAQjcKuDEeiRK6iIVq4LZA" type="Association_Edge" source="_OfrcQKuCEeiRK6iIVq4LZA" target="_9OY6oKuBEeiRK6iIVq4LZA">
-      <children xmi:type="notation:DecorationNode" xmi:id="_GAQjc6uDEeiRK6iIVq4LZA" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Gs94cKuDEeiRK6iIVq4LZA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_GAQjdKuDEeiRK6iIVq4LZA" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_GAQjdauDEeiRK6iIVq4LZA" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_GtHCYKuDEeiRK6iIVq4LZA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_GAQjdquDEeiRK6iIVq4LZA" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_GAQjd6uDEeiRK6iIVq4LZA" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_GtakYKuDEeiRK6iIVq4LZA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_GAQjeKuDEeiRK6iIVq4LZA" x="37" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_GAQjeauDEeiRK6iIVq4LZA" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_GuKLQKuDEeiRK6iIVq4LZA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_GAQjequDEeiRK6iIVq4LZA" x="-37" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_GAQje6uDEeiRK6iIVq4LZA" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_GudGMKuDEeiRK6iIVq4LZA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_GAQjfKuDEeiRK6iIVq4LZA" x="53" y="-15"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_GAQjfauDEeiRK6iIVq4LZA" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Gu5yIKuDEeiRK6iIVq4LZA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_GAQjfquDEeiRK6iIVq4LZA" x="-17" y="-47"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_GAQjcauDEeiRK6iIVq4LZA"/>
-      <element xmi:type="uml:Association" href="Service.uml#_F_g8kKuDEeiRK6iIVq4LZA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GAQjcquDEeiRK6iIVq4LZA" points="[420, 240, -643984, -643984]$[420, 220, -643984, -643984]$[420, 100, -643984, -643984]$[293, 100, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GBTsUKuDEeiRK6iIVq4LZA" id="(0.7665505226480837,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GBTsUauDEeiRK6iIVq4LZA" id="(1.0,0.3314917127071823)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qVaNAKuCEeiRK6iIVq4LZA" id="(0.11695906432748537,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qVaNAauCEeiRK6iIVq4LZA" id="(0.5574912891986062,1.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_VfVgoquDEeiRK6iIVq4LZA" type="StereotypeCommentLink" source="_VfCloquDEeiRK6iIVq4LZA" target="_VfVgnquDEeiRK6iIVq4LZA">
       <styles xmi:type="notation:FontStyle" xmi:id="_VfVgo6uDEeiRK6iIVq4LZA"/>
@@ -4640,31 +4551,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MALMkKuFEeiRK6iIVq4LZA" id="(0.6211180124223602,0.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MALMkauFEeiRK6iIVq4LZA" id="(1.0,0.5769230769230769)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_SyspQKuFEeiRK6iIVq4LZA" type="Association_Edge" source="_9OY6oKuBEeiRK6iIVq4LZA" target="_VfCloquDEeiRK6iIVq4LZA">
-      <children xmi:type="notation:DecorationNode" xmi:id="_SyspQ6uFEeiRK6iIVq4LZA" type="Association_StereotypeLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_SyspRKuFEeiRK6iIVq4LZA" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_SyspRauFEeiRK6iIVq4LZA" type="Association_NameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_SyspRquFEeiRK6iIVq4LZA" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_SyspR6uFEeiRK6iIVq4LZA" type="Association_TargetRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_SyspSKuFEeiRK6iIVq4LZA" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_SyspSauFEeiRK6iIVq4LZA" type="Association_SourceRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_SyspSquFEeiRK6iIVq4LZA" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_SyspS6uFEeiRK6iIVq4LZA" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_SyspTKuFEeiRK6iIVq4LZA" x="-9" y="7"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_SyspTauFEeiRK6iIVq4LZA" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_SyspTquFEeiRK6iIVq4LZA" x="18" y="-13"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_SyspQauFEeiRK6iIVq4LZA"/>
-      <element xmi:type="uml:Association" href="Service.uml#_SyGMUKuFEeiRK6iIVq4LZA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SyspQquFEeiRK6iIVq4LZA" points="[280, 40, -643984, -643984]$[640, 40, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Sz48EKuFEeiRK6iIVq4LZA" id="(0.960960960960961,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Sz48EauFEeiRK6iIVq4LZA" id="(0.0,0.0)"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_mEqCIKuFEeiRK6iIVq4LZA" type="Association_Edge" source="_ABDPgKuCEeiRK6iIVq4LZA" target="_XCul8quDEeiRK6iIVq4LZA">
       <children xmi:type="notation:DecorationNode" xmi:id="_mEqCI6uFEeiRK6iIVq4LZA" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_nWUeUKuFEeiRK6iIVq4LZA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -4692,8 +4578,8 @@
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_mEqCIauFEeiRK6iIVq4LZA"/>
       <element xmi:type="uml:Association" href="Service.uml#_mD6bQKuFEeiRK6iIVq4LZA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mEqCIquFEeiRK6iIVq4LZA" points="[-160, 461, -643984, -643984]$[-160, 620, -643984, -643984]$[580, 620, -643984, -643984]$[580, 344, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mGcx4KuFEeiRK6iIVq4LZA" id="(0.2787456445993031,1.0)"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mEqCIquFEeiRK6iIVq4LZA" points="[-400, 481, -643984, -643984]$[-400, 620, -643984, -643984]$[-198, 620, -643984, -643984]$[580, 620, -643984, -643984]$[580, 344, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mGcx4KuFEeiRK6iIVq4LZA" id="(0.2631578947368421,1.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mGcx4auFEeiRK6iIVq4LZA" id="(0.14084507042253522,1.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_AdG8kKuGEeiRK6iIVq4LZA" type="Association_Edge" source="_OfrcQKuCEeiRK6iIVq4LZA" target="_YBnQEauDEeiRK6iIVq4LZA">
@@ -4715,7 +4601,7 @@
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_AdG8m6uGEeiRK6iIVq4LZA" type="Association_SourceMultiplicityLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_A_reIKuGEeiRK6iIVq4LZA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_AdG8nKuGEeiRK6iIVq4LZA" x="23" y="15"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_AdG8nKuGEeiRK6iIVq4LZA" x="26" y="-25"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_AdG8nauGEeiRK6iIVq4LZA" type="Association_TargetMultiplicityLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_BAIKEKuGEeiRK6iIVq4LZA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -4723,10 +4609,76 @@
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_AdG8kauGEeiRK6iIVq4LZA"/>
       <element xmi:type="uml:Association" href="Service.uml#_AchGsKuGEeiRK6iIVq4LZA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_AdG8kquGEeiRK6iIVq4LZA" points="[340, 461, -643984, -643984]$[340, 540, -643984, -643984]$[820, 540, -643984, -643984]$[820, 344, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AeTPYKuGEeiRK6iIVq4LZA" id="(0.4878048780487805,1.0)"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_AdG8kquGEeiRK6iIVq4LZA" points="[280, 461, -643984, -643984]$[280, 540, -643984, -643984]$[820, 540, -643984, -643984]$[820, 344, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AeTPYKuGEeiRK6iIVq4LZA" id="(0.4678362573099415,1.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AeTPYauGEeiRK6iIVq4LZA" id="(0.4968944099378882,1.0)"/>
     </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_CWKL9K0SEei2W47ZDLIFGA" type="StereotypeCommentLink" source="_CVtgAK0SEei2W47ZDLIFGA" target="_CWKL8K0SEei2W47ZDLIFGA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_CWKL9a0SEei2W47ZDLIFGA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_CWKL-a0SEei2W47ZDLIFGA" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="Service.uml#_CUXcMK0SEei2W47ZDLIFGA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_CWKL9q0SEei2W47ZDLIFGA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CWKL960SEei2W47ZDLIFGA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CWKL-K0SEei2W47ZDLIFGA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_PHsIQK0TEei2W47ZDLIFGA" type="Association_Edge" source="_CVtgAK0SEei2W47ZDLIFGA" target="_VfCloquDEeiRK6iIVq4LZA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_PHsIQ60TEei2W47ZDLIFGA" type="Association_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_PHsIRK0TEei2W47ZDLIFGA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_PHsIRa0TEei2W47ZDLIFGA" type="Association_NameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_PHsIRq0TEei2W47ZDLIFGA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_PHsIR60TEei2W47ZDLIFGA" type="Association_TargetRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_PHsISK0TEei2W47ZDLIFGA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_PHsISa0TEei2W47ZDLIFGA" type="Association_SourceRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_PHsISq0TEei2W47ZDLIFGA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_PHsIS60TEei2W47ZDLIFGA" type="Association_SourceMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_PHsITK0TEei2W47ZDLIFGA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_PHsITa0TEei2W47ZDLIFGA" type="Association_TargetMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_PHsITq0TEei2W47ZDLIFGA" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_PHsIQa0TEei2W47ZDLIFGA"/>
+      <element xmi:type="uml:Association" href="Service.uml#_PHQDYK0TEei2W47ZDLIFGA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PHsIQq0TEei2W47ZDLIFGA" points="[147, 80, -643984, -643984]$[640, 80, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PJVHAK0TEei2W47ZDLIFGA" id="(1.0,0.2094240837696335)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PJVHAa0TEei2W47ZDLIFGA" id="(0.0,0.38461538461538464)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_kq9ccK0TEei2W47ZDLIFGA" type="Association_Edge" source="_OfrcQKuCEeiRK6iIVq4LZA" target="_CVtgAK0SEei2W47ZDLIFGA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_kq9cc60TEei2W47ZDLIFGA" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lKsFYK0TEei2W47ZDLIFGA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_kq9cdK0TEei2W47ZDLIFGA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_kq9cda0TEei2W47ZDLIFGA" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lK_nYK0TEei2W47ZDLIFGA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_kq9cdq0TEei2W47ZDLIFGA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_kq9cd60TEei2W47ZDLIFGA" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lLSiUK0TEei2W47ZDLIFGA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_kq9ceK0TEei2W47ZDLIFGA" x="44" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_kq9cea0TEei2W47ZDLIFGA" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lLvOQK0TEei2W47ZDLIFGA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_kq9ceq0TEei2W47ZDLIFGA" x="-44" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_kq9ce60TEei2W47ZDLIFGA" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lMCJMK0TEei2W47ZDLIFGA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_kq9cfK0TEei2W47ZDLIFGA" x="13" y="25"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_kq9cfa0TEei2W47ZDLIFGA" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lMe1IK0TEei2W47ZDLIFGA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_kq9cfq0TEei2W47ZDLIFGA" x="-23" y="-47"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_kq9cca0TEei2W47ZDLIFGA"/>
+      <element xmi:type="uml:Association" href="Service.uml#_kqW_gK0TEei2W47ZDLIFGA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kq9ccq0TEei2W47ZDLIFGA" points="[280, 280, -643984, -643984]$[280, 120, -643984, -643984]$[147, 120, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ksJIMK0TEei2W47ZDLIFGA" id="(0.4678362573099415,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ksJIMa0TEei2W47ZDLIFGA" id="(1.0,0.418848167539267)"/>
+    </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_75kwkKzxEeiRK6iIVq4LZA" type="PapyrusUMLClassDiagram" name="ServiceDescriptor" measurementUnit="Pixel">
     <children xmi:type="notation:Shape" xmi:id="_Dz2bUKz5EeiRK6iIVq4LZA" type="Class_Shape">
@@ -4922,72 +4874,6 @@
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D-0N4Kz8EeiRK6iIVq4LZA" x="200"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_Z-ULAaz8EeiRK6iIVq4LZA" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_Z-ULA6z8EeiRK6iIVq4LZA" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Z-ULBKz8EeiRK6iIVq4LZA" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z-ULBaz8EeiRK6iIVq4LZA" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_Z-ULBqz8EeiRK6iIVq4LZA" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_cdMLwKz9EeiRK6iIVq4LZA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="Service.uml#_ccvf0Kz9EeiRK6iIVq4LZA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_cdMLwaz9EeiRK6iIVq4LZA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_zRDlIKz9EeiRK6iIVq4LZA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="Service.uml#_zQm5MKz9EeiRK6iIVq4LZA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_zRDlIaz9EeiRK6iIVq4LZA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_1mz7kKz9EeiRK6iIVq4LZA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="Service.uml#_1mNeoKz9EeiRK6iIVq4LZA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_1mz7kaz9EeiRK6iIVq4LZA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_5E1hoKz9EeiRK6iIVq4LZA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="Service.uml#_5EPrwKz9EeiRK6iIVq4LZA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_5E1hoaz9EeiRK6iIVq4LZA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_-Hcf4Kz9EeiRK6iIVq4LZA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="Service.uml#_-Gs5AKz9EeiRK6iIVq4LZA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_-Hcf4az9EeiRK6iIVq4LZA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_GJGCIKz-EeiRK6iIVq4LZA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="Service.uml#_GIflMKz-EeiRK6iIVq4LZA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_GJGCIaz-EeiRK6iIVq4LZA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_WERscKz-EeiRK6iIVq4LZA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="Service.uml#_WDrPgKz-EeiRK6iIVq4LZA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_WERscaz-EeiRK6iIVq4LZA"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_ZDTCUKz-EeiRK6iIVq4LZA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="Service.uml#_ZCaRgKz-EeiRK6iIVq4LZA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_ZDTCUaz-EeiRK6iIVq4LZA"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_Z-ULB6z8EeiRK6iIVq4LZA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_Z-ULCKz8EeiRK6iIVq4LZA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Z-ULCaz8EeiRK6iIVq4LZA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z-ULCqz8EeiRK6iIVq4LZA"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_Z-ULC6z8EeiRK6iIVq4LZA" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_Z-ULDKz8EeiRK6iIVq4LZA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_Z-ULDaz8EeiRK6iIVq4LZA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Z-ULDqz8EeiRK6iIVq4LZA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z-ULD6z8EeiRK6iIVq4LZA"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_Z-ULEKz8EeiRK6iIVq4LZA" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_Z-ULEaz8EeiRK6iIVq4LZA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_Z-ULEqz8EeiRK6iIVq4LZA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Z-ULE6z8EeiRK6iIVq4LZA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z-ULFKz8EeiRK6iIVq4LZA"/>
-      </children>
-      <element xmi:type="uml:Class" href="Service.uml#_Z-LBEKz8EeiRK6iIVq4LZA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z-ULAqz8EeiRK6iIVq4LZA" x="500" y="-40"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_Z-nF_qz8EeiRK6iIVq4LZA" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_Z-nF_6z8EeiRK6iIVq4LZA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Z-nGAaz8EeiRK6iIVq4LZA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="Service.uml#_Z-LBEKz8EeiRK6iIVq4LZA"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z-nGAKz8EeiRK6iIVq4LZA" x="200"/>
-    </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_75kwkazxEeiRK6iIVq4LZA" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_75kwkqzxEeiRK6iIVq4LZA"/>
     <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_75kwk6zxEeiRK6iIVq4LZA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
@@ -5024,16 +4910,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D-0N5az8EeiRK6iIVq4LZA"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D-0N5qz8EeiRK6iIVq4LZA"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_Z-nGAqz8EeiRK6iIVq4LZA" type="StereotypeCommentLink" source="_Z-ULAaz8EeiRK6iIVq4LZA" target="_Z-nF_qz8EeiRK6iIVq4LZA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_Z-nGA6z8EeiRK6iIVq4LZA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Z-nGB6z8EeiRK6iIVq4LZA" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Class" href="Service.uml#_Z-LBEKz8EeiRK6iIVq4LZA"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z-nGBKz8EeiRK6iIVq4LZA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Z-nGBaz8EeiRK6iIVq4LZA"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Z-nGBqz8EeiRK6iIVq4LZA"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_jjOvcKz_EeiRK6iIVq4LZA" type="Association_Edge" source="_Dz2bUKz5EeiRK6iIVq4LZA" target="_D-rD4Kz8EeiRK6iIVq4LZA">
       <children xmi:type="notation:DecorationNode" xmi:id="_jjOvc6z_EeiRK6iIVq4LZA" type="Association_StereotypeLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_jjOvdKz_EeiRK6iIVq4LZA" y="-20"/>
@@ -5059,37 +4935,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jkbCQKz_EeiRK6iIVq4LZA" id="(0.5460750853242321,1.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jkbCQaz_EeiRK6iIVq4LZA" id="(0.498220640569395,0.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_7ukSEKz_EeiRK6iIVq4LZA" type="Association_Edge" source="_Dz2bUKz5EeiRK6iIVq4LZA" target="_Z-ULAaz8EeiRK6iIVq4LZA">
-      <children xmi:type="notation:DecorationNode" xmi:id="_7ukSE6z_EeiRK6iIVq4LZA" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Zw9usK0AEeiRK6iIVq4LZA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_7ukSFKz_EeiRK6iIVq4LZA" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_7ukSFaz_EeiRK6iIVq4LZA" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Zxt8oK0AEeiRK6iIVq4LZA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_7ukSFqz_EeiRK6iIVq4LZA" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_7ukSF6z_EeiRK6iIVq4LZA" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ZyTLcK0AEeiRK6iIVq4LZA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_7ukSGKz_EeiRK6iIVq4LZA" x="23" y="-60"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_7ukSGaz_EeiRK6iIVq4LZA" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Zyv3YK0AEeiRK6iIVq4LZA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_7ukSGqz_EeiRK6iIVq4LZA" x="-57" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_7ukSG6z_EeiRK6iIVq4LZA" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ZzMjUK0AEeiRK6iIVq4LZA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_7ukSHKz_EeiRK6iIVq4LZA" x="-18" y="-32"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_7ukSHaz_EeiRK6iIVq4LZA" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ZzpPQK0AEeiRK6iIVq4LZA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_7ukSHqz_EeiRK6iIVq4LZA" x="-39" y="-16"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_7ukSEaz_EeiRK6iIVq4LZA"/>
-      <element xmi:type="uml:Association" href="Service.uml#_7thJMKz_EeiRK6iIVq4LZA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7ukSEqz_EeiRK6iIVq4LZA" points="[153, 100, -643984, -643984]$[160, 60, -643984, -643984]$[500, 60, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7wgLwKz_EeiRK6iIVq4LZA" id="(1.0,0.08298755186721991)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7wgLwaz_EeiRK6iIVq4LZA" id="(0.0,0.4484304932735426)"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_eM02AK0AEeiRK6iIVq4LZA" type="Association_Edge" source="_Dz2bUKz5EeiRK6iIVq4LZA" target="_Po5Ewqz7EeiRK6iIVq4LZA">
       <children xmi:type="notation:DecorationNode" xmi:id="_eM02A60AEeiRK6iIVq4LZA" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_fF5zEK0AEeiRK6iIVq4LZA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -5121,30 +4966,5 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eN3-4K0AEeiRK6iIVq4LZA" id="(1.0,0.6639004149377593)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eN3-4a0AEeiRK6iIVq4LZA" id="(0.2054794520547945,0.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_xLuI8K0AEeiRK6iIVq4LZA" type="Association_Edge" source="_Z-ULAaz8EeiRK6iIVq4LZA" target="_Po5Ewqz7EeiRK6iIVq4LZA">
-      <children xmi:type="notation:DecorationNode" xmi:id="_xLuI860AEeiRK6iIVq4LZA" type="Association_StereotypeLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xLuI9K0AEeiRK6iIVq4LZA" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_xLuI9a0AEeiRK6iIVq4LZA" type="Association_NameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xLuI9q0AEeiRK6iIVq4LZA" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_xLuI960AEeiRK6iIVq4LZA" type="Association_TargetRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xLuI-K0AEeiRK6iIVq4LZA" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_xLuI-a0AEeiRK6iIVq4LZA" type="Association_SourceRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xLuI-q0AEeiRK6iIVq4LZA" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_xLuI-60AEeiRK6iIVq4LZA" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xLuI_K0AEeiRK6iIVq4LZA" x="-29" y="-25"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_xLuI_a0AEeiRK6iIVq4LZA" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xLuI_q0AEeiRK6iIVq4LZA" x="20" y="-30"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_xLuI8a0AEeiRK6iIVq4LZA"/>
-      <element xmi:type="uml:Association" href="Service.uml#_xKrnIK0AEeiRK6iIVq4LZA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xLuI8q0AEeiRK6iIVq4LZA" points="[660, 183, -643984, -643984]$[540, 400, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xNXHsK0AEeiRK6iIVq4LZA" id="(0.27303754266211605,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xNXHsa0AEeiRK6iIVq4LZA" id="(0.8904109589041096,0.0)"/>
-    </edges>
   </notation:Diagram>
 </xmi:XMI>
diff --git a/papyrus/ONAP Information Model/Service.uml b/papyrus/ONAP Information Model/Service.uml
index 2b9e764..3c24aee 100644
--- a/papyrus/ONAP Information Model/Service.uml
+++ b/papyrus/ONAP Information Model/Service.uml
@@ -491,226 +491,23 @@ If null, then represents to the end of time&#xD;
           <type xmi:type="uml:Class" href="Resource.uml#_13gdcDzEEeiWMf5FLWfdLA"/>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_9NzEwKuBEeiRK6iIVq4LZA" name="ServiceDescriptor">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_9NzEwauBEeiRK6iIVq4LZA" annotatedElement="_9NzEwKuBEeiRK6iIVq4LZA">
-          <body>ServiceDescriptor is used to model the design time representation of a service. </body>
-        </ownedComment>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_9NzEwquBEeiRK6iIVq4LZA" name="invariantUuid" visibility="public">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_9NzEw6uBEeiRK6iIVq4LZA" annotatedElement="_9NzEwquBEeiRK6iIVq4LZA">
-            <body> Constant identifier of the service model.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="Common.uml#_YQwQ0D0NEeiWMf5FLWfdLA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_9NzExKuBEeiRK6iIVq4LZA" name="uuid" visibility="public">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_9NzExauBEeiRK6iIVq4LZA" annotatedElement="_9NzExKuBEeiRK6iIVq4LZA">
-            <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"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_9NzExquBEeiRK6iIVq4LZA" name="name" visibility="public">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_9NzEx6uBEeiRK6iIVq4LZA" annotatedElement="_9NzExquBEeiRK6iIVq4LZA">
-            <body>The name of the service model designed.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_9NzEyKuBEeiRK6iIVq4LZA" name="description" visibility="public">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_9NzEyauBEeiRK6iIVq4LZA" annotatedElement="_9NzEyKuBEeiRK6iIVq4LZA">
-            <body>The description of the service model designed.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_9NzEyquBEeiRK6iIVq4LZA" name="category" visibility="public">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_9NzEy6uBEeiRK6iIVq4LZA" annotatedElement="_9NzEyquBEeiRK6iIVq4LZA">
-            <body>A predefined list which identifies the construct's category. There is a predefined list of service categories.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9NzEzKuBEeiRK6iIVq4LZA" value="1"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9NzEzauBEeiRK6iIVq4LZA" value="*"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_9NzEzquBEeiRK6iIVq4LZA" name="version" visibility="public">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_9NzEz6uBEeiRK6iIVq4LZA" annotatedElement="_9NzEzquBEeiRK6iIVq4LZA">
-            <body>The service model version.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_9NzE0KuBEeiRK6iIVq4LZA" name="serviceType" visibility="public">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_9NzE0auBEeiRK6iIVq4LZA" annotatedElement="_9NzE0KuBEeiRK6iIVq4LZA">
-            <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"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_9NzE0quBEeiRK6iIVq4LZA" name="serviceRole" visibility="public">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_9NzE06uBEeiRK6iIVq4LZA" annotatedElement="_9NzE0quBEeiRK6iIVq4LZA">
-            <body>An optional string field for shortcode that defines the function that the service is providing. E.g. “MISVPN” or “AIM”.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9NzE1KuBEeiRK6iIVq4LZA"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9NzE1auBEeiRK6iIVq4LZA" value="1"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_9NzE1quBEeiRK6iIVq4LZA" name="icon" visibility="public">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_9NzE16uBEeiRK6iIVq4LZA" annotatedElement="_9NzE1quBEeiRK6iIVq4LZA">
-            <body>The icon path of the service.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_9NzE2KuBEeiRK6iIVq4LZA" name="serviceComponentUuid" visibility="public">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_9NzE2auBEeiRK6iIVq4LZA" annotatedElement="_9NzE2KuBEeiRK6iIVq4LZA">
-            <body>The service component descriptor UUIDs that the service includes (relationhip to Service Component).</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="Common.uml#_YQwQ0D0NEeiWMf5FLWfdLA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_9NzE2quBEeiRK6iIVq4LZA" name="_serviceDescriptor" type="_9NzEwKuBEeiRK6iIVq4LZA" aggregation="shared">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9NzE26uBEeiRK6iIVq4LZA"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9NzE3KuBEeiRK6iIVq4LZA" value="*"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_9NzE3auBEeiRK6iIVq4LZA" name="_serviceInstance" type="_HFfXUD0QEeiWMf5FLWfdLA">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9NzE3quBEeiRK6iIVq4LZA"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9NzE36uBEeiRK6iIVq4LZA" value="*"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_9NzE4KuBEeiRK6iIVq4LZA" name="_serviceComponentDescriptor" type="_7SrB0D0VEeiWMf5FLWfdLA" aggregation="shared">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9NzE4auBEeiRK6iIVq4LZA" value="1"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9NzE4quBEeiRK6iIVq4LZA" value="*"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_9NzE46uBEeiRK6iIVq4LZA" name="attachment" type="_nrfckI93EeiT7tMsBl6xjA" aggregation="composite">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9NzE5KuBEeiRK6iIVq4LZA"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9NzE5auBEeiRK6iIVq4LZA" value="*"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_SyGMU6uFEeiRK6iIVq4LZA" name="serviceinstance" type="_VfCloKuDEeiRK6iIVq4LZA" association="_SyGMUKuFEeiRK6iIVq4LZA">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_SyP9UauFEeiRK6iIVq4LZA"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SyP9UquFEeiRK6iIVq4LZA" value="*"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_syJ_cKuGEeiRK6iIVq4LZA" name="invariantUuid" visibility="public">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_syJ_cauGEeiRK6iIVq4LZA" annotatedElement="_syJ_cKuGEeiRK6iIVq4LZA">
-            <body> Constant identifier of the service model.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="Common.uml#_YQwQ0D0NEeiWMf5FLWfdLA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_16bLgKuGEeiRK6iIVq4LZA" name="uuid" visibility="public">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_16bLgauGEeiRK6iIVq4LZA" annotatedElement="_16bLgKuGEeiRK6iIVq4LZA">
-            <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"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_A42n8KuHEeiRK6iIVq4LZA" name="name" visibility="public">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_A42n8auHEeiRK6iIVq4LZA" annotatedElement="_A42n8KuHEeiRK6iIVq4LZA">
-            <body>The name of the service model designed.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_FBppUKuHEeiRK6iIVq4LZA" name="description" visibility="public">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_FBppUauHEeiRK6iIVq4LZA" annotatedElement="_FBppUKuHEeiRK6iIVq4LZA">
-            <body>The description of the service model designed.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_MoCL4KuHEeiRK6iIVq4LZA" name="version" visibility="public">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_MoCL4auHEeiRK6iIVq4LZA" annotatedElement="_MoCL4KuHEeiRK6iIVq4LZA">
-            <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="_QZuU0KuHEeiRK6iIVq4LZA" name="designer" visibility="public">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_QZuU0auHEeiRK6iIVq4LZA" annotatedElement="_QZuU0KuHEeiRK6iIVq4LZA">
-            <body>The designer of the service component.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        </ownedAttribute>
-      </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_AAwUkKuCEeiRK6iIVq4LZA" name="ServiceAtomicDescriptor">
-        <generalization xmi:type="uml:Generalization" xmi:id="_FxeWAKuCEeiRK6iIVq4LZA" general="_9NzEwKuBEeiRK6iIVq4LZA"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_FxeWAKuCEeiRK6iIVq4LZA" general="_CUXcMK0SEei2W47ZDLIFGA"/>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_mD6bQ6uFEeiRK6iIVq4LZA" name="serviceatomicinstance" type="_XCul8KuDEeiRK6iIVq4LZA" association="_mD6bQKuFEeiRK6iIVq4LZA">
           <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="_mloLwKuGEeiRK6iIVq4LZA" name="invariantUuid" visibility="public">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_mloLwauGEeiRK6iIVq4LZA" annotatedElement="_mloLwKuGEeiRK6iIVq4LZA">
-            <body> Constant identifier of the service model.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="Common.uml#_YQwQ0D0NEeiWMf5FLWfdLA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_4n3pMKuGEeiRK6iIVq4LZA" name="uuid" visibility="public">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_4n3pMauGEeiRK6iIVq4LZA" annotatedElement="_4n3pMKuGEeiRK6iIVq4LZA">
-            <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"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_-4G4MKuGEeiRK6iIVq4LZA" name="name" visibility="public">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_-4G4MauGEeiRK6iIVq4LZA" annotatedElement="_-4G4MKuGEeiRK6iIVq4LZA">
-            <body>The name of the service model designed.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_Dq7G8KuHEeiRK6iIVq4LZA" name="description" visibility="public">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_Dq7G8auHEeiRK6iIVq4LZA" annotatedElement="_Dq7G8KuHEeiRK6iIVq4LZA">
-            <body>The description of the service model designed.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_LXHWkKuHEeiRK6iIVq4LZA" name="version" visibility="public">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_LXHWkauHEeiRK6iIVq4LZA" annotatedElement="_LXHWkKuHEeiRK6iIVq4LZA">
-            <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="_Pi4zcKuHEeiRK6iIVq4LZA" name="designer" visibility="public">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_Pi4zcauHEeiRK6iIVq4LZA" annotatedElement="_Pi4zcKuHEeiRK6iIVq4LZA">
-            <body>The designer of the service component.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_OfhrQKuCEeiRK6iIVq4LZA" name="ServiceCompositeDescriptor">
-        <generalization xmi:type="uml:Generalization" xmi:id="_qUEJMKuCEeiRK6iIVq4LZA" general="_9NzEwKuBEeiRK6iIVq4LZA"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_F_qtkquDEeiRK6iIVq4LZA" name="servicedescriptor" type="_9NzEwKuBEeiRK6iIVq4LZA" aggregation="shared" association="_F_g8kKuDEeiRK6iIVq4LZA">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_F_qtlKuDEeiRK6iIVq4LZA" value="1"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_F_qtlauDEeiRK6iIVq4LZA" value="*"/>
-        </ownedAttribute>
+        <generalization xmi:type="uml:Generalization" xmi:id="_qUEJMKuCEeiRK6iIVq4LZA" general="_CUXcMK0SEei2W47ZDLIFGA"/>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_AcqQoquGEeiRK6iIVq4LZA" name="servicecompositeinstance" type="_YBdfEKuDEeiRK6iIVq4LZA" association="_AchGsKuGEeiRK6iIVq4LZA">
           <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="_XHS1gKuGEeiRK6iIVq4LZA" name="invariantUuid" visibility="public">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_XHS1gauGEeiRK6iIVq4LZA" annotatedElement="_XHS1gKuGEeiRK6iIVq4LZA">
-            <body> Constant identifier of the service model.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="Common.uml#_YQwQ0D0NEeiWMf5FLWfdLA"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_5hPhMKuGEeiRK6iIVq4LZA" name="uuid" visibility="public">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_5hPhMauGEeiRK6iIVq4LZA" annotatedElement="_5hPhMKuGEeiRK6iIVq4LZA">
-            <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"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="__iIsoKuGEeiRK6iIVq4LZA" name="name" visibility="public">
-          <ownedComment xmi:type="uml:Comment" xmi:id="__iIsoauGEeiRK6iIVq4LZA" annotatedElement="__iIsoKuGEeiRK6iIVq4LZA">
-            <body>The name of the service model designed.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_EDq-IKuHEeiRK6iIVq4LZA" name="description" visibility="public">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_EDq-IauHEeiRK6iIVq4LZA" annotatedElement="_EDq-IKuHEeiRK6iIVq4LZA">
-            <body>The description of the service model designed.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_LtnyEKuHEeiRK6iIVq4LZA" name="version" visibility="public">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_LtnyEauHEeiRK6iIVq4LZA" annotatedElement="_LtnyEKuHEeiRK6iIVq4LZA">
-            <body>The version of service component.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_kqgJcq0TEei2W47ZDLIFGA" name="servicedescriptor" type="_CUXcMK0SEei2W47ZDLIFGA" aggregation="shared" association="_kqW_gK0TEei2W47ZDLIFGA">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kqgJdK0TEei2W47ZDLIFGA" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kqgJda0TEei2W47ZDLIFGA" value="*"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_P4fQAKuHEeiRK6iIVq4LZA" name="designer" visibility="public">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_P4fQAauHEeiRK6iIVq4LZA" annotatedElement="_P4fQAKuHEeiRK6iIVq4LZA">
-            <body>The designer of the service component.</body>
-          </ownedComment>
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        </ownedAttribute>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_F_g8kKuDEeiRK6iIVq4LZA" name="ServiceCompositeDescriptorHasServiceDescriptors" memberEnd="_F_qtkquDEeiRK6iIVq4LZA _F_qtlquDEeiRK6iIVq4LZA">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_F_qtkKuDEeiRK6iIVq4LZA" source="org.eclipse.papyrus">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_F_qtkauDEeiRK6iIVq4LZA" key="nature" value="UML_Nature"/>
-        </eAnnotations>
-        <ownedEnd xmi:type="uml:Property" xmi:id="_F_qtlquDEeiRK6iIVq4LZA" name="servicecompositedescriptor" type="_OfhrQKuCEeiRK6iIVq4LZA" association="_F_g8kKuDEeiRK6iIVq4LZA"/>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_VfCloKuDEeiRK6iIVq4LZA" name="ServiceInstance"/>
       <packagedElement xmi:type="uml:Class" xmi:id="_XCul8KuDEeiRK6iIVq4LZA" name="ServiceAtomicInstance">
@@ -729,12 +526,6 @@ If null, then represents to the end of time&#xD;
         </eAnnotations>
         <ownedEnd xmi:type="uml:Property" xmi:id="_L-ZD4quFEeiRK6iIVq4LZA" name="servicecompositeinstance" type="_YBdfEKuDEeiRK6iIVq4LZA" association="_L-PS4KuFEeiRK6iIVq4LZA"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_SyGMUKuFEeiRK6iIVq4LZA" name="ServiceDescriptorMadeAvailableAs" memberEnd="_SyGMU6uFEeiRK6iIVq4LZA _SyP9U6uFEeiRK6iIVq4LZA">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_SyGMUauFEeiRK6iIVq4LZA" source="org.eclipse.papyrus">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SyGMUquFEeiRK6iIVq4LZA" key="nature" value="UML_Nature"/>
-        </eAnnotations>
-        <ownedEnd xmi:type="uml:Property" xmi:id="_SyP9U6uFEeiRK6iIVq4LZA" name="servicedescriptor" type="_9NzEwKuBEeiRK6iIVq4LZA" association="_SyGMUKuFEeiRK6iIVq4LZA"/>
-      </packagedElement>
       <packagedElement xmi:type="uml:Association" xmi:id="_mD6bQKuFEeiRK6iIVq4LZA" name="ServiceAtomicDescriptorMadeAvailableAs" memberEnd="_mD6bQ6uFEeiRK6iIVq4LZA _mEEMQquFEeiRK6iIVq4LZA">
         <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"/>
@@ -775,10 +566,6 @@ If null, then represents to the end of time&#xD;
         <ownedAttribute xmi:type="uml:Property" xmi:id="_wTV-MKz6EeiRK6iIVq4LZA" name="version">
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_7tq6Mqz_EeiRK6iIVq4LZA" name="resourcedescriptorgroup" type="_Z-LBEKz8EeiRK6iIVq4LZA" association="_7thJMKz_EeiRK6iIVq4LZA">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_7tq6NKz_EeiRK6iIVq4LZA"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7tq6Naz_EeiRK6iIVq4LZA" value="*"/>
-        </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_eMPAI60AEeiRK6iIVq4LZA" name="resourcedescriptor" type="_Po5EwKz7EeiRK6iIVq4LZA" association="_eMPAIK0AEeiRK6iIVq4LZA">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_eMPAJa0AEeiRK6iIVq4LZA"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_eMPAJq0AEeiRK6iIVq4LZA" value="*"/>
@@ -827,36 +614,6 @@ If null, then represents to the end of time&#xD;
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_Z-LBEKz8EeiRK6iIVq4LZA" name="ResourceDescriptorGroup">
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_ccvf0Kz9EeiRK6iIVq4LZA" name="id">
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_zQm5MKz9EeiRK6iIVq4LZA" name="name">
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_1mNeoKz9EeiRK6iIVq4LZA" name="href">
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_5EPrwKz9EeiRK6iIVq4LZA" name="description">
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_-Gs5AKz9EeiRK6iIVq4LZA" name="type">
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_GIflMKz-EeiRK6iIVq4LZA" name="members" visibility="public">
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_WDrPgKz-EeiRK6iIVq4LZA" name="metadata">
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_ZCaRgKz-EeiRK6iIVq4LZA" name="initial_count">
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_xKrnI60AEeiRK6iIVq4LZA" name="resourcedescriptor" type="_Po5EwKz7EeiRK6iIVq4LZA" aggregation="shared" association="_xKrnIK0AEeiRK6iIVq4LZA">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xK-iEK0AEeiRK6iIVq4LZA" value="1"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xK-iEa0AEeiRK6iIVq4LZA" value="*"/>
-        </ownedAttribute>
-      </packagedElement>
       <packagedElement xmi:type="uml:Association" xmi:id="_jioSgKz_EeiRK6iIVq4LZA" name="ServiceDescriptorHasAttachments" memberEnd="_jioSg6z_EeiRK6iIVq4LZA _jiyDgqz_EeiRK6iIVq4LZA">
         <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jioSgaz_EeiRK6iIVq4LZA" source="org.eclipse.papyrus">
           <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jioSgqz_EeiRK6iIVq4LZA" key="nature" value="UML_Nature"/>
@@ -867,23 +624,56 @@ If null, then represents to the end of time&#xD;
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jiyDgaz_EeiRK6iIVq4LZA" value="*"/>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_7thJMKz_EeiRK6iIVq4LZA" name="ServiceDescriptorHasReferenceOnResourceGroup" memberEnd="_7tq6Mqz_EeiRK6iIVq4LZA _7tq6Nqz_EeiRK6iIVq4LZA">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7tq6MKz_EeiRK6iIVq4LZA" source="org.eclipse.papyrus">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7tq6Maz_EeiRK6iIVq4LZA" key="nature" value="UML_Nature"/>
-        </eAnnotations>
-        <ownedEnd xmi:type="uml:Property" xmi:id="_7tq6Nqz_EeiRK6iIVq4LZA" name="servicedescriptor" type="_DzsqUKz5EeiRK6iIVq4LZA" association="_7thJMKz_EeiRK6iIVq4LZA"/>
-      </packagedElement>
       <packagedElement xmi:type="uml:Association" xmi:id="_eMPAIK0AEeiRK6iIVq4LZA" name="ServiceDescriptorHasReferenceOnResourceDescriptor" memberEnd="_eMPAI60AEeiRK6iIVq4LZA _eMPAJ60AEeiRK6iIVq4LZA">
         <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_eMPAIa0AEeiRK6iIVq4LZA" source="org.eclipse.papyrus">
           <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_eMPAIq0AEeiRK6iIVq4LZA" key="nature" value="UML_Nature"/>
         </eAnnotations>
         <ownedEnd xmi:type="uml:Property" xmi:id="_eMPAJ60AEeiRK6iIVq4LZA" name="servicedescriptor" type="_DzsqUKz5EeiRK6iIVq4LZA" association="_eMPAIK0AEeiRK6iIVq4LZA"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_xKrnIK0AEeiRK6iIVq4LZA" name="ResourceGroupRealizedByResourceDescriptors" visibility="package" memberEnd="_xKrnI60AEeiRK6iIVq4LZA _xLHsAK0AEeiRK6iIVq4LZA">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xKrnIa0AEeiRK6iIVq4LZA" source="org.eclipse.papyrus">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xKrnIq0AEeiRK6iIVq4LZA" key="nature" value="UML_Nature"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_CUXcMK0SEei2W47ZDLIFGA" name="ServiceDescriptor">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_U1UO4K0SEei2W47ZDLIFGA" name="invariantUuid" visibility="public">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_U1UO4a0SEei2W47ZDLIFGA" annotatedElement="_U1UO4K0SEei2W47ZDLIFGA">
+            <body> Constant identifier of the service model.</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="Common.uml#_YQwQ0D0NEeiWMf5FLWfdLA"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_V-onYK0SEei2W47ZDLIFGA" name="uuid" visibility="public">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_V-onYa0SEei2W47ZDLIFGA" annotatedElement="_V-onYK0SEei2W47ZDLIFGA">
+            <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"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_W4TaUK0SEei2W47ZDLIFGA" name="name" visibility="public">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_W4TaUa0SEei2W47ZDLIFGA" annotatedElement="_W4TaUK0SEei2W47ZDLIFGA">
+            <body>The name of the service model designed.</body>
+          </ownedComment>
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_v-DWwK0SEei2W47ZDLIFGA" name="description">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_3DWlgK0SEei2W47ZDLIFGA" name="version">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_Ap5B8K0TEei2W47ZDLIFGA" name="designer">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_PHQDY60TEei2W47ZDLIFGA" name="serviceinstance" type="_VfCloKuDEeiRK6iIVq4LZA" association="_PHQDYK0TEei2W47ZDLIFGA">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_PHZNUK0TEei2W47ZDLIFGA"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PHZNUa0TEei2W47ZDLIFGA" value="*"/>
+        </ownedAttribute>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_PHQDYK0TEei2W47ZDLIFGA" name="ServiceDescriptorMadeAvailableAs" memberEnd="_PHQDY60TEei2W47ZDLIFGA _PHZNUq0TEei2W47ZDLIFGA">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PHQDYa0TEei2W47ZDLIFGA" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PHQDYq0TEei2W47ZDLIFGA" key="nature" value="UML_Nature"/>
+        </eAnnotations>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_PHZNUq0TEei2W47ZDLIFGA" name="servicedescriptor" type="_CUXcMK0SEei2W47ZDLIFGA" association="_PHQDYK0TEei2W47ZDLIFGA"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_kqW_gK0TEei2W47ZDLIFGA" name="ServiceCompositeDescriptorHasServiceDescriptors" memberEnd="_kqgJcq0TEei2W47ZDLIFGA _kqgJdq0TEei2W47ZDLIFGA">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kqgJcK0TEei2W47ZDLIFGA" source="org.eclipse.papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kqgJca0TEei2W47ZDLIFGA" key="nature" value="UML_Nature"/>
         </eAnnotations>
-        <ownedEnd xmi:type="uml:Property" xmi:id="_xLHsAK0AEeiRK6iIVq4LZA" name="resourcegroup" type="_Z-LBEKz8EeiRK6iIVq4LZA" association="_xKrnIK0AEeiRK6iIVq4LZA"/>
+        <ownedEnd xmi:type="uml:Property" xmi:id="_kqgJdq0TEei2W47ZDLIFGA" name="servicecompositedescriptor" type="_OfhrQKuCEeiRK6iIVq4LZA" association="_kqW_gK0TEei2W47ZDLIFGA"/>
       </packagedElement>
     </packagedElement>
     <packagedElement xmi:type="uml:Package" xmi:id="_fXNM8TOHEei5Af8DcjrhIQ" name="Interfaces"/>
@@ -2405,54 +2195,17 @@ NOTE 3: 	When the corresponding NS level is used in the context of NS scaling, t
   <OpenModel_Profile:Future xmi:id="_p-yLIKewEeixw5Ke5QD1pQ">
     <base_Element xmi:type="uml:Class" href="Resource.uml#_bd53ADzFEeiWMf5FLWfdLA"/>
   </OpenModel_Profile:Future>
-  <OpenModel_Profile:OpenModelClass xmi:id="_9N8OsKuBEeiRK6iIVq4LZA" base_Class="_9NzEwKuBEeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_9N8OsauBEeiRK6iIVq4LZA" base_StructuralFeature="_9NzEwquBEeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_9N8OsquBEeiRK6iIVq4LZA" base_StructuralFeature="_9NzExKuBEeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_9N8Os6uBEeiRK6iIVq4LZA" base_StructuralFeature="_9NzExquBEeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_9N8OtKuBEeiRK6iIVq4LZA" base_StructuralFeature="_9NzEyKuBEeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_9N8OtauBEeiRK6iIVq4LZA" base_StructuralFeature="_9NzEyquBEeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_9N8OtquBEeiRK6iIVq4LZA" base_StructuralFeature="_9NzEzquBEeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_9N8Ot6uBEeiRK6iIVq4LZA" base_StructuralFeature="_9NzE0KuBEeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_9N8OuKuBEeiRK6iIVq4LZA" base_StructuralFeature="_9NzE0quBEeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_9N8OuauBEeiRK6iIVq4LZA" base_StructuralFeature="_9NzE1quBEeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_9N8OuquBEeiRK6iIVq4LZA" base_StructuralFeature="_9NzE2KuBEeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_9N8Ou6uBEeiRK6iIVq4LZA" base_StructuralFeature="_9NzE2quBEeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_9N8OvKuBEeiRK6iIVq4LZA" base_StructuralFeature="_9NzE3auBEeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_9N8OvauBEeiRK6iIVq4LZA" base_StructuralFeature="_9NzE4KuBEeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_9N8OvquBEeiRK6iIVq4LZA" base_StructuralFeature="_9NzE46uBEeiRK6iIVq4LZA"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_AAwUkauCEeiRK6iIVq4LZA" base_Class="_AAwUkKuCEeiRK6iIVq4LZA"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_OfhrQauCEeiRK6iIVq4LZA" base_Class="_OfhrQKuCEeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_F_qtk6uDEeiRK6iIVq4LZA" base_StructuralFeature="_F_qtkquDEeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_F_z3gKuDEeiRK6iIVq4LZA" base_StructuralFeature="_F_qtlquDEeiRK6iIVq4LZA"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_VfCloauDEeiRK6iIVq4LZA" base_Class="_VfCloKuDEeiRK6iIVq4LZA"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_XCul8auDEeiRK6iIVq4LZA" base_Class="_XCul8KuDEeiRK6iIVq4LZA"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_YBnQEKuDEeiRK6iIVq4LZA" base_Class="_YBdfEKuDEeiRK6iIVq4LZA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_L-PS5KuFEeiRK6iIVq4LZA" base_StructuralFeature="_L-PS46uFEeiRK6iIVq4LZA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_L-ZD46uFEeiRK6iIVq4LZA" base_StructuralFeature="_L-ZD4quFEeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_SyP9UKuFEeiRK6iIVq4LZA" base_StructuralFeature="_SyGMU6uFEeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_SyP9VKuFEeiRK6iIVq4LZA" base_StructuralFeature="_SyP9U6uFEeiRK6iIVq4LZA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_mD6bRKuFEeiRK6iIVq4LZA" base_StructuralFeature="_mD6bQ6uFEeiRK6iIVq4LZA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_mEEMQ6uFEeiRK6iIVq4LZA" base_StructuralFeature="_mEEMQquFEeiRK6iIVq4LZA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_AcqQo6uGEeiRK6iIVq4LZA" base_StructuralFeature="_AcqQoquGEeiRK6iIVq4LZA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_AcqQp6uGEeiRK6iIVq4LZA" base_StructuralFeature="_AcqQpquGEeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_XHS1gquGEeiRK6iIVq4LZA" base_StructuralFeature="_XHS1gKuGEeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_mloLwquGEeiRK6iIVq4LZA" base_StructuralFeature="_mloLwKuGEeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_syJ_cquGEeiRK6iIVq4LZA" base_StructuralFeature="_syJ_cKuGEeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_16bLgquGEeiRK6iIVq4LZA" base_StructuralFeature="_16bLgKuGEeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_4n3pMquGEeiRK6iIVq4LZA" base_StructuralFeature="_4n3pMKuGEeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_5hPhMquGEeiRK6iIVq4LZA" base_StructuralFeature="_5hPhMKuGEeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_-4G4MquGEeiRK6iIVq4LZA" base_StructuralFeature="_-4G4MKuGEeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="__iIsoquGEeiRK6iIVq4LZA" base_StructuralFeature="__iIsoKuGEeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_A42n8quHEeiRK6iIVq4LZA" base_StructuralFeature="_A42n8KuHEeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_Dq7G8quHEeiRK6iIVq4LZA" base_StructuralFeature="_Dq7G8KuHEeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_ED0IEKuHEeiRK6iIVq4LZA" base_StructuralFeature="_EDq-IKuHEeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_FBppUquHEeiRK6iIVq4LZA" base_StructuralFeature="_FBppUKuHEeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_LXHWkquHEeiRK6iIVq4LZA" base_StructuralFeature="_LXHWkKuHEeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_LtnyEquHEeiRK6iIVq4LZA" base_StructuralFeature="_LtnyEKuHEeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_MoLV0KuHEeiRK6iIVq4LZA" base_StructuralFeature="_MoCL4KuHEeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_Pi4zcquHEeiRK6iIVq4LZA" base_StructuralFeature="_Pi4zcKuHEeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_P4fQAquHEeiRK6iIVq4LZA" base_StructuralFeature="_P4fQAKuHEeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_QZuU0quHEeiRK6iIVq4LZA" base_StructuralFeature="_QZuU0KuHEeiRK6iIVq4LZA"/>
   <OpenModel_Profile:OpenModelClass xmi:id="_DzsqUaz5EeiRK6iIVq4LZA" base_Class="_DzsqUKz5EeiRK6iIVq4LZA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_IoAt4az5EeiRK6iIVq4LZA" base_StructuralFeature="_IoAt4Kz5EeiRK6iIVq4LZA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_e2xPEaz5EeiRK6iIVq4LZA" base_StructuralFeature="_e2xPEKz5EeiRK6iIVq4LZA"/>
@@ -2478,21 +2231,19 @@ NOTE 3: 	When the corresponding NS level is used in the context of NS scaling, t
   <OpenModel_Profile:OpenModelAttribute xmi:id="_NRPbcaz8EeiRK6iIVq4LZA" base_StructuralFeature="_NRPbcKz8EeiRK6iIVq4LZA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_QekTEaz8EeiRK6iIVq4LZA" base_StructuralFeature="_QekTEKz8EeiRK6iIVq4LZA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_TvLvQaz8EeiRK6iIVq4LZA" base_StructuralFeature="_TvLvQKz8EeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelClass xmi:id="_Z-ULAKz8EeiRK6iIVq4LZA" base_Class="_Z-LBEKz8EeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_ccvf0az9EeiRK6iIVq4LZA" base_StructuralFeature="_ccvf0Kz9EeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_zQm5Maz9EeiRK6iIVq4LZA" base_StructuralFeature="_zQm5MKz9EeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_1mNeoaz9EeiRK6iIVq4LZA" base_StructuralFeature="_1mNeoKz9EeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_5EPrwaz9EeiRK6iIVq4LZA" base_StructuralFeature="_5EPrwKz9EeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_-Gs5Aaz9EeiRK6iIVq4LZA" base_StructuralFeature="_-Gs5AKz9EeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_GIflMaz-EeiRK6iIVq4LZA" base_StructuralFeature="_GIflMKz-EeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_WDrPgaz-EeiRK6iIVq4LZA" base_StructuralFeature="_WDrPgKz-EeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_ZCaRgaz-EeiRK6iIVq4LZA" base_StructuralFeature="_ZCaRgKz-EeiRK6iIVq4LZA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_jioShKz_EeiRK6iIVq4LZA" base_StructuralFeature="_jioSg6z_EeiRK6iIVq4LZA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_jiyDg6z_EeiRK6iIVq4LZA" base_StructuralFeature="_jiyDgqz_EeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_7tq6M6z_EeiRK6iIVq4LZA" base_StructuralFeature="_7tq6Mqz_EeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_7tq6N6z_EeiRK6iIVq4LZA" base_StructuralFeature="_7tq6Nqz_EeiRK6iIVq4LZA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_eMPAJK0AEeiRK6iIVq4LZA" base_StructuralFeature="_eMPAI60AEeiRK6iIVq4LZA"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_eMPAKK0AEeiRK6iIVq4LZA" base_StructuralFeature="_eMPAJ60AEeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_xKrnJK0AEeiRK6iIVq4LZA" base_StructuralFeature="_xKrnI60AEeiRK6iIVq4LZA"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_xLHsAa0AEeiRK6iIVq4LZA" base_StructuralFeature="_xLHsAK0AEeiRK6iIVq4LZA"/>
+  <OpenModel_Profile:OpenModelClass xmi:id="_CUhNMK0SEei2W47ZDLIFGA" base_Class="_CUXcMK0SEei2W47ZDLIFGA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_U1UO4q0SEei2W47ZDLIFGA" base_StructuralFeature="_U1UO4K0SEei2W47ZDLIFGA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_V-onYq0SEei2W47ZDLIFGA" base_StructuralFeature="_V-onYK0SEei2W47ZDLIFGA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_W4TaUq0SEei2W47ZDLIFGA" base_StructuralFeature="_W4TaUK0SEei2W47ZDLIFGA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_v-DWwa0SEei2W47ZDLIFGA" base_StructuralFeature="_v-DWwK0SEei2W47ZDLIFGA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_3DWlga0SEei2W47ZDLIFGA" base_StructuralFeature="_3DWlgK0SEei2W47ZDLIFGA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_Ap5B8a0TEei2W47ZDLIFGA" base_StructuralFeature="_Ap5B8K0TEei2W47ZDLIFGA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_PHQDZK0TEei2W47ZDLIFGA" base_StructuralFeature="_PHQDY60TEei2W47ZDLIFGA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_PHZNU60TEei2W47ZDLIFGA" base_StructuralFeature="_PHZNUq0TEei2W47ZDLIFGA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_kqgJc60TEei2W47ZDLIFGA" base_StructuralFeature="_kqgJcq0TEei2W47ZDLIFGA"/>
+  <OpenModel_Profile:OpenModelAttribute xmi:id="_kqgJd60TEei2W47ZDLIFGA" base_StructuralFeature="_kqgJdq0TEei2W47ZDLIFGA"/>
 </xmi:XMI>