Updates to Ves

Changed associations between event and domain classes from composition to generalization. Also renamed Event to VesEvent. Issue-ID: MODELING-104 Change-Id: Ie8bc9e0e934485a35f9477bf0c1c5f1037d586ec Signed-off-by: Kevin Scaggs <ks0567@att.com>
author: Kevin Scaggs <ks0567@att.com> 2019-03-15 16:49:28 -0500
committer: Kevin Scaggs <ks0567@att.com> 2019-03-15 16:49:28 -0500
commit: c5cf5be90bf9189dd17a6ef0508f68044c9b063d (patch)
tree: 9c451b3cb83b5327c36df492bd6c93d646adc404
parent: 03991d6387401327cf17b3389521262ec2c89dea (diff)
2 files changed, 181 insertions, 606 deletions
diff --git a/ONAP Information Model/Ves.notation b/ONAP Information Model/Ves.notation
index fab733f..ae3600a 100644
--- a/ONAP Information Model/Ves.notation
+++ b/ONAP Information Model/Ves.notation
@@ -897,10 +897,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_X2pfX4nbEeiOe-BKGdv_Yg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X2pfYInbEeiOe-BKGdv_Yg"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_X21skInbEeiOe-BKGdv_Yg" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_X21skYnbEeiOe-BKGdv_Yg" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="__HaBEEcZEemyn_6pFezSzw" visible="false" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="__HaBEUcZEemyn_6pFezSzw" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X21skonbEeiOe-BKGdv_Yg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__HaBEkcZEemyn_6pFezSzw"/>
       </children>
       <element xmi:type="uml:Class" href="Ves.uml#_PmIOkH7uEeifJIHxnlj6Cg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X2o4QYnbEeiOe-BKGdv_Yg" x="500" y="20" width="161" height="61"/>
@@ -936,13 +936,13 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_7UDHYMGaEeiS695oPTRE1Q"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7UDHYcGaEeiS695oPTRE1Q"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_7UIm4MGaEeiS695oPTRE1Q" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_7UIm4cGaEeiS695oPTRE1Q" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="__Hm1YEcZEemyn_6pFezSzw" visible="false" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="__Hm1YUcZEemyn_6pFezSzw" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7UIm4sGaEeiS695oPTRE1Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__Hm1YkcZEemyn_6pFezSzw"/>
       </children>
       <element xmi:type="uml:Class" href="Ves.uml#_7SeaAMGaEeiS695oPTRE1Q"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7UCgQcGaEeiS695oPTRE1Q" x="200" y="240" width="121" height="61"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7UCgQcGaEeiS695oPTRE1Q" x="200" y="160" width="121" height="61"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_7UIm7sGaEeiS695oPTRE1Q" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_7UIm78GaEeiS695oPTRE1Q"/>
@@ -975,13 +975,13 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_n2mmLcWKEeiLjtyU_R81wg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n2mmLsWKEeiLjtyU_R81wg"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_n2t64MWKEeiLjtyU_R81wg" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_n2t64cWKEeiLjtyU_R81wg" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="__HuxMEcZEemyn_6pFezSzw" visible="false" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="__HuxMUcZEemyn_6pFezSzw" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n2t64sWKEeiLjtyU_R81wg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__HuxMkcZEemyn_6pFezSzw"/>
       </children>
       <element xmi:type="uml:Class" href="Ves.uml#_n09AUMWKEeiLjtyU_R81wg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n2ji0cWKEeiLjtyU_R81wg" x="360" y="240" width="121" height="61"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n2ji0cWKEeiLjtyU_R81wg" x="360" y="160" width="121" height="61"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_n2vwEMWKEeiLjtyU_R81wg" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_n2vwEcWKEeiLjtyU_R81wg"/>
@@ -1014,13 +1014,13 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_qYCBHcWKEeiLjtyU_R81wg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qYCBHsWKEeiLjtyU_R81wg"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_qYHgoMWKEeiLjtyU_R81wg" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_qYHgocWKEeiLjtyU_R81wg" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="__H3UEEcZEemyn_6pFezSzw" visible="false" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="__H3UEUcZEemyn_6pFezSzw" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qYHgosWKEeiLjtyU_R81wg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__H3UEkcZEemyn_6pFezSzw"/>
       </children>
       <element xmi:type="uml:Class" href="Ves.uml#_qX-WsMWKEeiLjtyU_R81wg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qYBaAcWKEeiLjtyU_R81wg" x="520" y="240" width="120" height="61"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qYBaAcWKEeiLjtyU_R81wg" x="520" y="160" width="120" height="61"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_qYKj8MWKEeiLjtyU_R81wg" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_qYKj8cWKEeiLjtyU_R81wg"/>
@@ -1053,10 +1053,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_XoDCAsWMEeiLjtyU_R81wg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XoDCA8WMEeiLjtyU_R81wg"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_XoKWsMWMEeiLjtyU_R81wg" visible="false" type="StereotypeLabel">
-        <styles xmi:type="notation:StringValueStyle" xmi:id="_XoKWscWMEeiLjtyU_R81wg" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="__H_28EcZEemyn_6pFezSzw" visible="false" type="StereotypeLabel">
+        <styles xmi:type="notation:StringValueStyle" xmi:id="__H_28UcZEemyn_6pFezSzw" name="stereotype" stringValue="OpenModel_Profile::OpenModelClass"/>
         <element xmi:type="uml:Stereotype" href="OpenModel_Profile.profile.uml#_JVMFMHBhEd6FKu9XX1078A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XoKWssWMEeiLjtyU_R81wg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__H_28kcZEemyn_6pFezSzw"/>
       </children>
       <element xmi:type="uml:Class" href="Ves.uml#_XoAlsMWMEeiLjtyU_R81wg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XoDB8cWMEeiLjtyU_R81wg" x="60" y="20" width="181" height="61"/>
@@ -1098,7 +1098,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_25rDEsWSEeiLjtyU_R81wg"/>
       </children>
       <element xmi:type="uml:Class" href="Ves.uml#_25jHQMWSEeiLjtyU_R81wg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_25kVYcWSEeiLjtyU_R81wg" x="680" y="240" width="121" height="61"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_25kVYcWSEeiLjtyU_R81wg" x="680" y="160" width="121" height="61"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_25rqI8WSEeiLjtyU_R81wg" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_25rqJMWSEeiLjtyU_R81wg"/>
@@ -1137,7 +1137,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_53Ku8sWSEeiLjtyU_R81wg"/>
       </children>
       <element xmi:type="uml:Class" href="Ves.uml#_53AW4MWSEeiLjtyU_R81wg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_53CMEcWSEeiLjtyU_R81wg" x="840" y="240" width="121" height="61"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_53CMEcWSEeiLjtyU_R81wg" x="840" y="160" width="121" height="61"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_53LWB8WSEeiLjtyU_R81wg" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_53LWCMWSEeiLjtyU_R81wg"/>
@@ -1176,7 +1176,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7_1EksWSEeiLjtyU_R81wg"/>
       </children>
       <element xmi:type="uml:Class" href="Ves.uml#_7_tv0MWSEeiLjtyU_R81wg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7_u98cWSEeiLjtyU_R81wg" x="1000" y="240" width="121" height="61"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7_u98cWSEeiLjtyU_R81wg" x="1000" y="160" width="121" height="61"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_7_1rp8WSEeiLjtyU_R81wg" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_7_1rqMWSEeiLjtyU_R81wg"/>
@@ -1215,7 +1215,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w0O5YsWTEeiLjtyU_R81wg"/>
       </children>
       <element xmi:type="uml:Class" href="Ves.uml#_w0GWgMWTEeiLjtyU_R81wg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w0HkocWTEeiLjtyU_R81wg" x="120" y="360" width="141" height="61"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w0HkocWTEeiLjtyU_R81wg" x="120" y="260" width="121" height="61"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_w0Pgc8WTEeiLjtyU_R81wg" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_w0PgdMWTEeiLjtyU_R81wg"/>
@@ -1254,7 +1254,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zinyQsWTEeiLjtyU_R81wg"/>
       </children>
       <element xmi:type="uml:Class" href="Ves.uml#_zieoUMWTEeiLjtyU_R81wg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zigdgcWTEeiLjtyU_R81wg" x="280" y="360" width="121" height="61"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zigdgcWTEeiLjtyU_R81wg" x="280" y="260" width="121" height="61"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_zioZUMWTEeiLjtyU_R81wg" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_zioZUcWTEeiLjtyU_R81wg"/>
@@ -1293,7 +1293,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1ZyIMsWTEeiLjtyU_R81wg"/>
       </children>
       <element xmi:type="uml:Class" href="Ves.uml#_1ZragMWTEeiLjtyU_R81wg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1ZsoocWTEeiLjtyU_R81wg" x="440" y="360" width="121" height="61"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1ZsoocWTEeiLjtyU_R81wg" x="440" y="260" width="121" height="61"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_1ZyvS8WTEeiLjtyU_R81wg" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_1ZyvTMWTEeiLjtyU_R81wg"/>
@@ -1332,7 +1332,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2rH0QsWTEeiLjtyU_R81wg"/>
       </children>
       <element xmi:type="uml:Class" href="Ves.uml#_2rBtoMWTEeiLjtyU_R81wg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2rC7wcWTEeiLjtyU_R81wg" x="600" y="360" width="121" height="61"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2rC7wcWTEeiLjtyU_R81wg" x="600" y="260" width="121" height="61"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_2rIbU8WTEeiLjtyU_R81wg" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_2rIbVMWTEeiLjtyU_R81wg"/>
@@ -1371,7 +1371,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4eHb4sWTEeiLjtyU_R81wg"/>
       </children>
       <element xmi:type="uml:Class" href="Ves.uml#_4d4yYMWTEeiLjtyU_R81wg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4d7OocWTEeiLjtyU_R81wg" x="740" y="360" width="161" height="61"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4d7OocWTEeiLjtyU_R81wg" x="740" y="260" width="161" height="61"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_4eIqAMWTEeiLjtyU_R81wg" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_4eIqAcWTEeiLjtyU_R81wg"/>
@@ -1410,7 +1410,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7svUAsWTEeiLjtyU_R81wg"/>
       </children>
       <element xmi:type="uml:Class" href="Ves.uml#_7sljAMWTEeiLjtyU_R81wg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7snYMcWTEeiLjtyU_R81wg" x="920" y="360" width="120" height="61"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7snYMcWTEeiLjtyU_R81wg" x="920" y="260" width="120" height="61"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_7sv7EMWTEeiLjtyU_R81wg" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_7sv7EcWTEeiLjtyU_R81wg"/>
