From 65b7491238d6c2c33547329220f8932a42b2c42d Mon Sep 17 00:00:00 2001
From: Kevin Scaggs <ks0567@att.com>
Date: Mon, 8 Apr 2019 14:20:42 -0500
Subject: Updates to Service Stereotypes

Updated stereotypes on ServiceOrder related classes, attributes, and
relationships.   Also updated composite/atomic stereotype relationships

Issue-ID: MODELING-104

Change-Id: I5105c68c131181b63a61c24a05357f7edeae826a
Signed-off-by: Kevin Scaggs <ks0567@att.com>
---
 ONAP Information Model/Service.notation | 527 +++++++++++++++++++++++++-------
 ONAP Information Model/Service.uml      |  70 ++++-
 2 files changed, 476 insertions(+), 121 deletions(-)

(limited to 'ONAP Information Model')

diff --git a/ONAP Information Model/Service.notation b/ONAP Information Model/Service.notation
index 46a02dc..4683318 100644
--- a/ONAP Information Model/Service.notation	
+++ b/ONAP Information Model/Service.notation	
@@ -159,7 +159,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mrU8K4n9EeiOe-BKGdv_Yg"/>
       </children>
       <element xmi:type="uml:Class" href="Service.uml#_mrJV8In9EeiOe-BKGdv_Yg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mrNAUYn9EeiOe-BKGdv_Yg" x="80" y="120" height="241"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mrNAUYn9EeiOe-BKGdv_Yg" x="20" y="100" height="261"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_mrVjN4n9EeiOe-BKGdv_Yg" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_mrVjOIn9EeiOe-BKGdv_Yg"/>
@@ -240,7 +240,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wnqCYon9EeiOe-BKGdv_Yg"/>
       </children>
       <element xmi:type="uml:Class" href="Service.uml#_wng4cIn9EeiOe-BKGdv_Yg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wnitoYn9EeiOe-BKGdv_Yg" x="480" y="160" height="101"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wnitoYn9EeiOe-BKGdv_Yg" x="480" y="140" height="121"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_wnqCbon9EeiOe-BKGdv_Yg" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_wnqCb4n9EeiOe-BKGdv_Yg"/>
@@ -279,7 +279,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B65Ewon-EeiOe-BKGdv_Yg"/>
       </children>
       <element xmi:type="uml:Class" href="Service.uml#_Jvy-QD0MEeiWMf5FLWfdLA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B6n_AYn-EeiOe-BKGdv_Yg" x="720" y="300" height="61"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B6n_AYn-EeiOe-BKGdv_Yg" x="760" y="300" height="61"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_B6_LY4n-EeiOe-BKGdv_Yg" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_B6_LZIn-EeiOe-BKGdv_Yg"/>
@@ -318,7 +318,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DBs70Yn-EeiOe-BKGdv_Yg"/>
       </children>
       <element xmi:type="uml:Class" href="Service.uml#_HFfXUD0QEeiWMf5FLWfdLA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DBgHgYn-EeiOe-BKGdv_Yg" x="720" y="80" width="123" height="61"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DBgHgYn-EeiOe-BKGdv_Yg" x="760" y="80" width="123" height="61"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_DBwmM4n-EeiOe-BKGdv_Yg" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_DBwmNIn-EeiOe-BKGdv_Yg"/>
@@ -376,7 +376,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3a8-946OEeiLSKWGMeE9mQ"/>
       </children>
       <element xmi:type="uml:Enumeration" href="Service.uml#_3a0cEI6OEeiLSKWGMeE9mQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3a4GcY6OEeiLSKWGMeE9mQ" x="880" y="480"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3a4GcY6OEeiLSKWGMeE9mQ" x="960" y="400"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_DwakALwnEeifWa7EkiXrHA" type="Enumeration_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_DwakArwnEeifWa7EkiXrHA" type="Enumeration_NameLabel"/>
@@ -410,7 +410,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DwbLFLwnEeifWa7EkiXrHA"/>
       </children>
       <element xmi:type="uml:Enumeration" href="Service.uml#_DwZV4LwnEeifWa7EkiXrHA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DwakAbwnEeifWa7EkiXrHA" x="640" y="480"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DwakAbwnEeifWa7EkiXrHA" x="720" y="400"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_pWZyIMA-Eei02ItngDf4ZA" type="Enumeration_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_pWcOYMA-Eei02ItngDf4ZA" type="Enumeration_NameLabel"/>
@@ -440,7 +440,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pWdchMA-Eei02ItngDf4ZA"/>
       </children>
       <element xmi:type="uml:Enumeration" href="Service.uml#_pWPaEMA-Eei02ItngDf4ZA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pWZyIcA-Eei02ItngDf4ZA" x="760" y="480"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pWZyIcA-Eei02ItngDf4ZA" x="840" y="400"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_UWia0MDfEeiebIKjAGZWdA" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_UWmsQMDfEeiebIKjAGZWdA" type="Class_NameLabel"/>
@@ -489,7 +489,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UW7cYsDfEeiebIKjAGZWdA"/>
       </children>
       <element xmi:type="uml:Class" href="Service.uml#_UWL1gMDfEeiebIKjAGZWdA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UWia0cDfEeiebIKjAGZWdA" x="940" y="180"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UWia0cDfEeiebIKjAGZWdA" x="980" y="220" height="81"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_UW8qgMDfEeiebIKjAGZWdA" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_UW8qgcDfEeiebIKjAGZWdA"/>
@@ -537,7 +537,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HFwZ4sDiEeiebIKjAGZWdA"/>
       </children>
       <element xmi:type="uml:Class" href="Service.uml#_HFmo4MDiEeiebIKjAGZWdA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HFpFIcDiEeiebIKjAGZWdA" x="1140" y="340"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HFpFIcDiEeiebIKjAGZWdA" x="960" y="60" height="61"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_HFxA88DiEeiebIKjAGZWdA" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_HFxA9MDiEeiebIKjAGZWdA"/>
@@ -593,7 +593,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M9nFYsGjEeiS695oPTRE1Q"/>
       </children>
       <element xmi:type="uml:AssociationClass" href="Service.uml#_MnBKUMGjEeiS695oPTRE1Q"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M9MOocGjEeiS695oPTRE1Q" x="120" y="520"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M9MOocGjEeiS695oPTRE1Q" x="60" y="460" height="61"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_M9nsc8GjEeiS695oPTRE1Q" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_M9nsdMGjEeiS695oPTRE1Q"/>
@@ -649,7 +649,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hWYf4sGkEeiS695oPTRE1Q"/>
       </children>
       <element xmi:type="uml:AssociationClass" href="Service.uml#_hUzLgMGkEeiS695oPTRE1Q"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hWTAUcGkEeiS695oPTRE1Q" x="400" y="380"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hWTAUcGkEeiS695oPTRE1Q" x="400" y="360" height="61"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_hWYf7sGkEeiS695oPTRE1Q" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_hWYf78GkEeiS695oPTRE1Q"/>
@@ -659,6 +659,70 @@
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hWYf8MGkEeiS695oPTRE1Q" x="929" y="193"/>
     </children>
+    <children xmi:type="notation:Shape" xmi:id="_NYDNtFoJEemSNe5QiI5UBQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_NYDNtVoJEemSNe5QiI5UBQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_NYDNt1oJEemSNe5QiI5UBQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Enumeration" href="Service.uml#_DwZV4LwnEeifWa7EkiXrHA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NYDNtloJEemSNe5QiI5UBQ" x="840" y="480"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_OY_tVFoJEemSNe5QiI5UBQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_OY_tVVoJEemSNe5QiI5UBQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_OY_tV1oJEemSNe5QiI5UBQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Enumeration" href="Service.uml#_pWPaEMA-Eei02ItngDf4ZA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OY_tVloJEemSNe5QiI5UBQ" x="960" y="480"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_PoHy5FoJEemSNe5QiI5UBQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_PoHy5VoJEemSNe5QiI5UBQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_PoHy51oJEemSNe5QiI5UBQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Enumeration" href="Service.uml#_3a0cEI6OEeiLSKWGMeE9mQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PoHy5loJEemSNe5QiI5UBQ" x="1080" y="480"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_C6JO8FoKEemSNe5QiI5UBQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_C6JO8VoKEemSNe5QiI5UBQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_C6JO81oKEemSNe5QiI5UBQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Service.uml#_rUEhgIoAEeiOe-BKGdv_Yg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C6JO8loKEemSNe5QiI5UBQ" x="220"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_FbP5wFoKEemSNe5QiI5UBQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_FbP5wVoKEemSNe5QiI5UBQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_FbP5w1oKEemSNe5QiI5UBQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Service.uml#_LBuJkIoCEeiOe-BKGdv_Yg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FbP5wloKEemSNe5QiI5UBQ" x="680" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_G-_H8FoLEemSNe5QiI5UBQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_G-_H8VoLEemSNe5QiI5UBQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_G-_H81oLEemSNe5QiI5UBQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Service.uml#_6z5EwMGTEeiS695oPTRE1Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_G-_H8loLEemSNe5QiI5UBQ" x="960" y="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_MzD_YFoLEemSNe5QiI5UBQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_MzD_YVoLEemSNe5QiI5UBQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MzD_Y1oLEemSNe5QiI5UBQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Service.uml#_OGFpEMDiEeiebIKjAGZWdA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MzD_YloLEemSNe5QiI5UBQ" x="1180" y="120"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_Q6K-sFoLEemSNe5QiI5UBQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Q6K-sVoLEemSNe5QiI5UBQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Q6K-s1oLEemSNe5QiI5UBQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Service.uml#_Lvny4MDgEeiebIKjAGZWdA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Q6K-sloLEemSNe5QiI5UBQ" x="960" y="200"/>
+    </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_kngqQYn9EeiOe-BKGdv_Yg" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_kngqQon9EeiOe-BKGdv_Yg"/>
     <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_kngqQ4n9EeiOe-BKGdv_Yg" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