@@ -1449,7 +1449,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ATazEiDMEemw1L3J4dNy4w"/>
       </children>
       <element xmi:type="uml:Class" href="Ves.uml#_ATTeUCDMEemw1L3J4dNy4w"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ATVTgSDMEemw1L3J4dNy4w" x="1080" y="360" width="121" height="61"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ATVTgSDMEemw1L3J4dNy4w" x="1080" y="260" width="121" height="61"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_ATbaICDMEemw1L3J4dNy4w" type="StereotypeComment">
       <styles xmi:type="notation:TitleStyle" xmi:id="_ATbaISDMEemw1L3J4dNy4w"/>
@@ -1485,40 +1485,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7UJN88GaEeiS695oPTRE1Q"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7UJN9MGaEeiS695oPTRE1Q"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_Tu1bMMGbEeiS695oPTRE1Q" type="Association_Edge" source="_X2o4QInbEeiOe-BKGdv_Yg" target="_7UCgQMGaEeiS695oPTRE1Q">
-      <children xmi:type="notation:DecorationNode" xmi:id="_Tu1bM8GbEeiS695oPTRE1Q" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_DLYUUMG5EeiS695oPTRE1Q" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Tu1bNMGbEeiS695oPTRE1Q" x="-1" y="-19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Tu1bNcGbEeiS695oPTRE1Q" type="Association_NameLabel">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Voy1EMWOEeiLjtyU_R81wg" source="PapyrusCSSForceValue">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VozcIMWOEeiLjtyU_R81wg" key="visible" value="true"/>
-        </eAnnotations>
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_DQe2wMG5EeiS695oPTRE1Q" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Tu1bNsGbEeiS695oPTRE1Q" x="158" y="-67"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Tu1bN8GbEeiS695oPTRE1Q" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_DVfSkMG5EeiS695oPTRE1Q" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Tu1bOMGbEeiS695oPTRE1Q" x="21" y="-19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Tu1bOcGbEeiS695oPTRE1Q" visible="false" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Dabc8MG5EeiS695oPTRE1Q" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Tu1bOsGbEeiS695oPTRE1Q" x="-22" y="18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Tu1bO8GbEeiS695oPTRE1Q" visible="false" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_DfqiQMG5EeiS695oPTRE1Q" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Tu1bPMGbEeiS695oPTRE1Q" x="23" y="18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Tu1bPcGbEeiS695oPTRE1Q" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_DkpI4MG5EeiS695oPTRE1Q" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Tu1bPsGbEeiS695oPTRE1Q" x="-13" y="-31"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_Tu1bMcGbEeiS695oPTRE1Q"/>
-      <element xmi:type="uml:Association" href="Ves.uml#_Tp2NgMGbEeiS695oPTRE1Q"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Tu1bMsGbEeiS695oPTRE1Q" points="[580, 61, -643984, -643984]$[580, 140, -643984, -643984]$[260, 140, -643984, -643984]$[260, 240, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_T4rTsMGbEeiS695oPTRE1Q" id="(0.4968944099378882,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_T4rTscGbEeiS695oPTRE1Q" id="(0.49586776859504134,0.0)"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_n2wXIMWKEeiLjtyU_R81wg" type="StereotypeCommentLink" source="_n2ji0MWKEeiLjtyU_R81wg" target="_n2vwEMWKEeiLjtyU_R81wg">
       <styles xmi:type="notation:FontStyle" xmi:id="_n2wXIcWKEeiLjtyU_R81wg"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_n2w-MMWKEeiLjtyU_R81wg" name="BASE_ELEMENT">
@@ -1539,37 +1505,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qYMZI8WKEeiLjtyU_R81wg"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qYMZJMWKEeiLjtyU_R81wg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_IcePoMWMEeiLjtyU_R81wg" type="Association_Edge" source="_X2o4QInbEeiOe-BKGdv_Yg" target="_n2ji0MWKEeiLjtyU_R81wg">
-      <children xmi:type="notation:DecorationNode" xmi:id="_Ice2sMWMEeiLjtyU_R81wg" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Rcu5wMWNEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ice2scWMEeiLjtyU_R81wg" y="-19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Ice2ssWMEeiLjtyU_R81wg" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Rc-KUMWNEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ice2s8WMEeiLjtyU_R81wg" x="85" y="-27"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Ice2tMWMEeiLjtyU_R81wg" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_RdMz0MWNEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ice2tcWMEeiLjtyU_R81wg" x="26" y="-19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Ice2tsWMEeiLjtyU_R81wg" visible="false" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_RdcEYMWNEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ice2t8WMEeiLjtyU_R81wg" x="-27" y="18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Ice2uMWMEeiLjtyU_R81wg" visible="false" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_RdrU8MWNEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ice2ucWMEeiLjtyU_R81wg" x="26" y="18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Ice2usWMEeiLjtyU_R81wg" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Rd6lgMWNEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ice2u8WMEeiLjtyU_R81wg" x="-13" y="-31"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_IcePocWMEeiLjtyU_R81wg"/>
-      <element xmi:type="uml:Association" href="Ves.uml#_IYFe4MWMEeiLjtyU_R81wg"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IcePosWMEeiLjtyU_R81wg" points="[580, 61, -643984, -643984]$[580, 140, -643984, -643984]$[420, 140, -643984, -643984]$[420, 240, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IlDj4MWMEeiLjtyU_R81wg" id="(0.4968944099378882,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IlDj4cWMEeiLjtyU_R81wg" id="(0.49586776859504134,0.0)"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_XoK9y8WMEeiLjtyU_R81wg" type="StereotypeCommentLink" source="_XoDB8MWMEeiLjtyU_R81wg" target="_XoK9x8WMEeiLjtyU_R81wg">
       <styles xmi:type="notation:FontStyle" xmi:id="_XoK9zMWMEeiLjtyU_R81wg"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_XoLk0MWMEeiLjtyU_R81wg" name="BASE_ELEMENT">
@@ -1611,37 +1546,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8EtMQMWMEeiLjtyU_R81wg" id="(0.0,0.32786885245901637)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8EtzUMWMEeiLjtyU_R81wg" id="(1.0,0.32786885245901637)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_O2K1QMWPEeiLjtyU_R81wg" type="Association_Edge" source="_X2o4QInbEeiOe-BKGdv_Yg" target="_qYBaAMWKEeiLjtyU_R81wg">
-      <children xmi:type="notation:DecorationNode" xmi:id="_O2K1Q8WPEeiLjtyU_R81wg" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_2CFlsMWQEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_O2K1RMWPEeiLjtyU_R81wg" x="1" y="-18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_O2LcUMWPEeiLjtyU_R81wg" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_2Ckt4MWQEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_O2LcUcWPEeiLjtyU_R81wg" x="36" y="5"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_O2LcUsWPEeiLjtyU_R81wg" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_2C3o0MWQEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_O2LcU8WPEeiLjtyU_R81wg" x="37" y="-19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_O2LcVMWPEeiLjtyU_R81wg" visible="false" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_2DLK0MWQEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_O2LcVcWPEeiLjtyU_R81wg" x="-37" y="18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_O2LcVsWPEeiLjtyU_R81wg" visible="false" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_2DfT4MWQEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_O2LcV8WPEeiLjtyU_R81wg" x="38" y="17"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_O2LcWMWPEeiLjtyU_R81wg" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_2Dzc8MWQEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_O2LcWcWPEeiLjtyU_R81wg" x="-13" y="-31"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_O2K1QcWPEeiLjtyU_R81wg"/>
-      <element xmi:type="uml:Association" href="Ves.uml#_O1nboMWPEeiLjtyU_R81wg"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_O2K1QsWPEeiLjtyU_R81wg" points="[580, 61, -643984, -643984]$[580, 140, -643984, -643984]$[580, 240, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_O2-GgMWPEeiLjtyU_R81wg" id="(0.4968944099378882,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_O2-GgcWPEeiLjtyU_R81wg" id="(0.5,0.0)"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_25rqJ8WSEeiLjtyU_R81wg" type="StereotypeCommentLink" source="_25kVYMWSEeiLjtyU_R81wg" target="_25rqI8WSEeiLjtyU_R81wg">
       <styles xmi:type="notation:FontStyle" xmi:id="_25rqKMWSEeiLjtyU_R81wg"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_25rqLMWSEeiLjtyU_R81wg" name="BASE_ELEMENT">
@@ -1732,288 +1636,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7sv7F8WTEeiLjtyU_R81wg"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7sv7GMWTEeiLjtyU_R81wg"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_QWzrIMWbEeiLjtyU_R81wg" type="Association_Edge" source="_X2o4QInbEeiOe-BKGdv_Yg" target="_25kVYMWSEeiLjtyU_R81wg">
-      <children xmi:type="notation:DecorationNode" xmi:id="_QW0SMMWbEeiLjtyU_R81wg" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_53t1oMWfEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QW0SMcWbEeiLjtyU_R81wg" x="1" y="-18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_QW0SMsWbEeiLjtyU_R81wg" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_5374EMWfEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QW0SM8WbEeiLjtyU_R81wg" x="68" y="27"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_QW0SNMWbEeiLjtyU_R81wg" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_54IsYMWfEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QW0SNcWbEeiLjtyU_R81wg" x="35" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_QW0SNsWbEeiLjtyU_R81wg" visible="false" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_54VgsMWfEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QW0SN8WbEeiLjtyU_R81wg" x="-36" y="19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_QW0SOMWbEeiLjtyU_R81wg" visible="false" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_54jjIMWfEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QW0SOcWbEeiLjtyU_R81wg" x="35" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_QW0SOsWbEeiLjtyU_R81wg" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_54w-gMWfEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QW0SO8WbEeiLjtyU_R81wg" x="-13" y="-31"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_QWzrIcWbEeiLjtyU_R81wg"/>
-      <element xmi:type="uml:Association" href="Ves.uml#_QWlBoMWbEeiLjtyU_R81wg"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QWzrIsWbEeiLjtyU_R81wg" points="[580, 61, -643984, -643984]$[580, 140, -643984, -643984]$[740, 140, -643984, -643984]$[740, 240, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QXUBcMWbEeiLjtyU_R81wg" id="(0.4968944099378882,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QXUBccWbEeiLjtyU_R81wg" id="(0.49586776859504134,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_VgL_wMWbEeiLjtyU_R81wg" type="Association_Edge" source="_X2o4QInbEeiOe-BKGdv_Yg" target="_53CMEMWSEeiLjtyU_R81wg">
-      <children xmi:type="notation:DecorationNode" xmi:id="_VgL_w8WbEeiLjtyU_R81wg" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_-OXFwMWfEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_VgL_xMWbEeiLjtyU_R81wg" x="1" y="-18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_VgL_xcWbEeiLjtyU_R81wg" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_-O0_0MWfEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_VgL_xsWbEeiLjtyU_R81wg" x="138" y="67"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_VgL_x8WbEeiLjtyU_R81wg" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_-PMzQMWfEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_VgL_yMWbEeiLjtyU_R81wg" x="50" y="-19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_VgL_ycWbEeiLjtyU_R81wg" visible="false" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_-Pa1sMWfEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_VgL_ysWbEeiLjtyU_R81wg" x="-51" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_VgL_y8WbEeiLjtyU_R81wg" visible="false" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_-PnqAMWfEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_VgL_zMWbEeiLjtyU_R81wg" x="51" y="18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_VgL_zcWbEeiLjtyU_R81wg" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_-P1scMWfEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_VgL_zsWbEeiLjtyU_R81wg" x="-13" y="-31"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_VgL_wcWbEeiLjtyU_R81wg"/>
-      <element xmi:type="uml:Association" href="Ves.uml#_Vf3PoMWbEeiLjtyU_R81wg"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VgL_wsWbEeiLjtyU_R81wg" points="[580, 61, -643984, -643984]$[580, 140, -643984, -643984]$[900, 140, -643984, -643984]$[900, 240, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VguLQMWbEeiLjtyU_R81wg" id="(0.4968944099378882,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VguLQcWbEeiLjtyU_R81wg" id="(0.49586776859504134,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_YbIG4MWbEeiLjtyU_R81wg" type="Association_Edge" source="_X2o4QInbEeiOe-BKGdv_Yg" target="_7_u98MWSEeiLjtyU_R81wg">
-      <children xmi:type="notation:DecorationNode" xmi:id="_YbIt8MWbEeiLjtyU_R81wg" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_D9QiQMWgEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YbIt8cWbEeiLjtyU_R81wg" x="1" y="-18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_YbIt8sWbEeiLjtyU_R81wg" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_D9eksMWgEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YbIt88WbEeiLjtyU_R81wg" x="212" y="27"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_YbIt9MWbEeiLjtyU_R81wg" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_D9tOMMWgEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YbIt9cWbEeiLjtyU_R81wg" x="70" y="-18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_YbIt9sWbEeiLjtyU_R81wg" visible="false" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_D973sMWgEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YbIt98WbEeiLjtyU_R81wg" x="-72" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_YbIt-MWbEeiLjtyU_R81wg" visible="false" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_D-OyoMWgEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YbIt-cWbEeiLjtyU_R81wg" x="70" y="19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_YbIt-sWbEeiLjtyU_R81wg" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_D-i7sMWgEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YbIt-8WbEeiLjtyU_R81wg" x="-13" y="-31"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_YbIG4cWbEeiLjtyU_R81wg"/>
-      <element xmi:type="uml:Association" href="Ves.uml#_Ya42UMWbEeiLjtyU_R81wg"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YbIG4sWbEeiLjtyU_R81wg" points="[580, 81, -643984, -643984]$[580, 140, -643984, -643984]$[1060, 140, -643984, -643984]$[1060, 240, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ybq5cMWbEeiLjtyU_R81wg" id="(0.4968944099378882,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ybq5ccWbEeiLjtyU_R81wg" id="(0.49586776859504134,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_ZyizgMWgEeiLjtyU_R81wg" type="Association_Edge" source="_X2o4QInbEeiOe-BKGdv_Yg" target="_w0HkoMWTEeiLjtyU_R81wg">
-      <children xmi:type="notation:DecorationNode" xmi:id="_Zyizg8WgEeiLjtyU_R81wg" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cnEJkMWgEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZyizhMWgEeiLjtyU_R81wg" x="1" y="-19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ZyizhcWgEeiLjtyU_R81wg" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cnfnYMWgEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZyizhsWgEeiLjtyU_R81wg" x="171" y="-187"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Zyizh8WgEeiLjtyU_R81wg" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cnuQ4MWgEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZyiziMWgEeiLjtyU_R81wg" x="94" y="-19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ZyizicWgEeiLjtyU_R81wg" visible="false" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cn86YMWgEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZyizisWgEeiLjtyU_R81wg" x="-94" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Zyizi8WgEeiLjtyU_R81wg" type="Association_SourceMultiplicityLabel">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GFZUYCWQEem2wfSvtxnwBQ" source="PapyrusCSSForceValue">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GFZ7cCWQEem2wfSvtxnwBQ" key="visible" value="true"/>
-        </eAnnotations>
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_coK80MWgEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZyizjMWgEeiLjtyU_R81wg" x="26" y="15"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ZyizjcWgEeiLjtyU_R81wg" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_coY_QMWgEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZyizjsWgEeiLjtyU_R81wg" x="-13" y="-31"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_ZyizgcWgEeiLjtyU_R81wg"/>
-      <element xmi:type="uml:Association" href="Ves.uml#_ZyP4kMWgEeiLjtyU_R81wg"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ZyizgsWgEeiLjtyU_R81wg" points="[580, 61, -643984, -643984]$[580, 140, -643984, -643984]$[180, 140, -643984, -643984]$[180, 360, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZzOI8MWgEeiLjtyU_R81wg" id="(0.4968944099378882,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZzOI8cWgEeiLjtyU_R81wg" id="(0.425531914893617,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_oQdOkMWgEeiLjtyU_R81wg" type="Association_Edge" source="_X2o4QInbEeiOe-BKGdv_Yg" target="_zigdgMWTEeiLjtyU_R81wg">
-      <children xmi:type="notation:DecorationNode" xmi:id="_oQdOk8WgEeiLjtyU_R81wg" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_xQ2RAMWgEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_oQdOlMWgEeiLjtyU_R81wg" y="-18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_oQdOlcWgEeiLjtyU_R81wg" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_xRM2UMWgEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_oQdOlsWgEeiLjtyU_R81wg" x="58" y="-187"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_oQdOl8WgEeiLjtyU_R81wg" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_xRa4wMWgEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_oQdOmMWgEeiLjtyU_R81wg" x="70" y="-18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_oQdOmcWgEeiLjtyU_R81wg" visible="false" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_xRqJUMWgEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_oQdOmsWgEeiLjtyU_R81wg" x="-71" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_oQdOm8WgEeiLjtyU_R81wg" visible="false" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_xR4LwMWgEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_oQd1oMWgEeiLjtyU_R81wg" x="70" y="18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_oQd1ocWgEeiLjtyU_R81wg" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_xSIDYMWgEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_oQd1osWgEeiLjtyU_R81wg" x="-13" y="-31"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_oQdOkcWgEeiLjtyU_R81wg"/>
-      <element xmi:type="uml:Association" href="Ves.uml#_oQMI0MWgEeiLjtyU_R81wg"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oQdOksWgEeiLjtyU_R81wg" points="[580, 61, -643984, -643984]$[580, 140, -643984, -643984]$[340, 140, -643984, -643984]$[340, 360, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oRB2UMWgEeiLjtyU_R81wg" id="(0.4968944099378882,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oRB2UcWgEeiLjtyU_R81wg" id="(0.49586776859504134,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_t-XdgMWpEeiLjtyU_R81wg" type="Association_Edge" source="_X2o4QInbEeiOe-BKGdv_Yg" target="_1ZsooMWTEeiLjtyU_R81wg">
-      <children xmi:type="notation:DecorationNode" xmi:id="_t-Xdg8WpEeiLjtyU_R81wg" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_6544wMWpEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_t-YEkMWpEeiLjtyU_R81wg" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_t-YEkcWpEeiLjtyU_R81wg" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_66TIcMWpEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_t-YEksWpEeiLjtyU_R81wg" x="146" y="8"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_t-YEk8WpEeiLjtyU_R81wg" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_66iZAMWpEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_t-YElMWpEeiLjtyU_R81wg" x="50" y="-19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_t-YElcWpEeiLjtyU_R81wg" visible="false" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_66yQoMWpEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_t-YElsWpEeiLjtyU_R81wg" x="-50" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_t-YEl8WpEeiLjtyU_R81wg" visible="false" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_67A6IMWpEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_t-YEmMWpEeiLjtyU_R81wg" x="50" y="19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_t-YEmcWpEeiLjtyU_R81wg" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_67QKsMWpEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_t-YEmsWpEeiLjtyU_R81wg" x="-13" y="-11"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_t-XdgcWpEeiLjtyU_R81wg"/>
-      <element xmi:type="uml:Association" href="Ves.uml#_t-VBQMWpEeiLjtyU_R81wg"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_t-XdgsWpEeiLjtyU_R81wg" points="[580, 61, -643984, -643984]$[580, 140, -643984, -643984]$[500, 140, -643984, -643984]$[500, 360, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_t_AWsMWpEeiLjtyU_R81wg" id="(0.4968944099378882,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_t_AWscWpEeiLjtyU_R81wg" id="(0.49586776859504134,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_BxMu0MWqEeiLjtyU_R81wg" type="Association_Edge" source="_X2o4QInbEeiOe-BKGdv_Yg" target="_2rC7wMWTEeiLjtyU_R81wg">
-      <children xmi:type="notation:DecorationNode" xmi:id="_BxMu08WqEeiLjtyU_R81wg" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_G3GRoMWqEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_BxMu1MWqEeiLjtyU_R81wg" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_BxMu1cWqEeiLjtyU_R81wg" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_G3WJQMWqEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_BxNV4MWqEeiLjtyU_R81wg" x="146" y="3"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_BxNV4cWqEeiLjtyU_R81wg" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_G3lZ0MWqEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_BxNV4sWqEeiLjtyU_R81wg" x="50" y="-19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_BxNV48WqEeiLjtyU_R81wg" visible="false" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_G30qYMWqEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_BxNV5MWqEeiLjtyU_R81wg" x="-50" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_BxNV5cWqEeiLjtyU_R81wg" visible="false" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_G4GXMMWqEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_BxNV5sWqEeiLjtyU_R81wg" x="50" y="18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_BxNV58WqEeiLjtyU_R81wg" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_G4exsMWqEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_BxNV6MWqEeiLjtyU_R81wg" x="-13" y="-31"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_BxMu0cWqEeiLjtyU_R81wg"/>
-      <element xmi:type="uml:Association" href="Ves.uml#_Bw4lwMWqEeiLjtyU_R81wg"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BxMu0sWqEeiLjtyU_R81wg" points="[580, 61, -643984, -643984]$[580, 140, -643984, -643984]$[660, 140, -643984, -643984]$[660, 360, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Bx1oAMWqEeiLjtyU_R81wg" id="(0.4968944099378882,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Bx1oAcWqEeiLjtyU_R81wg" id="(0.49586776859504134,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_MjsoEMWqEeiLjtyU_R81wg" type="Association_Edge" source="_X2o4QInbEeiOe-BKGdv_Yg" target="_4d7OoMWTEeiLjtyU_R81wg">
-      <children xmi:type="notation:DecorationNode" xmi:id="_MjsoE8WqEeiLjtyU_R81wg" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_NF3hAMWqEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_MjsoFMWqEeiLjtyU_R81wg" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_MjsoFcWqEeiLjtyU_R81wg" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_NGP7gMWqEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_MjsoFsWqEeiLjtyU_R81wg" x="57" y="187"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_MjsoF8WqEeiLjtyU_R81wg" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_NGgaMMWqEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_MjsoGMWqEeiLjtyU_R81wg" x="63" y="-19"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_MjsoGcWqEeiLjtyU_R81wg" visible="false" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_NGyHAMWqEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_MjsoGsWqEeiLjtyU_R81wg" x="-63" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_MjsoG8WqEeiLjtyU_R81wg" visible="false" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_NHFpAMWqEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_MjsoHMWqEeiLjtyU_R81wg" x="63" y="18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_MjsoHcWqEeiLjtyU_R81wg" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_NHWHsMWqEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_MjsoHsWqEeiLjtyU_R81wg" x="-13" y="-31"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_MjsoEcWqEeiLjtyU_R81wg"/>
-      <element xmi:type="uml:Association" href="Ves.uml#_MjWCwMWqEeiLjtyU_R81wg"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MjsoEsWqEeiLjtyU_R81wg" points="[640, 61, -643984, -643984]$[580, 140, -643984, -643984]$[820, 140, -643984, -643984]$[820, 360, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MkWvYMWqEeiLjtyU_R81wg" id="(0.4968944099378882,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MkWvYcWqEeiLjtyU_R81wg" id="(0.4968944099378882,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_f3Kc0MWqEeiLjtyU_R81wg" type="Association_Edge" source="_X2o4QInbEeiOe-BKGdv_Yg" target="_7snYMMWTEeiLjtyU_R81wg">
-      <children xmi:type="notation:DecorationNode" xmi:id="_f3Kc08WqEeiLjtyU_R81wg" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_gW9XMMWqEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_f3Kc1MWqEeiLjtyU_R81wg" x="1" y="-18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_f3Kc1cWqEeiLjtyU_R81wg" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_gXYN8MWqEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_f3Kc1sWqEeiLjtyU_R81wg" x="161" y="187"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_f3Kc18WqEeiLjtyU_R81wg" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_gXosoMWqEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_f3Kc2MWqEeiLjtyU_R81wg" x="84" y="-18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_f3Kc2cWqEeiLjtyU_R81wg" visible="false" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_gX5LUMWqEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_f3Kc2sWqEeiLjtyU_R81wg" x="-85" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_f3Kc28WqEeiLjtyU_R81wg" visible="false" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_gYKREMWqEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_f3Kc3MWqEeiLjtyU_R81wg" x="85" y="18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_f3Kc3cWqEeiLjtyU_R81wg" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_gYaIsMWqEeiLjtyU_R81wg" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_f3Kc3sWqEeiLjtyU_R81wg" x="-13" y="-31"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_f3Kc0cWqEeiLjtyU_R81wg"/>
-      <element xmi:type="uml:Association" href="Ves.uml#_f23h4MWqEeiLjtyU_R81wg"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_f3Kc0sWqEeiLjtyU_R81wg" points="[580, 61, -643984, -643984]$[580, 140, -643984, -643984]$[980, 140, -643984, -643984]$[980, 360, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f3z9EMWqEeiLjtyU_R81wg" id="(0.4968944099378882,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f3z9EcWqEeiLjtyU_R81wg" id="(0.5,0.0)"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_ATbaJCDMEemw1L3J4dNy4w" type="StereotypeCommentLink" source="_ATVTgCDMEemw1L3J4dNy4w" target="_ATbaICDMEemw1L3J4dNy4w">
       <styles xmi:type="notation:FontStyle" xmi:id="_ATbaJSDMEemw1L3J4dNy4w"/>
       <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ATbaKSDMEemw1L3J4dNy4w" name="BASE_ELEMENT">
@@ -2024,36 +1646,145 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ATbaJyDMEemw1L3J4dNy4w"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ATbaKCDMEemw1L3J4dNy4w"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_NqEEECDMEemw1L3J4dNy4w" type="Association_Edge" source="_X2o4QInbEeiOe-BKGdv_Yg" target="_ATVTgCDMEemw1L3J4dNy4w">
-      <children xmi:type="notation:DecorationNode" xmi:id="_NqErICDMEemw1L3J4dNy4w" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cTvDMCDMEemw1L3J4dNy4w" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_NqErISDMEemw1L3J4dNy4w" x="1" y="-18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_NqErIiDMEemw1L3J4dNy4w" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cUBXECDMEemw1L3J4dNy4w" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_NqErIyDMEemw1L3J4dNy4w" x="241" y="187"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_NqErJCDMEemw1L3J4dNy4w" visible="false" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cUSc0CDMEemw1L3J4dNy4w" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_NqErJSDMEemw1L3J4dNy4w" x="58" y="34"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_NqErJiDMEemw1L3J4dNy4w" visible="false" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cUjikCDMEemw1L3J4dNy4w" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_NqErJyDMEemw1L3J4dNy4w" x="-95" y="18"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_NqErKCDMEemw1L3J4dNy4w" visible="false" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cU3roCDMEemw1L3J4dNy4w" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_NqErKSDMEemw1L3J4dNy4w" x="59" y="73"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_NqErKiDMEemw1L3J4dNy4w" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cVJ_gCDMEemw1L3J4dNy4w" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_NqErKyDMEemw1L3J4dNy4w" x="-13" y="-31"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_NqEEESDMEemw1L3J4dNy4w"/>
-      <element xmi:type="uml:Association" href="Ves.uml#_NprCgCDMEemw1L3J4dNy4w"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NqEEEiDMEemw1L3J4dNy4w" points="[580, 81, -643984, -643984]$[580, 140, -643984, -643984]$[1140, 140, -643984, -643984]$[1120, 360, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Nq5xkCDMEemw1L3J4dNy4w" id="(0.4968944099378882,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Nq5xkSDMEemw1L3J4dNy4w" id="(0.49586776859504134,0.0)"/>
+    <edges xmi:type="notation:Connector" xmi:id="_GOV74EaIEemmD4xckllxww" type="Generalization_Edge" source="_7UCgQMGaEeiS695oPTRE1Q" target="_X2o4QInbEeiOe-BKGdv_Yg">
+      <children xmi:type="notation:DecorationNode" xmi:id="_GOa0YEaIEemmD4xckllxww" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_9KbZcEaJEemmD4xckllxww" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_GOa0YUaIEemmD4xckllxww" x="-1" y="39"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_GOV74UaIEemmD4xckllxww"/>
+      <element xmi:type="uml:Generalization" href="Ves.uml#_GHoP4EaIEemmD4xckllxww"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GOV74kaIEemmD4xckllxww" points="[260, 160, -643984, -643984]$[260, 120, -643984, -643984]$[580, 120, -643984, -643984]$[580, 81, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GbtCcEaIEemmD4xckllxww" id="(0.49586776859504134,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GbtCcUaIEemmD4xckllxww" id="(0.4968944099378882,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_VouIwEaUEem_U-rQUWOmPw" type="Generalization_Edge" source="_n2ji0MWKEeiLjtyU_R81wg" target="_X2o4QInbEeiOe-BKGdv_Yg" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_VovW4EaUEem_U-rQUWOmPw" type="Generalization_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_VovW4UaUEem_U-rQUWOmPw" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_VouIwUaUEem_U-rQUWOmPw"/>
+      <element xmi:type="uml:Generalization" href="Ves.uml#_Vdmd4EaUEem_U-rQUWOmPw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VouIwkaUEem_U-rQUWOmPw" points="[420, 160, -643984, -643984]$[580, 81, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_V-9egEaUEem_U-rQUWOmPw" id="(0.49586776859504134,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_V-9egUaUEem_U-rQUWOmPw" id="(0.4968944099378882,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_ZgC_oEaUEem_U-rQUWOmPw" type="Generalization_Edge" source="_qYBaAMWKEeiLjtyU_R81wg" target="_X2o4QInbEeiOe-BKGdv_Yg">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ZgC_o0aUEem_U-rQUWOmPw" type="Generalization_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZgC_pEaUEem_U-rQUWOmPw" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_ZgC_oUaUEem_U-rQUWOmPw"/>
+      <element xmi:type="uml:Generalization" href="Ves.uml#_ZULt4EaUEem_U-rQUWOmPw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ZgC_okaUEem_U-rQUWOmPw" points="[580, 221, -643984, -643984]$[580, 81, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Z4acUEaUEem_U-rQUWOmPw" id="(0.5,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Z4acUUaUEem_U-rQUWOmPw" id="(0.4968944099378882,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_b1plEEaUEem_U-rQUWOmPw" type="Generalization_Edge" source="_25kVYMWSEeiLjtyU_R81wg" target="_X2o4QInbEeiOe-BKGdv_Yg" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_b1plE0aUEem_U-rQUWOmPw" type="Generalization_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_b1plFEaUEem_U-rQUWOmPw" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_b1plEUaUEem_U-rQUWOmPw"/>
+      <element xmi:type="uml:Generalization" href="Ves.uml#_bp1WoEaUEem_U-rQUWOmPw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_b1plEkaUEem_U-rQUWOmPw" points="[740, 160, -643984, -643984]$[580, 81, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cM3yQEaUEem_U-rQUWOmPw" id="(0.49586776859504134,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cM3yQUaUEem_U-rQUWOmPw" id="(0.4968944099378882,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_4CUPIEaUEemtHYgFzN-tvQ" type="Generalization_Edge" source="_53CMEMWSEeiLjtyU_R81wg" target="_X2o4QInbEeiOe-BKGdv_Yg">
+      <children xmi:type="notation:DecorationNode" xmi:id="_4CYgkEaUEemtHYgFzN-tvQ" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_SBvlkEaVEem3MJDthqMI_w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_4CYgkUaUEemtHYgFzN-tvQ" x="1" y="38"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_4CUPIUaUEemtHYgFzN-tvQ"/>
+      <element xmi:type="uml:Generalization" href="Ves.uml#_32jEAEaUEemtHYgFzN-tvQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4CUPIkaUEemtHYgFzN-tvQ" points="[900, 160, -643984, -643984]$[900, 120, -643984, -643984]$[580, 120, -643984, -643984]$[580, 81, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4anaYEaUEemtHYgFzN-tvQ" id="(0.49586776859504134,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4aoBcEaUEemtHYgFzN-tvQ" id="(0.4968944099378882,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_FPRb0EaZEem3MJDthqMI_w" type="Generalization_Edge" source="_7_u98MWSEeiLjtyU_R81wg" target="_X2o4QInbEeiOe-BKGdv_Yg">
+      <children xmi:type="notation:DecorationNode" xmi:id="_FPVGMEaZEem3MJDthqMI_w" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_HR73IEaZEem3MJDthqMI_w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_FPVtQEaZEem3MJDthqMI_w" x="-1" y="38"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_FPRb0UaZEem3MJDthqMI_w"/>
+      <element xmi:type="uml:Generalization" href="Ves.uml#_FCgyMEaZEem3MJDthqMI_w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FPRb0kaZEem3MJDthqMI_w" points="[1060, 160, -643984, -643984]$[1060, 120, -643984, -643984]$[580, 120, -643984, -643984]$[580, 81, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FnUIYEaZEem3MJDthqMI_w" id="(0.49586776859504134,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FnUvcEaZEem3MJDthqMI_w" id="(0.4968944099378882,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_Juv30EaZEem3MJDthqMI_w" type="Generalization_Edge" source="_w0HkoMWTEeiLjtyU_R81wg" target="_X2o4QInbEeiOe-BKGdv_Yg">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Juwe4EaZEem3MJDthqMI_w" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_LdLvkEaZEem3MJDthqMI_w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Juwe4UaZEem3MJDthqMI_w" x="1" y="38"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_Juv30UaZEem3MJDthqMI_w"/>
+      <element xmi:type="uml:Generalization" href="Ves.uml#_JiXBoEaZEem3MJDthqMI_w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Juv30kaZEem3MJDthqMI_w" points="[180, 260, -643984, -643984]$[180, 120, -643984, -643984]$[580, 120, -643984, -643984]$[580, 81, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KG-xoEaZEem3MJDthqMI_w" id="(0.49586776859504134,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KG-xoUaZEem3MJDthqMI_w" id="(0.4968944099378882,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_PgsoUEaZEem3MJDthqMI_w" type="Generalization_Edge" source="_zigdgMWTEeiLjtyU_R81wg" target="_X2o4QInbEeiOe-BKGdv_Yg">
+      <children xmi:type="notation:DecorationNode" xmi:id="_PgtPYEaZEem3MJDthqMI_w" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_QzFdQEaZEem3MJDthqMI_w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_PgtPYUaZEem3MJDthqMI_w" x="1" y="38"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_PgsoUUaZEem3MJDthqMI_w"/>
+      <element xmi:type="uml:Generalization" href="Ves.uml#_PU3y0EaZEem3MJDthqMI_w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PgsoUkaZEem3MJDthqMI_w" points="[340, 360, -643984, -643984]$[340, 120, -643984, -643984]$[580, 120, -643984, -643984]$[580, 81, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_P5KysEaZEem3MJDthqMI_w" id="(0.49586776859504134,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_P5KysUaZEem3MJDthqMI_w" id="(0.4968944099378882,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_SnrAUEaZEem3MJDthqMI_w" type="Generalization_Edge" source="_1ZsooMWTEeiLjtyU_R81wg" target="_X2o4QInbEeiOe-BKGdv_Yg">
+      <children xmi:type="notation:DecorationNode" xmi:id="_SnrAU0aZEem3MJDthqMI_w" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_UWfSkEaZEem3MJDthqMI_w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_SnrAVEaZEem3MJDthqMI_w" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_SnrAUUaZEem3MJDthqMI_w"/>
+      <element xmi:type="uml:Generalization" href="Ves.uml#_Sb8RcEaZEem3MJDthqMI_w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SnrAUkaZEem3MJDthqMI_w" points="[500, 360, -643984, -643984]$[500, 120, -643984, -643984]$[580, 120, -643984, -643984]$[580, 81, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_S_NWkEaZEem3MJDthqMI_w" id="(0.49586776859504134,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_S_NWkUaZEem3MJDthqMI_w" id="(0.4968944099378882,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_XMLGQEaZEem3MJDthqMI_w" type="Generalization_Edge" source="_2rC7wMWTEeiLjtyU_R81wg" target="_X2o4QInbEeiOe-BKGdv_Yg">
+      <children xmi:type="notation:DecorationNode" xmi:id="_XMLtUEaZEem3MJDthqMI_w" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ZclCoEaZEem3MJDthqMI_w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_XMLtUUaZEem3MJDthqMI_w" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_XMLGQUaZEem3MJDthqMI_w"/>
+      <element xmi:type="uml:Generalization" href="Ves.uml#_XAezoEaZEem3MJDthqMI_w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XMLGQkaZEem3MJDthqMI_w" points="[660, 260, -643984, -643984]$[660, 120, -643984, -643984]$[580, 120, -643984, -643984]$[580, 81, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xi91oEaZEem3MJDthqMI_w" id="(0.49586776859504134,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xi91oUaZEem3MJDthqMI_w" id="(0.4968944099378882,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_bZTOAEaZEem3MJDthqMI_w" type="Generalization_Edge" source="_4d7OoMWTEeiLjtyU_R81wg" target="_X2o4QInbEeiOe-BKGdv_Yg">
+      <children xmi:type="notation:DecorationNode" xmi:id="_bZT1EEaZEem3MJDthqMI_w" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_c4-4EEaZEem3MJDthqMI_w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_bZT1EUaZEem3MJDthqMI_w" x="-2" y="37"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_bZTOAUaZEem3MJDthqMI_w"/>
+      <element xmi:type="uml:Generalization" href="Ves.uml#_bNb8QEaZEem3MJDthqMI_w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_bZTOAkaZEem3MJDthqMI_w" points="[820, 260, -643984, -643984]$[820, 120, -643984, -643984]$[580, 120, -643984, -643984]$[580, 81, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bwxS0EaZEem3MJDthqMI_w" id="(0.4968944099378882,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bwxS0UaZEem3MJDthqMI_w" id="(0.4968944099378882,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_fqFtwEaZEem3MJDthqMI_w" type="Generalization_Edge" source="_7snYMMWTEeiLjtyU_R81wg" target="_X2o4QInbEeiOe-BKGdv_Yg">
+      <children xmi:type="notation:DecorationNode" xmi:id="_fqFtw0aZEem3MJDthqMI_w" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_g4LRgEaZEem3MJDthqMI_w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_fqGU0EaZEem3MJDthqMI_w" x="1" y="38"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_fqFtwUaZEem3MJDthqMI_w"/>
+      <element xmi:type="uml:Generalization" href="Ves.uml#_ferH8EaZEem3MJDthqMI_w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_fqFtwkaZEem3MJDthqMI_w" points="[980, 260, -643984, -643984]$[980, 120, -643984, -643984]$[580, 120, -643984, -643984]$[580, 81, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gBgvQEaZEem3MJDthqMI_w" id="(0.5,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gBhWUEaZEem3MJDthqMI_w" id="(0.4968944099378882,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_iq-r4EaZEem3MJDthqMI_w" type="Generalization_Edge" source="_ATVTgCDMEemw1L3J4dNy4w" target="_X2o4QInbEeiOe-BKGdv_Yg">
+      <children xmi:type="notation:DecorationNode" xmi:id="_iq-r40aZEem3MJDthqMI_w" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jw0SkEaZEem3MJDthqMI_w" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_iq-r5EaZEem3MJDthqMI_w" x="1" y="38"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_iq-r4UaZEem3MJDthqMI_w"/>
+      <element xmi:type="uml:Generalization" href="Ves.uml#_ifa8IEaZEem3MJDthqMI_w"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_iq-r4kaZEem3MJDthqMI_w" points="[1140, 260, -643984, -643984]$[1140, 120, -643984, -643984]$[580, 120, -643984, -643984]$[580, 81, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jDItMEaZEem3MJDthqMI_w" id="(0.49586776859504134,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jDItMUaZEem3MJDthqMI_w" id="(0.4968944099378882,1.0)"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_deNk4LHUEeid-vjMcczUWA" type="PapyrusUMLClassDiagram" name="Measurement Domain Entities" measurementUnit="Pixel">
diff --git a/ONAP Information Model/Ves.uml b/ONAP Information Model/Ves.uml
index 057fb80..92be0ea 100644
--- a/ONAP Information Model/Ves.uml
+++ b/ONAP Information Model/Ves.uml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <uml:Package xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_mi5hgIbfEei-x_BD9U-ssQ" name="Ves">
   <packagedElement xmi:type="uml:Package" xmi:id="_rmBdIIbfEei-x_BD9U-ssQ" name="ObjectClasses">
-    <packagedElement xmi:type="uml:Class" xmi:id="_PmIOkH7uEeifJIHxnlj6Cg" name="Event">
+    <packagedElement xmi:type="uml:Class" xmi:id="_PmIOkH7uEeifJIHxnlj6Cg" name="VesEvent">
       <ownedComment xmi:type="uml:Comment" xmi:id="_O8t0wIncEeiOe-BKGdv_Yg" annotatedElement="_PmIOkH7uEeifJIHxnlj6Cg">
         <body>An ONAP event is an aggregation of a header and a message.  Event messages may be published to a message broker by service instances, resource instances, or ONAP platform components.  Service or resource instances may be in support of network infrastructure or customer services.  Interested platforms may subscribe to events on the message broker (e.g. Centralized Testing Platform CTP) may see an event on a service VNF instance and perform an automated test as part of a closed loop management policy.  Events are unique and distinguishable from one another.&#xD;
 &#xD;
@@ -11,90 +11,6 @@ ONAP event messages are serialized as a unicode ASCII character string which may
       <generalization xmi:type="uml:Generalization" xmi:id="_FT4nsDq0EemOl5OHBoqS_w">
         <general xmi:type="uml:Class" href="Common.uml#_8fYhoDqyEemOl5OHBoqS_w"/>
       </generalization>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_Tp20ksGbEeiS695oPTRE1Q" name="_fault" type="_7SeaAMGaEeiS695oPTRE1Q" aggregation="composite" association="_Tp2NgMGbEeiS695oPTRE1Q">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_ot0fEN1REeiRzJu73dYz2w" annotatedElement="_Tp20ksGbEeiS695oPTRE1Q">
-          <body>Fields specific to fault events</body>
-        </ownedComment>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Tp3boMGbEeiS695oPTRE1Q"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Tp3bocGbEeiS695oPTRE1Q" value="1"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_IYJJQMWMEeiLjtyU_R81wg" name="_heartbeat" type="_n09AUMWKEeiLjtyU_R81wg" aggregation="composite" association="_IYFe4MWMEeiLjtyU_R81wg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_qKIFAN1REeiRzJu73dYz2w" annotatedElement="_IYJJQMWMEeiLjtyU_R81wg">
-          <body>Fields specific to heartbeat events</body>
-        </ownedComment>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IYKXYMWMEeiLjtyU_R81wg"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IYK-cMWMEeiLjtyU_R81wg" value="1"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_O1pQ0cWPEeiLjtyU_R81wg" name="_measurement" type="_qX-WsMWKEeiLjtyU_R81wg" aggregation="composite" association="_O1nboMWPEeiLjtyU_R81wg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_sQR5MN1REeiRzJu73dYz2w" annotatedElement="_O1pQ0cWPEeiLjtyU_R81wg">
-          <body>Fields specific to measurement events</body>
-        </ownedComment>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_O1sUIMWPEeiLjtyU_R81wg"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_O1uJUMWPEeiLjtyU_R81wg" value="1"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_QWlossWbEeiLjtyU_R81wg" name="_mobileflow" type="_25jHQMWSEeiLjtyU_R81wg" aggregation="composite" association="_QWlBoMWbEeiLjtyU_R81wg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_ubgaoN1REeiRzJu73dYz2w" annotatedElement="_QWlossWbEeiLjtyU_R81wg">
-          <body>Fields specific to mobility flow events</body>
-        </ownedComment>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_QWmPwMWbEeiLjtyU_R81wg"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_QWmPwcWbEeiLjtyU_R81wg" value="1"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_Vf32ssWbEeiLjtyU_R81wg" name="_notification" type="_53AW4MWSEeiLjtyU_R81wg" aggregation="composite" association="_Vf3PoMWbEeiLjtyU_R81wg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_wOJc8N1REeiRzJu73dYz2w" annotatedElement="_Vf32ssWbEeiLjtyU_R81wg">
-          <body>Fields specific to notification events</body>
-        </ownedComment>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Vf4dwcWbEeiLjtyU_R81wg"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Vf4dwsWbEeiLjtyU_R81wg" value="1"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_Ya5dYsWbEeiLjtyU_R81wg" name="_other" type="_7_tv0MWSEeiLjtyU_R81wg" aggregation="composite" association="_Ya42UMWbEeiLjtyU_R81wg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_x2M_4N1REeiRzJu73dYz2w" annotatedElement="_Ya5dYsWbEeiLjtyU_R81wg">
-          <body>Fields specific to other types of events</body>
-        </ownedComment>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ya5dZMWbEeiLjtyU_R81wg"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ya6EcMWbEeiLjtyU_R81wg" value="1"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_ZyQfosWgEeiLjtyU_R81wg" name="_pnfregistration" type="_w0GWgMWTEeiLjtyU_R81wg" aggregation="composite" association="_ZyP4kMWgEeiLjtyU_R81wg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_zXxgUN1REeiRzJu73dYz2w" annotatedElement="_ZyQfosWgEeiLjtyU_R81wg">
-          <body>Fields specific to pnfRegistration events</body>
-        </ownedComment>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZyRGscWgEeiLjtyU_R81wg"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZyRGssWgEeiLjtyU_R81wg" value="1"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_oQMv4cWgEeiLjtyU_R81wg" name="_sipSignaling" type="_zieoUMWTEeiLjtyU_R81wg" aggregation="composite" association="_oQMI0MWgEeiLjtyU_R81wg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_09CN8N1REeiRzJu73dYz2w" annotatedElement="_oQMv4cWgEeiLjtyU_R81wg">
-          <body>Fields specific to sipSignaling events</body>
-        </ownedComment>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_oQNW8MWgEeiLjtyU_R81wg"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oQNW8cWgEeiLjtyU_R81wg" value="1"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_t-WPYMWpEeiLjtyU_R81wg" name="_statechange" type="_1ZragMWTEeiLjtyU_R81wg" aggregation="composite" association="_t-VBQMWpEeiLjtyU_R81wg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_2dlasN1REeiRzJu73dYz2w" annotatedElement="_t-WPYMWpEeiLjtyU_R81wg">
-          <body>Fields specific to state change events</body>
-        </ownedComment>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t-WPYsWpEeiLjtyU_R81wg"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t-W2cMWpEeiLjtyU_R81wg" value="1"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_Bw5M0sWqEeiLjtyU_R81wg" name="_syslog" type="_2rBtoMWTEeiLjtyU_R81wg" aggregation="composite" association="_Bw4lwMWqEeiLjtyU_R81wg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_4EhjUN1REeiRzJu73dYz2w" annotatedElement="_Bw5M0sWqEeiLjtyU_R81wg">
-          <body>Fields specific to syslog events</body>
-        </ownedComment>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Bw5z4MWqEeiLjtyU_R81wg"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Bw5z4cWqEeiLjtyU_R81wg" value="1"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_MjWp0sWqEeiLjtyU_R81wg" name="_thresholdCrossingAlert" type="_4d4yYMWTEeiLjtyU_R81wg" aggregation="composite" association="_MjWCwMWqEeiLjtyU_R81wg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_6EIqoN1REeiRzJu73dYz2w" annotatedElement="_MjWp0sWqEeiLjtyU_R81wg">
-          <body>Fields specific to threshold crossing alert events</body>
-        </ownedComment>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_MjWp1MWqEeiLjtyU_R81wg"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MjWp1cWqEeiLjtyU_R81wg" value="1"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_f24I8sWqEeiLjtyU_R81wg" name="_voicequality" type="_7sljAMWTEeiLjtyU_R81wg" aggregation="composite" association="_f23h4MWqEeiLjtyU_R81wg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_7oy7UN1REeiRzJu73dYz2w" annotatedElement="_f24I8sWqEeiLjtyU_R81wg">
-          <body>Fields specific to voiceQuality events</body>
-        </ownedComment>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_f24wAMWqEeiLjtyU_R81wg"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_f24wAcWqEeiLjtyU_R81wg" value="1"/>
-      </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_8Dr4ksWMEeiLjtyU_R81wg" name="_commoneventheader" type="_XoAlsMWMEeiLjtyU_R81wg" aggregation="composite" association="_8DrRgMWMEeiLjtyU_R81wg">
         <ownedComment xmi:type="uml:Comment" xmi:id="_nLgXwN1REeiRzJu73dYz2w" annotatedElement="_8Dr4ksWMEeiLjtyU_R81wg">
           <body>Fields common to all events</body>
@@ -102,15 +18,12 @@ ONAP event messages are serialized as a unicode ASCII character string which may
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8DsfoMWMEeiLjtyU_R81wg" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8DsfocWMEeiLjtyU_R81wg" value="1"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_NprpkiDMEemw1L3J4dNy4w" name="_perf3gpp" type="_ATTeUCDMEemw1L3J4dNy4w" aggregation="composite" association="_NprCgCDMEemw1L3J4dNy4w">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NpsQoCDMEemw1L3J4dNy4w"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NpsQoSDMEemw1L3J4dNy4w" value="1"/>
-      </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_7SeaAMGaEeiS695oPTRE1Q" name="Fault">
       <ownedComment xmi:type="uml:Comment" xmi:id="_qgCpQMcZEeiafPHvepnkKQ" annotatedElement="_7SeaAMGaEeiS695oPTRE1Q">
         <body>Fields specific to fault events</body>
       </ownedComment>
+      <generalization xmi:type="uml:Generalization" xmi:id="_GHoP4EaIEemmD4xckllxww" general="_PmIOkH7uEeifJIHxnlj6Cg"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_U98FwIEoEeieQ4zKGFzYtQ" name="alarmAdditionalInformation" type="_yPR44IEoEeieQ4zKGFzYtQ">
         <ownedComment xmi:type="uml:Comment" xmi:id="_1yYHkKZIEeily5uFlujj3Q" annotatedElement="_U98FwIEoEeieQ4zKGFzYtQ">
           <body>Additional alarm information. &#xD;
@@ -177,6 +90,7 @@ Could contain managed object instance as separate key:value; could add probable
       <ownedComment xmi:type="uml:Comment" xmi:id="_LA3yYNE6EeilcYLXtz_Wig" annotatedElement="_n09AUMWKEeiLjtyU_R81wg">
         <body>The heartbeatFields datatype is an optional field block for fields specific to heartbeat events.</body>
       </ownedComment>
+      <generalization xmi:type="uml:Generalization" xmi:id="_Vdmd4EaUEem_U-rQUWOmPw" general="_PmIOkH7uEeifJIHxnlj6Cg"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_fTh9kIFJEeieQ4zKGFzYtQ" name="additionalFields" type="_yPR44IEoEeieQ4zKGFzYtQ">
         <ownedComment xmi:type="uml:Comment" xmi:id="_1FAF0IFJEeieQ4zKGFzYtQ" annotatedElement="_fTh9kIFJEeieQ4zKGFzYtQ">
           <body>Additional expansion fields if needed.&#xD;
@@ -378,6 +292,7 @@ For fault events, startEpochMicrosec is the timestamp of the initial alarm; if t
       <ownedComment xmi:type="uml:Comment" xmi:id="_MzyhgNE6EeilcYLXtz_Wig" annotatedElement="_qX-WsMWKEeiLjtyU_R81wg">
         <body>Fields specific to measurement events</body>
       </ownedComment>
+      <generalization xmi:type="uml:Generalization" xmi:id="_ZULt4EaUEem_U-rQUWOmPw" general="_PmIOkH7uEeifJIHxnlj6Cg"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_MIUQcIFKEeieQ4zKGFzYtQ" name="additionalFields" type="_yPR44IEoEeieQ4zKGFzYtQ">
         <ownedComment xmi:type="uml:Comment" xmi:id="_MqDuwIFOEeieQ4zKGFzYtQ" annotatedElement="_MIUQcIFKEeieQ4zKGFzYtQ">
           <body>Additional measurement fields if needed.&#xD;
@@ -562,6 +477,7 @@ For fault events, startEpochMicrosec is the timestamp of the initial alarm; if t
       <ownedComment xmi:type="uml:Comment" xmi:id="_Omf1QNE6EeilcYLXtz_Wig" annotatedElement="_25jHQMWSEeiLjtyU_R81wg">
         <body>Fields specific to mobility flow events</body>
       </ownedComment>
+      <generalization xmi:type="uml:Generalization" xmi:id="_bp1WoEaUEem_U-rQUWOmPw" general="_PmIOkH7uEeifJIHxnlj6Cg"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_69Dm8JQkEei6kI-JPNdeuw" name="additionalFields" type="_yPR44IEoEeieQ4zKGFzYtQ">
         <ownedComment xmi:type="uml:Comment" xmi:id="_D_EvIJQnEei6kI-JPNdeuw" annotatedElement="_69Dm8JQkEei6kI-JPNdeuw">
           <body>additionalFields - Additional mobileFlow fields if needed.&#xD;
@@ -865,6 +781,7 @@ Note: current data type (String) may be changed to Common Resource Datatype L3Ad
       <ownedComment xmi:type="uml:Comment" xmi:id="_QMUjkNE6EeilcYLXtz_Wig" annotatedElement="_53AW4MWSEeiLjtyU_R81wg">
         <body>Fields specific to notification events</body>
       </ownedComment>
+      <generalization xmi:type="uml:Generalization" xmi:id="_32jEAEaUEemtHYgFzN-tvQ" general="_PmIOkH7uEeifJIHxnlj6Cg"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_sl3TYJQuEei6kI-JPNdeuw" name="additionalFields" type="_yPR44IEoEeieQ4zKGFzYtQ">
         <ownedComment xmi:type="uml:Comment" xmi:id="__TMVMJQuEei6kI-JPNdeuw" annotatedElement="_sl3TYJQuEei6kI-JPNdeuw">
           <body>Additional notification fields if needed.&#xD;
@@ -942,6 +859,7 @@ For example: &quot;inService&quot;, &quot;outOfService&quot;, &quot;maintenance&
       <ownedComment xmi:type="uml:Comment" xmi:id="_Y-AboNE6EeilcYLXtz_Wig" annotatedElement="_7_tv0MWSEeiLjtyU_R81wg">
         <body>The otherFields datatype defines fields for events belonging to the 'other' domain of the commonEventHeader domain enumeration.</body>
       </ownedComment>
+      <generalization xmi:type="uml:Generalization" xmi:id="_FCgyMEaZEem3MJDthqMI_w" general="_PmIOkH7uEeifJIHxnlj6Cg"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_V7c6gJQ6Eei6kI-JPNdeuw" name="arrayofNamedHashMap" type="_sOvPAJQ9Eei6kI-JPNdeuw">
         <ownedComment xmi:type="uml:Comment" xmi:id="_R9EqwLX3EeiFDLhMCq9-Iw" annotatedElement="_V7c6gJQ6Eei6kI-JPNdeuw">
           <body>Array of named hashMaps</body>
@@ -976,6 +894,7 @@ For example: &quot;inService&quot;, &quot;outOfService&quot;, &quot;maintenance&
       <ownedComment xmi:type="uml:Comment" xmi:id="_cNXTkNE6EeilcYLXtz_Wig" annotatedElement="_w0GWgMWTEeiLjtyU_R81wg">
         <body>The pnfRegistrationFields datatype defines fields for events belonging to the 'pnfRegistration' domain of the commonEventHeader domain enumeration; it consists of the following fields:</body>
       </ownedComment>
+      <generalization xmi:type="uml:Generalization" xmi:id="_JiXBoEaZEem3MJDthqMI_w" general="_PmIOkH7uEeifJIHxnlj6Cg"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_wTZ74Jc-Eeis0eUbsDSw0w" name="additionalFields" type="_yPR44IEoEeieQ4zKGFzYtQ">
         <ownedComment xmi:type="uml:Comment" xmi:id="_iLbK0LbKEeiWgvNHCpdNlg" annotatedElement="_wTZ74Jc-Eeis0eUbsDSw0w">
           <body>Additional pnfRegistration fields if needed</body>
@@ -1085,6 +1004,7 @@ For example: &quot;inService&quot;, &quot;outOfService&quot;, &quot;maintenance&
         <body>sipSignalingFields - The sipSignalingFields datatype communicates information about SIP signaling messages, parameters and signaling state.&#xD;
 </body>
       </ownedComment>
+      <generalization xmi:type="uml:Generalization" xmi:id="_PU3y0EaZEem3MJDthqMI_w" general="_PmIOkH7uEeifJIHxnlj6Cg"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_VL2WIJpnEeidy9iGT_F5-w" name="additionalInformation" type="_yPR44IEoEeieQ4zKGFzYtQ">
         <ownedComment xmi:type="uml:Comment" xmi:id="_Kuns0JpoEeidy9iGT_F5-w" annotatedElement="_VL2WIJpnEeidy9iGT_F5-w">
           <body>zdditionalInformation - Additional sipSignalling fields.&#xD;
@@ -1171,6 +1091,7 @@ Note: current data type (String) may be changed to Common Resource Datatype L3Ad
       <ownedComment xmi:type="uml:Comment" xmi:id="_hclKcNE6EeilcYLXtz_Wig" annotatedElement="_1ZragMWTEeiLjtyU_R81wg">
         <body>Fields specific to state change events.</body>
       </ownedComment>
+      <generalization xmi:type="uml:Generalization" xmi:id="_Sb8RcEaZEem3MJDthqMI_w" general="_PmIOkH7uEeifJIHxnlj6Cg"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_JYYzUJzREeiLvPKMh61-Bg" name="additionalFields" type="_yPR44IEoEeieQ4zKGFzYtQ">
         <ownedComment xmi:type="uml:Comment" xmi:id="_FjUJwJzSEeiLvPKMh61-Bg" annotatedElement="_JYYzUJzREeiLvPKMh61-Bg">
           <body>Additional stateChange fields if needed</body>
@@ -1209,6 +1130,7 @@ Note: current data type (String) may be changed to Common Resource Datatype L3Ad
 VES supports both classes of syslog, however VES is only recommended for control logs or for lower volume session logs, less than 60k per hour. High volume session logging should use a file-based transport solution.&#xD;
 </body>
       </ownedComment>
+      <generalization xmi:type="uml:Generalization" xmi:id="_XAezoEaZEem3MJDthqMI_w" general="_PmIOkH7uEeifJIHxnlj6Cg"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_fX1bQJzTEeiLvPKMh61-Bg" name="additionalFields" type="_yPR44IEoEeieQ4zKGFzYtQ">
         <ownedComment xmi:type="uml:Comment" xmi:id="_tMbUkLt0Eeiq-o0aE00M6w" annotatedElement="_fX1bQJzTEeiLvPKMh61-Bg">
           <body>Additional syslog fields if needed Ex:  {“name1”: ”value1”, “name2: “value2” … }</body>
@@ -1893,6 +1815,7 @@ Debug	          7	    debug-level messages&#xD;
       <ownedComment xmi:type="uml:Comment" xmi:id="__uOkANE6EeilcYLXtz_Wig" annotatedElement="_4d4yYMWTEeiLjtyU_R81wg">
         <body>The thresholdCrossingAlertFields datatype consists of the following fields:</body>
       </ownedComment>
+      <generalization xmi:type="uml:Generalization" xmi:id="_bNb8QEaZEem3MJDthqMI_w" general="_PmIOkH7uEeifJIHxnlj6Cg"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_RRq8IKJVEeibfLkXoC-lBg" name="additionalFields" type="_yPR44IEoEeieQ4zKGFzYtQ">
         <ownedComment xmi:type="uml:Comment" xmi:id="_GtNpcKJWEeibfLkXoC-lBg" annotatedElement="_RRq8IKJVEeibfLkXoC-lBg">
           <body>additionalFields - Additional pnfRegistration fields if needed.&#xD;
@@ -2008,6 +1931,7 @@ Debug	          7	    debug-level messages&#xD;
       <ownedComment xmi:type="uml:Comment" xmi:id="_Na2FANE7EeilcYLXtz_Wig" annotatedElement="_7sljAMWTEeiLjtyU_R81wg">
         <body>The voiceQuality class provides statistics related to customer facing voice products; consists of the following fields:</body>
       </ownedComment>
+      <generalization xmi:type="uml:Generalization" xmi:id="_ferH8EaZEem3MJDthqMI_w" general="_PmIOkH7uEeifJIHxnlj6Cg"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_e9yVUNikEeiRnMGpBj3Tnw" name="additionalInformation" type="_yPR44IEoEeieQ4zKGFzYtQ">
         <ownedComment xmi:type="uml:Comment" xmi:id="_wvMlMNkXEei09Y1bp3mjwA" annotatedElement="_e9yVUNikEeiRnMGpBj3Tnw">
           <body>Additional voice quality fields</body>
@@ -3892,6 +3816,7 @@ Field	Type	Required?	Description&#xD;
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_ATTeUCDMEemw1L3J4dNy4w" name="Perf3gpp">
+      <generalization xmi:type="uml:Generalization" xmi:id="_ifa8IEaZEem3MJDthqMI_w" general="_PmIOkH7uEeifJIHxnlj6Cg"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_onUNUCDPEemw1L3J4dNy4w" name="eventAddlFields" type="_yPR44IEoEeieQ4zKGFzYtQ">
         <ownedComment xmi:type="uml:Comment" xmi:id="_9_Mw4CDPEemw1L3J4dNy4w" annotatedElement="_onUNUCDPEemw1L3J4dNy4w">
           <body>Additional key-value pairs if needed</body>
@@ -4687,84 +4612,12 @@ Debug	          7	    debug-level messages&#xD;
     </packagedElement>
   </packagedElement>
   <packagedElement xmi:type="uml:Package" xmi:id="_UgGsIMyIEeicT7FGufu5-g" name="Associations">
-    <packagedElement xmi:type="uml:Association" xmi:id="_f23h4MWqEeiLjtyU_R81wg" name="EventContainsVoiceQuality" memberEnd="_f24I8sWqEeiLjtyU_R81wg _f24wAsWqEeiLjtyU_R81wg">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_f24I8MWqEeiLjtyU_R81wg" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_f24I8cWqEeiLjtyU_R81wg" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_f24wAsWqEeiLjtyU_R81wg" name="event" type="_PmIOkH7uEeifJIHxnlj6Cg" association="_f23h4MWqEeiLjtyU_R81wg"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_MjWCwMWqEeiLjtyU_R81wg" name="EventConainsThresholdCrossingAlert" memberEnd="_MjWp0sWqEeiLjtyU_R81wg _MjWp1sWqEeiLjtyU_R81wg">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_MjWp0MWqEeiLjtyU_R81wg" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_MjWp0cWqEeiLjtyU_R81wg" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_MjWp1sWqEeiLjtyU_R81wg" name="event" type="_PmIOkH7uEeifJIHxnlj6Cg" association="_MjWCwMWqEeiLjtyU_R81wg"/>
-    </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_8DrRgMWMEeiLjtyU_R81wg" name="EventContainsComonEventHeader" memberEnd="_8Dr4ksWMEeiLjtyU_R81wg _8DsfosWMEeiLjtyU_R81wg">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8Dr4kMWMEeiLjtyU_R81wg" source="org.eclipse.papyrus">
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8Dr4kcWMEeiLjtyU_R81wg" key="nature" value="UML_Nature"/>
       </eAnnotations>
       <ownedEnd xmi:type="uml:Property" xmi:id="_8DsfosWMEeiLjtyU_R81wg" name="event" type="_PmIOkH7uEeifJIHxnlj6Cg" association="_8DrRgMWMEeiLjtyU_R81wg"/>
     </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_Tp2NgMGbEeiS695oPTRE1Q" name="EventContainsFault" memberEnd="_Tp20ksGbEeiS695oPTRE1Q _Tp3bosGbEeiS695oPTRE1Q">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Tp20kMGbEeiS695oPTRE1Q" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Tp20kcGbEeiS695oPTRE1Q" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_Tp3bosGbEeiS695oPTRE1Q" name="event" type="_PmIOkH7uEeifJIHxnlj6Cg" association="_Tp2NgMGbEeiS695oPTRE1Q"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_IYFe4MWMEeiLjtyU_R81wg" name="EventContainsHeartbeat" memberEnd="_IYJJQMWMEeiLjtyU_R81wg _IYK-ccWMEeiLjtyU_R81wg">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IYH7IMWMEeiLjtyU_R81wg" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IYH7IcWMEeiLjtyU_R81wg" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_IYK-ccWMEeiLjtyU_R81wg" name="event" type="_PmIOkH7uEeifJIHxnlj6Cg" association="_IYFe4MWMEeiLjtyU_R81wg"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_O1nboMWPEeiLjtyU_R81wg" name="EventContainsMeasurement" memberEnd="_O1pQ0cWPEeiLjtyU_R81wg _O1v-gMWPEeiLjtyU_R81wg">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_O1opwMWPEeiLjtyU_R81wg" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_O1pQ0MWPEeiLjtyU_R81wg" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_O1v-gMWPEeiLjtyU_R81wg" name="event" type="_PmIOkH7uEeifJIHxnlj6Cg" association="_O1nboMWPEeiLjtyU_R81wg"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_QWlBoMWbEeiLjtyU_R81wg" name="EventContainsMobileFlow" memberEnd="_QWlossWbEeiLjtyU_R81wg _QWmPwsWbEeiLjtyU_R81wg">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QWlosMWbEeiLjtyU_R81wg" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QWloscWbEeiLjtyU_R81wg" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_QWmPwsWbEeiLjtyU_R81wg" name="event" type="_PmIOkH7uEeifJIHxnlj6Cg" association="_QWlBoMWbEeiLjtyU_R81wg"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_Vf3PoMWbEeiLjtyU_R81wg" name="EventContainsNotification" memberEnd="_Vf32ssWbEeiLjtyU_R81wg _Vf5E0MWbEeiLjtyU_R81wg">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Vf32sMWbEeiLjtyU_R81wg" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Vf32scWbEeiLjtyU_R81wg" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_Vf5E0MWbEeiLjtyU_R81wg" name="event" type="_PmIOkH7uEeifJIHxnlj6Cg" association="_Vf3PoMWbEeiLjtyU_R81wg"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_Ya42UMWbEeiLjtyU_R81wg" name="EventContainsOther" memberEnd="_Ya5dYsWbEeiLjtyU_R81wg _Ya6EccWbEeiLjtyU_R81wg">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ya5dYMWbEeiLjtyU_R81wg" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ya5dYcWbEeiLjtyU_R81wg" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_Ya6EccWbEeiLjtyU_R81wg" name="event" type="_PmIOkH7uEeifJIHxnlj6Cg" association="_Ya42UMWbEeiLjtyU_R81wg"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_ZyP4kMWgEeiLjtyU_R81wg" name="EventContainsPnfRegistration" memberEnd="_ZyQfosWgEeiLjtyU_R81wg _ZyRGs8WgEeiLjtyU_R81wg">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZyQfoMWgEeiLjtyU_R81wg" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZyQfocWgEeiLjtyU_R81wg" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_ZyRGs8WgEeiLjtyU_R81wg" name="event" type="_PmIOkH7uEeifJIHxnlj6Cg" association="_ZyP4kMWgEeiLjtyU_R81wg"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_oQMI0MWgEeiLjtyU_R81wg" name="EventContainsSipSignaling" memberEnd="_oQMv4cWgEeiLjtyU_R81wg _oQNW8sWgEeiLjtyU_R81wg">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_oQMI0cWgEeiLjtyU_R81wg" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_oQMv4MWgEeiLjtyU_R81wg" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_oQNW8sWgEeiLjtyU_R81wg" name="event" type="_PmIOkH7uEeifJIHxnlj6Cg" association="_oQMI0MWgEeiLjtyU_R81wg"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_t-VBQMWpEeiLjtyU_R81wg" name="EventContainsStateChange" memberEnd="_t-WPYMWpEeiLjtyU_R81wg _t-W2ccWpEeiLjtyU_R81wg">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_t-VoUMWpEeiLjtyU_R81wg" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t-VoUcWpEeiLjtyU_R81wg" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_t-W2ccWpEeiLjtyU_R81wg" name="eventcontainssipsignaling" type="_PmIOkH7uEeifJIHxnlj6Cg" association="_t-VBQMWpEeiLjtyU_R81wg"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_Bw4lwMWqEeiLjtyU_R81wg" name="EventContainsSysLog" memberEnd="_Bw5M0sWqEeiLjtyU_R81wg _Bw5z4sWqEeiLjtyU_R81wg">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Bw5M0MWqEeiLjtyU_R81wg" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bw5M0cWqEeiLjtyU_R81wg" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_Bw5z4sWqEeiLjtyU_R81wg" name="event" type="_PmIOkH7uEeifJIHxnlj6Cg" association="_Bw4lwMWqEeiLjtyU_R81wg"/>
-    </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_322w4MivEeiKReoLXDYvSw" name="MeasurementHasCodecsInUse" memberEnd="_325NIMivEeiKReoLXDYvSw _326bQsivEeiKReoLXDYvSw">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_324mEMivEeiKReoLXDYvSw" source="org.eclipse.papyrus">
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_324mEcivEeiKReoLXDYvSw" key="nature" value="UML_Nature"/>
@@ -4927,15 +4780,6 @@ Debug	          7	    debug-level messages&#xD;
       </eAnnotations>
       <ownedEnd xmi:type="uml:Property" xmi:id="_4Ii74tkYEei09Y1bp3mjwA" name="voicequality" type="_7sljAMWTEeiLjtyU_R81wg" association="_4IhtwNkYEei09Y1bp3mjwA"/>
     </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_NprCgCDMEemw1L3J4dNy4w" name="EventContainsPerf3gpp" memberEnd="_NprpkiDMEemw1L3J4dNy4w _NpsQoiDMEemw1L3J4dNy4w">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NprpkCDMEemw1L3J4dNy4w" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NprpkSDMEemw1L3J4dNy4w" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedComment xmi:type="uml:Comment" xmi:id="_PkTJoCZSEemRA_CB-n5OfQ" annotatedElement="_NprCgCDMEemw1L3J4dNy4w">
-        <body>Fields specific to 3gpp types of events</body>
-      </ownedComment>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_NpsQoiDMEemw1L3J4dNy4w" name="event" type="_PmIOkH7uEeifJIHxnlj6Cg" association="_NprCgCDMEemw1L3J4dNy4w"/>
-    </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_2YIm8CDREemw1L3J4dNy4w" name="Perf3gppContainsMeasDataCollection" memberEnd="_2YJOAiDREemw1L3J4dNy4w _2YJ1EyDREemw1L3J4dNy4w">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2YJOACDREemw1L3J4dNy4w" source="org.eclipse.papyrus">
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2YJOASDREemw1L3J4dNy4w" key="nature" value="UML_Nature"/>
author	Kevin Scaggs <ks0567@att.com>	2019-03-15 16:49:28 -0500
committer	Kevin Scaggs <ks0567@att.com>	2019-03-15 16:49:28 -0500
commit	c5cf5be90bf9189dd17a6ef0508f68044c9b063d (patch)
tree	9c451b3cb83b5327c36df492bd6c93d646adc404
parent	03991d6387401327cf17b3389521262ec2c89dea (diff)