@@ -712,7 +776,7 @@
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_rUXcdYoAEeiOe-BKGdv_Yg" type="Association_NameLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_upCSMIoAEeiOe-BKGdv_Yg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_rUXcdooAEeiOe-BKGdv_Yg" x="1" y="-13"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_rUXcdooAEeiOe-BKGdv_Yg" x="4" y="-33"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_rUXcd4oAEeiOe-BKGdv_Yg" visible="false" type="Association_TargetRoleLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_upLcIIoAEeiOe-BKGdv_Yg" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -733,8 +797,8 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_rUXccYoAEeiOe-BKGdv_Yg"/>
       <element xmi:type="uml:Association" href="Service.uml#_rUEhgIoAEeiOe-BKGdv_Yg"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rUXccooAEeiOe-BKGdv_Yg" points="[316, 200, -643984, -643984]$[640, 240, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rU5A4IoAEeiOe-BKGdv_Yg" id="(1.0,0.33195020746887965)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rU5A4YoAEeiOe-BKGdv_Yg" id="(0.0,0.39603960396039606)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rU5A4IoAEeiOe-BKGdv_Yg" id="(1.0,0.3831417624521073)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rU5A4YoAEeiOe-BKGdv_Yg" id="(0.0,0.49586776859504134)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_LB_2YIoCEeiOe-BKGdv_Yg" type="Association_Edge" source="_wnitoIn9EeiOe-BKGdv_Yg" target="_DBgHgIn-EeiOe-BKGdv_Yg">
       <children xmi:type="notation:DecorationNode" xmi:id="_LB_2Y4oCEeiOe-BKGdv_Yg" type="Association_StereotypeLabel">
@@ -743,7 +807,7 @@
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_LB_2ZYoCEeiOe-BKGdv_Yg" type="Association_NameLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QdA74I9YEeiT7tMsBl6xjA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_LB_2ZooCEeiOe-BKGdv_Yg" x="8" y="-13"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_LB_2ZooCEeiOe-BKGdv_Yg" x="-12" y="-33"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_LB_2Z4oCEeiOe-BKGdv_Yg" visible="false" type="Association_TargetRoleLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QrnYkI9YEeiT7tMsBl6xjA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -764,7 +828,7 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_LB_2YYoCEeiOe-BKGdv_Yg"/>
       <element xmi:type="uml:Association" href="Service.uml#_LBuJkIoCEeiOe-BKGdv_Yg"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LB_2YooCEeiOe-BKGdv_Yg" points="[560, 160, -643984, -643984]$[560, 100, -643984, -643984]$[740, 120, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LCb7QIoCEeiOe-BKGdv_Yg" id="(0.5369127516778524,0.0)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LCb7QIoCEeiOe-BKGdv_Yg" id="(0.35714285714285715,0.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LCb7QYoCEeiOe-BKGdv_Yg" id="(0.0,0.32786885245901637)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_IstTMI9WEeiT7tMsBl6xjA" type="Association_Edge" source="_wnitoIn9EeiOe-BKGdv_Yg" target="_B6n_AIn-EeiOe-BKGdv_Yg">
@@ -774,7 +838,7 @@
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_IstTNY9WEeiT7tMsBl6xjA" type="Association_NameLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_NepGQI9YEeiT7tMsBl6xjA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_IstTNo9WEeiT7tMsBl6xjA" x="62" y="-33"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_IstTNo9WEeiT7tMsBl6xjA" x="22" y="-33"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_Ist6QI9WEeiT7tMsBl6xjA" visible="false" type="Association_TargetRoleLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_NtPi8I9YEeiT7tMsBl6xjA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -794,8 +858,8 @@
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_IstTMY9WEeiT7tMsBl6xjA"/>
       <element xmi:type="uml:Association" href="Service.uml#_IdqxoI9WEeiT7tMsBl6xjA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IstTMo9WEeiT7tMsBl6xjA" points="[560, 261, -643984, -643984]$[560, 320, -643984, -643984]$[720, 320, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JKyWUI9WEeiT7tMsBl6xjA" id="(0.5369127516778524,1.0)"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IstTMo9WEeiT7tMsBl6xjA" points="[600, 261, -643984, -643984]$[600, 320, -643984, -643984]$[760, 320, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JKyWUI9WEeiT7tMsBl6xjA" id="(0.5357142857142857,1.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JKyWUY9WEeiT7tMsBl6xjA" id="(0.0,0.32786885245901637)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_UW9RkcDfEeiebIKjAGZWdA" type="StereotypeCommentLink" source="_UWia0MDfEeiebIKjAGZWdA" target="_UW8qgMDfEeiebIKjAGZWdA">
@@ -811,11 +875,11 @@
     <edges xmi:type="notation:Connector" xmi:id="_LwLMgMDgEeiebIKjAGZWdA" type="Association_Edge" source="_B6n_AIn-EeiOe-BKGdv_Yg" target="_UWia0MDfEeiebIKjAGZWdA">
       <children xmi:type="notation:DecorationNode" xmi:id="_LwLMg8DgEeiebIKjAGZWdA" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_P0Q3kMDhEeiebIKjAGZWdA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_LwLMhMDgEeiebIKjAGZWdA" y="-20"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_LwLMhMDgEeiebIKjAGZWdA" x="-5" y="7"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_LwLMhcDgEeiebIKjAGZWdA" type="Association_NameLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_P0lAoMDhEeiebIKjAGZWdA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_LwLMhsDgEeiebIKjAGZWdA" x="-16" y="-13"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_LwLMhsDgEeiebIKjAGZWdA" x="10" y="-13"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_LwLMh8DgEeiebIKjAGZWdA" visible="false" type="Association_TargetRoleLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_P00RMMDhEeiebIKjAGZWdA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -835,9 +899,9 @@
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_LwLMgcDgEeiebIKjAGZWdA"/>
       <element xmi:type="uml:Association" href="Service.uml#_Lvny4MDgEeiebIKjAGZWdA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LwLMgsDgEeiebIKjAGZWdA" points="[833, 320, -643984, -643984]$[1060, 320, -643984, -643984]$[1060, 280, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LxFygMDgEeiebIKjAGZWdA" id="(1.0,0.32786885245901637)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LxGZkMDgEeiebIKjAGZWdA" id="(0.7947019867549668,1.0)"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LwLMgsDgEeiebIKjAGZWdA" points="[883, 340, -643984, -643984]$[1159, 340, -643984, -643984]$[1160, 301, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LxFygMDgEeiebIKjAGZWdA" id="(1.0,0.6557377049180327)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LxGZkMDgEeiebIKjAGZWdA" id="(0.7964601769911505,1.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_HFxA98DiEeiebIKjAGZWdA" type="StereotypeCommentLink" source="_HFpFIMDiEeiebIKjAGZWdA" target="_HFxA88DiEeiebIKjAGZWdA">
       <styles xmi:type="notation:FontStyle" xmi:id="_HFxA-MDiEeiebIKjAGZWdA"/>
@@ -852,11 +916,11 @@
     <edges xmi:type="notation:Connector" xmi:id="_OGfRsMDiEeiebIKjAGZWdA" type="Association_Edge" source="_UWia0MDfEeiebIKjAGZWdA" target="_HFpFIMDiEeiebIKjAGZWdA">
       <children xmi:type="notation:DecorationNode" xmi:id="_OGfRs8DiEeiebIKjAGZWdA" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OxaeAMDiEeiebIKjAGZWdA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_OGfRtMDiEeiebIKjAGZWdA" y="-20"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_OGfRtMDiEeiebIKjAGZWdA" x="3" y="-4"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_OGfRtcDiEeiebIKjAGZWdA" type="Association_NameLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OxunEMDiEeiebIKjAGZWdA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_OGfRtsDiEeiebIKjAGZWdA" x="-19" y="19"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_OGfRtsDiEeiebIKjAGZWdA" x="23" y="1"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_OGfRt8DiEeiebIKjAGZWdA" visible="false" type="Association_TargetRoleLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OyAT4MDiEeiebIKjAGZWdA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -868,7 +932,7 @@
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_OGfRu8DiEeiebIKjAGZWdA" type="Association_SourceMultiplicityLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Oyh4UMDiEeiebIKjAGZWdA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_OGfRvMDiEeiebIKjAGZWdA" x="20" y="7"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_OGfRvMDiEeiebIKjAGZWdA" x="13" y="11"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_OGfRvcDiEeiebIKjAGZWdA" type="Association_TargetMultiplicityLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Oyy-EMDiEeiebIKjAGZWdA" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -876,35 +940,41 @@
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_OGfRscDiEeiebIKjAGZWdA"/>
       <element xmi:type="uml:Association" href="Service.uml#_OGFpEMDiEeiebIKjAGZWdA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OGfRssDiEeiebIKjAGZWdA" points="[1091, 220, -643984, -643984]$[1200, 220, -643984, -643984]$[1200, 340, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OHIK4MDiEeiebIKjAGZWdA" id="(1.0,0.4)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OHIK4cDiEeiebIKjAGZWdA" id="(0.47619047619047616,0.0)"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OGfRssDiEeiebIKjAGZWdA" points="[1060, 220, -643984, -643984]$[1060, 121, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OHIK4MDiEeiebIKjAGZWdA" id="(0.35398230088495575,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OHIK4cDiEeiebIKjAGZWdA" id="(0.5,1.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_605xYMGTEeiS695oPTRE1Q" type="Association_Edge" source="_B6n_AIn-EeiOe-BKGdv_Yg" target="_DBgHgIn-EeiOe-BKGdv_Yg" lineColor="0">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZGPsIMGYEeiS695oPTRE1Q" source="PapyrusCSSForceValue">
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZGQTMMGYEeiS695oPTRE1Q" key="lineColor" value="true"/>
       </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_606YcMGTEeiS695oPTRE1Q" type="Association_StereotypeLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_606YccGTEeiS695oPTRE1Q" y="-20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_sLjXIFoJEemSNe5QiI5UBQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_606YccGTEeiS695oPTRE1Q" x="-7" y="-4"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_606YcsGTEeiS695oPTRE1Q" type="Association_NameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_606Yc8GTEeiS695oPTRE1Q" x="13" y="-8"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_sL8YsFoJEemSNe5QiI5UBQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_606Yc8GTEeiS695oPTRE1Q" x="13" y="12"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_606YdMGTEeiS695oPTRE1Q" visible="false" type="Association_TargetRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_606YdcGTEeiS695oPTRE1Q" y="-20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_sMS-AFoJEemSNe5QiI5UBQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_606YdcGTEeiS695oPTRE1Q" x="24" y="-20"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_606YdsGTEeiS695oPTRE1Q" visible="false" type="Association_SourceRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_606Yd8GTEeiS695oPTRE1Q" y="20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_sMo8QFoJEemSNe5QiI5UBQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_606Yd8GTEeiS695oPTRE1Q" x="-24" y="20"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_606YeMGTEeiS695oPTRE1Q" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_606_gMGTEeiS695oPTRE1Q" y="20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_sM_hkFoJEemSNe5QiI5UBQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_606_gMGTEeiS695oPTRE1Q" x="24" y="20"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_606_gcGTEeiS695oPTRE1Q" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_606_gsGTEeiS695oPTRE1Q" y="-20"/>
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_sNWG4FoJEemSNe5QiI5UBQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_606_gsGTEeiS695oPTRE1Q" x="-24" y="-20"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_605xYcGTEeiS695oPTRE1Q"/>
       <element xmi:type="uml:Association" href="Service.uml#_6z5EwMGTEeiS695oPTRE1Q"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_605xYsGTEeiS695oPTRE1Q" points="[800, 300, -643984, -643984]$[800, 141, -643984, -643984]"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_605xYsGTEeiS695oPTRE1Q" points="[840, 300, -643984, -643984]$[840, 141, -643984, -643984]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_62Wi4MGTEeiS695oPTRE1Q" id="(0.7079646017699115,0.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_62Wi4cGTEeiS695oPTRE1Q" id="(0.6504065040650406,1.0)"/>
     </edges>
@@ -919,9 +989,9 @@
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_MrpyscGjEeiS695oPTRE1Q"/>
       <element xmi:type="uml:AssociationClass" href="Service.uml#_MnBKUMGjEeiS695oPTRE1Q"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MrpyssGjEeiS695oPTRE1Q" points="[120, 361, -643984, -643984]$[120, 420, -643984, -643984]$[120, 440, -643984, -643984]$[120, 460, -643984, -643984]$[120, 500, -643984, -643984]$[220, 500, -643984, -643984]$[220, 361, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_M5ASMMGjEeiS695oPTRE1Q" id="(0.1702127659574468,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_M5ASMcGjEeiS695oPTRE1Q" id="(0.5957446808510638,1.0)"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MrpyssGjEeiS695oPTRE1Q" points="[80, 361, -643984, -643984]$[80, 420, -643984, -643984]$[80, 400, -643984, -643984]$[80, 420, -643984, -643984]$[200, 420, -643984, -643984]$[200, 361, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_M5ASMMGjEeiS695oPTRE1Q" id="(0.1935483870967742,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_M5ASMcGjEeiS695oPTRE1Q" id="(0.5806451612903226,1.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_Mv5ZgMGjEeiS695oPTRE1Q" type="StereotypeCommentLink" source="_MrpysMGjEeiS695oPTRE1Q" target="_Mv4ycMGjEeiS695oPTRE1Q">
       <styles xmi:type="notation:FontStyle" xmi:id="_Mv5ZgcGjEeiS695oPTRE1Q"/>
@@ -962,8 +1032,8 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_hVK-8cGkEeiS695oPTRE1Q"/>
       <element xmi:type="uml:AssociationClass" href="Service.uml#_hUzLgMGkEeiS695oPTRE1Q"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hVK-8sGkEeiS695oPTRE1Q" points="[480, 240, -643984, -643984]$[440, 240, -643984, -643984]$[440, 320, -643984, -643984]$[520, 320, -643984, -643984]$[520, 261, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hWChoMGkEeiS695oPTRE1Q" id="(0.0,0.7920792079207921)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hWChocGkEeiS695oPTRE1Q" id="(0.2684563758389262,1.0)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hWChoMGkEeiS695oPTRE1Q" id="(0.0,0.8264462809917356)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hWChocGkEeiS695oPTRE1Q" id="(0.17857142857142858,1.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_hViyZMGkEeiS695oPTRE1Q" type="StereotypeCommentLink" source="_hVK-8MGkEeiS695oPTRE1Q" target="_hViyYMGkEeiS695oPTRE1Q">
       <styles xmi:type="notation:FontStyle" xmi:id="_hViyZcGkEeiS695oPTRE1Q"/>
@@ -990,7 +1060,87 @@
       <element xsi:nil="true"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hW-80sGkEeiS695oPTRE1Q" points="[-50, -46, 0, 0]$[-50, -46, 0, 0]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hW_j4MGkEeiS695oPTRE1Q" id="(0.49606299212598426,0.6299212598425197)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_h5P8YMGkEeiS695oPTRE1Q" id="(0.5633802816901409,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_h5P8YMGkEeiS695oPTRE1Q" id="(0.5298013245033113,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_NYDNuFoJEemSNe5QiI5UBQ" type="StereotypeCommentLink" source="_DwakALwnEeifWa7EkiXrHA" target="_NYDNtFoJEemSNe5QiI5UBQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_NYDNuVoJEemSNe5QiI5UBQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_NYD0wloJEemSNe5QiI5UBQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Enumeration" href="Service.uml#_DwZV4LwnEeifWa7EkiXrHA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NYDNuloJEemSNe5QiI5UBQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NYD0wFoJEemSNe5QiI5UBQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NYD0wVoJEemSNe5QiI5UBQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_OY_tWFoJEemSNe5QiI5UBQ" type="StereotypeCommentLink" source="_pWZyIMA-Eei02ItngDf4ZA" target="_OY_tVFoJEemSNe5QiI5UBQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_OY_tWVoJEemSNe5QiI5UBQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_OY_tXVoJEemSNe5QiI5UBQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Enumeration" href="Service.uml#_pWPaEMA-Eei02ItngDf4ZA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OY_tWloJEemSNe5QiI5UBQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OY_tW1oJEemSNe5QiI5UBQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OY_tXFoJEemSNe5QiI5UBQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_PoHy6FoJEemSNe5QiI5UBQ" type="StereotypeCommentLink" source="_3a4GcI6OEeiLSKWGMeE9mQ" target="_PoHy5FoJEemSNe5QiI5UBQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_PoHy6VoJEemSNe5QiI5UBQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_PoHy7VoJEemSNe5QiI5UBQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Enumeration" href="Service.uml#_3a0cEI6OEeiLSKWGMeE9mQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PoHy6loJEemSNe5QiI5UBQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PoHy61oJEemSNe5QiI5UBQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PoHy7FoJEemSNe5QiI5UBQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_C6JO9FoKEemSNe5QiI5UBQ" type="StereotypeCommentLink" source="_rUXccIoAEeiOe-BKGdv_Yg" target="_C6JO8FoKEemSNe5QiI5UBQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_C6JO9VoKEemSNe5QiI5UBQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_C6J2AloKEemSNe5QiI5UBQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Service.uml#_rUEhgIoAEeiOe-BKGdv_Yg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_C6JO9loKEemSNe5QiI5UBQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_C6J2AFoKEemSNe5QiI5UBQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_C6J2AVoKEemSNe5QiI5UBQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_FbP5xFoKEemSNe5QiI5UBQ" type="StereotypeCommentLink" source="_LB_2YIoCEeiOe-BKGdv_Yg" target="_FbP5wFoKEemSNe5QiI5UBQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_FbP5xVoKEemSNe5QiI5UBQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_FbP5yVoKEemSNe5QiI5UBQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Service.uml#_LBuJkIoCEeiOe-BKGdv_Yg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FbP5xloKEemSNe5QiI5UBQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FbP5x1oKEemSNe5QiI5UBQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FbP5yFoKEemSNe5QiI5UBQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_G-_H9FoLEemSNe5QiI5UBQ" type="StereotypeCommentLink" source="_605xYMGTEeiS695oPTRE1Q" target="_G-_H8FoLEemSNe5QiI5UBQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_G-_H9VoLEemSNe5QiI5UBQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_G-_vAloLEemSNe5QiI5UBQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Service.uml#_6z5EwMGTEeiS695oPTRE1Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_G-_H9loLEemSNe5QiI5UBQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_G-_vAFoLEemSNe5QiI5UBQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_G-_vAVoLEemSNe5QiI5UBQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_MzD_ZFoLEemSNe5QiI5UBQ" type="StereotypeCommentLink" source="_OGfRsMDiEeiebIKjAGZWdA" target="_MzD_YFoLEemSNe5QiI5UBQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_MzD_ZVoLEemSNe5QiI5UBQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_MzD_aVoLEemSNe5QiI5UBQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Service.uml#_OGFpEMDiEeiebIKjAGZWdA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MzD_ZloLEemSNe5QiI5UBQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MzD_Z1oLEemSNe5QiI5UBQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MzD_aFoLEemSNe5QiI5UBQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_Q6K-tFoLEemSNe5QiI5UBQ" type="StereotypeCommentLink" source="_LwLMgMDgEeiebIKjAGZWdA" target="_Q6K-sFoLEemSNe5QiI5UBQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Q6K-tVoLEemSNe5QiI5UBQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Q6K-uVoLEemSNe5QiI5UBQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Service.uml#_Lvny4MDgEeiebIKjAGZWdA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Q6K-tloLEemSNe5QiI5UBQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Q6K-t1oLEemSNe5QiI5UBQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Q6K-uFoLEemSNe5QiI5UBQ"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_LKKcAI91EeiT7tMsBl6xjA" type="PapyrusUMLClassDiagram" name="Service Catalog" measurementUnit="Pixel">
@@ -3352,14 +3502,6 @@
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bHM_8R9eEemLMI6HKP6Lbw" x="200"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_nNPngzAvEemfJIA7XFfVEg" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_nNPnhDAvEemfJIA7XFfVEg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_nNPnhjAvEemfJIA7XFfVEg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="Service.uml#_OtbCoDAvEemfJIA7XFfVEg"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nNPnhTAvEemfJIA7XFfVEg" x="540" y="-140"/>
-    </children>
     <children xmi:type="notation:Shape" xmi:id="_AZRcIDEiEemRSoIWRX3jNw" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_AZSqQDEiEemRSoIWRX3jNw" type="Class_NameLabel"/>
       <children xmi:type="notation:DecorationNode" xmi:id="_AZSqQTEiEemRSoIWRX3jNw" type="Class_FloatingNameLabel">
@@ -3446,6 +3588,102 @@
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_h_BoRTJ2Eem5adcA1c6ckw" x="200"/>
     </children>
+    <children xmi:type="notation:Shape" xmi:id="_xW3gEFn2EemSNe5QiI5UBQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_xW3gEVn2EemSNe5QiI5UBQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xW6jYFn2EemSNe5QiI5UBQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Service.uml#_6lxVwCC1Eemw1L3J4dNy4w"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xW3gEln2EemSNe5QiI5UBQ" x="420" y="220"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_0XsMwFn2EemSNe5QiI5UBQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_0XsMwVn2EemSNe5QiI5UBQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0XsMw1n2EemSNe5QiI5UBQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Generalization" href="Service.uml#_yX44MB9eEemLMI6HKP6Lbw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0XsMwln2EemSNe5QiI5UBQ" x="420" y="220"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_aow7AFn3EemSNe5QiI5UBQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_aow7AVn3EemSNe5QiI5UBQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_aow7A1n3EemSNe5QiI5UBQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Generalization" href="Service.uml#_xMGpgM4oEeinDdlk3ffduQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aow7Aln3EemSNe5QiI5UBQ" x="680" y="220"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_looh4Fn3EemSNe5QiI5UBQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_looh4Vn3EemSNe5QiI5UBQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_looh41n3EemSNe5QiI5UBQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Generalization" href="Service.uml#_o4dRYKuDEeiRK6iIVq4LZA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_looh4ln3EemSNe5QiI5UBQ" x="1140" y="220"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_nq-NEFn3EemSNe5QiI5UBQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_nq-NEVn3EemSNe5QiI5UBQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_nq-NE1n3EemSNe5QiI5UBQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Generalization" href="Service.uml#_pmW5MKuDEeiRK6iIVq4LZA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nq-NEln3EemSNe5QiI5UBQ" x="1440" y="220"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_smg6AFn3EemSNe5QiI5UBQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_smg6AVn3EemSNe5QiI5UBQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_smg6A1n3EemSNe5QiI5UBQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Service.uml#_L-PS4KuFEeiRK6iIVq4LZA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_smg6Aln3EemSNe5QiI5UBQ" x="1440" y="220"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_u5r2gFn3EemSNe5QiI5UBQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_u5r2gVn3EemSNe5QiI5UBQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_u5sdkFn3EemSNe5QiI5UBQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Service.uml#_9m-qsCC6Eemw1L3J4dNy4w"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_u5r2gln3EemSNe5QiI5UBQ" x="680" y="220"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_3-jwUFn3EemSNe5QiI5UBQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_3-jwUVn3EemSNe5QiI5UBQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3-jwU1n3EemSNe5QiI5UBQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Service.uml#_hxFFYCC7Eemw1L3J4dNy4w"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3-jwUln3EemSNe5QiI5UBQ" x="420" y="220"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_86WU4Fn3EemSNe5QiI5UBQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_86WU4Vn3EemSNe5QiI5UBQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_86WU41n3EemSNe5QiI5UBQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Service.uml#_-s0pcDJ2Eem5adcA1c6ckw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_86WU4ln3EemSNe5QiI5UBQ" x="1440" y="220"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_-64CMFn3EemSNe5QiI5UBQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_-64CMVn3EemSNe5QiI5UBQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_-64CM1n3EemSNe5QiI5UBQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Service.uml#_5Ip2QDJ2Eem5adcA1c6ckw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-64CMln3EemSNe5QiI5UBQ" x="1140" y="220"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_CIyvsFn4EemSNe5QiI5UBQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_CIyvsVn4EemSNe5QiI5UBQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_CIyvs1n4EemSNe5QiI5UBQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Service.uml#_uulWADJ0EembsLjrwaSXHQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CIyvsln4EemSNe5QiI5UBQ" x="680" y="220"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_EAQAkFn4EemSNe5QiI5UBQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_EAQAkVn4EemSNe5QiI5UBQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_EAQAk1n4EemSNe5QiI5UBQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Service.uml#_qdIu8DJ0EembsLjrwaSXHQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EAQAkln4EemSNe5QiI5UBQ" x="420" y="220"/>
+    </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_Y0oyUR9cEemLMI6HKP6Lbw" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_Y0oyUh9cEemLMI6HKP6Lbw"/>
     <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_Y0oyUx9cEemLMI6HKP6Lbw" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
@@ -3515,7 +3753,7 @@
     <edges xmi:type="notation:Connector" xmi:id="_ta_gYB9eEemLMI6HKP6Lbw" type="Generalization_Edge" source="_bJ4LYB9cEemLMI6HKP6Lbw" target="_nTtrAB9cEemLMI6HKP6Lbw">
       <children xmi:type="notation:DecorationNode" xmi:id="_ta_gYx9eEemLMI6HKP6Lbw" type="Generalization_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_wyBGkB9eEemLMI6HKP6Lbw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ta_gZB9eEemLMI6HKP6Lbw" y="38"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ta_gZB9eEemLMI6HKP6Lbw" x="-56" y="-27"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_ta_gYR9eEemLMI6HKP6Lbw"/>
       <element xmi:type="uml:Generalization" href="Service.uml#_xMGpgM4oEeinDdlk3ffduQ"/>
@@ -3526,7 +3764,7 @@
     <edges xmi:type="notation:Connector" xmi:id="_yclyAB9eEemLMI6HKP6Lbw" type="Generalization_Edge" source="_Yz45gB9eEemLMI6HKP6Lbw" target="_nTtrAB9cEemLMI6HKP6Lbw">
       <children xmi:type="notation:DecorationNode" xmi:id="_yclyAx9eEemLMI6HKP6Lbw" type="Generalization_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_zMzG8B9eEemLMI6HKP6Lbw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_yclyBB9eEemLMI6HKP6Lbw" y="39"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_yclyBB9eEemLMI6HKP6Lbw" x="-74" y="27"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_yclyAR9eEemLMI6HKP6Lbw"/>
       <element xmi:type="uml:Generalization" href="Service.uml#_yX44MB9eEemLMI6HKP6Lbw"/>
@@ -3537,7 +3775,7 @@
     <edges xmi:type="notation:Connector" xmi:id="_KVp44B9fEemLMI6HKP6Lbw" type="Generalization_Edge" source="_eJ8qIB9cEemLMI6HKP6Lbw" target="_bHBZwB9eEemLMI6HKP6Lbw">
       <children xmi:type="notation:DecorationNode" xmi:id="_KVp44x9fEemLMI6HKP6Lbw" type="Generalization_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_OLsWUB9fEemLMI6HKP6Lbw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_KVp45B9fEemLMI6HKP6Lbw" y="38"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_KVp45B9fEemLMI6HKP6Lbw" x="-94" y="27"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_KVp44R9fEemLMI6HKP6Lbw"/>
       <element xmi:type="uml:Generalization" href="Service.uml#_o4dRYKuDEeiRK6iIVq4LZA"/>
@@ -3548,7 +3786,7 @@
     <edges xmi:type="notation:Connector" xmi:id="_MG9ecB9fEemLMI6HKP6Lbw" type="Generalization_Edge" source="_jBdysB9cEemLMI6HKP6Lbw" target="_bHBZwB9eEemLMI6HKP6Lbw">
       <children xmi:type="notation:DecorationNode" xmi:id="_MG-FgB9fEemLMI6HKP6Lbw" type="Generalization_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Q5y7UB9fEemLMI6HKP6Lbw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_MG-FgR9fEemLMI6HKP6Lbw" y="39"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_MG-FgR9fEemLMI6HKP6Lbw" x="-76" y="-27"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_MG9ecR9fEemLMI6HKP6Lbw"/>
       <element xmi:type="uml:Generalization" href="Service.uml#_pmW5MKuDEeiRK6iIVq4LZA"/>
@@ -3559,7 +3797,7 @@
     <edges xmi:type="notation:Connector" xmi:id="_sF6uYB9fEemLMI6HKP6Lbw" type="Association_Edge" source="_jBdysB9cEemLMI6HKP6Lbw" target="_bHBZwB9eEemLMI6HKP6Lbw">
       <children xmi:type="notation:DecorationNode" xmi:id="_sF7VcB9fEemLMI6HKP6Lbw" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_x52b4B9fEemLMI6HKP6Lbw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_sF7VcR9fEemLMI6HKP6Lbw" x="-1" y="-18"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_sF7VcR9fEemLMI6HKP6Lbw" x="3" y="-4"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_sF7Vch9fEemLMI6HKP6Lbw" type="Association_NameLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_x96cgB9fEemLMI6HKP6Lbw" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -3621,11 +3859,11 @@
     <edges xmi:type="notation:Connector" xmi:id="_9v9nkCC6Eemw1L3J4dNy4w" type="Association_Edge" source="_bJ4LYB9cEemLMI6HKP6Lbw" target="_eJ8qIB9cEemLMI6HKP6Lbw">
       <children xmi:type="notation:DecorationNode" xmi:id="_9v9nkyC6Eemw1L3J4dNy4w" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_C_2z4CC7Eemw1L3J4dNy4w" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_9v9nlCC6Eemw1L3J4dNy4w" x="1" y="-18"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_9v9nlCC6Eemw1L3J4dNy4w" x="-4" y="7"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_9v9nlSC6Eemw1L3J4dNy4w" type="Association_NameLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_DIvqICC7Eemw1L3J4dNy4w" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_9v9nliC6Eemw1L3J4dNy4w" x="1" y="-13"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_9v9nliC6Eemw1L3J4dNy4w" x="11" y="-13"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_9v9nlyC6Eemw1L3J4dNy4w" visible="false" type="Association_TargetRoleLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_DRWzkCC7Eemw1L3J4dNy4w" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -3652,11 +3890,11 @@
     <edges xmi:type="notation:Connector" xmi:id="_h6SEsCC7Eemw1L3J4dNy4w" type="Association_Edge" source="_Yz45gB9eEemLMI6HKP6Lbw" target="_jBdysB9cEemLMI6HKP6Lbw">
       <children xmi:type="notation:DecorationNode" xmi:id="_h6SEsyC7Eemw1L3J4dNy4w" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jGjqkCC7Eemw1L3J4dNy4w" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_h6SEtCC7Eemw1L3J4dNy4w" x="1" y="-18"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_h6SEtCC7Eemw1L3J4dNy4w" x="16" y="7"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_h6SEtSC7Eemw1L3J4dNy4w" type="Association_NameLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jQJrcCC7Eemw1L3J4dNy4w" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_h6SEtiC7Eemw1L3J4dNy4w" x="10" y="-13"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_h6SEtiC7Eemw1L3J4dNy4w" x="30" y="-13"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_h6SEtyC7Eemw1L3J4dNy4w" visible="false" type="Association_TargetRoleLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jZnJcCC7Eemw1L3J4dNy4w" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -3680,47 +3918,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iMi5YCC7Eemw1L3J4dNy4w" id="(0.18099547511312217,1.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iMi5YSC7Eemw1L3J4dNy4w" id="(0.8144796380090498,1.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_OzhqoDAvEemfJIA7XFfVEg" type="Association_Edge" source="_nTtrAB9cEemLMI6HKP6Lbw" target="_bHBZwB9eEemLMI6HKP6Lbw">
-      <children xmi:type="notation:DecorationNode" xmi:id="_OznxQDAvEemfJIA7XFfVEg" visible="false" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_P5o-IDAvEemfJIA7XFfVEg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_OznxQTAvEemfJIA7XFfVEg" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_OznxQjAvEemfJIA7XFfVEg" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_P7WOUDAvEemfJIA7XFfVEg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_OznxQzAvEemfJIA7XFfVEg" x="-9" y="-13"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_OznxRDAvEemfJIA7XFfVEg" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QBf5oDAvEemfJIA7XFfVEg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_OznxRTAvEemfJIA7XFfVEg" x="41" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_OznxRjAvEemfJIA7XFfVEg" visible="false" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QD4fQDAvEemfJIA7XFfVEg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_OznxRzAvEemfJIA7XFfVEg" x="-40" y="19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_OznxSDAvEemfJIA7XFfVEg" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QJgmIDAvEemfJIA7XFfVEg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_OznxSTAvEemfJIA7XFfVEg" x="41" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_OznxSjAvEemfJIA7XFfVEg" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QO2ZIDAvEemfJIA7XFfVEg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_OznxSzAvEemfJIA7XFfVEg" x="-36" y="27"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_OzhqoTAvEemfJIA7XFfVEg"/>
-      <element xmi:type="uml:Association" href="Service.uml#_OtbCoDAvEemfJIA7XFfVEg"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OzhqojAvEemfJIA7XFfVEg" points="[621, 80, -643984, -643984]$[800, 80, -643984, -643984]$[800, 80, -643984, -643984]$[900, 140, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_O-Zd4DAvEemfJIA7XFfVEg" id="(1.0,0.4979253112033195)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_O-Zd4TAvEemfJIA7XFfVEg" id="(0.0,0.5)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_nNPnhzAvEemfJIA7XFfVEg" type="StereotypeCommentLink" source="_OzhqoDAvEemfJIA7XFfVEg" target="_nNPngzAvEemfJIA7XFfVEg">
-      <styles xmi:type="notation:FontStyle" xmi:id="_nNPniDAvEemfJIA7XFfVEg"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_nNPnjDAvEemfJIA7XFfVEg" name="BASE_ELEMENT">
-        <eObjectValue xmi:type="uml:Association" href="Service.uml#_OtbCoDAvEemfJIA7XFfVEg"/>
-      </styles>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nNPniTAvEemfJIA7XFfVEg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nNPnijAvEemfJIA7XFfVEg"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nNPnizAvEemfJIA7XFfVEg"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_AZvWNzEiEemRSoIWRX3jNw" type="StereotypeCommentLink" source="_AZRcIDEiEemRSoIWRX3jNw" target="_AZvWMzEiEemRSoIWRX3jNw">
       <styles xmi:type="notation:FontStyle" xmi:id="_AZvWODEiEemRSoIWRX3jNw"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_AZvWPDEiEemRSoIWRX3jNw" name="BASE_ELEMENT">
@@ -3734,7 +3931,7 @@
     <edges xmi:type="notation:Connector" xmi:id="_qoS2EDJ0EembsLjrwaSXHQ" type="Association_Edge" source="_Yz45gB9eEemLMI6HKP6Lbw" target="_AZRcIDEiEemRSoIWRX3jNw">
       <children xmi:type="notation:DecorationNode" xmi:id="_qoS2EzJ0EembsLjrwaSXHQ" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_vYa10DJ3Eem5adcA1c6ckw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_qoS2FDJ0EembsLjrwaSXHQ" y="-20"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qoS2FDJ0EembsLjrwaSXHQ" x="17" y="4"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_qoS2FTJ0EembsLjrwaSXHQ" type="Association_NameLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_vlUCUDJ3Eem5adcA1c6ckw" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -3765,7 +3962,7 @@
     <edges xmi:type="notation:Connector" xmi:id="_u6LiADJ0EembsLjrwaSXHQ" type="Association_Edge" source="_bJ4LYB9cEemLMI6HKP6Lbw" target="_AZRcIDEiEemRSoIWRX3jNw">
       <children xmi:type="notation:DecorationNode" xmi:id="_u6LiAzJ0EembsLjrwaSXHQ" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_wip0UDJ3Eem5adcA1c6ckw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_u6LiBDJ0EembsLjrwaSXHQ" y="-20"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_u6LiBDJ0EembsLjrwaSXHQ" x="-3" y="4"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_u6LiBTJ0EembsLjrwaSXHQ" type="Association_NameLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_wuIrkDJ3Eem5adcA1c6ckw" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -3806,7 +4003,7 @@
     <edges xmi:type="notation:Connector" xmi:id="_5Vc8IDJ2Eem5adcA1c6ckw" type="Association_Edge" source="_eJ8qIB9cEemLMI6HKP6Lbw" target="_h-bLUDJ2Eem5adcA1c6ckw">
       <children xmi:type="notation:DecorationNode" xmi:id="_5Vc8IzJ2Eem5adcA1c6ckw" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_67gT8DJ2Eem5adcA1c6ckw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_5Vc8JDJ2Eem5adcA1c6ckw" x="-1" y="-19"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_5Vc8JDJ2Eem5adcA1c6ckw" x="-3" y="4"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_5Vc8JTJ2Eem5adcA1c6ckw" type="Association_NameLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_7CgT0DJ2Eem5adcA1c6ckw" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -3837,7 +4034,7 @@
     <edges xmi:type="notation:Connector" xmi:id="_-1AVEDJ2Eem5adcA1c6ckw" type="Association_Edge" source="_jBdysB9cEemLMI6HKP6Lbw" target="_h-bLUDJ2Eem5adcA1c6ckw">
       <children xmi:type="notation:DecorationNode" xmi:id="_-1AVEzJ2Eem5adcA1c6ckw" type="Association_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_KFQE0DJ4Eem5adcA1c6ckw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_-1AVFDJ2Eem5adcA1c6ckw" y="-20"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-1AVFDJ2Eem5adcA1c6ckw" x="-3" y="4"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_-1AVFTJ2Eem5adcA1c6ckw" type="Association_NameLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_KPkecDJ4Eem5adcA1c6ckw" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -3865,5 +4062,125 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__LxPQDJ2Eem5adcA1c6ckw" id="(0.18099547511312217,1.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__LxPQTJ2Eem5adcA1c6ckw" id="(0.9049773755656109,0.0)"/>
     </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_xW6jYVn2EemSNe5QiI5UBQ" type="StereotypeCommentLink" source="_6uqzECC1Eemw1L3J4dNy4w" target="_xW3gEFn2EemSNe5QiI5UBQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_xW6jYln2EemSNe5QiI5UBQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xW7Kcln2EemSNe5QiI5UBQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Service.uml#_6lxVwCC1Eemw1L3J4dNy4w"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xW6jY1n2EemSNe5QiI5UBQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xW7KcFn2EemSNe5QiI5UBQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xW7KcVn2EemSNe5QiI5UBQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_0XsMxFn2EemSNe5QiI5UBQ" type="StereotypeCommentLink" source="_yclyAB9eEemLMI6HKP6Lbw" target="_0XsMwFn2EemSNe5QiI5UBQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_0XsMxVn2EemSNe5QiI5UBQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0Xsz0Fn2EemSNe5QiI5UBQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Generalization" href="Service.uml#_yX44MB9eEemLMI6HKP6Lbw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0XsMxln2EemSNe5QiI5UBQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0XsMx1n2EemSNe5QiI5UBQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0XsMyFn2EemSNe5QiI5UBQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_aow7BFn3EemSNe5QiI5UBQ" type="StereotypeCommentLink" source="_ta_gYB9eEemLMI6HKP6Lbw" target="_aow7AFn3EemSNe5QiI5UBQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_aow7BVn3EemSNe5QiI5UBQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_aow7CVn3EemSNe5QiI5UBQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Generalization" href="Service.uml#_xMGpgM4oEeinDdlk3ffduQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_aow7Bln3EemSNe5QiI5UBQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aow7B1n3EemSNe5QiI5UBQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aow7CFn3EemSNe5QiI5UBQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_looh5Fn3EemSNe5QiI5UBQ" type="StereotypeCommentLink" source="_KVp44B9fEemLMI6HKP6Lbw" target="_looh4Fn3EemSNe5QiI5UBQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_looh5Vn3EemSNe5QiI5UBQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_looh6Vn3EemSNe5QiI5UBQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Generalization" href="Service.uml#_o4dRYKuDEeiRK6iIVq4LZA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_looh5ln3EemSNe5QiI5UBQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_looh51n3EemSNe5QiI5UBQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_looh6Fn3EemSNe5QiI5UBQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_nq-NFFn3EemSNe5QiI5UBQ" type="StereotypeCommentLink" source="_MG9ecB9fEemLMI6HKP6Lbw" target="_nq-NEFn3EemSNe5QiI5UBQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_nq-NFVn3EemSNe5QiI5UBQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_nq-NGVn3EemSNe5QiI5UBQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Generalization" href="Service.uml#_pmW5MKuDEeiRK6iIVq4LZA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nq-NFln3EemSNe5QiI5UBQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nq-NF1n3EemSNe5QiI5UBQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nq-NGFn3EemSNe5QiI5UBQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_smg6BFn3EemSNe5QiI5UBQ" type="StereotypeCommentLink" source="_sF6uYB9fEemLMI6HKP6Lbw" target="_smg6AFn3EemSNe5QiI5UBQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_smg6BVn3EemSNe5QiI5UBQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_smg6CVn3EemSNe5QiI5UBQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Service.uml#_L-PS4KuFEeiRK6iIVq4LZA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_smg6Bln3EemSNe5QiI5UBQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_smg6B1n3EemSNe5QiI5UBQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_smg6CFn3EemSNe5QiI5UBQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_u5sdkVn3EemSNe5QiI5UBQ" type="StereotypeCommentLink" source="_9v9nkCC6Eemw1L3J4dNy4w" target="_u5r2gFn3EemSNe5QiI5UBQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_u5sdkln3EemSNe5QiI5UBQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_u5sdlln3EemSNe5QiI5UBQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Service.uml#_9m-qsCC6Eemw1L3J4dNy4w"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_u5sdk1n3EemSNe5QiI5UBQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_u5sdlFn3EemSNe5QiI5UBQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_u5sdlVn3EemSNe5QiI5UBQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_3-jwVFn3EemSNe5QiI5UBQ" type="StereotypeCommentLink" source="_h6SEsCC7Eemw1L3J4dNy4w" target="_3-jwUFn3EemSNe5QiI5UBQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_3-jwVVn3EemSNe5QiI5UBQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3-jwWVn3EemSNe5QiI5UBQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Service.uml#_hxFFYCC7Eemw1L3J4dNy4w"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3-jwVln3EemSNe5QiI5UBQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3-jwV1n3EemSNe5QiI5UBQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3-jwWFn3EemSNe5QiI5UBQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_86WU5Fn3EemSNe5QiI5UBQ" type="StereotypeCommentLink" source="_-1AVEDJ2Eem5adcA1c6ckw" target="_86WU4Fn3EemSNe5QiI5UBQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_86WU5Vn3EemSNe5QiI5UBQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_86WU6Vn3EemSNe5QiI5UBQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Service.uml#_-s0pcDJ2Eem5adcA1c6ckw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_86WU5ln3EemSNe5QiI5UBQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_86WU51n3EemSNe5QiI5UBQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_86WU6Fn3EemSNe5QiI5UBQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_-64CNFn3EemSNe5QiI5UBQ" type="StereotypeCommentLink" source="_5Vc8IDJ2Eem5adcA1c6ckw" target="_-64CMFn3EemSNe5QiI5UBQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_-64CNVn3EemSNe5QiI5UBQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_-64COVn3EemSNe5QiI5UBQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Service.uml#_5Ip2QDJ2Eem5adcA1c6ckw"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-64CNln3EemSNe5QiI5UBQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-64CN1n3EemSNe5QiI5UBQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-64COFn3EemSNe5QiI5UBQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_CIyvtFn4EemSNe5QiI5UBQ" type="StereotypeCommentLink" source="_u6LiADJ0EembsLjrwaSXHQ" target="_CIyvsFn4EemSNe5QiI5UBQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_CIyvtVn4EemSNe5QiI5UBQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_CIzWwFn4EemSNe5QiI5UBQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Service.uml#_uulWADJ0EembsLjrwaSXHQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_CIyvtln4EemSNe5QiI5UBQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CIyvt1n4EemSNe5QiI5UBQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CIyvuFn4EemSNe5QiI5UBQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_EAQAlFn4EemSNe5QiI5UBQ" type="StereotypeCommentLink" source="_qoS2EDJ0EembsLjrwaSXHQ" target="_EAQAkFn4EemSNe5QiI5UBQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_EAQAlVn4EemSNe5QiI5UBQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_EAQnoln4EemSNe5QiI5UBQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Association" href="Service.uml#_qdIu8DJ0EembsLjrwaSXHQ"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EAQAlln4EemSNe5QiI5UBQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EAQnoFn4EemSNe5QiI5UBQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EAQnoVn4EemSNe5QiI5UBQ"/>
+    </edges>
   </notation:Diagram>
 </xmi:XMI>
diff --git a/ONAP Information Model/Service.uml b/ONAP Information Model/Service.uml
index 71ea2ef..65ed696 100644
--- a/ONAP Information Model/Service.uml	
+++ b/ONAP Information Model/Service.uml	
@@ -422,12 +422,6 @@
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_U0YlcCC7Eemw1L3J4dNy4w" value="*"/>
         </ownedEnd>
       </packagedElement>
-      <packagedElement xmi:type="uml:Association" xmi:id="_OtbCoDAvEemfJIA7XFfVEg" name="ServiceDescriptorMadeAvailableAsServiceInstance" memberEnd="_OtnP4DAvEemfJIA7XFfVEg _OtnP5DAvEemfJIA7XFfVEg">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OthJQDAvEemfJIA7XFfVEg" source="org.eclipse.papyrus">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OthJQTAvEemfJIA7XFfVEg" key="nature" value="UML_Nature"/>
-        </eAnnotations>
-        <ownedEnd xmi:type="uml:Property" xmi:id="_OtnP5DAvEemfJIA7XFfVEg" name="servicedescriptor" type="_Jvy-QD0MEeiWMf5FLWfdLA" association="_OtbCoDAvEemfJIA7XFfVEg"/>
-      </packagedElement>
       <packagedElement xmi:type="uml:Association" xmi:id="_uulWADJ0EembsLjrwaSXHQ" name="ServiceAtomicDescriptorReferencesResourceDesc" memberEnd="_uuuf8jJ0EembsLjrwaSXHQ _uuuf9jJ0EembsLjrwaSXHQ">
         <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uuuf8DJ0EembsLjrwaSXHQ" source="org.eclipse.papyrus">
           <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uuuf8TJ0EembsLjrwaSXHQ" key="nature" value="UML_Nature"/>
@@ -636,13 +630,6 @@ NOTE:  NFV Management and Orchestration functions shall instantiate VNFs from th
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZzkacJDrEei9Vqs7Ti8Wxg"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Zzm2sJDrEei9Vqs7Ti8Wxg" value="*"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_OtnP4DAvEemfJIA7XFfVEg" name="_serviceInstance" type="_HFfXUD0QEeiWMf5FLWfdLA" association="_OtbCoDAvEemfJIA7XFfVEg">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_qWGVMEYwEem7INgoaq_j-g" annotatedElement="_OtnP4DAvEemfJIA7XFfVEg">
-            <body>An instance of Service deployment.</body>
-          </ownedComment>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_OtnP4jAvEemfJIA7XFfVEg"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OtnP4zAvEemfJIA7XFfVEg" value="*"/>
-        </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_HFfXUD0QEeiWMf5FLWfdLA" name="ServiceInstance" isAbstract="true">
         <ownedComment xmi:type="uml:Comment" xmi:id="_cnoqID0QEeiWMf5FLWfdLA" annotatedElement="_HFfXUD0QEeiWMf5FLWfdLA">
@@ -1606,9 +1593,6 @@ If null, then represents to the end of time&#xD;
   <OpenModel_Profile:Preliminary xmi:id="_6O-v8C9nEemMV6PO6VJAGw" base_Element="_vyTaID0OEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Preliminary xmi:id="_7SdmMC9nEemMV6PO6VJAGw" base_Element="_5tq3ED0OEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Preliminary xmi:id="_8WRMkC9nEemMV6PO6VJAGw" base_Element="_Zze64JDrEei9Vqs7Ti8Wxg"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_OtnP4TAvEemfJIA7XFfVEg" base_StructuralFeature="_OtnP4DAvEemfJIA7XFfVEg"/>
-  <OpenModel_Profile:OpenModelAttribute xmi:id="_OtnP5TAvEemfJIA7XFfVEg" base_StructuralFeature="_OtnP5DAvEemfJIA7XFfVEg"/>
-  <OpenModel_Profile:Preliminary xmi:id="_nIwwIDAvEemfJIA7XFfVEg" base_Element="_OtbCoDAvEemfJIA7XFfVEg"/>
   <OpenModel_Profile:Preliminary xmi:id="_TdYtgDA2EemfJIA7XFfVEg" base_Element="_mDZZ8D0QEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Preliminary xmi:id="_UsGjYDA2EemfJIA7XFfVEg" base_Element="_w3sqAD0QEeiWMf5FLWfdLA"/>
   <OpenModel_Profile:Preliminary xmi:id="__b-_QDA2EemfJIA7XFfVEg" base_Element="_AuX84D0TEeiWMf5FLWfdLA"/>
@@ -1625,4 +1609,58 @@ If null, then represents to the end of time&#xD;
   <OpenModel_Profile:OpenModelAttribute xmi:id="_-s0pdDJ2Eem5adcA1c6ckw" base_StructuralFeature="_-s0pczJ2Eem5adcA1c6ckw"/>
   <OpenModel_Profile:OpenModelAttribute xmi:id="_-s0peDJ2Eem5adcA1c6ckw" base_StructuralFeature="_-s0pdzJ2Eem5adcA1c6ckw"/>
   <ActionLanguage:TextualRepresentation xmi:id="_ztgeYEYNEem7INgoaq_j-g" base_Comment="_ztURIEYNEem7INgoaq_j-g" language="org.eclipse.papyrus.uml.textedit.property.xtext.UmlProperty"/>
+  <OpenModel_Profile:Preliminary xmi:id="_kJpQ0Fn2EemSNe5QiI5UBQ" base_Element="_Jvy-QD0MEeiWMf5FLWfdLA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_mLw5kFn2EemSNe5QiI5UBQ" base_Element="_HFfXUD0QEeiWMf5FLWfdLA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_nkoJ8Fn2EemSNe5QiI5UBQ" base_Element="_7SrB0D0VEeiWMf5FLWfdLA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_orOloFn2EemSNe5QiI5UBQ" base_Element="_AAwUkKuCEeiRK6iIVq4LZA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_qMp8IFn2EemSNe5QiI5UBQ" base_Element="_XCul8KuDEeiRK6iIVq4LZA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_rP13cFn2EemSNe5QiI5UBQ" base_Element="_YBdfEKuDEeiRK6iIVq4LZA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_xV1lUFn2EemSNe5QiI5UBQ" base_Element="_6lxVwCC1Eemw1L3J4dNy4w"/>
+  <OpenModel_Profile:Preliminary xmi:id="_0W6JoFn2EemSNe5QiI5UBQ" base_Element="_yX44MB9eEemLMI6HKP6Lbw"/>
+  <OpenModel_Profile:Preliminary xmi:id="_aoMTQFn3EemSNe5QiI5UBQ" base_Element="_xMGpgM4oEeinDdlk3ffduQ"/>
+  <OpenModel_Profile:Preliminary xmi:id="_loG9cFn3EemSNe5QiI5UBQ" base_Element="_o4dRYKuDEeiRK6iIVq4LZA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_nqcooFn3EemSNe5QiI5UBQ" base_Element="_pmW5MKuDEeiRK6iIVq4LZA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_sl-HcFn3EemSNe5QiI5UBQ" base_Element="_L-PS4KuFEeiRK6iIVq4LZA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_u5BvMFn3EemSNe5QiI5UBQ" base_Element="_9m-qsCC6Eemw1L3J4dNy4w"/>
+  <OpenModel_Profile:Preliminary xmi:id="_3-DaAFn3EemSNe5QiI5UBQ" base_Element="_hxFFYCC7Eemw1L3J4dNy4w"/>
+  <OpenModel_Profile:Preliminary xmi:id="_85rmgFn3EemSNe5QiI5UBQ" base_Element="_-s0pcDJ2Eem5adcA1c6ckw"/>
+  <OpenModel_Profile:Preliminary xmi:id="_-6YS8Fn3EemSNe5QiI5UBQ" base_Element="_5Ip2QDJ2Eem5adcA1c6ckw"/>
+  <OpenModel_Profile:Preliminary xmi:id="_CILrsFn4EemSNe5QiI5UBQ" base_Element="_uulWADJ0EembsLjrwaSXHQ"/>
+  <OpenModel_Profile:Preliminary xmi:id="_D_rY0Fn4EemSNe5QiI5UBQ" base_Element="_qdIu8DJ0EembsLjrwaSXHQ"/>
+  <OpenModel_Profile:Preliminary xmi:id="_kLJngFoIEemSNe5QiI5UBQ" base_Element="_mrJV8In9EeiOe-BKGdv_Yg"/>
+  <OpenModel_Profile:Preliminary xmi:id="_oMbEkFoIEemSNe5QiI5UBQ" base_Element="_Q-9g4In-EeiOe-BKGdv_Yg"/>
+  <OpenModel_Profile:Preliminary xmi:id="_pobvkFoIEemSNe5QiI5UBQ" base_Element="_W04LYIn-EeiOe-BKGdv_Yg"/>
+  <OpenModel_Profile:Preliminary xmi:id="_q2wj4FoIEemSNe5QiI5UBQ" base_Element="_XqlEUIn-EeiOe-BKGdv_Yg"/>
+  <OpenModel_Profile:Preliminary xmi:id="_swbbQFoIEemSNe5QiI5UBQ" base_Element="_YPjZoIn-EeiOe-BKGdv_Yg"/>
+  <OpenModel_Profile:Preliminary xmi:id="_uKKOUFoIEemSNe5QiI5UBQ" base_Element="_YvjIUIn-EeiOe-BKGdv_Yg"/>
+  <OpenModel_Profile:Preliminary xmi:id="_veVL8FoIEemSNe5QiI5UBQ" base_Element="_uatGcI6OEeiLSKWGMeE9mQ"/>
+  <OpenModel_Profile:Preliminary xmi:id="_w1_icFoIEemSNe5QiI5UBQ" base_Element="_ZM2IUIn-EeiOe-BKGdv_Yg"/>
+  <OpenModel_Profile:Preliminary xmi:id="_yb6-cFoIEemSNe5QiI5UBQ" base_Element="_bNd8QIn-EeiOe-BKGdv_Yg"/>
+  <OpenModel_Profile:Preliminary xmi:id="_0Qaa4FoIEemSNe5QiI5UBQ" base_Element="_dOQ54In_EeiOe-BKGdv_Yg"/>
+  <OpenModel_Profile:Preliminary xmi:id="_1ey5kFoIEemSNe5QiI5UBQ" base_Element="_eNHu0In_EeiOe-BKGdv_Yg"/>
+  <OpenModel_Profile:Preliminary xmi:id="_2neY4FoIEemSNe5QiI5UBQ" base_Element="_eyBysIn_EeiOe-BKGdv_Yg"/>
+  <OpenModel_Profile:Preliminary xmi:id="_35uq8FoIEemSNe5QiI5UBQ" base_Element="_fTdEwIn_EeiOe-BKGdv_Yg"/>
+  <OpenModel_Profile:Preliminary xmi:id="_5PEGMFoIEemSNe5QiI5UBQ" base_Element="_fvaA8In_EeiOe-BKGdv_Yg"/>
+  <OpenModel_Profile:Preliminary xmi:id="_HIBaEFoJEemSNe5QiI5UBQ" base_Element="_wng4cIn9EeiOe-BKGdv_Yg"/>
+  <OpenModel_Profile:Preliminary xmi:id="_J7Rk0FoJEemSNe5QiI5UBQ" base_Element="_UWL1gMDfEeiebIKjAGZWdA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_LwwfwFoJEemSNe5QiI5UBQ" base_Element="_HFmo4MDiEeiebIKjAGZWdA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_NXgbIFoJEemSNe5QiI5UBQ" base_Element="_DwZV4LwnEeifWa7EkiXrHA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_OYZQYFoJEemSNe5QiI5UBQ" base_Element="_pWPaEMA-Eei02ItngDf4ZA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_PngH0FoJEemSNe5QiI5UBQ" base_Element="_3a0cEI6OEeiLSKWGMeE9mQ"/>
+  <OpenModel_Profile:Preliminary xmi:id="_d9Kl0FoJEemSNe5QiI5UBQ" base_Element="_MnBKUMGjEeiS695oPTRE1Q"/>
+  <OpenModel_Profile:Preliminary xmi:id="_fzhDcFoJEemSNe5QiI5UBQ" base_Element="_hUzLgMGkEeiS695oPTRE1Q"/>
+  <OpenModel_Profile:Preliminary xmi:id="_iR9b0FoJEemSNe5QiI5UBQ" base_Element="_tFrMkIoBEeiOe-BKGdv_Yg"/>
+  <OpenModel_Profile:Preliminary xmi:id="_jkXe4FoJEemSNe5QiI5UBQ" base_Element="_ttCHgIoBEeiOe-BKGdv_Yg"/>
+  <OpenModel_Profile:Preliminary xmi:id="_k8hkoFoJEemSNe5QiI5UBQ" base_Element="_uN6nAIoBEeiOe-BKGdv_Yg"/>
+  <OpenModel_Profile:Preliminary xmi:id="_mK1K0FoJEemSNe5QiI5UBQ" base_Element="_up_fAIoBEeiOe-BKGdv_Yg"/>
+  <OpenModel_Profile:Preliminary xmi:id="_w4oxUFoJEemSNe5QiI5UBQ" base_Element="__mP8gMG_EeiS695oPTRE1Q"/>
+  <OpenModel_Profile:Preliminary xmi:id="_yaTYYFoJEemSNe5QiI5UBQ" base_Element="_R9Rn4MGkEeiS695oPTRE1Q"/>
+  <OpenModel_Profile:Preliminary xmi:id="_2gKagFoJEemSNe5QiI5UBQ" base_Element="_1_pvIMGSEeiS695oPTRE1Q"/>
+  <OpenModel_Profile:Preliminary xmi:id="_54ZhoFoJEemSNe5QiI5UBQ" base_Element="_gEq14MDfEeiebIKjAGZWdA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_7H4zkFoJEemSNe5QiI5UBQ" base_Element="_j0sK4MDfEeiebIKjAGZWdA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_C5qt0FoKEemSNe5QiI5UBQ" base_Element="_rUEhgIoAEeiOe-BKGdv_Yg"/>
+  <OpenModel_Profile:Preliminary xmi:id="_FatuQFoKEemSNe5QiI5UBQ" base_Element="_LBuJkIoCEeiOe-BKGdv_Yg"/>
+  <OpenModel_Profile:Preliminary xmi:id="_G-c8cFoLEemSNe5QiI5UBQ" base_Element="_6z5EwMGTEeiS695oPTRE1Q"/>
+  <OpenModel_Profile:Preliminary xmi:id="_MyglwFoLEemSNe5QiI5UBQ" base_Element="_OGFpEMDiEeiebIKjAGZWdA"/>
+  <OpenModel_Profile:Preliminary xmi:id="_Q5paQFoLEemSNe5QiI5UBQ" base_Element="_Lvny4MDgEeiebIKjAGZWdA"/>
 </xmi:XMI>
-- 
cgit 1.2.3-korg