add CoS Metrics and BW Profiles to UML model

Change-Id: I826a30313427001eba1ba166c8ea5858cfde7e19 Signed-off-by: SteveAtSentosa <steve@sentosatech.com>
author: SteveAtSentosa <steve@sentosatech.com> 2015-10-02 15:46:08 -0600
committer: SteveAtSentosa <steve@sentosatech.com> 2015-10-02 15:46:53 -0600
commit: 97c32a1ef1a91d9c8251154a7b15eba2605d5018 (patch)
tree: 89d705c697f6a1503708b3a5381af4df54a60f0d /model
parent: e257faf98c345415b8d3d9e582f0fe27f8206567 (diff)
4 files changed, 1483 insertions, 485 deletions
diff --git a/model/MEF-Classes.png b/model/MEF-Classes.png
index 2e726c8..41779de 100644
--- a/model/MEF-Classes.png
+++ b/model/MEF-Classes.png
diff --git a/model/README.md b/model/README.md
index 1e4596f..f0475b6 100644
--- a/model/README.md
+++ b/model/README.md
@@ -7,8 +7,8 @@
 4. After these components are installed, create a Papyrus perspective by clicking on the “+” sigh in the perspective bar near the upper right (there will already be a Java Perspective created”)
     - Select “Papyrus” and hit “OK”
 5. Assuming that your eclipse working is ~/workspace:
-    - make a copy of the the folder “cl-mef-uml”, and (it contents) from the attached zip file  in ~/workspace (so that you end up with a ~/workspace/cl-mef_uml” directory”
+    - make a copy of the the folder “cl-mef-uml”, and (it contents) in ~/workspace (so that you end up with a ~/workspace/cl-mef_uml” directory”
 6. Activate the Papyrus perspective in eclipse, and goto the menu “File/New/Papyrus Project”
     - give the new project the name “cl-mef-uml” and the files that you placed into your workspace directory will automatically be imported into the new project.
-7. In the “Model” pane on the left, expand the “>Model” tree to see all of the the model components
-    - To view the detailed UML class digram click on “Diagram Data Model - Foundational Components” and the UML diagrams will become visible in the main pane.
+7. In the “Model Explorer” pane on the left, expand the “>Model” tree to see all of the the model components
+8. To view the UML class digram click on “Show Diagrams” icon withing In the “Model Explorer” pane on the left, and select the "MEF Classes" diagram.
diff --git a/model/cl-mef-uml/model.notation b/model/cl-mef-uml/model.notation
index e79af4b..4f9e3cd 100644
--- a/model/cl-mef-uml/model.notation
+++ b/model/cl-mef-uml/model.notation
@@ -1,6 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
   <notation:Diagram xmi:id="_tptY8AidEeWgbbgaC4xhOQ" type="PapyrusUMLClassDiagram" name="MEF Classes" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_tBraYmbpEeWGp9Z_qQVBGA" type="2012" fillColor="4308612" gradient="16777215, -1, 1">
+      <children xmi:type="notation:DecorationNode" xmi:id="_tBraY2bpEeWGp9Z_qQVBGA" type="5038"/>
+      <element xmi:type="uml:Comment" href="model.uml#_tBraYGbpEeWGp9Z_qQVBGA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tBraZGbpEeWGp9Z_qQVBGA" x="879" y="127" width="164" height="41"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_YuTAwmbpEeWGp9Z_qQVBGA" type="2012" fillColor="4308612" gradient="16777215, -1, 1">
+      <children xmi:type="notation:DecorationNode" xmi:id="_YuTAw2bpEeWGp9Z_qQVBGA" type="5038"/>
+      <element xmi:type="uml:Comment" href="model.uml#_YuTAwGbpEeWGp9Z_qQVBGA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YuTAxGbpEeWGp9Z_qQVBGA" x="381" y="434" width="156" height="41"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_W2rMIGYKEeWisPYqI1z_rA" type="2012" fillColor="4308612" gradient="16777215, -1, 1">
+      <children xmi:type="notation:DecorationNode" xmi:id="_W2rMIWYKEeWisPYqI1z_rA" type="5038"/>
+      <element xmi:type="uml:Comment" href="model.uml#_W2qlEGYKEeWisPYqI1z_rA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W2rMImYKEeWisPYqI1z_rA" x="140" y="415" width="128" height="73"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_QqmDkGPJEeWyNbIEfiGf0A" type="2012" fillColor="4308612" gradient="16777215, -1, 1">
+      <children xmi:type="notation:DecorationNode" xmi:id="_QqmDkmPJEeWyNbIEfiGf0A" type="5038"/>
+      <element xmi:type="uml:Comment" href="model.uml#_QocugGPJEeWyNbIEfiGf0A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QqmDkWPJEeWyNbIEfiGf0A" x="284" y="-199" width="168" height="46"/>
+    </children>
     <children xmi:type="notation:Shape" xmi:id="_8OWuIAidEeWgbbgaC4xhOQ" type="2008">
       <children xmi:type="notation:DecorationNode" xmi:id="_8OXVMAidEeWgbbgaC4xhOQ" type="5029"/>
       <children xmi:type="notation:BasicCompartment" xmi:id="_8OXVMQidEeWgbbgaC4xhOQ" type="7017">
@@ -20,6 +40,22 @@
           <element xmi:type="uml:Property" href="model.uml#_8JT2FAidEeWgbbgaC4xhOQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_FhWjgQieEeWgbbgaC4xhOQ"/>
         </children>
+        <children xmi:type="notation:Shape" xmi:id="_XeCjkGYJEeWisPYqI1z_rA" type="3012">
+          <element xmi:type="uml:Property" href="model.uml#_XbLc0GYJEeWisPYqI1z_rA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_XeCjkWYJEeWisPYqI1z_rA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_cgfw0GYJEeWisPYqI1z_rA" type="3012">
+          <element xmi:type="uml:Property" href="model.uml#_cgeisGYJEeWisPYqI1z_rA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_cgfw0WYJEeWisPYqI1z_rA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_tKUp0GYJEeWisPYqI1z_rA" type="3012">
+          <element xmi:type="uml:Property" href="model.uml#_tKTbsGYJEeWisPYqI1z_rA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_tKUp0WYJEeWisPYqI1z_rA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_6mIusGYJEeWisPYqI1z_rA" type="3012">
+          <element xmi:type="uml:Property" href="model.uml#_6mHgkGYJEeWisPYqI1z_rA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_6mIusWYJEeWisPYqI1z_rA"/>
+        </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_8OXVMgidEeWgbbgaC4xhOQ"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_8OXVMwidEeWgbbgaC4xhOQ"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_8OXVNAidEeWgbbgaC4xhOQ"/>
@@ -46,7 +82,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8OXVPwidEeWgbbgaC4xhOQ"/>
       </children>
       <element xmi:type="uml:Class" href="model.uml#_8JT2EAidEeWgbbgaC4xhOQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8OWuIQidEeWgbbgaC4xhOQ" x="1587" y="197" width="191" height="208"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8OWuIQidEeWgbbgaC4xhOQ" x="53" y="478" width="191" height="218"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_bDy70AifEeWgbbgaC4xhOQ" type="2006">
       <children xmi:type="notation:DecorationNode" xmi:id="_bDy70gifEeWgbbgaC4xhOQ" type="5023"/>
@@ -69,7 +105,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bDy71wifEeWgbbgaC4xhOQ"/>
       </children>
       <element xmi:type="uml:Enumeration" href="model.uml#_bDyUwAifEeWgbbgaC4xhOQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bDy70QifEeWgbbgaC4xhOQ" x="1201" y="-132"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bDy70QifEeWgbbgaC4xhOQ" x="1279" y="-136"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_lXjqoAifEeWgbbgaC4xhOQ" type="2006">
       <children xmi:type="notation:DecorationNode" xmi:id="_lXkRsAifEeWgbbgaC4xhOQ" type="5023"/>
@@ -92,72 +128,9 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lXkRtQifEeWgbbgaC4xhOQ"/>
       </children>
       <element xmi:type="uml:Enumeration" href="model.uml#_lXjDkAifEeWgbbgaC4xhOQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lXjqoQifEeWgbbgaC4xhOQ" x="1202" y="-29"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lXjqoQifEeWgbbgaC4xhOQ" x="1448" y="-134"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_sWFjAAifEeWgbbgaC4xhOQ" type="2008">
-      <children xmi:type="notation:DecorationNode" xmi:id="_sWFjAgifEeWgbbgaC4xhOQ" type="5029"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_sWFjAwifEeWgbbgaC4xhOQ" type="7017">
-        <children xmi:type="notation:Shape" xmi:id="_vWv3oAifEeWgbbgaC4xhOQ" type="3012">
-          <element xmi:type="uml:Property" href="model.uml#_sWE78QifEeWgbbgaC4xhOQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_vWv3oQifEeWgbbgaC4xhOQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_vWyT4AifEeWgbbgaC4xhOQ" type="3012">
-          <element xmi:type="uml:Property" href="model.uml#_sWE78gifEeWgbbgaC4xhOQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_vWyT4QifEeWgbbgaC4xhOQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_vW0JEAifEeWgbbgaC4xhOQ" type="3012">
-          <element xmi:type="uml:Property" href="model.uml#_sWE78wifEeWgbbgaC4xhOQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_vW0JEQifEeWgbbgaC4xhOQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_vW1XMAifEeWgbbgaC4xhOQ" type="3012">
-          <element xmi:type="uml:Property" href="model.uml#_sWE79AifEeWgbbgaC4xhOQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_vW1XMQifEeWgbbgaC4xhOQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_vW3MYAifEeWgbbgaC4xhOQ" type="3012">
-          <element xmi:type="uml:Property" href="model.uml#_sWE79QifEeWgbbgaC4xhOQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_vW3MYQifEeWgbbgaC4xhOQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_vW5BkAifEeWgbbgaC4xhOQ" type="3012">
-          <element xmi:type="uml:Property" href="model.uml#_sWE79gifEeWgbbgaC4xhOQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_vW5BkQifEeWgbbgaC4xhOQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_vW62wAifEeWgbbgaC4xhOQ" type="3012">
-          <element xmi:type="uml:Property" href="model.uml#_sWE79wifEeWgbbgaC4xhOQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_vW62wQifEeWgbbgaC4xhOQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_vW8r8AifEeWgbbgaC4xhOQ" type="3012">
-          <element xmi:type="uml:Property" href="model.uml#_sWE7-AifEeWgbbgaC4xhOQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_vW8r8QifEeWgbbgaC4xhOQ"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_sWFjBAifEeWgbbgaC4xhOQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_sWFjBQifEeWgbbgaC4xhOQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_sWFjBgifEeWgbbgaC4xhOQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sWFjBwifEeWgbbgaC4xhOQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_sWFjCAifEeWgbbgaC4xhOQ" type="7018">
-        <children xmi:type="notation:Shape" xmi:id="_wOYqQAifEeWgbbgaC4xhOQ" type="3013">
-          <element xmi:type="uml:Operation" href="model.uml#_sWE7-QifEeWgbbgaC4xhOQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_wOYqQQifEeWgbbgaC4xhOQ"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_wObGgAifEeWgbbgaC4xhOQ" type="3013">
-          <element xmi:type="uml:Operation" href="model.uml#_sWE7-gifEeWgbbgaC4xhOQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_wObGgQifEeWgbbgaC4xhOQ"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_sWFjCQifEeWgbbgaC4xhOQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_sWFjCgifEeWgbbgaC4xhOQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_sWFjCwifEeWgbbgaC4xhOQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sWFjDAifEeWgbbgaC4xhOQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_sWFjDQifEeWgbbgaC4xhOQ" type="7019">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_sWFjDgifEeWgbbgaC4xhOQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_sWFjDwifEeWgbbgaC4xhOQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_sWFjEAifEeWgbbgaC4xhOQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sWFjEQifEeWgbbgaC4xhOQ"/>
-      </children>
-      <element xmi:type="uml:Class" href="model.uml#_sWE78AifEeWgbbgaC4xhOQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sWFjAQifEeWgbbgaC4xhOQ" x="667" y="-131" width="277"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_6ejSgAifEeWgbbgaC4xhOQ" type="2008" fillColor="8905185">
+    <children xmi:type="notation:Shape" xmi:id="_6ejSgAifEeWgbbgaC4xhOQ" type="2008">
       <children xmi:type="notation:DecorationNode" xmi:id="_6ejSggifEeWgbbgaC4xhOQ" type="5029"/>
       <children xmi:type="notation:BasicCompartment" xmi:id="_6ejSgwifEeWgbbgaC4xhOQ" type="7017">
         <children xmi:type="notation:Shape" xmi:id="__q2_UAifEeWgbbgaC4xhOQ" type="3012">
@@ -196,6 +169,10 @@
           <element xmi:type="uml:Property" href="model.uml#_6eiEcAifEeWgbbgaC4xhOQ"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="__rIFEQifEeWgbbgaC4xhOQ"/>
         </children>
+        <children xmi:type="notation:Shape" xmi:id="_GE-UQGO_EeWAFfMNIf5-6Q" type="3012">
+          <element xmi:type="uml:Property" href="model.uml#_GE6p4GO_EeWAFfMNIf5-6Q"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_GE-UQWO_EeWAFfMNIf5-6Q"/>
+        </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_6ejShAifEeWgbbgaC4xhOQ"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_6ejShQifEeWgbbgaC4xhOQ"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_6ejShgifEeWgbbgaC4xhOQ"/>
@@ -222,7 +199,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6ej5mQifEeWgbbgaC4xhOQ"/>
       </children>
       <element xmi:type="uml:Class" href="model.uml#_6eiEYAifEeWgbbgaC4xhOQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6ejSgQifEeWgbbgaC4xhOQ" x="1003" y="-129" width="194" height="236"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6ejSgQifEeWgbbgaC4xhOQ" x="1002" y="-143" width="246" height="256"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_PhLlgAilEeWgbbgaC4xhOQ" type="2009">
       <children xmi:type="notation:DecorationNode" xmi:id="_PhLlggilEeWgbbgaC4xhOQ" type="5032"/>
@@ -239,9 +216,9 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PhLljAilEeWgbbgaC4xhOQ"/>
       </children>
       <element xmi:type="uml:PrimitiveType" href="model.uml#_PhJwUAilEeWgbbgaC4xhOQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PhLlgQilEeWgbbgaC4xhOQ" x="1780" y="-341" width="190" height="34"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PhLlgQilEeWgbbgaC4xhOQ" x="1319" y="-382" width="190" height="34"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_6ExcYAimEeWgbbgaC4xhOQ" type="2008" fillColor="8905185">
+    <children xmi:type="notation:Shape" xmi:id="_6ExcYAimEeWgbbgaC4xhOQ" type="2008">
       <children xmi:type="notation:DecorationNode" xmi:id="_6ExcYgimEeWgbbgaC4xhOQ" type="5029"/>
       <children xmi:type="notation:BasicCompartment" xmi:id="_6ExcYwimEeWgbbgaC4xhOQ" type="7017">
         <children xmi:type="notation:Shape" xmi:id="__rTVIAioEeWgbbgaC4xhOQ" type="3012">
@@ -442,35 +419,6 @@
       <element xmi:type="uml:DataType" href="model.uml#_NmywkAoSEeWNdNIyeR54mg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Nmz-sQoSEeWNdNIyeR54mg" x="1377" y="1011"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_PFMLwAoTEeWNdNIyeR54mg" type="2010">
-      <children xmi:type="notation:DecorationNode" xmi:id="_PFMLwgoTEeWNdNIyeR54mg" type="5035"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_PFMLwwoTEeWNdNIyeR54mg" type="7020">
-        <children xmi:type="notation:Shape" xmi:id="_RpcRMAoTEeWNdNIyeR54mg" type="3018">
-          <element xmi:type="uml:Property" href="model.uml#_RpbDEAoTEeWNdNIyeR54mg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_RpcRMQoTEeWNdNIyeR54mg"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_VXug0AoTEeWNdNIyeR54mg" type="3018">
-          <element xmi:type="uml:Property" href="model.uml#_VXtSsAoTEeWNdNIyeR54mg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_VXug0QoTEeWNdNIyeR54mg"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_bP7DQAoTEeWNdNIyeR54mg" type="3018">
-          <element xmi:type="uml:Property" href="model.uml#_bP51IAoTEeWNdNIyeR54mg"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_bP7DQQoTEeWNdNIyeR54mg"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_PFMLxAoTEeWNdNIyeR54mg"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_PFMLxQoTEeWNdNIyeR54mg"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_PFMLxgoTEeWNdNIyeR54mg"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PFMLxwoTEeWNdNIyeR54mg"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_PFMy0AoTEeWNdNIyeR54mg" type="7021">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_PFMy0QoTEeWNdNIyeR54mg"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_PFMy0goTEeWNdNIyeR54mg"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_PFMy0woTEeWNdNIyeR54mg"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PFMy1AoTEeWNdNIyeR54mg"/>
-      </children>
-      <element xmi:type="uml:DataType" href="model.uml#_PFK9oAoTEeWNdNIyeR54mg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PFMLwQoTEeWNdNIyeR54mg" x="1376" y="1115" width="207" height="109"/>
-    </children>
     <children xmi:type="notation:Shape" xmi:id="_0_0I4AoTEeWNdNIyeR54mg" type="2006">
       <children xmi:type="notation:DecorationNode" xmi:id="_0_0v8AoTEeWNdNIyeR54mg" type="5023"/>
       <children xmi:type="notation:BasicCompartment" xmi:id="_0_0v8QoTEeWNdNIyeR54mg" type="7015">
@@ -538,7 +486,7 @@
       <element xmi:type="uml:DataType" href="model.uml#_ybOZUAogEeWNdNIyeR54mg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ybPncQogEeWNdNIyeR54mg" x="1513" y="1009" width="166" height="103"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_rc5pYAotEeWkNoOTovCSlw" type="2008" fillColor="8905185">
+    <children xmi:type="notation:Shape" xmi:id="_rc5pYAotEeWkNoOTovCSlw" type="2008">
       <children xmi:type="notation:DecorationNode" xmi:id="_rc5pYgotEeWkNoOTovCSlw" type="5029"/>
       <children xmi:type="notation:BasicCompartment" xmi:id="_rc5pYwotEeWkNoOTovCSlw" type="7017">
         <children xmi:type="notation:Shape" xmi:id="_Q7OsEAouEeWkNoOTovCSlw" type="3012">
@@ -646,7 +594,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LY1vpwowEeWkNoOTovCSlw"/>
       </children>
       <element xmi:type="uml:Enumeration" href="model.uml#_LYz6cAowEeWkNoOTovCSlw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LY1voQowEeWkNoOTovCSlw" x="1336" y="399"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LY1voQowEeWkNoOTovCSlw" x="1351" y="525"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_BrE0YAoxEeWkNoOTovCSlw" type="2006">
       <children xmi:type="notation:DecorationNode" xmi:id="_BrE0YgoxEeWkNoOTovCSlw" type="5023"/>
@@ -665,9 +613,9 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BrFbdAoxEeWkNoOTovCSlw"/>
       </children>
       <element xmi:type="uml:Enumeration" href="model.uml#_BrDmQAoxEeWkNoOTovCSlw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BrE0YQoxEeWkNoOTovCSlw" x="1335" y="528" height="72"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BrE0YQoxEeWkNoOTovCSlw" x="1464" y="429" width="112" height="72"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_6CfP8ArAEeWkNoOTovCSlw" type="2008" fillColor="8905185">
+    <children xmi:type="notation:Shape" xmi:id="_6CfP8ArAEeWkNoOTovCSlw" type="2008">
       <children xmi:type="notation:DecorationNode" xmi:id="_6CfP8grAEeWkNoOTovCSlw" type="5029"/>
       <children xmi:type="notation:BasicCompartment" xmi:id="_6CfP8wrAEeWkNoOTovCSlw" type="7017">
         <styles xmi:type="notation:TitleStyle" xmi:id="_6CfP9ArAEeWkNoOTovCSlw"/>
@@ -688,7 +636,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6CfQAQrAEeWkNoOTovCSlw"/>
       </children>
       <element xmi:type="uml:Class" href="model.uml#_6CdawArAEeWkNoOTovCSlw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6CfP8QrAEeWkNoOTovCSlw" x="787" y="150" width="175" height="69"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6CfP8QrAEeWkNoOTovCSlw" x="1277" y="96" width="175" height="69"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_EP6GMArBEeWkNoOTovCSlw" type="2008">
       <children xmi:type="notation:DecorationNode" xmi:id="_EP6GMgrBEeWkNoOTovCSlw" type="5029"/>
@@ -711,9 +659,9 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EP6GQQrBEeWkNoOTovCSlw"/>
       </children>
       <element xmi:type="uml:Class" href="model.uml#_EP4RAArBEeWkNoOTovCSlw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EP6GMQrBEeWkNoOTovCSlw" x="810" y="402" height="82"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EP6GMQrBEeWkNoOTovCSlw" x="1726" y="374" height="82"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_OAtR4ArBEeWkNoOTovCSlw" type="2008" fillColor="8905185">
+    <children xmi:type="notation:Shape" xmi:id="_OAtR4ArBEeWkNoOTovCSlw" type="2008">
       <children xmi:type="notation:DecorationNode" xmi:id="_OAtR4grBEeWkNoOTovCSlw" type="5029"/>
       <children xmi:type="notation:BasicCompartment" xmi:id="_OAtR4wrBEeWkNoOTovCSlw" type="7017">
         <styles xmi:type="notation:TitleStyle" xmi:id="_OAtR5ArBEeWkNoOTovCSlw"/>
@@ -734,9 +682,9 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OAt49ArBEeWkNoOTovCSlw"/>
       </children>
       <element xmi:type="uml:Class" href="model.uml#_OArcsArBEeWkNoOTovCSlw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OAtR4QrBEeWkNoOTovCSlw" x="859" y="684" height="78"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OAtR4QrBEeWkNoOTovCSlw" x="1707" y="520" width="185" height="78"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_U3fjggrBEeWkNoOTovCSlw" type="2008" fillColor="8905185">
+    <children xmi:type="notation:Shape" xmi:id="_U3fjggrBEeWkNoOTovCSlw" type="2008">
       <children xmi:type="notation:DecorationNode" xmi:id="_U3fjgwrBEeWkNoOTovCSlw" type="5029"/>
       <children xmi:type="notation:BasicCompartment" xmi:id="_U3fjhArBEeWkNoOTovCSlw" type="7017">
         <styles xmi:type="notation:TitleStyle" xmi:id="_U3fjhQrBEeWkNoOTovCSlw"/>
@@ -757,9 +705,9 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_U3fjkgrBEeWkNoOTovCSlw"/>
       </children>
       <element xmi:type="uml:Class" href="model.uml#_U3fjgArBEeWkNoOTovCSlw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_U3fjlgrBEeWkNoOTovCSlw" x="634" y="682" height="78"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_U3fjlgrBEeWkNoOTovCSlw" x="1939" y="523" width="214" height="78"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_qjcSkArBEeWkNoOTovCSlw" type="2008" fillColor="8905185">
+    <children xmi:type="notation:Shape" xmi:id="_qjcSkArBEeWkNoOTovCSlw" type="2008">
       <children xmi:type="notation:DecorationNode" xmi:id="_qjcSkgrBEeWkNoOTovCSlw" type="5029"/>
       <children xmi:type="notation:BasicCompartment" xmi:id="_qjcSkwrBEeWkNoOTovCSlw" type="7017">
         <styles xmi:type="notation:TitleStyle" xmi:id="_qjcSlArBEeWkNoOTovCSlw"/>
@@ -780,7 +728,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qjcSoQrBEeWkNoOTovCSlw"/>
       </children>
       <element xmi:type="uml:Class" href="model.uml#_qjadYArBEeWkNoOTovCSlw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qjcSkQrBEeWkNoOTovCSlw" x="677" y="800" height="74"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qjcSkQrBEeWkNoOTovCSlw" x="1940" y="630" width="215" height="74"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_1_-8cArDEeWkNoOTovCSlw" type="2008">
       <children xmi:type="notation:DecorationNode" xmi:id="_1_-8cgrDEeWkNoOTovCSlw" type="5029"/>
@@ -808,49 +756,10 @@
       </children>
       <children xmi:type="notation:Shape" xmi:id="_2d3hwCD9EeWFusc4sUZ9zQ" type="3032">
         <element xsi:nil="true"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2d3hwSD9EeWFusc4sUZ9zQ" x="45" y="56"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2d3hwSD9EeWFusc4sUZ9zQ" x="56" y="56"/>
       </children>
       <element xmi:type="uml:Class" href="model.uml#_1_9HQArDEeWkNoOTovCSlw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1_-8cQrDEeWkNoOTovCSlw" x="1045" y="-313" height="57"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_E2OksArUEeWkNoOTovCSlw" type="2008">
-      <children xmi:type="notation:DecorationNode" xmi:id="_E2OksgrUEeWkNoOTovCSlw" type="5029"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_E2OkswrUEeWkNoOTovCSlw" type="7017">
-        <children xmi:type="notation:Shape" xmi:id="_VC2kUArUEeWkNoOTovCSlw" type="3012">
-          <element xmi:type="uml:Property" href="model.uml#_VC0vIArUEeWkNoOTovCSlw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_VC2kUQrUEeWkNoOTovCSlw"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_VbcDcArUEeWkNoOTovCSlw" type="3012">
-          <element xmi:type="uml:Property" href="model.uml#_VbbcYArUEeWkNoOTovCSlw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_VbcDcQrUEeWkNoOTovCSlw"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_Vu-qgArUEeWkNoOTovCSlw" type="3012">
-          <element xmi:type="uml:Property" href="model.uml#_Vu-DcArUEeWkNoOTovCSlw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Vu-qgQrUEeWkNoOTovCSlw"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_WGDGsArUEeWkNoOTovCSlw" type="3012">
-          <element xmi:type="uml:Property" href="model.uml#_WGCfoArUEeWkNoOTovCSlw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_WGDGsQrUEeWkNoOTovCSlw"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_E2OktArUEeWkNoOTovCSlw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_E2OktQrUEeWkNoOTovCSlw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_E2OktgrUEeWkNoOTovCSlw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E2OktwrUEeWkNoOTovCSlw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_E2OkuArUEeWkNoOTovCSlw" type="7018">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_E2OkuQrUEeWkNoOTovCSlw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_E2OkugrUEeWkNoOTovCSlw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_E2OkuwrUEeWkNoOTovCSlw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E2OkvArUEeWkNoOTovCSlw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_E2OkvQrUEeWkNoOTovCSlw" type="7019">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_E2OkvgrUEeWkNoOTovCSlw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_E2OkvwrUEeWkNoOTovCSlw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_E2OkwArUEeWkNoOTovCSlw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E2OkwQrUEeWkNoOTovCSlw"/>
-      </children>
-      <element xmi:type="uml:Class" href="model.uml#_E2MvgArUEeWkNoOTovCSlw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E2OksQrUEeWkNoOTovCSlw" x="1593" y="471" width="175" height="159"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1_-8cQrDEeWkNoOTovCSlw" x="1058" y="-339" height="57"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_scOoQCD-EeWFusc4sUZ9zQ" type="2008">
       <children xmi:type="notation:DecorationNode" xmi:id="_scPPUCD-EeWFusc4sUZ9zQ" type="5029"/>
@@ -873,7 +782,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_scPPXyD-EeWFusc4sUZ9zQ"/>
       </children>
       <element xmi:type="uml:Class" href="model.uml#_scKW0CD-EeWFusc4sUZ9zQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_scOoQSD-EeWFusc4sUZ9zQ" x="1119" y="255" width="155" height="74"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_scOoQSD-EeWFusc4sUZ9zQ" x="1051" y="186" width="155" height="74"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_wZ6JUCD_EeWFusc4sUZ9zQ" type="2008">
       <children xmi:type="notation:DecorationNode" xmi:id="_wZ6JUiD_EeWFusc4sUZ9zQ" type="5029"/>
@@ -896,7 +805,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wZ6JYSD_EeWFusc4sUZ9zQ"/>
       </children>
       <element xmi:type="uml:Class" href="model.uml#_wZ4UICD_EeWFusc4sUZ9zQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wZ6JUSD_EeWFusc4sUZ9zQ" x="789" y="259" width="166" height="76"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wZ6JUSD_EeWFusc4sUZ9zQ" x="1282" y="187" width="166" height="76"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_aytSwCPxEeW21PC6xbr-bA" type="2008">
       <children xmi:type="notation:DecorationNode" xmi:id="_ayt50CPxEeW21PC6xbr-bA" type="5029"/>
@@ -919,7 +828,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ayug5CPxEeW21PC6xbr-bA"/>
       </children>
       <element xmi:type="uml:Class" href="model.uml#_ayCkYCPxEeW21PC6xbr-bA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aytSwSPxEeW21PC6xbr-bA" x="1192" y="-356" height="46"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aytSwSPxEeW21PC6xbr-bA" x="1205" y="-382" height="46"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_cgJE8SPxEeW21PC6xbr-bA" type="2008">
       <children xmi:type="notation:DecorationNode" xmi:id="_cgJE8iPxEeW21PC6xbr-bA" type="5029"/>
@@ -942,7 +851,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cgJFASPxEeW21PC6xbr-bA"/>
       </children>
       <element xmi:type="uml:Class" href="model.uml#_cgJE8CPxEeW21PC6xbr-bA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cgJFBSPxEeW21PC6xbr-bA" x="1188" y="-301" height="46"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cgJFBSPxEeW21PC6xbr-bA" x="1201" y="-327" height="46"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_f_LXoCPxEeW21PC6xbr-bA" type="2008">
       <children xmi:type="notation:DecorationNode" xmi:id="_f_LXoSPxEeW21PC6xbr-bA" type="5029"/>
@@ -965,9 +874,9 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f_LXsCPxEeW21PC6xbr-bA"/>
       </children>
       <element xmi:type="uml:Class" href="model.uml#_f_KwkCPxEeW21PC6xbr-bA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f_LXtCPxEeW21PC6xbr-bA" x="1191" y="-246" height="46"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f_LXtCPxEeW21PC6xbr-bA" x="1204" y="-272" height="46"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_OoCygC-_EeWtJpOtnfchGg" type="2008" fillColor="10265827">
+    <children xmi:type="notation:Shape" xmi:id="_OoCygC-_EeWtJpOtnfchGg" type="2008">
       <children xmi:type="notation:DecorationNode" xmi:id="_OoDZkC-_EeWtJpOtnfchGg" type="5029"/>
       <children xmi:type="notation:BasicCompartment" xmi:id="_OoDZkS-_EeWtJpOtnfchGg" type="7017">
         <styles xmi:type="notation:TitleStyle" xmi:id="_OoDZki-_EeWtJpOtnfchGg"/>
@@ -988,7 +897,698 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OoEApC-_EeWtJpOtnfchGg"/>
       </children>
       <element xmi:type="uml:Class" href="model.uml#_OnjDQC-_EeWtJpOtnfchGg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OoCygS-_EeWtJpOtnfchGg" x="988" y="342" height="65"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OoCygS-_EeWtJpOtnfchGg" x="1264" y="298" height="65"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_dgiRsGO9EeWQv9mZwpAw9Q" type="2010">
+      <children xmi:type="notation:DecorationNode" xmi:id="_dgi4wGO9EeWQv9mZwpAw9Q" type="5035"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_dgi4wWO9EeWQv9mZwpAw9Q" type="7020">
+        <children xmi:type="notation:Shape" xmi:id="_xhkXEGO9EeWAFfMNIf5-6Q" type="3018">
+          <element xmi:type="uml:Property" href="model.uml#_xhF18GO9EeWAFfMNIf5-6Q"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_xhkXEWO9EeWAFfMNIf5-6Q"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_ZYjTMGO-EeWAFfMNIf5-6Q" type="3018">
+          <element xmi:type="uml:Property" href="model.uml#_ZYheAGO-EeWAFfMNIf5-6Q"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_ZYjTMWO-EeWAFfMNIf5-6Q"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_dgi4wmO9EeWQv9mZwpAw9Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_dgi4w2O9EeWQv9mZwpAw9Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_dgi4xGO9EeWQv9mZwpAw9Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dgi4xWO9EeWQv9mZwpAw9Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_dgi4xmO9EeWQv9mZwpAw9Q" type="7021">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_dgi4x2O9EeWQv9mZwpAw9Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_dgi4yGO9EeWQv9mZwpAw9Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_dgi4yWO9EeWQv9mZwpAw9Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dgi4ymO9EeWQv9mZwpAw9Q"/>
+      </children>
+      <element xmi:type="uml:DataType" href="model.uml#_df9p8GO9EeWQv9mZwpAw9Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dgiRsWO9EeWQv9mZwpAw9Q" x="1279" y="-33" width="165"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_BbLUEGO-EeWAFfMNIf5-6Q" type="2006">
+      <children xmi:type="notation:DecorationNode" xmi:id="_BbLUEWO-EeWAFfMNIf5-6Q" type="5023"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_BbLUEmO-EeWAFfMNIf5-6Q" type="7015">
+        <children xmi:type="notation:Shape" xmi:id="_BbLUE2O-EeWAFfMNIf5-6Q" type="3017">
+          <element xmi:type="uml:EnumerationLiteral" href="model.uml#_BbJe4WO-EeWAFfMNIf5-6Q"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_BbLUFGO-EeWAFfMNIf5-6Q"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_BbLUFWO-EeWAFfMNIf5-6Q" type="3017">
+          <element xmi:type="uml:EnumerationLiteral" href="model.uml#_BbJe4mO-EeWAFfMNIf5-6Q"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_BbLUFmO-EeWAFfMNIf5-6Q"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BbLUGWO-EeWAFfMNIf5-6Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BbLUGmO-EeWAFfMNIf5-6Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BbLUG2O-EeWAFfMNIf5-6Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BbLUHGO-EeWAFfMNIf5-6Q"/>
+      </children>
+      <element xmi:type="uml:Enumeration" href="model.uml#_BbJe4GO-EeWAFfMNIf5-6Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BbLUIGO-EeWAFfMNIf5-6Q" x="1449" y="-34" width="108"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_crVD0GPEEeWAFfMNIf5-6Q" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_crVD0mPEEeWAFfMNIf5-6Q" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_crVD02PEEeWAFfMNIf5-6Q" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_Oi3QIGPLEeWyNbIEfiGf0A" type="3012">
+          <element xmi:type="uml:Property" href="model.uml#_Oi2CAGPLEeWyNbIEfiGf0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Oi3QIWPLEeWyNbIEfiGf0A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_1itFsGPHEeWyNbIEfiGf0A" type="3012">
+          <element xmi:type="uml:Property" href="model.uml#_1iqpcGPHEeWyNbIEfiGf0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_1itFsWPHEeWyNbIEfiGf0A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_JMbhhWPMEeWyNbIEfiGf0A" type="3012">
+          <element xmi:type="uml:Property" href="model.uml#_JMaTY2PMEeWyNbIEfiGf0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_JMbhhmPMEeWyNbIEfiGf0A"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_crVD1GPEEeWAFfMNIf5-6Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_crVD1WPEEeWAFfMNIf5-6Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_crVD1mPEEeWAFfMNIf5-6Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_crVD12PEEeWAFfMNIf5-6Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_crVD2GPEEeWAFfMNIf5-6Q" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_crVD2WPEEeWAFfMNIf5-6Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_crVD2mPEEeWAFfMNIf5-6Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_crVD22PEEeWAFfMNIf5-6Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_crVD3GPEEeWAFfMNIf5-6Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_crVq4GPEEeWAFfMNIf5-6Q" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_crVq4WPEEeWAFfMNIf5-6Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_crVq4mPEEeWAFfMNIf5-6Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_crVq42PEEeWAFfMNIf5-6Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_crVq5GPEEeWAFfMNIf5-6Q"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#_crT1sGPEEeWAFfMNIf5-6Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_crVD0WPEEeWAFfMNIf5-6Q" x="375" y="-155" height="114"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_WxMVwGPGEeWAFfMNIf5-6Q" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_WxM80GPGEeWAFfMNIf5-6Q" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_WxM80WPGEeWAFfMNIf5-6Q" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_prn4EGPJEeWyNbIEfiGf0A" type="3012">
+          <element xmi:type="uml:Property" href="model.uml#_prmp8GPJEeWyNbIEfiGf0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_prn4EWPJEeWyNbIEfiGf0A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_tJr6YGPJEeWyNbIEfiGf0A" type="3012">
+          <element xmi:type="uml:Property" href="model.uml#_tJqsQGPJEeWyNbIEfiGf0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_tJr6YWPJEeWyNbIEfiGf0A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_wAehUGPJEeWyNbIEfiGf0A" type="3012">
+          <element xmi:type="uml:Property" href="model.uml#_wAdTMGPJEeWyNbIEfiGf0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_wAehUWPJEeWyNbIEfiGf0A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_24Ui4GPJEeWyNbIEfiGf0A" type="3012">
+          <element xmi:type="uml:Property" href="model.uml#_24TUwGPJEeWyNbIEfiGf0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_24Ui4WPJEeWyNbIEfiGf0A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_54LmQGPJEeWyNbIEfiGf0A" type="3012">
+          <element xmi:type="uml:Property" href="model.uml#_54KYIGPJEeWyNbIEfiGf0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_54LmQWPJEeWyNbIEfiGf0A"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_WxM80mPGEeWAFfMNIf5-6Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_WxM802PGEeWAFfMNIf5-6Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_WxM81GPGEeWAFfMNIf5-6Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WxM81WPGEeWAFfMNIf5-6Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_WxM81mPGEeWAFfMNIf5-6Q" type="7018">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1e7cIGPLEeWyNbIEfiGf0A" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1e7cIWPLEeWyNbIEfiGf0A" key="collapsed" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_WxM812PGEeWAFfMNIf5-6Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_WxM82GPGEeWAFfMNIf5-6Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_WxM82WPGEeWAFfMNIf5-6Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WxM82mPGEeWAFfMNIf5-6Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_WxM822PGEeWAFfMNIf5-6Q" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_WxM83GPGEeWAFfMNIf5-6Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_WxM83WPGEeWAFfMNIf5-6Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_WxM83mPGEeWAFfMNIf5-6Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WxM832PGEeWAFfMNIf5-6Q"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#_WxLusGPGEeWAFfMNIf5-6Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WxMVwWPGEeWAFfMNIf5-6Q" x="113" y="-25" width="184" height="152"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_i-JI4GPIEeWyNbIEfiGf0A" type="2010">
+      <children xmi:type="notation:DecorationNode" xmi:id="_i-Jv8GPIEeWyNbIEfiGf0A" type="5035"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_i-Jv8WPIEeWyNbIEfiGf0A" type="7020">
+        <children xmi:type="notation:Shape" xmi:id="_liCpAGPIEeWyNbIEfiGf0A" type="3018">
+          <element xmi:type="uml:Property" href="model.uml#_lh--oGPIEeWyNbIEfiGf0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_liCpAWPIEeWyNbIEfiGf0A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_soKXIGPIEeWyNbIEfiGf0A" type="3018">
+          <element xmi:type="uml:Property" href="model.uml#_soJwEGPIEeWyNbIEfiGf0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_soKXIWPIEeWyNbIEfiGf0A"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_i-Jv8mPIEeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_i-Jv82PIEeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_i-Jv9GPIEeWyNbIEfiGf0A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i-Jv9WPIEeWyNbIEfiGf0A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_i-KXAGPIEeWyNbIEfiGf0A" type="7021">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_i-KXAWPIEeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_i-KXAmPIEeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_i-KXA2PIEeWyNbIEfiGf0A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i-KXBGPIEeWyNbIEfiGf0A"/>
+      </children>
+      <element xmi:type="uml:DataType" href="model.uml#_i-GFkGPIEeWyNbIEfiGf0A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i-JI4WPIEeWyNbIEfiGf0A" x="247" y="-156" width="122" height="90"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_JMbhgGPMEeWyNbIEfiGf0A" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_JMbhgWPMEeWyNbIEfiGf0A" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_JMbhgmPMEeWyNbIEfiGf0A" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_JMbhh2PMEeWyNbIEfiGf0A" type="3012">
+          <element xmi:type="uml:Property" href="model.uml#_JMaTZmPMEeWyNbIEfiGf0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_JMbhiGPMEeWyNbIEfiGf0A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_JMbhiWPMEeWyNbIEfiGf0A" type="3012">
+          <element xmi:type="uml:Property" href="model.uml#_JMaTZ2PMEeWyNbIEfiGf0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_JMbhimPMEeWyNbIEfiGf0A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_JMbhi2PMEeWyNbIEfiGf0A" type="3012">
+          <element xmi:type="uml:Property" href="model.uml#_JMaTaGPMEeWyNbIEfiGf0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_JMbhjGPMEeWyNbIEfiGf0A"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_JMbhkWPMEeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_JMbhkmPMEeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_JMbhk2PMEeWyNbIEfiGf0A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JMbhlGPMEeWyNbIEfiGf0A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_JMbhlWPMEeWyNbIEfiGf0A" type="7018">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_JMbhlmPMEeWyNbIEfiGf0A" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_JMbhl2PMEeWyNbIEfiGf0A" key="collapsed" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_JMbhmGPMEeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_JMbhmWPMEeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_JMbhmmPMEeWyNbIEfiGf0A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JMbhm2PMEeWyNbIEfiGf0A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_JMbhnGPMEeWyNbIEfiGf0A" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_JMbhnWPMEeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_JMbhnmPMEeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_JMbhn2PMEeWyNbIEfiGf0A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JMbhoGPMEeWyNbIEfiGf0A"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#_JMaTYGPMEeWyNbIEfiGf0A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JMbhpGPMEeWyNbIEfiGf0A" x="115" y="135" width="184" height="112"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_kvXnMGPOEeWyNbIEfiGf0A" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_kvXnMWPOEeWyNbIEfiGf0A" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kvXnMmPOEeWyNbIEfiGf0A" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_kvXnM2POEeWyNbIEfiGf0A" type="3012">
+          <element xmi:type="uml:Property" href="model.uml#_kvXAI2POEeWyNbIEfiGf0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_kvXnNGPOEeWyNbIEfiGf0A"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kvXnOWPOEeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_kvXnOmPOEeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_kvXnO2POEeWyNbIEfiGf0A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kvXnPGPOEeWyNbIEfiGf0A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kvXnPWPOEeWyNbIEfiGf0A" type="7018">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kvXnPmPOEeWyNbIEfiGf0A" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kvXnP2POEeWyNbIEfiGf0A" key="collapsed" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kvXnQGPOEeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_kvXnQWPOEeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_kvXnQmPOEeWyNbIEfiGf0A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kvXnQ2POEeWyNbIEfiGf0A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kvXnRGPOEeWyNbIEfiGf0A" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kvXnRWPOEeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_kvXnRmPOEeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_kvXnR2POEeWyNbIEfiGf0A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kvXnSGPOEeWyNbIEfiGf0A"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#_kvXAIGPOEeWyNbIEfiGf0A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kvXnTGPOEeWyNbIEfiGf0A" x="116" y="262" width="184" height="78"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_-dVaNmPOEeWyNbIEfiGf0A" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_-dVaN2POEeWyNbIEfiGf0A" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_-dVaOGPOEeWyNbIEfiGf0A" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_-dVaO2POEeWyNbIEfiGf0A" type="3012">
+          <element xmi:type="uml:Property" href="model.uml#_-dVaNGPOEeWyNbIEfiGf0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_-dVaPGPOEeWyNbIEfiGf0A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_-dVaPWPOEeWyNbIEfiGf0A" type="3012">
+          <element xmi:type="uml:Property" href="model.uml#_-dVaNWPOEeWyNbIEfiGf0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_-dVaPmPOEeWyNbIEfiGf0A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_H_XKEGPPEeWyNbIEfiGf0A" type="3012">
+          <element xmi:type="uml:Property" href="model.uml#_H_WjAGPPEeWyNbIEfiGf0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_H_XKEWPPEeWyNbIEfiGf0A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_PktK0GPPEeWyNbIEfiGf0A" type="3012">
+          <element xmi:type="uml:Property" href="model.uml#_Pkr8sGPPEeWyNbIEfiGf0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_PktK0WPPEeWyNbIEfiGf0A"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_-dVaP2POEeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_-dVaQGPOEeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_-dVaQWPOEeWyNbIEfiGf0A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-dVaQmPOEeWyNbIEfiGf0A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_-dVaQ2POEeWyNbIEfiGf0A" type="7018">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-dVaRGPOEeWyNbIEfiGf0A" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-dVaRWPOEeWyNbIEfiGf0A" key="collapsed" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_-dVaRmPOEeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_-dVaR2POEeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_-dVaSGPOEeWyNbIEfiGf0A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-dVaSWPOEeWyNbIEfiGf0A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_-dVaSmPOEeWyNbIEfiGf0A" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_-dVaS2POEeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_-dVaTGPOEeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_-dVaTWPOEeWyNbIEfiGf0A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-dVaTmPOEeWyNbIEfiGf0A"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#_-dVaMGPOEeWyNbIEfiGf0A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-dVaUmPOEeWyNbIEfiGf0A" x="341" y="207" width="184" height="132"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_dl6mUGPQEeWyNbIEfiGf0A" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_dl6mUWPQEeWyNbIEfiGf0A" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_dl6mUmPQEeWyNbIEfiGf0A" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_dl6mU2PQEeWyNbIEfiGf0A" type="3012">
+          <element xmi:type="uml:Property" href="model.uml#_dl5_RGPQEeWyNbIEfiGf0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_dl6mVGPQEeWyNbIEfiGf0A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_dl6mVWPQEeWyNbIEfiGf0A" type="3012">
+          <element xmi:type="uml:Property" href="model.uml#_dl5_RWPQEeWyNbIEfiGf0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_dl6mVmPQEeWyNbIEfiGf0A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_dl6mV2PQEeWyNbIEfiGf0A" type="3012">
+          <element xmi:type="uml:Property" href="model.uml#_dl5_R2PQEeWyNbIEfiGf0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_dl6mWGPQEeWyNbIEfiGf0A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_dl6mWWPQEeWyNbIEfiGf0A" type="3012">
+          <element xmi:type="uml:Property" href="model.uml#_dl5_SGPQEeWyNbIEfiGf0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_dl6mWmPQEeWyNbIEfiGf0A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_0bU30GPQEeWyNbIEfiGf0A" type="3012">
+          <element xmi:type="uml:Property" href="model.uml#_0bUQwGPQEeWyNbIEfiGf0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_0bU30WPQEeWyNbIEfiGf0A"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_dl6mW2PQEeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_dl6mXGPQEeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_dl6mXWPQEeWyNbIEfiGf0A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dl6mXmPQEeWyNbIEfiGf0A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_dl6mX2PQEeWyNbIEfiGf0A" type="7018">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dl6mYGPQEeWyNbIEfiGf0A" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dl6mYWPQEeWyNbIEfiGf0A" key="collapsed" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_dl6mYmPQEeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_dl6mY2PQEeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_dl6mZGPQEeWyNbIEfiGf0A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dl6mZWPQEeWyNbIEfiGf0A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_dl6mZmPQEeWyNbIEfiGf0A" type="7019">
+        <children xmi:type="notation:Shape" xmi:id="_F3MRwGPREeWyNbIEfiGf0A" type="3014">
+          <element xmi:type="uml:Class" href="model.uml#_F3InYGPREeWyNbIEfiGf0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_F3MRwWPREeWyNbIEfiGf0A"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_dl6mZ2PQEeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_dl6maGPQEeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_dl6maWPQEeWyNbIEfiGf0A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dl6mamPQEeWyNbIEfiGf0A"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#_dl5_QGPQEeWyNbIEfiGf0A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dl6mbmPQEeWyNbIEfiGf0A" x="544" y="186" width="184" height="152"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_M3C_0GPREeWyNbIEfiGf0A" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_M3C_0WPREeWyNbIEfiGf0A" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_M3C_0mPREeWyNbIEfiGf0A" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_M3C_02PREeWyNbIEfiGf0A" type="3012">
+          <element xmi:type="uml:Property" href="model.uml#_M3CYxWPREeWyNbIEfiGf0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_M3C_1GPREeWyNbIEfiGf0A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_M3C_1WPREeWyNbIEfiGf0A" type="3012">
+          <element xmi:type="uml:Property" href="model.uml#_M3CYxmPREeWyNbIEfiGf0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_M3C_1mPREeWyNbIEfiGf0A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_M3C_12PREeWyNbIEfiGf0A" type="3012">
+          <element xmi:type="uml:Property" href="model.uml#_M3CYyGPREeWyNbIEfiGf0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_M3C_2GPREeWyNbIEfiGf0A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_M3C_2WPREeWyNbIEfiGf0A" type="3012">
+          <element xmi:type="uml:Property" href="model.uml#_M3CYyWPREeWyNbIEfiGf0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_M3C_2mPREeWyNbIEfiGf0A"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_M3C_22PREeWyNbIEfiGf0A" type="3012">
+          <element xmi:type="uml:Property" href="model.uml#_M3CYymPREeWyNbIEfiGf0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_M3C_3GPREeWyNbIEfiGf0A"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_M3C_3WPREeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_M3C_3mPREeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_M3C_32PREeWyNbIEfiGf0A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M3C_4GPREeWyNbIEfiGf0A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_M3C_4WPREeWyNbIEfiGf0A" type="7018">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_M3C_4mPREeWyNbIEfiGf0A" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_M3C_42PREeWyNbIEfiGf0A" key="collapsed" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_M3C_5GPREeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_M3C_5WPREeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_M3C_5mPREeWyNbIEfiGf0A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M3C_52PREeWyNbIEfiGf0A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_M3C_6GPREeWyNbIEfiGf0A" type="7019">
+        <children xmi:type="notation:Shape" xmi:id="_M3C_6WPREeWyNbIEfiGf0A" type="3014">
+          <element xmi:type="uml:Class" href="model.uml#_M3CYy2PREeWyNbIEfiGf0A"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_M3C_6mPREeWyNbIEfiGf0A"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_M3C_62PREeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_M3C_7GPREeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_M3C_7WPREeWyNbIEfiGf0A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M3C_7mPREeWyNbIEfiGf0A"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#_M3CYwGPREeWyNbIEfiGf0A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M3C_8mPREeWyNbIEfiGf0A" x="546" y="24" width="184" height="152"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_C_yfcGPUEeWyNbIEfiGf0A" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_C_yfcmPUEeWyNbIEfiGf0A" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_C_yfc2PUEeWyNbIEfiGf0A" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_C_yfdGPUEeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_C_yfdWPUEeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_C_yfdmPUEeWyNbIEfiGf0A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C_yfd2PUEeWyNbIEfiGf0A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_C_yfeGPUEeWyNbIEfiGf0A" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_C_yfeWPUEeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_C_yfemPUEeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_C_yfe2PUEeWyNbIEfiGf0A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C_yffGPUEeWyNbIEfiGf0A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_C_yffWPUEeWyNbIEfiGf0A" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_C_yffmPUEeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_C_yff2PUEeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_C_yfgGPUEeWyNbIEfiGf0A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C_yfgWPUEeWyNbIEfiGf0A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_C_4mEGPUEeWyNbIEfiGf0A" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_C_4mEWPUEeWyNbIEfiGf0A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C_4mEmPUEeWyNbIEfiGf0A"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_NTP90GX5EeWycoIPYbKzNg" type="3032">
+        <element xsi:nil="true"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NTP90WX5EeWycoIPYbKzNg" x="46" y="-15" width="16" height="16"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_WX9mEGbqEeWGp9Z_qQVBGA" type="3032">
+        <element xsi:nil="true"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WX9mEWbqEeWGp9Z_qQVBGA" x="43" y="48"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#_C_wDMGPUEeWyNbIEfiGf0A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C_yfcWPUEeWyNbIEfiGf0A" x="812" y="169" width="116" height="49"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_2M7bgWPUEeWyNbIEfiGf0A" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_2M7bgmPUEeWyNbIEfiGf0A" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_2M7bg2PUEeWyNbIEfiGf0A" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_2M7bhGPUEeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_2M7bhWPUEeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_2M7bhmPUEeWyNbIEfiGf0A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2M7bh2PUEeWyNbIEfiGf0A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_2M7biGPUEeWyNbIEfiGf0A" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_2M7biWPUEeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_2M7bimPUEeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_2M7bi2PUEeWyNbIEfiGf0A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2M7bjGPUEeWyNbIEfiGf0A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_2M7bjWPUEeWyNbIEfiGf0A" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_2M7bjmPUEeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_2M7bj2PUEeWyNbIEfiGf0A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_2M7bkGPUEeWyNbIEfiGf0A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2M7bkWPUEeWyNbIEfiGf0A"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_2M7bkmPUEeWyNbIEfiGf0A" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_2M7bk2PUEeWyNbIEfiGf0A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2M7blGPUEeWyNbIEfiGf0A"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#_2M7bgGPUEeWyNbIEfiGf0A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2M7blWPUEeWyNbIEfiGf0A" x="808" y="37" width="117" height="53"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_ULnj0GX5EeWycoIPYbKzNg" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ULnj0WX5EeWycoIPYbKzNg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_ULnj0mX5EeWycoIPYbKzNg" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_ULnj02X5EeWycoIPYbKzNg" type="3012">
+          <element xmi:type="uml:Property" href="model.uml#_ULm8wWX5EeWycoIPYbKzNg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_ULnj1GX5EeWycoIPYbKzNg"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ULnj1WX5EeWycoIPYbKzNg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_ULnj1mX5EeWycoIPYbKzNg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_ULnj12X5EeWycoIPYbKzNg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ULnj2GX5EeWycoIPYbKzNg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_ULnj2WX5EeWycoIPYbKzNg" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ULnj2mX5EeWycoIPYbKzNg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_ULnj22X5EeWycoIPYbKzNg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_ULnj3GX5EeWycoIPYbKzNg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ULnj3WX5EeWycoIPYbKzNg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_ULnj3mX5EeWycoIPYbKzNg" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ULnj32X5EeWycoIPYbKzNg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_ULnj4GX5EeWycoIPYbKzNg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_ULnj4WX5EeWycoIPYbKzNg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ULnj4mX5EeWycoIPYbKzNg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_ULnj42X5EeWycoIPYbKzNg" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ULnj5GX5EeWycoIPYbKzNg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ULnj5WX5EeWycoIPYbKzNg"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#_ULm8wGX5EeWycoIPYbKzNg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ULnj5mX5EeWycoIPYbKzNg" x="666" y="-159" height="76"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_HUmQQGYIEeWycoIPYbKzNg" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_HUmQQWYIEeWycoIPYbKzNg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_HUmQQmYIEeWycoIPYbKzNg" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_tLtmYGYIEeWycoIPYbKzNg" type="3012">
+          <element xmi:type="uml:Property" href="model.uml#_tLpU8GYIEeWycoIPYbKzNg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_tLtmYWYIEeWycoIPYbKzNg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_VLVFwGboEeWGp9Z_qQVBGA" type="3012">
+          <element xmi:type="uml:Property" href="model.uml#_VLT3oGboEeWGp9Z_qQVBGA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_VLVFwWboEeWGp9Z_qQVBGA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_HUmQQ2YIEeWycoIPYbKzNg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_HUmQRGYIEeWycoIPYbKzNg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_HUmQRWYIEeWycoIPYbKzNg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HUmQRmYIEeWycoIPYbKzNg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_HUmQR2YIEeWycoIPYbKzNg" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_HUmQSGYIEeWycoIPYbKzNg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_HUmQSWYIEeWycoIPYbKzNg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_HUmQSmYIEeWycoIPYbKzNg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HUmQS2YIEeWycoIPYbKzNg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_HUmQTGYIEeWycoIPYbKzNg" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_HUmQTWYIEeWycoIPYbKzNg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_HUmQTmYIEeWycoIPYbKzNg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_HUmQT2YIEeWycoIPYbKzNg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HUmQUGYIEeWycoIPYbKzNg"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#_HUlpMGYIEeWycoIPYbKzNg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HUmQVGYIEeWycoIPYbKzNg" x="373" y="475" width="155" height="92"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_vPCosGYLEeWIk-zXg3ayAw" type="2006">
+      <children xmi:type="notation:DecorationNode" xmi:id="_vPCosWYLEeWIk-zXg3ayAw" type="5023"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_vPCosmYLEeWIk-zXg3ayAw" type="7015">
+        <children xmi:type="notation:Shape" xmi:id="_vPCos2YLEeWIk-zXg3ayAw" type="3017">
+          <element xmi:type="uml:EnumerationLiteral" href="model.uml#_vO9wMWYLEeWIk-zXg3ayAw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_vPCotGYLEeWIk-zXg3ayAw"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_vPCotWYLEeWIk-zXg3ayAw" type="3017">
+          <element xmi:type="uml:EnumerationLiteral" href="model.uml#_vO9wMmYLEeWIk-zXg3ayAw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_vPCotmYLEeWIk-zXg3ayAw"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_vPCot2YLEeWIk-zXg3ayAw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_vPCouGYLEeWIk-zXg3ayAw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_vPCouWYLEeWIk-zXg3ayAw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vPCoumYLEeWIk-zXg3ayAw"/>
+      </children>
+      <element xmi:type="uml:Enumeration" href="model.uml#_vO9wMGYLEeWIk-zXg3ayAw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vPCovmYLEeWIk-zXg3ayAw" x="-61" y="477" width="108"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_RcUKUGYMEeWIk-zXg3ayAw" type="2012" fillColor="10265827">
+      <children xmi:type="notation:DecorationNode" xmi:id="_RcVYcGYMEeWIk-zXg3ayAw" type="5038"/>
+      <element xmi:type="uml:Comment" href="model.uml#_RZ8y0GYMEeWIk-zXg3ayAw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RcUKUWYMEeWIk-zXg3ayAw" x="1152" y="-154" height="25"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_c1zyIGYMEeWIk-zXg3ayAw" type="2012" fillColor="10265827">
+      <children xmi:type="notation:DecorationNode" xmi:id="_c1zyIWYMEeWIk-zXg3ayAw" type="5038"/>
+      <element xmi:type="uml:Comment" href="model.uml#_c1zLEGYMEeWIk-zXg3ayAw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c1zyImYMEeWIk-zXg3ayAw" x="1387" y="86" height="25"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_nLIAIGYMEeWIk-zXg3ayAw" type="2012" fillColor="10265827">
+      <children xmi:type="notation:DecorationNode" xmi:id="_nLIAIWYMEeWIk-zXg3ayAw" type="5038"/>
+      <element xmi:type="uml:Comment" href="model.uml#_nLHZEGYMEeWIk-zXg3ayAw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nLIAImYMEeWIk-zXg3ayAw" x="1087" y="783" height="25"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_0mJa0GYMEeWIk-zXg3ayAw" type="2012" fillColor="10265827">
+      <children xmi:type="notation:DecorationNode" xmi:id="_0mJa0WYMEeWIk-zXg3ayAw" type="5038"/>
+      <element xmi:type="uml:Comment" href="model.uml#_0mIMsGYMEeWIk-zXg3ayAw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0mJa0mYMEeWIk-zXg3ayAw" x="1989" y="513" height="25"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_ghmuoGYxEeWA-LVuew9z5A" type="2012" fillColor="10265827">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ghmuoWYxEeWA-LVuew9z5A" type="5038"/>
+      <element xmi:type="uml:Comment" href="model.uml#_ghjrUGYxEeWA-LVuew9z5A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ghmuomYxEeWA-LVuew9z5A" x="1272" y="392" height="25"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_fY0sMGYyEeWA-LVuew9z5A" type="2012" fillColor="10265827">
+      <children xmi:type="notation:DecorationNode" xmi:id="_fY0sMWYyEeWA-LVuew9z5A" type="5038"/>
+      <element xmi:type="uml:Comment" href="model.uml#_fY0FIGYyEeWA-LVuew9z5A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fY0sMmYyEeWA-LVuew9z5A" x="1778" y="586" height="25"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_dEfXMGbkEeWGp9Z_qQVBGA" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_dEf-QGbkEeWGp9Z_qQVBGA" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_dEf-QWbkEeWGp9Z_qQVBGA" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_9KGowGbkEeWGp9Z_qQVBGA" type="3012">
+          <element xmi:type="uml:Property" href="model.uml#_9KEzkGbkEeWGp9Z_qQVBGA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_9KGowWbkEeWGp9Z_qQVBGA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_9_Z5EGbkEeWGp9Z_qQVBGA" type="3012">
+          <element xmi:type="uml:Property" href="model.uml#_9_YD4GbkEeWGp9Z_qQVBGA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_9_Z5EWbkEeWGp9Z_qQVBGA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_EghcsGblEeWGp9Z_qQVBGA" type="3012">
+          <element xmi:type="uml:Property" href="model.uml#_EggOkGblEeWGp9Z_qQVBGA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_EghcsWblEeWGp9Z_qQVBGA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_dEf-QmbkEeWGp9Z_qQVBGA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_dEf-Q2bkEeWGp9Z_qQVBGA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_dEf-RGbkEeWGp9Z_qQVBGA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dEf-RWbkEeWGp9Z_qQVBGA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_dEglUGbkEeWGp9Z_qQVBGA" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_dEglUWbkEeWGp9Z_qQVBGA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_dEglUmbkEeWGp9Z_qQVBGA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_dEglU2bkEeWGp9Z_qQVBGA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dEglVGbkEeWGp9Z_qQVBGA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_dEglVWbkEeWGp9Z_qQVBGA" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_dEglVmbkEeWGp9Z_qQVBGA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_dEglV2bkEeWGp9Z_qQVBGA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_dEglWGbkEeWGp9Z_qQVBGA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dEglWWbkEeWGp9Z_qQVBGA"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#_dEHjwGbkEeWGp9Z_qQVBGA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dEfXMWbkEeWGp9Z_qQVBGA" x="754" y="431"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_P95e8mblEeWGp9Z_qQVBGA" type="2012" fillColor="4308612" gradient="16777215, -1, 1">
+      <children xmi:type="notation:DecorationNode" xmi:id="_P95e82blEeWGp9Z_qQVBGA" type="5038"/>
+      <element xmi:type="uml:Comment" href="model.uml#_P95e8GblEeWGp9Z_qQVBGA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P95e9GblEeWGp9Z_qQVBGA" x="753" y="385" width="300" height="41"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_610cgGblEeWGp9Z_qQVBGA" type="2006">
+      <children xmi:type="notation:DecorationNode" xmi:id="_610cgWblEeWGp9Z_qQVBGA" type="5023"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_610cgmblEeWGp9Z_qQVBGA" type="7015">
+        <children xmi:type="notation:Shape" xmi:id="_610cg2blEeWGp9Z_qQVBGA" type="3017">
+          <element xmi:type="uml:EnumerationLiteral" href="model.uml#_61z1cWblEeWGp9Z_qQVBGA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_610chGblEeWGp9Z_qQVBGA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_610chWblEeWGp9Z_qQVBGA" type="3017">
+          <element xmi:type="uml:EnumerationLiteral" href="model.uml#_61z1cmblEeWGp9Z_qQVBGA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_610chmblEeWGp9Z_qQVBGA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_VHfZgGbmEeWGp9Z_qQVBGA" type="3017">
+          <element xmi:type="uml:EnumerationLiteral" href="model.uml#_VHZ58GbmEeWGp9Z_qQVBGA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_VHfZgWbmEeWGp9Z_qQVBGA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_610ch2blEeWGp9Z_qQVBGA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_610ciGblEeWGp9Z_qQVBGA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_610ciWblEeWGp9Z_qQVBGA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_610cimblEeWGp9Z_qQVBGA"/>
+      </children>
+      <element xmi:type="uml:Enumeration" href="model.uml#_61z1cGblEeWGp9Z_qQVBGA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_610cjmblEeWGp9Z_qQVBGA" x="1351" y="429" width="112" height="92"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_O3M_0GbpEeWGp9Z_qQVBGA" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_O3M_0WbpEeWGp9Z_qQVBGA" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_O3M_0mbpEeWGp9Z_qQVBGA" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_O3M_02bpEeWGp9Z_qQVBGA" type="3012">
+          <element xmi:type="uml:Property" href="model.uml#_O3MYwWbpEeWGp9Z_qQVBGA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_O3M_1GbpEeWGp9Z_qQVBGA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_O3M_1WbpEeWGp9Z_qQVBGA" type="3012">
+          <element xmi:type="uml:Property" href="model.uml#_O3MYwmbpEeWGp9Z_qQVBGA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_O3M_1mbpEeWGp9Z_qQVBGA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_O3M_12bpEeWGp9Z_qQVBGA" type="3012">
+          <element xmi:type="uml:Property" href="model.uml#_O3MYw2bpEeWGp9Z_qQVBGA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_O3M_2GbpEeWGp9Z_qQVBGA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_7QF5gGbsEeWGp9Z_qQVBGA" type="3012">
+          <element xmi:type="uml:Property" href="model.uml#_7QErYGbsEeWGp9Z_qQVBGA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_7QF5gWbsEeWGp9Z_qQVBGA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_O3M_2WbpEeWGp9Z_qQVBGA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_O3M_2mbpEeWGp9Z_qQVBGA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_O3M_22bpEeWGp9Z_qQVBGA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O3M_3GbpEeWGp9Z_qQVBGA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_O3M_3WbpEeWGp9Z_qQVBGA" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_O3M_3mbpEeWGp9Z_qQVBGA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_O3M_32bpEeWGp9Z_qQVBGA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_O3M_4GbpEeWGp9Z_qQVBGA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O3M_4WbpEeWGp9Z_qQVBGA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_O3M_4mbpEeWGp9Z_qQVBGA" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_O3M_42bpEeWGp9Z_qQVBGA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_O3M_5GbpEeWGp9Z_qQVBGA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_O3M_5WbpEeWGp9Z_qQVBGA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O3M_5mbpEeWGp9Z_qQVBGA"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#_O3MYwGbpEeWGp9Z_qQVBGA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O3Nm42bpEeWGp9Z_qQVBGA" x="751" y="566"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_QG87AGbqEeWGp9Z_qQVBGA" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_QG87AmbqEeWGp9Z_qQVBGA" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_QG87A2bqEeWGp9Z_qQVBGA" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_QG87BGbqEeWGp9Z_qQVBGA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_QG87BWbqEeWGp9Z_qQVBGA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_QG87BmbqEeWGp9Z_qQVBGA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QG87B2bqEeWGp9Z_qQVBGA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_QG87CGbqEeWGp9Z_qQVBGA" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_QG87CWbqEeWGp9Z_qQVBGA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_QG87CmbqEeWGp9Z_qQVBGA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_QG87C2bqEeWGp9Z_qQVBGA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QG87DGbqEeWGp9Z_qQVBGA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_QG87DWbqEeWGp9Z_qQVBGA" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_QG87DmbqEeWGp9Z_qQVBGA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_QG87D2bqEeWGp9Z_qQVBGA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_QG87EGbqEeWGp9Z_qQVBGA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QG87EWbqEeWGp9Z_qQVBGA"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#_QG7s4GbqEeWGp9Z_qQVBGA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QG87AWbqEeWGp9Z_qQVBGA" x="817" y="280" height="66"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_phpFUWbtEeWGp9Z_qQVBGA" type="2012" fillColor="10265827">
+      <children xmi:type="notation:DecorationNode" xmi:id="_phpFUmbtEeWGp9Z_qQVBGA" type="5038"/>
+      <element xmi:type="uml:Comment" href="model.uml#_phpFUGbtEeWGp9Z_qQVBGA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_phpFU2btEeWGp9Z_qQVBGA" x="1910" y="677" height="25"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_SzKe0GeIEeWmi5ydVYW0lA" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_SzLs8GeIEeWmi5ydVYW0lA" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_SzLs8WeIEeWmi5ydVYW0lA" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_SzLs8meIEeWmi5ydVYW0lA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_SzLs82eIEeWmi5ydVYW0lA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_SzLs9GeIEeWmi5ydVYW0lA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SzLs9WeIEeWmi5ydVYW0lA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_SzLs9meIEeWmi5ydVYW0lA" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_SzLs92eIEeWmi5ydVYW0lA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_SzLs-GeIEeWmi5ydVYW0lA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_SzLs-WeIEeWmi5ydVYW0lA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SzLs-meIEeWmi5ydVYW0lA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_SzLs-2eIEeWmi5ydVYW0lA" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_SzLs_GeIEeWmi5ydVYW0lA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_SzLs_WeIEeWmi5ydVYW0lA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_SzLs_meIEeWmi5ydVYW0lA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SzLs_2eIEeWmi5ydVYW0lA"/>
+      </children>
+      <element xmi:type="uml:Class" href="model.uml#_SuQwsGeIEeWmi5ydVYW0lA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SzKe0WeIEeWmi5ydVYW0lA" x="679" y="876"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_UJLPgGeIEeWmi5ydVYW0lA" type="2012" fillColor="8905185">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UJLPgWeIEeWmi5ydVYW0lA" type="5038"/>
+      <element xmi:type="uml:Comment" href="model.uml#_UJKocGeIEeWmi5ydVYW0lA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UJLPgmeIEeWmi5ydVYW0lA" x="625" y="910" width="217" height="25"/>
     </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_tptY8QidEeWgbbgaC4xhOQ" name="diagram_compatibility_version" stringValue="1.0.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_tptY8gidEeWgbbgaC4xhOQ"/>
@@ -996,31 +1596,6 @@
       <owner xmi:type="uml:Model" href="model.uml#_tpbsIAidEeWgbbgaC4xhOQ"/>
     </styles>
     <element xmi:type="uml:Model" href="model.uml#_tpbsIAidEeWgbbgaC4xhOQ"/>
-    <edges xmi:type="notation:Connector" xmi:id="_NPhBsAihEeWgbbgaC4xhOQ" type="4001" source="_6ejSgAifEeWgbbgaC4xhOQ" target="_sWFjAAifEeWgbbgaC4xhOQ">
-      <children xmi:type="notation:DecorationNode" xmi:id="_NPhBswihEeWgbbgaC4xhOQ" type="6001">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_NPhBtAihEeWgbbgaC4xhOQ" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_NPhBtQihEeWgbbgaC4xhOQ" type="6002">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_NPhBtgihEeWgbbgaC4xhOQ" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_NPhBtwihEeWgbbgaC4xhOQ" type="6003">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_NPhBuAihEeWgbbgaC4xhOQ" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_NPhBuQihEeWgbbgaC4xhOQ" type="6005">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_NPhBugihEeWgbbgaC4xhOQ" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_NPhBuwihEeWgbbgaC4xhOQ" type="6033">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_NPhBvAihEeWgbbgaC4xhOQ" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_NPhowAihEeWgbbgaC4xhOQ" type="6034">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_NPhowQihEeWgbbgaC4xhOQ" y="-20"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_NPhBsQihEeWgbbgaC4xhOQ"/>
-      <element xmi:type="uml:Association" href="model.uml#_NPfMgwihEeWgbbgaC4xhOQ"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NPhBsgihEeWgbbgaC4xhOQ" points="[-97, -10, 210, 21]$[-269, -80, 38, -49]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UeNdAAihEeWgbbgaC4xhOQ" id="(0.0,0.3983050847457627)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NPqysAihEeWgbbgaC4xhOQ" id="(1.0,0.4155844155844156)"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_j6XFwArBEeWkNoOTovCSlw" type="4002" source="_U3fjggrBEeWkNoOTovCSlw" target="_EP6GMArBEeWkNoOTovCSlw">
       <children xmi:type="notation:DecorationNode" xmi:id="_j6XFwwrBEeWkNoOTovCSlw" type="6007">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_j6XFxArBEeWkNoOTovCSlw" y="40"/>
@@ -1028,8 +1603,8 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_j6XFwQrBEeWkNoOTovCSlw"/>
       <element xmi:type="uml:Generalization" href="model.uml#_j6V3oArBEeWkNoOTovCSlw"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_j6XFwgrBEeWkNoOTovCSlw" points="[18, -39, -68, 87]$[42, -167, -44, -41]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2TtcACEEEeWFusc4sUZ9zQ" id="(0.6484018264840182,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2TuDECEEEeWFusc4sUZ9zQ" id="(0.3,1.0)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2TtcACEEEeWFusc4sUZ9zQ" id="(0.0308411214953271,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2TuDECEEEeWFusc4sUZ9zQ" id="(0.98,1.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_lVqmIArBEeWkNoOTovCSlw" type="4002" source="_OAtR4ArBEeWkNoOTovCSlw" target="_EP6GMArBEeWkNoOTovCSlw">
       <children xmi:type="notation:DecorationNode" xmi:id="_lVqmIwrBEeWkNoOTovCSlw" type="6007">
@@ -1038,8 +1613,8 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_lVqmIQrBEeWkNoOTovCSlw"/>
       <element xmi:type="uml:Generalization" href="model.uml#_lVpYAArBEeWkNoOTovCSlw"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lVqmIgrBEeWkNoOTovCSlw" points="[-7, -8, 52, 69]$[-49, -58, 10, 19]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lVtCYArBEeWkNoOTovCSlw" id="(0.5179039301310043,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lVtCYQrBEeWkNoOTovCSlw" id="(0.58,1.0)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lVtCYArBEeWkNoOTovCSlw" id="(0.43243243243243246,0.05128205128205128)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lVtCYQrBEeWkNoOTovCSlw" id="(0.52,0.9390243902439024)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_m6YhMArBEeWkNoOTovCSlw" type="4001" source="_OAtR4ArBEeWkNoOTovCSlw" target="_6ExcYAimEeWgbbgaC4xhOQ">
       <children xmi:type="notation:DecorationNode" xmi:id="_m6YhMwrBEeWkNoOTovCSlw" type="6001">
@@ -1049,7 +1624,7 @@
         <layoutConstraint xmi:type="notation:Location" xmi:id="_m6YhNgrBEeWkNoOTovCSlw" y="20"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_m6YhNwrBEeWkNoOTovCSlw" type="6003">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_m6YhOArBEeWkNoOTovCSlw" y="-20"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_m6YhOArBEeWkNoOTovCSlw" x="-94" y="-108"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_m6YhOQrBEeWkNoOTovCSlw" type="6005">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_m6YhOgrBEeWkNoOTovCSlw" y="20"/>
@@ -1063,8 +1638,8 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_m6YhMQrBEeWkNoOTovCSlw"/>
       <element xmi:type="uml:Association" href="model.uml#_m6WE8wrBEeWkNoOTovCSlw"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_m6YhMgrBEeWkNoOTovCSlw" points="[0, 1, -142, -187]$[142, 188, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_m6en0ArBEeWkNoOTovCSlw" id="(0.7449781659388647,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_m6en0QrBEeWkNoOTovCSlw" id="(0.0,0.07363420427553444)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_m6en0ArBEeWkNoOTovCSlw" id="(0.014054054054054054,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_m6en0QrBEeWkNoOTovCSlw" id="(1.0,0.00332541567695962)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_xVAF8ArBEeWkNoOTovCSlw" type="4001" source="_U3fjggrBEeWkNoOTovCSlw" target="_qjcSkArBEeWkNoOTovCSlw">
       <children xmi:type="notation:DecorationNode" xmi:id="_xVAF8wrBEeWkNoOTovCSlw" type="6001">
@@ -1088,8 +1663,8 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_xVAF8QrBEeWkNoOTovCSlw"/>
       <element xmi:type="uml:Association" href="model.uml#_xU-QwwrBEeWkNoOTovCSlw"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xVAF8grBEeWkNoOTovCSlw" points="[-50, -6, 121, -5]$[-221, -6, -50, -5]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_c5B78CEFEeWFusc4sUZ9zQ" id="(0.5132420091324201,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_c5B78SEFEeWFusc4sUZ9zQ" id="(0.4155688622754491,0.0)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_c5B78CEFEeWFusc4sUZ9zQ" id="(0.602803738317757,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_c5B78SEFEeWFusc4sUZ9zQ" id="(0.48372093023255813,0.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_AXzkgArHEeWkNoOTovCSlw" type="4001" source="_rc5pYAotEeWkNoOTovCSlw" target="_6ExcYAimEeWgbbgaC4xhOQ">
       <children xmi:type="notation:DecorationNode" xmi:id="_AX0LkArHEeWkNoOTovCSlw" type="6001">
@@ -1116,56 +1691,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AX5EEArHEeWkNoOTovCSlw" id="(0.49159663865546216,1.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AX5EEQrHEeWkNoOTovCSlw" id="(0.6194029850746269,0.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_ixWUoArUEeWkNoOTovCSlw" type="4001" source="_E2OksArUEeWkNoOTovCSlw" target="_8OWuIAidEeWgbbgaC4xhOQ">
-      <children xmi:type="notation:DecorationNode" xmi:id="_ixWUowrUEeWkNoOTovCSlw" type="6001">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ixWUpArUEeWkNoOTovCSlw" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ixWUpQrUEeWkNoOTovCSlw" type="6002">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ixWUpgrUEeWkNoOTovCSlw" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ixWUpwrUEeWkNoOTovCSlw" type="6003">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ixWUqArUEeWkNoOTovCSlw" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ixWUqQrUEeWkNoOTovCSlw" type="6005">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ixW7sArUEeWkNoOTovCSlw" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ixW7sQrUEeWkNoOTovCSlw" type="6033">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ixW7sgrUEeWkNoOTovCSlw" x="-2" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ixW7swrUEeWkNoOTovCSlw" type="6034">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ixW7tArUEeWkNoOTovCSlw" y="-20"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_ixWUoQrUEeWkNoOTovCSlw"/>
-      <element xmi:type="uml:Association" href="model.uml#_ixUfcArUEeWkNoOTovCSlw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ixWUogrUEeWkNoOTovCSlw" points="[3, -8, 0, 113]$[-22, -81, -25, 40]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ixamEArUEeWkNoOTovCSlw" id="(0.33714285714285713,0.09433962264150944)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ixbNIArUEeWkNoOTovCSlw" id="(0.3089005235602094,0.9471153846153846)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_ldg_8ArUEeWkNoOTovCSlw" type="4001" source="_E2OksArUEeWkNoOTovCSlw" target="_8OWuIAidEeWgbbgaC4xhOQ">
-      <children xmi:type="notation:DecorationNode" xmi:id="_ldg_8wrUEeWkNoOTovCSlw" type="6001">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ldg_9ArUEeWkNoOTovCSlw" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ldg_9QrUEeWkNoOTovCSlw" type="6002">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ldg_9grUEeWkNoOTovCSlw" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ldg_9wrUEeWkNoOTovCSlw" type="6003">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ldg_-ArUEeWkNoOTovCSlw" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ldg_-QrUEeWkNoOTovCSlw" type="6005">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ldg_-grUEeWkNoOTovCSlw" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ldhnAArUEeWkNoOTovCSlw" type="6033">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ldhnAQrUEeWkNoOTovCSlw" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ldhnAgrUEeWkNoOTovCSlw" type="6034">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ldhnAwrUEeWkNoOTovCSlw" y="-20"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_ldg_8QrUEeWkNoOTovCSlw"/>
-      <element xmi:type="uml:Association" href="model.uml#_ldfKwArUEeWkNoOTovCSlw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ldg_8grUEeWkNoOTovCSlw" points="[-5, -13, 0, 80]$[-3, -86, 2, 7]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ldl4cArUEeWkNoOTovCSlw" id="(0.7714285714285715,0.11320754716981132)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ldl4cQrUEeWkNoOTovCSlw" id="(0.7801047120418848,1.0)"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_2eCg4CD9EeWFusc4sUZ9zQ" type="4022" source="_2d3hwCD9EeWFusc4sUZ9zQ" target="_6ejSgAifEeWgbbgaC4xhOQ">
       <styles xmi:type="notation:FontStyle" xmi:id="_2eCg4SD9EeWFusc4sUZ9zQ"/>
       <element xsi:nil="true"/>
@@ -1193,8 +1718,8 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_2KsRoSD-EeWFusc4sUZ9zQ"/>
       <element xmi:type="uml:Association" href="model.uml#_2Kp1YCD-EeWFusc4sUZ9zQ"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2KsRoiD-EeWFusc4sUZ9zQ" points="[3, 35, -12, -109]$[14, 107, -1, -37]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2K0NcCD-EeWFusc4sUZ9zQ" id="(0.5,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6VNKQCD-EeWFusc4sUZ9zQ" id="(0.4967741935483871,0.0)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2K0NcCD-EeWFusc4sUZ9zQ" id="(0.5024390243902439,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6VNKQCD-EeWFusc4sUZ9zQ" id="(0.48129032258064514,0.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_8xwFMCD-EeWFusc4sUZ9zQ" type="4001" source="_scOoQCD-EeWFusc4sUZ9zQ" target="_rc5pYAotEeWkNoOTovCSlw">
       <children xmi:type="notation:DecorationNode" xmi:id="_8xwsQCD-EeWFusc4sUZ9zQ" type="6001">
@@ -1218,8 +1743,8 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_8xwFMSD-EeWFusc4sUZ9zQ"/>
       <element xmi:type="uml:Association" href="model.uml#_8xto8CD-EeWFusc4sUZ9zQ"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8xwFMiD-EeWFusc4sUZ9zQ" points="[7, 16, -71, -156]$[82, 132, 4, -40]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8x3Z8CD-EeWFusc4sUZ9zQ" id="(0.5741935483870968,0.8648648648648649)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8x3Z8SD-EeWFusc4sUZ9zQ" id="(0.40336134453781514,0.016891891891891893)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8x3Z8CD-EeWFusc4sUZ9zQ" id="(0.5587096774193548,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8x3Z8SD-EeWFusc4sUZ9zQ" id="(0.3907563025210084,0.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_gUioQCD_EeWFusc4sUZ9zQ" type="4001" source="_6ejSgAifEeWgbbgaC4xhOQ" target="_6CfP8ArAEeWkNoOTovCSlw">
       <children xmi:type="notation:DecorationNode" xmi:id="_gUjPUCD_EeWFusc4sUZ9zQ" type="6001">
@@ -1242,9 +1767,9 @@
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_gUioQSD_EeWFusc4sUZ9zQ"/>
       <element xmi:type="uml:Association" href="model.uml#_gUgMACD_EeWFusc4sUZ9zQ"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_gUioQiD_EeWFusc4sUZ9zQ" points="[0, 0, 136, -43]$[-100, 43, 36, 0]$[-105, 43, 31, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gUp9ACD_EeWFusc4sUZ9zQ" id="(0.32989690721649484,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lv1MQCD_EeWFusc4sUZ9zQ" id="(0.8253012048192772,0.0)"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_gUioQiD_EeWFusc4sUZ9zQ" points="[4, 3, -36, -28]$[40, 31, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gUp9ACD_EeWFusc4sUZ9zQ" id="(1.0,0.93359375)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lv1MQCD_EeWFusc4sUZ9zQ" id="(0.0,0.12753623188405797)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_VaOdgCEEEeWFusc4sUZ9zQ" type="4001" source="_6CfP8ArAEeWkNoOTovCSlw" target="_wZ6JUCD_EeWFusc4sUZ9zQ">
       <children xmi:type="notation:DecorationNode" xmi:id="_VaOdgyEEEeWFusc4sUZ9zQ" type="6001">
@@ -1268,8 +1793,7 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_VaOdgSEEEeWFusc4sUZ9zQ"/>
       <element xmi:type="uml:Association" href="model.uml#_VaMBQCEEEeWFusc4sUZ9zQ"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VaOdgiEEEeWFusc4sUZ9zQ" points="[0, 0, 22, -37]$[-22, 37, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VaVLMCEEEeWFusc4sUZ9zQ" id="(0.43373493975903615,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VaVLMSEEEeWFusc4sUZ9zQ" id="(0.47,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VaVLMSEEEeWFusc4sUZ9zQ" id="(0.4602409638554217,0.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_eeSfACEEEeWFusc4sUZ9zQ" type="4001" source="_scOoQCD-EeWFusc4sUZ9zQ" target="_wZ6JUCD_EeWFusc4sUZ9zQ">
       <children xmi:type="notation:DecorationNode" xmi:id="_eeSfAyEEEeWFusc4sUZ9zQ" type="6001">
@@ -1293,8 +1817,8 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_eeSfASEEEeWFusc4sUZ9zQ"/>
       <element xmi:type="uml:Association" href="model.uml#_eeQCwCEEEeWFusc4sUZ9zQ"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_eeSfAiEEEeWFusc4sUZ9zQ" points="[-16, -4, 184, 3]$[-150, -4, 50, 3]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eeZMsCEEEeWFusc4sUZ9zQ" id="(0.012903225806451613,0.581081081081081)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_s_qdwCEEEeWFusc4sUZ9zQ" id="(1.0,0.4868421052631579)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eeZMsCEEEeWFusc4sUZ9zQ" id="(0.9419354838709677,0.33783783783783783)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_s_qdwCEEEeWFusc4sUZ9zQ" id="(0.060240963855421686,0.27631578947368424)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_FF8hQCEFEeWFusc4sUZ9zQ" type="4001" source="_wZ6JUCD_EeWFusc4sUZ9zQ" target="_EP6GMArBEeWkNoOTovCSlw">
       <children xmi:type="notation:DecorationNode" xmi:id="_FF8hQyEFEeWFusc4sUZ9zQ" type="6001">
@@ -1307,18 +1831,19 @@
         <layoutConstraint xmi:type="notation:Location" xmi:id="_FF8hSCEFEeWFusc4sUZ9zQ" y="-20"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_FF9IUCEFEeWFusc4sUZ9zQ" type="6005">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_FF9IUSEFEeWFusc4sUZ9zQ" y="20"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_FF9IUSEFEeWFusc4sUZ9zQ" x="105" y="-55"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_FF9IUiEFEeWFusc4sUZ9zQ" type="6033">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_FF9IUyEFEeWFusc4sUZ9zQ" y="20"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_FF9IVCEFEeWFusc4sUZ9zQ" type="6034">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_FF9IVSEFEeWFusc4sUZ9zQ" y="-20"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_FF9IVSEFEeWFusc4sUZ9zQ" x="25" y="-6"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_FF8hQSEFEeWFusc4sUZ9zQ"/>
       <element xmi:type="uml:Association" href="model.uml#_FF6FACEFEeWFusc4sUZ9zQ"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FF8hQiEFEeWFusc4sUZ9zQ" points="[-5, 38, 8, -85]$[-14, 105, -1, -18]"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FGDO8CEFEeWFusc4sUZ9zQ" id="(0.49,0.21951219512195122)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_czXbwWYEEeWycoIPYbKzNg" id="(1.0,0.9394736842105263)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FGDO8CEFEeWFusc4sUZ9zQ" id="(0.0,0.08292682926829269)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_mHCtwCPxEeW21PC6xbr-bA" type="4002" source="_aytSwCPxEeW21PC6xbr-bA" target="_1_-8cArDEeWkNoOTovCSlw">
       <children xmi:type="notation:DecorationNode" xmi:id="_mHCtwyPxEeW21PC6xbr-bA" type="6007">
@@ -1327,8 +1852,8 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_mHCtwSPxEeW21PC6xbr-bA"/>
       <element xmi:type="uml:Generalization" href="model.uml#_mG6x8CPxEeW21PC6xbr-bA"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mHCtwiPxEeW21PC6xbr-bA" points="[-63, -20, 128, 40]$[-191, -78, 0, -18]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mlpVUCPxEeW21PC6xbr-bA" id="(0.0,0.3130434782608696)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mHHmQCPxEeW21PC6xbr-bA" id="(1.0,0.2982456140350877)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mlpVUCPxEeW21PC6xbr-bA" id="(0.0,0.21739130434782608)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mHHmQCPxEeW21PC6xbr-bA" id="(1.0,0.2631578947368421)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_oomEgCPxEeW21PC6xbr-bA" type="4002" source="_cgJE8SPxEeW21PC6xbr-bA" target="_1_-8cArDEeWkNoOTovCSlw">
       <children xmi:type="notation:DecorationNode" xmi:id="_oomrkCPxEeW21PC6xbr-bA" type="6007">
@@ -1337,8 +1862,8 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_oomEgSPxEeW21PC6xbr-bA"/>
       <element xmi:type="uml:Generalization" href="model.uml#_ooldcCPxEeW21PC6xbr-bA"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oomEgiPxEeW21PC6xbr-bA" points="[-62, -6, 233, 25]$[-294, -3, 1, 28]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_r74aMCPxEeW21PC6xbr-bA" id="(0.0,0.3695652173913043)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oopu4CPxEeW21PC6xbr-bA" id="(1.0,0.5087719298245614)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_r74aMCPxEeW21PC6xbr-bA" id="(0.0,0.32608695652173914)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oopu4CPxEeW21PC6xbr-bA" id="(1.0,0.47368421052631576)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_qWuaQCPxEeW21PC6xbr-bA" type="4002" source="_f_LXoCPxEeW21PC6xbr-bA" target="_1_-8cArDEeWkNoOTovCSlw">
       <children xmi:type="notation:DecorationNode" xmi:id="_qWvBUCPxEeW21PC6xbr-bA" type="6007">
@@ -1347,83 +1872,8 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_qWuaQSPxEeW21PC6xbr-bA"/>
       <element xmi:type="uml:Generalization" href="model.uml#_qWtMICPxEeW21PC6xbr-bA"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qWuaQiPxEeW21PC6xbr-bA" points="[-62, -9, 433, 65]$[-432, -65, 63, 9]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sfA8cCPxEeW21PC6xbr-bA" id="(0.0,0.13043478260869565)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sfA8cSPxEeW21PC6xbr-bA" id="(1.0,0.7192982456140351)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_NXbHcCPzEeW21PC6xbr-bA" type="4001" source="_6ejSgAifEeWgbbgaC4xhOQ" target="_E2OksArUEeWkNoOTovCSlw">
-      <children xmi:type="notation:DecorationNode" xmi:id="_NXbugCPzEeW21PC6xbr-bA" type="6001">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_NXbugSPzEeW21PC6xbr-bA" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_NXbugiPzEeW21PC6xbr-bA" type="6002">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_NXbugyPzEeW21PC6xbr-bA" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_NXbuhCPzEeW21PC6xbr-bA" type="6003">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_NXbuhSPzEeW21PC6xbr-bA" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_NXbuhiPzEeW21PC6xbr-bA" type="6005">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_NXbuhyPzEeW21PC6xbr-bA" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_NXbuiCPzEeW21PC6xbr-bA" type="6033">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_NXbuiSPzEeW21PC6xbr-bA" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_NXcVkCPzEeW21PC6xbr-bA" type="6034">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_NXcVkSPzEeW21PC6xbr-bA" y="-20"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_NXbHcSPzEeW21PC6xbr-bA"/>
-      <element xmi:type="uml:Association" href="model.uml#_NXYrMCPzEeW21PC6xbr-bA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NXbHciPzEeW21PC6xbr-bA" points="[48, 35, -695, -507]$[743, 485, 0, -57]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NXmtoCPzEeW21PC6xbr-bA" id="(0.9206185567010309,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NXmtoSPzEeW21PC6xbr-bA" id="(0.0,0.1169811320754717)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_Os5FkCPzEeW21PC6xbr-bA" type="4001" source="_rc5pYAotEeWkNoOTovCSlw" target="_E2OksArUEeWkNoOTovCSlw">
-      <children xmi:type="notation:DecorationNode" xmi:id="_Os5FkyPzEeW21PC6xbr-bA" type="6001">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Os5soCPzEeW21PC6xbr-bA" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Os5soSPzEeW21PC6xbr-bA" type="6002">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Os5soiPzEeW21PC6xbr-bA" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Os5soyPzEeW21PC6xbr-bA" type="6003">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Os5spCPzEeW21PC6xbr-bA" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Os5spSPzEeW21PC6xbr-bA" type="6005">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Os5spiPzEeW21PC6xbr-bA" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Os5spyPzEeW21PC6xbr-bA" type="6033">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Os5sqCPzEeW21PC6xbr-bA" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Os5sqSPzEeW21PC6xbr-bA" type="6034">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Os5sqiPzEeW21PC6xbr-bA" y="-20"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_Os5FkSPzEeW21PC6xbr-bA"/>
-      <element xmi:type="uml:Association" href="model.uml#_Os2pUyPzEeW21PC6xbr-bA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Os5FkiPzEeW21PC6xbr-bA" points="[28, -5, -477, 85]$[506, -21, 1, 69]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OtBocCPzEeW21PC6xbr-bA" id="(1.0,0.9054054054054054)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OtBocSPzEeW21PC6xbr-bA" id="(0.0,0.5144654088050314)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_chCK4CPzEeW21PC6xbr-bA" type="4001" source="_6ExcYAimEeWgbbgaC4xhOQ" target="_E2OksArUEeWkNoOTovCSlw">
-      <children xmi:type="notation:DecorationNode" xmi:id="_chCx8CPzEeW21PC6xbr-bA" type="6001">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_chCx8SPzEeW21PC6xbr-bA" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_chCx8iPzEeW21PC6xbr-bA" type="6002">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_chCx8yPzEeW21PC6xbr-bA" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_chCx9CPzEeW21PC6xbr-bA" type="6003">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_chCx9SPzEeW21PC6xbr-bA" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_chCx9iPzEeW21PC6xbr-bA" type="6005">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_chCx9yPzEeW21PC6xbr-bA" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_chCx-CPzEeW21PC6xbr-bA" type="6033">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_chCx-SPzEeW21PC6xbr-bA" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_chCx-iPzEeW21PC6xbr-bA" type="6034">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_chCx-yPzEeW21PC6xbr-bA" y="-20"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_chCK4SPzEeW21PC6xbr-bA"/>
-      <element xmi:type="uml:Association" href="model.uml#_cg_uoCPzEeW21PC6xbr-bA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_chCK4iPzEeW21PC6xbr-bA" points="[13, -10, -286, 220]$[300, -213, 1, 17]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_chJfoCPzEeW21PC6xbr-bA" id="(1.0,0.00332541567695962)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_chJfoSPzEeW21PC6xbr-bA" id="(0.0,0.9371069182389937)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sfA8cCPxEeW21PC6xbr-bA" id="(0.0,0.08695652173913043)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sfA8cSPxEeW21PC6xbr-bA" id="(1.0,0.6842105263157895)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_ZV1gkCP7EeWgfeI19M_f4A" type="4001" source="_6ExcYAimEeWgbbgaC4xhOQ" target="_rc5pYAotEeWkNoOTovCSlw">
       <children xmi:type="notation:DecorationNode" xmi:id="_ZV2HoCP7EeWgfeI19M_f4A" type="6001">
@@ -1472,6 +1922,8 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_bT6oMS-_EeWtJpOtnfchGg"/>
       <element xmi:type="uml:Association" href="model.uml#_bT3k4C-_EeWtJpOtnfchGg"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_bT6oMi-_EeWtJpOtnfchGg" points="[-70, 37, 88, -45]$[-155, 50, 3, -32]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vUAFYGYEEeWycoIPYbKzNg" id="(1.0,0.8378378378378378)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vUAFYWYEEeWycoIPYbKzNg" id="(0.0,0.15384615384615385)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_gV-z4C-_EeWtJpOtnfchGg" type="4001" source="_wZ6JUCD_EeWFusc4sUZ9zQ" target="_OoCygC-_EeWtJpOtnfchGg">
       <children xmi:type="notation:DecorationNode" xmi:id="_gV-z4y-_EeWtJpOtnfchGg" type="6001">
@@ -1495,6 +1947,253 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_gV-z4S-_EeWtJpOtnfchGg"/>
       <element xmi:type="uml:Association" href="model.uml#_gV7wkC-_EeWtJpOtnfchGg"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_gV-z4i-_EeWtJpOtnfchGg" points="[78, 38, -88, -39]$[116, 71, -50, -6]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_czW0sGYEEeWycoIPYbKzNg" id="(0.653012048192771,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_czXbwGYEEeWycoIPYbKzNg" id="(0.88,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_DMhfcGPKEeWyNbIEfiGf0A" type="4002" source="_WxMVwGPGEeWAFfMNIf5-6Q" target="_crVD0GPEEeWAFfMNIf5-6Q">
+      <children xmi:type="notation:DecorationNode" xmi:id="_DMhfc2PKEeWyNbIEfiGf0A" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_DMhfdGPKEeWyNbIEfiGf0A" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_DMhfcWPKEeWyNbIEfiGf0A"/>
+      <element xmi:type="uml:Generalization" href="model.uml#_DMfqQGPKEeWyNbIEfiGf0A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DMhfcmPKEeWyNbIEfiGf0A" points="[103, -57, -102, 57]$[206, -101, 1, 13]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_G_4cUGPKEeWyNbIEfiGf0A" id="(1.0,0.017105263157894738)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DMlw4GPKEeWyNbIEfiGf0A" id="(0.0,0.8824561403508772)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_QoPLwGPMEeWyNbIEfiGf0A" type="4002" source="_JMbhgGPMEeWyNbIEfiGf0A" target="_crVD0GPEEeWAFfMNIf5-6Q">
+      <children xmi:type="notation:DecorationNode" xmi:id="_QoPy0GPMEeWyNbIEfiGf0A" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QoPy0WPMEeWyNbIEfiGf0A" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_QoPLwWPMEeWyNbIEfiGf0A"/>
+      <element xmi:type="uml:Generalization" href="model.uml#_QoOksGPMEeWyNbIEfiGf0A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QoPLwmPMEeWyNbIEfiGf0A" points="[38, -61, -111, 181]$[150, -220, 1, 22]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QoRoAGPMEeWyNbIEfiGf0A" id="(1.0,0.005357142857142857)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QoRoAWPMEeWyNbIEfiGf0A" id="(0.15555555555555556,0.9824561403508771)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_yb4agGPOEeWyNbIEfiGf0A" type="4002" source="_kvXnMGPOEeWyNbIEfiGf0A" target="_crVD0GPEEeWAFfMNIf5-6Q">
+      <children xmi:type="notation:DecorationNode" xmi:id="_yb4ag2POEeWyNbIEfiGf0A" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_yb4ahGPOEeWyNbIEfiGf0A" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_yb4agWPOEeWyNbIEfiGf0A"/>
+      <element xmi:type="uml:Generalization" href="model.uml#_yb3MYGPOEeWyNbIEfiGf0A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_yb4agmPOEeWyNbIEfiGf0A" points="[22, -13, -141, 87]$[163, -65, 0, 35]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yb62wGPOEeWyNbIEfiGf0A" id="(0.9782608695652174,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yb62wWPOEeWyNbIEfiGf0A" id="(0.3333333333333333,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_XGjLoGPPEeWyNbIEfiGf0A" type="4002" source="_-dVaNmPOEeWyNbIEfiGf0A" target="_crVD0GPEEeWAFfMNIf5-6Q">
+      <children xmi:type="notation:DecorationNode" xmi:id="_XGjLo2PPEeWyNbIEfiGf0A" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_XGjLpGPPEeWyNbIEfiGf0A" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_XGjLoWPPEeWyNbIEfiGf0A"/>
+      <element xmi:type="uml:Generalization" href="model.uml#_XGikkGPPEeWyNbIEfiGf0A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XGjLomPPEeWyNbIEfiGf0A" points="[27, -49, -193, 385]$[224, -363, 4, 71]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XGlA0GPPEeWyNbIEfiGf0A" id="(0.5597826086956522,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZF_T0GPPEeWyNbIEfiGf0A" id="(0.5111111111111111,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_kf6kAGPQEeWyNbIEfiGf0A" type="4002" source="_dl6mUGPQEeWyNbIEfiGf0A" target="_crVD0GPEEeWAFfMNIf5-6Q">
+      <children xmi:type="notation:DecorationNode" xmi:id="_kf6kA2PQEeWyNbIEfiGf0A" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_kf7LEGPQEeWyNbIEfiGf0A" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_kf6kAWPQEeWyNbIEfiGf0A"/>
+      <element xmi:type="uml:Generalization" href="model.uml#_kf588GPQEeWyNbIEfiGf0A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kf6kAmPQEeWyNbIEfiGf0A" points="[8, -82, -50, 439]$[51, -450, -7, 71]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lTc5wGPQEeWyNbIEfiGf0A" id="(0.0,0.018421052631578946)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lTc5wWPQEeWyNbIEfiGf0A" id="(0.7777777777777778,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_kvs3AGPREeWyNbIEfiGf0A" type="4002" source="_M3C_0GPREeWyNbIEfiGf0A" target="_crVD0GPEEeWAFfMNIf5-6Q">
+      <children xmi:type="notation:DecorationNode" xmi:id="_kvteEGPREeWyNbIEfiGf0A" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_kvteEWPREeWyNbIEfiGf0A" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_kvs3AWPREeWyNbIEfiGf0A"/>
+      <element xmi:type="uml:Generalization" href="model.uml#_kvsP8GPREeWyNbIEfiGf0A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kvs3AmPREeWyNbIEfiGf0A" points="[-27, -95, 151, 428]$[-94, -558, 84, -35]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mHE5oGPREeWyNbIEfiGf0A" id="(0.010869565217391304,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mHE5oWPREeWyNbIEfiGf0A" id="(1.0,0.9526315789473684)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_V33DkGPSEeWyNbIEfiGf0A" type="4001" source="_6ejSgAifEeWgbbgaC4xhOQ" target="_ULnj0GX5EeWycoIPYbKzNg">
+      <children xmi:type="notation:DecorationNode" xmi:id="_V33qomPSEeWyNbIEfiGf0A" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_V33qo2PSEeWyNbIEfiGf0A" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_V33qpGPSEeWyNbIEfiGf0A" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_V33qpWPSEeWyNbIEfiGf0A" x="-4" y="9"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_V33qpmPSEeWyNbIEfiGf0A" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_V33qp2PSEeWyNbIEfiGf0A" x="-41"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_V33qqGPSEeWyNbIEfiGf0A" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_V33qqWPSEeWyNbIEfiGf0A" x="70" y="2"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_V33qqmPSEeWyNbIEfiGf0A" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_V33qq2PSEeWyNbIEfiGf0A" x="-13" y="10"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_V33qrGPSEeWyNbIEfiGf0A" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_V33qrWPSEeWyNbIEfiGf0A" x="7" y="10"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_V33qoGPSEeWyNbIEfiGf0A"/>
+      <element xmi:type="uml:Association" href="model.uml#_V311c2PSEeWyNbIEfiGf0A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_V33qoWPSEeWyNbIEfiGf0A" points="[-2, -1, 233, 7]$[-221, -1, 14, 7]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_V38jIGPSEeWyNbIEfiGf0A" id="(0.008130081300813009,0.12109375)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kU24oGPSEeWyNbIEfiGf0A" id="(0.8803418803418803,0.5131578947368421)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_NTcLEGX5EeWycoIPYbKzNg" type="4022" source="_NTP90GX5EeWycoIPYbKzNg" target="_2M7bgWPUEeWyNbIEfiGf0A">
+      <styles xmi:type="notation:FontStyle" xmi:id="_NTcLEWX5EeWycoIPYbKzNg"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NTcLEmX5EeWycoIPYbKzNg" points="[1, 9, 0, -46]$[1, 24, 0, -31]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_PvC1YGX6EeWycoIPYbKzNg" type="4001" source="_ULnj0GX5EeWycoIPYbKzNg" target="_crVD0GPEEeWAFfMNIf5-6Q">
+      <children xmi:type="notation:DecorationNode" xmi:id="_PvC1Y2X6EeWycoIPYbKzNg" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_PvC1ZGX6EeWycoIPYbKzNg" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_PvC1ZWX6EeWycoIPYbKzNg" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_PvC1ZmX6EeWycoIPYbKzNg" x="-7" y="5"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_PvC1Z2X6EeWycoIPYbKzNg" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_PvC1aGX6EeWycoIPYbKzNg" x="-22"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_PvDccGX6EeWycoIPYbKzNg" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_PvDccWX6EeWycoIPYbKzNg" x="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_PvDccmX6EeWycoIPYbKzNg" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_PvDcc2X6EeWycoIPYbKzNg" x="-11" y="7"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_PvDcdGX6EeWycoIPYbKzNg" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_PvDcdWX6EeWycoIPYbKzNg" x="-3" y="7"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_PvC1YWX6EeWycoIPYbKzNg"/>
+      <element xmi:type="uml:Association" href="model.uml#_PvAZIGX6EeWycoIPYbKzNg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PvC1YmX6EeWycoIPYbKzNg" points="[-17, 1, 151, 1]$[-167, -30, 1, -30]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PvIU8GX6EeWycoIPYbKzNg" id="(0.0,0.35526315789473684)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PvI8AGX6EeWycoIPYbKzNg" id="(1.0,0.20175438596491227)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_qXFrAGX6EeWycoIPYbKzNg" type="4001" source="_2M7bgWPUEeWyNbIEfiGf0A" target="_ULnj0GX5EeWycoIPYbKzNg">
+      <children xmi:type="notation:DecorationNode" xmi:id="_qXFrA2X6EeWycoIPYbKzNg" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qXFrBGX6EeWycoIPYbKzNg" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_qXFrBWX6EeWycoIPYbKzNg" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qXFrBmX6EeWycoIPYbKzNg" x="-8" y="19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_qXFrB2X6EeWycoIPYbKzNg" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qXFrCGX6EeWycoIPYbKzNg" x="-7" y="-1"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_qXFrCWX6EeWycoIPYbKzNg" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qXFrCmX6EeWycoIPYbKzNg" x="4"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_qXFrC2X6EeWycoIPYbKzNg" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qXFrDGX6EeWycoIPYbKzNg" x="-1" y="-10"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_qXGSEGX6EeWycoIPYbKzNg" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qXGSEWX6EeWycoIPYbKzNg" x="-4" y="-14"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_qXFrAWX6EeWycoIPYbKzNg"/>
+      <element xmi:type="uml:Association" href="model.uml#_qXDOwGX6EeWycoIPYbKzNg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qXFrAmX6EeWycoIPYbKzNg" points="[4, 39, -7, -108]$[4, 100, -7, -47]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PDsycGbjEeWGp9Z_qQVBGA" id="(0.3623931623931624,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PDtZgGbjEeWGp9Z_qQVBGA" id="(0.6393162393162393,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_Dc57EGYKEeWisPYqI1z_rA" type="4001" source="_HUmQQGYIEeWycoIPYbKzNg" target="_8OWuIAidEeWgbbgaC4xhOQ">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Dc57E2YKEeWisPYqI1z_rA" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Dc6iIGYKEeWisPYqI1z_rA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Dc6iIWYKEeWisPYqI1z_rA" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Dc6iImYKEeWisPYqI1z_rA" x="-4" y="10"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Dc6iI2YKEeWisPYqI1z_rA" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Dc6iJGYKEeWisPYqI1z_rA" x="-18" y="1"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Dc6iJWYKEeWisPYqI1z_rA" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Dc6iJmYKEeWisPYqI1z_rA" x="15"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Dc6iJ2YKEeWisPYqI1z_rA" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Dc6iKGYKEeWisPYqI1z_rA" x="-5" y="-9"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Dc6iKWYKEeWisPYqI1z_rA" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Dc6iKmYKEeWisPYqI1z_rA" x="-9" y="-9"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_Dc57EWYKEeWisPYqI1z_rA"/>
+      <element xmi:type="uml:Association" href="model.uml#_Dc2QsGYKEeWisPYqI1z_rA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Dc57EmYKEeWisPYqI1z_rA" points="[-20, 5, 175, -47]$[-194, -5, 1, -57]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DdCd8GYKEeWisPYqI1z_rA" id="(0.0,0.6189189189189189)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DdCd8WYKEeWisPYqI1z_rA" id="(0.9790575916230366,0.26146788990825687)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_n8WmsGbmEeWGp9Z_qQVBGA" type="4001" source="_rc5pYAotEeWkNoOTovCSlw" target="_dEfXMGbkEeWGp9Z_qQVBGA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_n8Wms2bmEeWGp9Z_qQVBGA" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_n8WmtGbmEeWGp9Z_qQVBGA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_n8WmtWbmEeWGp9Z_qQVBGA" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_n8XNwGbmEeWGp9Z_qQVBGA" x="1" y="7"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_n8XNwWbmEeWGp9Z_qQVBGA" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_n8XNwmbmEeWGp9Z_qQVBGA" x="-30"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_n8XNw2bmEeWGp9Z_qQVBGA" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_n8XNxGbmEeWGp9Z_qQVBGA" x="28" y="1"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_n8XNxWbmEeWGp9Z_qQVBGA" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_n8XNxmbmEeWGp9Z_qQVBGA" x="-16" y="-8"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_n8XNx2bmEeWGp9Z_qQVBGA" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_n8XNyGbmEeWGp9Z_qQVBGA" x="4" y="-9"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_n8WmsWbmEeWGp9Z_qQVBGA"/>
+      <element xmi:type="uml:Association" href="model.uml#_n8TjY2bmEeWGp9Z_qQVBGA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_n8WmsmbmEeWGp9Z_qQVBGA" points="[-22, 7, 291, 0]$[-292, -15, 21, -22]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_n8dUYGbmEeWGp9Z_qQVBGA" id="(0.03361344537815126,0.13851351351351351)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_n8dUYWbmEeWGp9Z_qQVBGA" id="(0.775,0.1328125)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_WYB3gGbqEeWGp9Z_qQVBGA" type="4022" source="_WX9mEGbqEeWGp9Z_qQVBGA" target="_QG87AGbqEeWGp9Z_qQVBGA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_WYB3gWbqEeWGp9Z_qQVBGA"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_WYB3gmbqEeWGp9Z_qQVBGA" points="[12, 4, -1059, -375]$[1009, 357, -62, -22]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_fbYHUGbqEeWGp9Z_qQVBGA" type="4001" source="_QG87AGbqEeWGp9Z_qQVBGA" target="_HUmQQGYIEeWycoIPYbKzNg">
+      <children xmi:type="notation:DecorationNode" xmi:id="_fbYHU2bqEeWGp9Z_qQVBGA" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_fbYHVGbqEeWGp9Z_qQVBGA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_fbYHVWbqEeWGp9Z_qQVBGA" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_fbYHVmbqEeWGp9Z_qQVBGA" x="12" y="21"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_fbYHV2bqEeWGp9Z_qQVBGA" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_fbYHWGbqEeWGp9Z_qQVBGA" x="-51"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_fbYHWWbqEeWGp9Z_qQVBGA" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_fbYHWmbqEeWGp9Z_qQVBGA" x="47" y="-2"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_fbYHW2bqEeWGp9Z_qQVBGA" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_fbYuYGbqEeWGp9Z_qQVBGA" x="-39" y="9"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_fbYuYWbqEeWGp9Z_qQVBGA" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_fbYuYmbqEeWGp9Z_qQVBGA" x="34" y="-15"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_fbYHUWbqEeWGp9Z_qQVBGA"/>
+      <element xmi:type="uml:Association" href="model.uml#_fbWSIGbqEeWGp9Z_qQVBGA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_fbYHUmbqEeWGp9Z_qQVBGA" points="[-9, 5, 403, -255]$[-411, 318, 1, 58]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fbcYwGbqEeWGp9Z_qQVBGA" id="(0.07,0.48484848484848486)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fbcYwWbqEeWGp9Z_qQVBGA" id="(0.7870967741935484,0.4891304347826087)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_0Xth4GbrEeWGp9Z_qQVBGA" type="4001" source="_rc5pYAotEeWkNoOTovCSlw" target="_O3M_0GbpEeWGp9Z_qQVBGA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_0XuI8GbrEeWGp9Z_qQVBGA" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_0XuI8WbrEeWGp9Z_qQVBGA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_0XuI8mbrEeWGp9Z_qQVBGA" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_0XuI82brEeWGp9Z_qQVBGA" x="-1" y="11"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_0XuI9GbrEeWGp9Z_qQVBGA" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_0XuI9WbrEeWGp9Z_qQVBGA" x="-29"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_0XuI9mbrEeWGp9Z_qQVBGA" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_0XuI92brEeWGp9Z_qQVBGA" x="27"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_0XuI-GbrEeWGp9Z_qQVBGA" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_0XuI-WbrEeWGp9Z_qQVBGA" x="-16" y="-6"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_0XuI-mbrEeWGp9Z_qQVBGA" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_0XuI-2brEeWGp9Z_qQVBGA" x="4" y="-8"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_0Xth4WbrEeWGp9Z_qQVBGA"/>
+      <element xmi:type="uml:Association" href="model.uml#_0XrFo2brEeWGp9Z_qQVBGA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0Xth4mbrEeWGp9Z_qQVBGA" points="[-10, 2, 337, 1]$[-346, -19, 1, -20]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0XyaYGbrEeWGp9Z_qQVBGA" id="(0.03361344537815126,0.6114864864864865)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0XyaYWbrEeWGp9Z_qQVBGA" id="(0.5555555555555556,0.125)"/>
     </edges>
   </notation:Diagram>
   <css:ModelStyleSheets xmi:id="_wt0qMAidEeWgbbgaC4xhOQ"/>
diff --git a/model/cl-mef-uml/model.uml b/model/cl-mef-uml/model.uml
index 8477c40..e27e9c5 100644
--- a/model/cl-mef-uml/model.uml
+++ b/model/cl-mef-uml/model.uml
@@ -3,20 +3,124 @@
   <ownedComment xmi:type="uml:Comment" xmi:id="_vNORcAoOEeWNdNIyeR54mg">
     <body></body>
   </ownedComment>
+  <ownedComment xmi:type="uml:Comment" xmi:id="_QocugGPJEeWyNbIEfiGf0A">
+    <ownedComment xmi:type="uml:Comment" xmi:id="_SCkGoGPKEeWyNbIEfiGf0A">
+      <body>Consider making S (uni pair list) of type EvcPath, since an EvcPath is in essense a uni pair
+</body>
+    </ownedComment>
+    <body>Consider making S (uni pair list) of type EvcPath, since an EvcPath is in essense a uni pair
+</body>
+  </ownedComment>
+  <ownedComment xmi:type="uml:Comment" xmi:id="_W2qlEGYKEeWisPYqI1z_rA">
+    <ownedComment xmi:type="uml:Comment" xmi:id="_W2qlEWYKEeWisPYqI1z_rA">
+      <body>Consider making S (uni pair list) of type EvcPath, since an EvcPath is in essense a uni pair
+</body>
+    </ownedComment>
+    <ownedComment xmi:type="uml:Comment" xmi:id="_Ohr_oGblEeWGp9Z_qQVBGA">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_Ohr_oWblEeWGp9Z_qQVBGA">
+        <body>Consider making S (uni pair list) of type EvcPath, since an EvcPath is in essense a uni pair
+</body>
+      </ownedComment>
+      <body>Note: When UNI:TokenSharing = DISABLED, then only 1 BandwidthProfileFlow exists per envelope</body>
+    </ownedComment>
+    <ownedComment xmi:type="uml:Comment" xmi:id="_PQveAGblEeWGp9Z_qQVBGA">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_PQveAWblEeWGp9Z_qQVBGA">
+        <body>Consider making S (uni pair list) of type EvcPath, since an EvcPath is in essense a uni pair
+</body>
+      </ownedComment>
+      <body>Note: When UNI:TokenSharing = DISABLED, then only 1 BandwidthProfileFlow exists per envelope</body>
+    </ownedComment>
+    <body>Note: When UNI:TokenSharing = DISABLED, then only 1 BandwidthProfileFlow exists per envelope</body>
+  </ownedComment>
+  <ownedComment xmi:type="uml:Comment" xmi:id="_RZ8y0GYMEeWIk-zXg3ayAw">
+    <ownedComment xmi:type="uml:Comment" xmi:id="_chQecGYMEeWIk-zXg3ayAw">
+      <body>EVC Attributes 
+captured in this class</body>
+    </ownedComment>
+    <body>EVC Attributes 
+captured in this class</body>
+  </ownedComment>
+  <ownedComment xmi:type="uml:Comment" xmi:id="_c1zLEGYMEeWIk-zXg3ayAw">
+    <ownedComment xmi:type="uml:Comment" xmi:id="_m4oh8GYMEeWIk-zXg3ayAw">
+      <body>OVC Attributes 
+captured in this class</body>
+    </ownedComment>
+    <body>OVC Attributes 
+captured in this class</body>
+  </ownedComment>
+  <ownedComment xmi:type="uml:Comment" xmi:id="_nLHZEGYMEeWIk-zXg3ayAw">
+    <body>UNI Attributes 
+captured in this class</body>
+  </ownedComment>
+  <ownedComment xmi:type="uml:Comment" xmi:id="_0mIMsGYMEeWIk-zXg3ayAw">
+    <body>OVC EP Per ENNI Attributes
+captured in this class</body>
+  </ownedComment>
+  <ownedComment xmi:type="uml:Comment" xmi:id="_ghjrUGYxEeWA-LVuew9z5A">
+    <body>EVC per UNI Attributes 
+captured in this class</body>
+  </ownedComment>
+  <ownedComment xmi:type="uml:Comment" xmi:id="_fY0FIGYyEeWA-LVuew9z5A">
+    <body>OVC EP Per ENNI Attributes
+captured in this class</body>
+  </ownedComment>
+  <ownedComment xmi:type="uml:Comment" xmi:id="_P95e8GblEeWGp9Z_qQVBGA">
+    <ownedComment xmi:type="uml:Comment" xmi:id="_P95e8WblEeWGp9Z_qQVBGA">
+      <body>Consider making S (uni pair list) of type EvcPath, since an EvcPath is in essense a uni pair
+</body>
+    </ownedComment>
+    <body>Maps ranges of CoS IDs (PCP or DSCP values) to a CoSName
+(If dataSvcFrameCosId = EVC, only 1 entry in this map, and cosIDStart=cosIDEnd=-1)</body>
+  </ownedComment>
+  <ownedComment xmi:type="uml:Comment" xmi:id="_YuTAwGbpEeWGp9Z_qQVBGA">
+    <ownedComment xmi:type="uml:Comment" xmi:id="_YuTAwWbpEeWGp9Z_qQVBGA">
+      <body>Consider making S (uni pair list) of type EvcPath, since an EvcPath is in essense a uni pair
+</body>
+    </ownedComment>
+    <body>Note: &quot;BW Profile&quot; and &quot;Envelope&quot; are analagous terms in 6.2/10.3</body>
+  </ownedComment>
+  <ownedComment xmi:type="uml:Comment" xmi:id="_tBraYGbpEeWGp9Z_qQVBGA">
+    <ownedComment xmi:type="uml:Comment" xmi:id="_tBraYWbpEeWGp9Z_qQVBGA">
+      <body>Consider making S (uni pair list) of type EvcPath, since an EvcPath is in essense a uni pair
+</body>
+    </ownedComment>
+    <body>Note: Was CoSMgr in phase 1.  
+Changing to SLSMgr upon addition of BWProfiles</body>
+  </ownedComment>
+  <ownedComment xmi:type="uml:Comment" xmi:id="_phpFUGbtEeWGp9Z_qQVBGA">
+    <body>ENNI Attributes
+captured in this class</body>
+  </ownedComment>
+  <ownedComment xmi:type="uml:Comment" xmi:id="_UJKocGeIEeWmi5ydVYW0lA">
+    <body>Needs to be fleshed out</body>
+  </ownedComment>
   <packagedElement xmi:type="uml:Interaction" xmi:id="_tp0tsAidEeWgbbgaC4xhOQ" name="Interaction1"/>
-  <packagedElement xmi:type="uml:Class" xmi:id="_8JT2EAidEeWgbbgaC4xhOQ" name="BandWidthProfile">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_8JT2EQidEeWgbbgaC4xhOQ" name="committedInfoRate" visibility="private">
+  <packagedElement xmi:type="uml:Class" xmi:id="_8JT2EAidEeWgbbgaC4xhOQ" name="BandWidthProfileFlow">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_8JT2EQidEeWgbbgaC4xhOQ" name="committedInfoRate" visibility="public">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+      <qualifier xmi:type="uml:Property" xmi:id="_58aRsGYIEeWycoIPYbKzNg" name="committedInfoRate" visibility="private">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+      </qualifier>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_8JT2FAidEeWgbbgaC4xhOQ" name="excessInfoRate" visibility="public">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_8JT2EgidEeWgbbgaC4xhOQ" name="committedInfoRateMax" visibility="public">
       <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
     </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_8JT2EgidEeWgbbgaC4xhOQ" name="committedBurtSize" visibility="private">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_8JT2EwidEeWgbbgaC4xhOQ" name="commitedBurstSize" visibility="public">
       <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
     </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_8JT2EwidEeWgbbgaC4xhOQ" name="excessInfoRate" visibility="private">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_XbLc0GYJEeWisPYqI1z_rA" name="excessInfoRateMax" visibility="public">
       <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
     </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_8JT2FAidEeWgbbgaC4xhOQ" name="excessBurstSize" visibility="private">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_cgeisGYJEeWisPYqI1z_rA" name="excessBurstSize">
       <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
     </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_tKTbsGYJEeWisPYqI1z_rA" name="colorMode" type="_vO9wMGYLEeWIk-zXg3ayAw"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_6mHgkGYJEeWisPYqI1z_rA" name="couplingFlag">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
+    </ownedAttribute>
     <ownedOperation xmi:type="uml:Operation" xmi:id="_8JT2FQidEeWgbbgaC4xhOQ" name="gettersForAllAttributes"/>
     <ownedOperation xmi:type="uml:Operation" xmi:id="_8JT2FgidEeWgbbgaC4xhOQ" name="settersForAllAttributes"/>
   </packagedElement>
@@ -30,41 +134,6 @@
     <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_lXjDkgifEeWgbbgaC4xhOQ" name="UNCONDITIONAL"/>
     <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_lXjDkwifEeWgbbgaC4xhOQ" name="CONDITIONAL"/>
   </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_sWE78AifEeWgbbgaC4xhOQ" name="EvcPerformance">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_sWE78QifEeWgbbgaC4xhOQ" name="oneWayFrameDelay" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_sWE78gifEeWgbbgaC4xhOQ" name="oneWayFrameDelayRange" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_sWE78wifEeWgbbgaC4xhOQ" name="oneWayMeanFrameDelay" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_sWE79AifEeWgbbgaC4xhOQ" name="oneWayInterFrameDelayVariation" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_sWE79QifEeWgbbgaC4xhOQ" name="oneWayFrameLossRatio" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_sWE79gifEeWgbbgaC4xhOQ" name="oneWayAvailability" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_sWE79wifEeWgbbgaC4xhOQ" name="oneWayResilHighLossIntervals" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_sWE7-AifEeWgbbgaC4xhOQ" name="oneWayResilConsecHighLossIntervals" visibility="private">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
-    </ownedAttribute>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_sWE7-QifEeWgbbgaC4xhOQ" name="gettersForAllAttributes"/>
-    <ownedOperation xmi:type="uml:Operation" xmi:id="_sWE7-gifEeWgbbgaC4xhOQ" name="settersForAllAttributes"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Association" xmi:id="_NPfMgwihEeWgbbgaC4xhOQ" memberEnd="_NPfMhAihEeWgbbgaC4xhOQ _NPfMgAihEeWgbbgaC4xhOQ">
-    <name xsi:nil="true"/>
-    <ownedEnd xmi:type="uml:Property" xmi:id="_NPfMhAihEeWgbbgaC4xhOQ" type="_6eiEYAifEeWgbbgaC4xhOQ" association="_NPfMgwihEeWgbbgaC4xhOQ">
-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NPfMhQihEeWgbbgaC4xhOQ" value="1"/>
-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NPfMhgihEeWgbbgaC4xhOQ" value="1"/>
-    </ownedEnd>
-  </packagedElement>
   <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_PhJwUAilEeWgbbgaC4xhOQ" name="UUID"/>
   <packagedElement xmi:type="uml:Enumeration" xmi:id="_7r0AwAioEeWgbbgaC4xhOQ" name="PhysicalLayer">
     <ownedComment xmi:type="uml:Comment" xmi:id="_3Sw1MAoOEeWNdNIyeR54mg">
@@ -92,17 +161,6 @@
     </ownedAttribute>
     <ownedAttribute xmi:type="uml:Property" xmi:id="_WFs2kAoSEeWNdNIyeR54mg" name="EvcId" type="_PhJwUAilEeWgbbgaC4xhOQ"/>
   </packagedElement>
-  <packagedElement xmi:type="uml:DataType" xmi:id="_PFK9oAoTEeWNdNIyeR54mg" name="Envelope">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_RpbDEAoTEeWNdNIyeR54mg" name="envId">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_VXtSsAoTEeWNdNIyeR54mg" name="CFo">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_bP51IAoTEeWNdNIyeR54mg" name="numBWProfileFlows">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
-    </ownedAttribute>
-  </packagedElement>
   <packagedElement xmi:type="uml:Enumeration" xmi:id="_0_y6wAoTEeWNdNIyeR54mg" name="BWProfilePerUni">
     <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_2_0RwAoTEeWNdNIyeR54mg" name="NO"/>
   </packagedElement>
@@ -118,11 +176,11 @@
     <ownedAttribute xmi:type="uml:Property" xmi:id="_CDK-kAohEeWNdNIyeR54mg" name="ProtocolIdentifier" type="_PhJwUAilEeWgbbgaC4xhOQ"/>
     <ownedAttribute xmi:type="uml:Property" xmi:id="_HPAxUAohEeWNdNIyeR54mg" name="LinkIdentifer" type="_PhJwUAilEeWgbbgaC4xhOQ"/>
   </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_rc30MAotEeWkNoOTovCSlw" name="EvcEndPoint (EVC/UNI Attributes)">
+  <packagedElement xmi:type="uml:Class" xmi:id="_rc30MAotEeWkNoOTovCSlw" name="EvcEndPoint">
     <ownedAttribute xmi:type="uml:Property" xmi:id="_Q7M24AouEeWkNoOTovCSlw" name="uniEvcId" visibility="private">
       <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
     </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_3ruhQAouEeWkNoOTovCSlw" name="dataSvcFrameCosId" visibility="private" type="_PhJwUAilEeWgbbgaC4xhOQ"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_3ruhQAouEeWkNoOTovCSlw" name="dataSvcFrameCosId" visibility="private" type="_61z1cGblEeWGp9Z_qQVBGA"/>
     <ownedAttribute xmi:type="uml:Property" xmi:id="_Cb9JoAovEeWkNoOTovCSlw" name="l2cpSvcFrameCosId" visibility="private" type="_PhJwUAilEeWgbbgaC4xhOQ"/>
     <ownedAttribute xmi:type="uml:Property" xmi:id="_-7FOcAovEeWkNoOTovCSlw" name="soamSvcFrameCosId" type="_PhJwUAilEeWgbbgaC4xhOQ"/>
     <ownedAttribute xmi:type="uml:Property" xmi:id="_Gfm6YAoxEeWkNoOTovCSlw" name="svcFrameColorIdType" type="_LYz6cAowEeWkNoOTovCSlw">
@@ -157,9 +215,13 @@
       <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AXwhMQrHEeWkNoOTovCSlw" value="1"/>
       <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AXwhMgrHEeWkNoOTovCSlw" value="1"/>
     </ownedAttribute>
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_Os2pUCPzEeW21PC6xbr-bA" type="_E2MvgArUEeWkNoOTovCSlw" association="_Os2pUyPzEeW21PC6xbr-bA">
-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Os2pUSPzEeW21PC6xbr-bA" value="1"/>
-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Os2pUiPzEeW21PC6xbr-bA" value="1"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_n8TjYGbmEeWGp9Z_qQVBGA" type="_dEHjwGbkEeWGp9Z_qQVBGA" association="_n8TjY2bmEeWGp9Z_qQVBGA">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_n8TjYWbmEeWGp9Z_qQVBGA" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_n8TjYmbmEeWGp9Z_qQVBGA" value="1"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_0XrFoGbrEeWGp9Z_qQVBGA" type="_O3MYwGbpEeWGp9Z_qQVBGA" association="_0XrFo2brEeWGp9Z_qQVBGA">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0XrFoWbrEeWGp9Z_qQVBGA"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0XrFombrEeWGp9Z_qQVBGA" value="*"/>
     </ownedAttribute>
   </packagedElement>
   <packagedElement xmi:type="uml:Enumeration" xmi:id="_LYz6cAowEeWkNoOTovCSlw" name="FrameColorIdType">
@@ -179,23 +241,24 @@
       <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9yx2sgo8EeWkNoOTovCSlw" value="1"/>
     </ownedAttribute>
     <nestedClassifier xmi:type="uml:Class" xmi:id="_1_9HQArDEeWkNoOTovCSlw" name="MEFSvc">
-      <nestedClassifier xmi:type="uml:Class" xmi:id="_6eiEYAifEeWgbbgaC4xhOQ" name="Evc (EVC Service Attributes)">
+      <nestedClassifier xmi:type="uml:Class" xmi:id="_6eiEYAifEeWgbbgaC4xhOQ" name="Evc">
         <ownedAttribute xmi:type="uml:Property" xmi:id="_6eiEYQifEeWgbbgaC4xhOQ" name="id" visibility="private" type="_PhJwUAilEeWgbbgaC4xhOQ"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_6eiEYgifEeWgbbgaC4xhOQ" name="evcType" visibility="private">
-          <type xmi:type="uml:Enumeration" href="../cl-mef-services/model.uml#_BfnRwAZAEeWQ3sI_qJW7pQ"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_6eiEYgifEeWgbbgaC4xhOQ" name="evcType" visibility="private" type="_bDyUwAifEeWgbbgaC4xhOQ">
+          <qualifier xmi:type="uml:Property" xmi:id="_6VgccGO-EeWAFfMNIf5-6Q" name="evcType" visibility="private" type="_bDyUwAifEeWgbbgaC4xhOQ"/>
+          <qualifier xmi:type="uml:Property" xmi:id="_7--UoGO-EeWAFfMNIf5-6Q" name="CopyOf_evcType_1" visibility="private" type="_bDyUwAifEeWgbbgaC4xhOQ">
+            <qualifier xmi:type="uml:Property" xmi:id="_7--UoWO-EeWAFfMNIf5-6Q" name="evcType" visibility="private" type="_bDyUwAifEeWgbbgaC4xhOQ"/>
+          </qualifier>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_GE6p4GO_EeWAFfMNIf5-6Q" name="uniList" type="_df9p8GO9EeWQv9mZwpAw9Q">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_J4ELYGO_EeWAFfMNIf5-6Q" value="2"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_J4EycGO_EeWAFfMNIf5-6Q" value="*"/>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_6eiEYwifEeWgbbgaC4xhOQ" name="maxUnils" visibility="private">
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_6eiEZwifEeWgbbgaC4xhOQ" name="unicastFrameDelivery" visibility="private">
-          <type xmi:type="uml:Enumeration" href="../cl-mef-services/model.uml#_9YqOAAZAEeWQ3sI_qJW7pQ"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_6eiEaAifEeWgbbgaC4xhOQ" name="multicastFrameDelivery" visibility="private">
-          <type xmi:type="uml:Enumeration" href="../cl-mef-services/model.uml#_9YqOAAZAEeWQ3sI_qJW7pQ"/>
-        </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_6eiEaQifEeWgbbgaC4xhOQ" name="broadcastFrameDelivery" visibility="private">
-          <type xmi:type="uml:Enumeration" href="../cl-mef-services/model.uml#_9YqOAAZAEeWQ3sI_qJW7pQ"/>
-        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_6eiEZwifEeWgbbgaC4xhOQ" name="unicastFrameDelivery" visibility="private" type="_lXjDkAifEeWgbbgaC4xhOQ"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_6eiEaAifEeWgbbgaC4xhOQ" name="multicastFrameDelivery" visibility="private" type="_lXjDkAifEeWgbbgaC4xhOQ"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_6eiEaQifEeWgbbgaC4xhOQ" name="broadcastFrameDelivery" visibility="private" type="_lXjDkAifEeWgbbgaC4xhOQ"/>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_6eiEagifEeWgbbgaC4xhOQ" name="ceVLanIdPreservation" visibility="private">
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
           <qualifier xmi:type="uml:Property" xmi:id="_6eiEawifEeWgbbgaC4xhOQ" name="ceVLanIdPreservation" visibility="private">
@@ -226,10 +289,6 @@
             </qualifier>
           </qualifier>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_NPfMgAihEeWgbbgaC4xhOQ" type="_sWE78AifEeWgbbgaC4xhOQ" association="_NPfMgwihEeWgbbgaC4xhOQ">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NPfMgQihEeWgbbgaC4xhOQ" value="1"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NPfMggihEeWgbbgaC4xhOQ" value="1"/>
-        </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_2KpOUCD-EeWFusc4sUZ9zQ" type="_scKW0CD-EeWFusc4sUZ9zQ" association="_2Kp1YCD-EeWFusc4sUZ9zQ">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2KpOUSD-EeWFusc4sUZ9zQ" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2KpOUiD-EeWFusc4sUZ9zQ" value="*"/>
@@ -238,9 +297,9 @@
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gUfk8SD_EeWFusc4sUZ9zQ" value="2"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gUfk8iD_EeWFusc4sUZ9zQ" value="*"/>
         </ownedAttribute>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_NXXdECPzEeW21PC6xbr-bA" type="_E2MvgArUEeWkNoOTovCSlw" association="_NXYrMCPzEeW21PC6xbr-bA">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NXXdESPzEeW21PC6xbr-bA" value="1"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NXXdEiPzEeW21PC6xbr-bA" value="1"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_V311cGPSEeWyNbIEfiGf0A" type="_ULm8wGX5EeWycoIPYbKzNg" association="_V311c2PSEeWyNbIEfiGf0A">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_V311cWPSEeWyNbIEfiGf0A"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_V311cmPSEeWyNbIEfiGf0A" value="*"/>
         </ownedAttribute>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_jMIC8AihEeWgbbgaC4xhOQ" name="gettersForAllAttributes"/>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_k4EAUAihEeWgbbgaC4xhOQ" name="settersForAllAttributes"/>
@@ -251,7 +310,7 @@
     <ownedOperation xmi:type="uml:Operation" xmi:id="_gv3ZwAo_EeWkNoOTovCSlw" name="create"/>
   </packagedElement>
   <packagedElement xmi:type="uml:Class" xmi:id="_iYvOUAo6EeWkNoOTovCSlw" name="UniMgr">
-    <nestedClassifier xmi:type="uml:Class" xmi:id="_6EwOQAimEeWgbbgaC4xhOQ" name="Uni (per UNI Attributes)">
+    <nestedClassifier xmi:type="uml:Class" xmi:id="_6EwOQAimEeWgbbgaC4xhOQ" name="Uni">
       <ownedAttribute xmi:type="uml:Property" xmi:id="__rQ44AioEeWgbbgaC4xhOQ" name="id" visibility="private" type="_PhJwUAilEeWgbbgaC4xhOQ"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_nrUw0AoPEeWNdNIyeR54mg" name="numLinks" visibility="private">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
@@ -292,7 +351,7 @@
       <ownedAttribute xmi:type="uml:Property" xmi:id="_ITtQ4AoTEeWNdNIyeR54mg" name="tokenShare" visibility="private">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_iguXYAoTEeWNdNIyeR54mg" name="envelopes" visibility="private" type="_PFK9oAoTEeWNdNIyeR54mg">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_iguXYAoTEeWNdNIyeR54mg" name="envelopes" visibility="private" type="_HUlpMGYIEeWycoIPYbKzNg">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_oBxlIAoTEeWNdNIyeR54mg"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oByMMAoTEeWNdNIyeR54mg" value="*"/>
       </ownedAttribute>
@@ -311,10 +370,6 @@
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_WyBBoAogEeWNdNIyeR54mg" name="l2cpAddrSet" visibility="private" type="_LO2gcAogEeWNdNIyeR54mg"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_LCN9MAohEeWNdNIyeR54mg" name="l2cp3Peering" type="_ybOZUAogEeWNdNIyeR54mg"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_cg_HkCPzEeW21PC6xbr-bA" type="_E2MvgArUEeWkNoOTovCSlw" association="_cg_uoCPzEeW21PC6xbr-bA">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_cg_HkSPzEeW21PC6xbr-bA" value="1"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cg_HkiPzEeW21PC6xbr-bA" value="1"/>
-      </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_ZVUjMCP7EeWgfeI19M_f4A" type="_rc30MAotEeWkNoOTovCSlw" association="_ZVY0oCP7EeWgfeI19M_f4A">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZVUjMSP7EeWgfeI19M_f4A"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZVUjMiP7EeWgfeI19M_f4A" value="*"/>
@@ -343,40 +398,17 @@
     <ownedAttribute xmi:type="uml:Property" xmi:id="_-z2nQAo-EeWkNoOTovCSlw" name="UniMgr" type="_iYvOUAo6EeWkNoOTovCSlw"/>
     <ownedAttribute xmi:type="uml:Property" xmi:id="_DQVZoAo_EeWkNoOTovCSlw" name="ConnectionMgr" type="_j0FK8Ao6EeWkNoOTovCSlw"/>
   </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_sVP98Ao-EeWkNoOTovCSlw" name="CoSMgr">
-    <nestedClassifier xmi:type="uml:Class" xmi:id="_E2MvgArUEeWkNoOTovCSlw" name="CoS">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_VC0vIArUEeWkNoOTovCSlw" name="availability">
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_VbbcYArUEeWkNoOTovCSlw" name="frameDelay">
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_Vu-DcArUEeWkNoOTovCSlw" name="jitter">
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_WGCfoArUEeWkNoOTovCSlw" name="frameLoss">
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_ixSDMArUEeWkNoOTovCSlw" type="_8JT2EAidEeWgbbgaC4xhOQ" association="_ixUfcArUEeWkNoOTovCSlw">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ixSDMQrUEeWkNoOTovCSlw" value="1"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ixSDMgrUEeWkNoOTovCSlw" value="1"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_ldejsArUEeWkNoOTovCSlw" type="_8JT2EAidEeWgbbgaC4xhOQ" association="_ldfKwArUEeWkNoOTovCSlw">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ldejsQrUEeWkNoOTovCSlw" value="1"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ldejsgrUEeWkNoOTovCSlw" value="1"/>
-      </ownedAttribute>
-    </nestedClassifier>
-  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_sVP98Ao-EeWkNoOTovCSlw" name="CoSMgr"/>
   <packagedElement xmi:type="uml:Signal" xmi:id="_54hG8ApEEeWkNoOTovCSlw" name="create"/>
   <packagedElement xmi:type="uml:Class" xmi:id="_EP4RAArBEeWkNoOTovCSlw" name="OvcEndPoint"/>
-  <packagedElement xmi:type="uml:Class" xmi:id="_OArcsArBEeWkNoOTovCSlw" name="OvcUniEndEP (OVC Per UNI Service Attributes)">
+  <packagedElement xmi:type="uml:Class" xmi:id="_OArcsArBEeWkNoOTovCSlw" name="OvcUniEndEP">
     <generalization xmi:type="uml:Generalization" xmi:id="_lVpYAArBEeWkNoOTovCSlw" general="_EP4RAArBEeWkNoOTovCSlw"/>
     <ownedAttribute xmi:type="uml:Property" xmi:id="_m6WE8ArBEeWkNoOTovCSlw" type="_6EwOQAimEeWgbbgaC4xhOQ" association="_m6WE8wrBEeWkNoOTovCSlw">
       <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_m6WE8QrBEeWkNoOTovCSlw" value="1"/>
       <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_m6WE8grBEeWkNoOTovCSlw" value="1"/>
     </ownedAttribute>
   </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_U3fjgArBEeWkNoOTovCSlw" name="OvcEnniEndEP (OVC EP Per ENNI Attributes)">
+  <packagedElement xmi:type="uml:Class" xmi:id="_U3fjgArBEeWkNoOTovCSlw" name="OvcEnniEndEP">
     <generalization xmi:type="uml:Generalization" xmi:id="_U3fjgQrBEeWkNoOTovCSlw" general="_EP4RAArBEeWkNoOTovCSlw"/>
     <generalization xmi:type="uml:Generalization" xmi:id="_j6V3oArBEeWkNoOTovCSlw" general="_EP4RAArBEeWkNoOTovCSlw"/>
     <ownedAttribute xmi:type="uml:Property" xmi:id="_xU-QwArBEeWkNoOTovCSlw" type="_qjadYArBEeWkNoOTovCSlw" association="_xU-QwwrBEeWkNoOTovCSlw">
@@ -406,7 +438,7 @@
     </ownedEnd>
   </packagedElement>
   <packagedElement xmi:type="uml:Class" xmi:id="_Q3wd4ArJEeWkNoOTovCSlw" name="OvcMgr">
-    <nestedClassifier xmi:type="uml:Class" xmi:id="_6CdawArAEeWkNoOTovCSlw" name="Ovc (OVC Service Attributes)">
+    <nestedClassifier xmi:type="uml:Class" xmi:id="_6CdawArAEeWkNoOTovCSlw" name="Ovc">
       <ownedAttribute xmi:type="uml:Property" xmi:id="_VaLaMCEEEeWFusc4sUZ9zQ" type="_wZ4UICD_EeWFusc4sUZ9zQ" association="_VaMBQCEEEeWFusc4sUZ9zQ">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VaLaMSEEEeWFusc4sUZ9zQ" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VaLaMiEEEeWFusc4sUZ9zQ" value="*"/>
@@ -416,20 +448,6 @@
   <packagedElement xmi:type="uml:Class" xmi:id="_8d0T0ArJEeWkNoOTovCSlw" name="EnniMgr">
     <nestedClassifier xmi:type="uml:Class" xmi:id="_qjadYArBEeWkNoOTovCSlw" name="evc Enni (ENNI Service Atributes)"/>
   </packagedElement>
-  <packagedElement xmi:type="uml:Association" xmi:id="_ixUfcArUEeWkNoOTovCSlw" memberEnd="_ixUfcQrUEeWkNoOTovCSlw _ixSDMArUEeWkNoOTovCSlw">
-    <name xsi:nil="true"/>
-    <ownedEnd xmi:type="uml:Property" xmi:id="_ixUfcQrUEeWkNoOTovCSlw" name="ingress" type="_E2MvgArUEeWkNoOTovCSlw" association="_ixUfcArUEeWkNoOTovCSlw">
-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ixUfcgrUEeWkNoOTovCSlw" value="1"/>
-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ixUfcwrUEeWkNoOTovCSlw" value="1"/>
-    </ownedEnd>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Association" xmi:id="_ldfKwArUEeWkNoOTovCSlw" memberEnd="_ldfKwQrUEeWkNoOTovCSlw _ldejsArUEeWkNoOTovCSlw">
-    <name xsi:nil="true"/>
-    <ownedEnd xmi:type="uml:Property" xmi:id="_ldfKwQrUEeWkNoOTovCSlw" name="egress" type="_E2MvgArUEeWkNoOTovCSlw" association="_ldfKwArUEeWkNoOTovCSlw">
-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ldfKwgrUEeWkNoOTovCSlw" value="1"/>
-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ldfKwwrUEeWkNoOTovCSlw" value="1"/>
-    </ownedEnd>
-  </packagedElement>
   <packagedElement xmi:type="uml:Class" xmi:id="_scKW0CD-EeWFusc4sUZ9zQ" name="EvcPath">
     <ownedAttribute xmi:type="uml:Property" xmi:id="_8xtB4CD-EeWFusc4sUZ9zQ" type="_rc30MAotEeWkNoOTovCSlw" association="_8xto8CD-EeWFusc4sUZ9zQ">
       <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8xtB4SD-EeWFusc4sUZ9zQ" value="2"/>
@@ -505,27 +523,6 @@
   <packagedElement xmi:type="uml:Class" xmi:id="_f_KwkCPxEeW21PC6xbr-bA" name="ETree">
     <generalization xmi:type="uml:Generalization" xmi:id="_qWtMICPxEeW21PC6xbr-bA" general="_1_9HQArDEeWkNoOTovCSlw"/>
   </packagedElement>
-  <packagedElement xmi:type="uml:Association" xmi:id="_NXYrMCPzEeW21PC6xbr-bA" memberEnd="_NXYrMSPzEeW21PC6xbr-bA _NXXdECPzEeW21PC6xbr-bA">
-    <name xsi:nil="true"/>
-    <ownedEnd xmi:type="uml:Property" xmi:id="_NXYrMSPzEeW21PC6xbr-bA" type="_6eiEYAifEeWgbbgaC4xhOQ" association="_NXYrMCPzEeW21PC6xbr-bA">
-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NXYrMiPzEeW21PC6xbr-bA" value="1"/>
-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NXYrMyPzEeW21PC6xbr-bA" value="1"/>
-    </ownedEnd>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Association" xmi:id="_Os2pUyPzEeW21PC6xbr-bA" memberEnd="_Os2pVCPzEeW21PC6xbr-bA _Os2pUCPzEeW21PC6xbr-bA">
-    <name xsi:nil="true"/>
-    <ownedEnd xmi:type="uml:Property" xmi:id="_Os2pVCPzEeW21PC6xbr-bA" type="_rc30MAotEeWkNoOTovCSlw" association="_Os2pUyPzEeW21PC6xbr-bA">
-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Os2pVSPzEeW21PC6xbr-bA" value="1"/>
-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Os2pViPzEeW21PC6xbr-bA" value="1"/>
-    </ownedEnd>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Association" xmi:id="_cg_uoCPzEeW21PC6xbr-bA" memberEnd="_cg_uoSPzEeW21PC6xbr-bA _cg_HkCPzEeW21PC6xbr-bA">
-    <name xsi:nil="true"/>
-    <ownedEnd xmi:type="uml:Property" xmi:id="_cg_uoSPzEeW21PC6xbr-bA" type="_6EwOQAimEeWgbbgaC4xhOQ" association="_cg_uoCPzEeW21PC6xbr-bA">
-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_cg_uoiPzEeW21PC6xbr-bA" value="1"/>
-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cg_uoyPzEeW21PC6xbr-bA" value="1"/>
-    </ownedEnd>
-  </packagedElement>
   <packagedElement xmi:type="uml:Association" xmi:id="_ZVY0oCP7EeWgfeI19M_f4A" visibility="protected" memberEnd="_ZVY0oSP7EeWgfeI19M_f4A _ZVUjMCP7EeWgfeI19M_f4A">
     <name xsi:nil="true"/>
     <ownedEnd xmi:type="uml:Property" xmi:id="_ZVY0oSP7EeWgfeI19M_f4A" type="_6EwOQAimEeWgbbgaC4xhOQ" association="_ZVY0oCP7EeWgfeI19M_f4A">
@@ -548,6 +545,308 @@
       <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gV7wky-_EeWtJpOtnfchGg" value="1"/>
     </ownedEnd>
   </packagedElement>
+  <packagedElement xmi:type="uml:DataType" xmi:id="_df9p8GO9EeWQv9mZwpAw9Q" name="UniUniTypePair">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_xhF18GO9EeWAFfMNIf5-6Q" name="UniId" type="_PhJwUAilEeWgbbgaC4xhOQ"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_ZYheAGO-EeWAFfMNIf5-6Q" name="uniRole" type="_BbJe4GO-EeWAFfMNIf5-6Q"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Enumeration" xmi:id="_BbJe4GO-EeWAFfMNIf5-6Q" name="UniRole">
+    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_BbJe4WO-EeWAFfMNIf5-6Q" name="ROOT"/>
+    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_BbJe4mO-EeWAFfMNIf5-6Q" name="LEAF"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_WxLusGPGEeWAFfMNIf5-6Q" name="OneWayFrameDelay">
+    <generalization xmi:type="uml:Generalization" xmi:id="_DMfqQGPKEeWyNbIEfiGf0A" general="_crT1sGPEEeWAFfMNIf5-6Q"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_prmp8GPJEeWyNbIEfiGf0A" name="Pd">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_tJqsQGPJEeWyNbIEfiGf0A" name="Pr">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_wAdTMGPJEeWyNbIEfiGf0A" name="d">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_24TUwGPJEeWyNbIEfiGf0A" name="dr">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_54KYIGPJEeWyNbIEfiGf0A" name="u">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:DataType" xmi:id="_i-GFkGPIEeWyNbIEfiGf0A" name="UniPair">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_lh--oGPIEeWyNbIEfiGf0A" name="uni1Id" type="_PhJwUAilEeWgbbgaC4xhOQ">
+      <qualifier xmi:type="uml:Property" xmi:id="_rxkGUGPIEeWyNbIEfiGf0A" name="uni1Id" type="_PhJwUAilEeWgbbgaC4xhOQ"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_soJwEGPIEeWyNbIEfiGf0A" name="uni2Id" type="_PhJwUAilEeWgbbgaC4xhOQ"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_JMaTYGPMEeWyNbIEfiGf0A" name="OneWayInterFrameDelayVariation">
+    <generalization xmi:type="uml:Generalization" xmi:id="_JMaTYWPMEeWyNbIEfiGf0A" general="_crT1sGPEEeWAFfMNIf5-6Q"/>
+    <generalization xmi:type="uml:Generalization" xmi:id="_QoOksGPMEeWyNbIEfiGf0A" general="_crT1sGPEEeWAFfMNIf5-6Q"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_JMaTZmPMEeWyNbIEfiGf0A" name="Pv">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_JMaTZ2PMEeWyNbIEfiGf0A" name="dt">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_JMaTaGPMEeWyNbIEfiGf0A" name="d">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_kvXAIGPOEeWyNbIEfiGf0A" name="OneWayFrameLossRatio">
+    <generalization xmi:type="uml:Generalization" xmi:id="_kvXAIWPOEeWyNbIEfiGf0A" general="_crT1sGPEEeWAFfMNIf5-6Q"/>
+    <generalization xmi:type="uml:Generalization" xmi:id="_kvXAImPOEeWyNbIEfiGf0A" general="_crT1sGPEEeWAFfMNIf5-6Q"/>
+    <generalization xmi:type="uml:Generalization" xmi:id="_yb3MYGPOEeWyNbIEfiGf0A" general="_crT1sGPEEeWAFfMNIf5-6Q"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_kvXAI2POEeWyNbIEfiGf0A" name="L">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_-dVaMGPOEeWyNbIEfiGf0A" name="OneWayAvailability">
+    <generalization xmi:type="uml:Generalization" xmi:id="_-dVaMWPOEeWyNbIEfiGf0A" general="_crT1sGPEEeWAFfMNIf5-6Q"/>
+    <generalization xmi:type="uml:Generalization" xmi:id="_-dVaMmPOEeWyNbIEfiGf0A" general="_crT1sGPEEeWAFfMNIf5-6Q"/>
+    <generalization xmi:type="uml:Generalization" xmi:id="_XGikkGPPEeWyNbIEfiGf0A" general="_crT1sGPEEeWAFfMNIf5-6Q"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_-dVaNGPOEeWyNbIEfiGf0A" name="dt">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_-dVaNWPOEeWyNbIEfiGf0A" name="C">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
+      <qualifier xmi:type="uml:Property" xmi:id="_E5T_IGPPEeWyNbIEfiGf0A" name="C">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
+      </qualifier>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_H_WjAGPPEeWyNbIEfiGf0A" name="n">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_Pkr8sGPPEeWyNbIEfiGf0A" name="A">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_dl5_QGPQEeWyNbIEfiGf0A" name="OneWayResiliency">
+    <generalization xmi:type="uml:Generalization" xmi:id="_dl5_QWPQEeWyNbIEfiGf0A" general="_crT1sGPEEeWAFfMNIf5-6Q"/>
+    <generalization xmi:type="uml:Generalization" xmi:id="_dl5_QmPQEeWyNbIEfiGf0A" general="_crT1sGPEEeWAFfMNIf5-6Q"/>
+    <generalization xmi:type="uml:Generalization" xmi:id="_dl5_Q2PQEeWyNbIEfiGf0A" general="_crT1sGPEEeWAFfMNIf5-6Q"/>
+    <generalization xmi:type="uml:Generalization" xmi:id="_kf588GPQEeWyNbIEfiGf0A" general="_crT1sGPEEeWAFfMNIf5-6Q"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_dl5_RGPQEeWyNbIEfiGf0A" name="dt">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_dl5_RWPQEeWyNbIEfiGf0A" name="C">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
+      <qualifier xmi:type="uml:Property" xmi:id="_dl5_RmPQEeWyNbIEfiGf0A" name="C">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
+      </qualifier>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_dl5_R2PQEeWyNbIEfiGf0A" name="p">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_dl5_SGPQEeWyNbIEfiGf0A" name="L">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_0bUQwGPQEeWyNbIEfiGf0A" name="B">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+    </ownedAttribute>
+    <nestedClassifier xmi:type="uml:Class" xmi:id="_F3InYGPREeWyNbIEfiGf0A" name="OneWayResiliency">
+      <generalization xmi:type="uml:Generalization" xmi:id="_F3InYWPREeWyNbIEfiGf0A" general="_crT1sGPEEeWAFfMNIf5-6Q"/>
+      <generalization xmi:type="uml:Generalization" xmi:id="_F3InYmPREeWyNbIEfiGf0A" general="_crT1sGPEEeWAFfMNIf5-6Q"/>
+      <generalization xmi:type="uml:Generalization" xmi:id="_F3InY2PREeWyNbIEfiGf0A" general="_crT1sGPEEeWAFfMNIf5-6Q"/>
+      <generalization xmi:type="uml:Generalization" xmi:id="_F3InZGPREeWyNbIEfiGf0A" general="_crT1sGPEEeWAFfMNIf5-6Q"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_F3InZWPREeWyNbIEfiGf0A" name="dt">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_F3InZmPREeWyNbIEfiGf0A" name="C">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
+        <qualifier xmi:type="uml:Property" xmi:id="_F3InZ2PREeWyNbIEfiGf0A" name="C">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
+        </qualifier>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_F3InaGPREeWyNbIEfiGf0A" name="p">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_F3InaWPREeWyNbIEfiGf0A" name="L">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_F3InamPREeWyNbIEfiGf0A" name="B">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+      </ownedAttribute>
+    </nestedClassifier>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_M3CYwGPREeWyNbIEfiGf0A" name="OneWayGroupAvailability">
+    <generalization xmi:type="uml:Generalization" xmi:id="_M3CYwWPREeWyNbIEfiGf0A" general="_crT1sGPEEeWAFfMNIf5-6Q"/>
+    <generalization xmi:type="uml:Generalization" xmi:id="_M3CYwmPREeWyNbIEfiGf0A" general="_crT1sGPEEeWAFfMNIf5-6Q"/>
+    <generalization xmi:type="uml:Generalization" xmi:id="_M3CYw2PREeWyNbIEfiGf0A" general="_crT1sGPEEeWAFfMNIf5-6Q"/>
+    <generalization xmi:type="uml:Generalization" xmi:id="_M3CYxGPREeWyNbIEfiGf0A" general="_crT1sGPEEeWAFfMNIf5-6Q"/>
+    <generalization xmi:type="uml:Generalization" xmi:id="_kvsP8GPREeWyNbIEfiGf0A" general="_crT1sGPEEeWAFfMNIf5-6Q"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_M3CYxWPREeWyNbIEfiGf0A" name="dt">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_M3CYxmPREeWyNbIEfiGf0A" name="C">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
+      <qualifier xmi:type="uml:Property" xmi:id="_M3CYx2PREeWyNbIEfiGf0A" name="C">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
+      </qualifier>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_M3CYyGPREeWyNbIEfiGf0A" name="K">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_M3CYyWPREeWyNbIEfiGf0A" name="n">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_M3CYymPREeWyNbIEfiGf0A" name="Ag">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
+    </ownedAttribute>
+    <nestedClassifier xmi:type="uml:Class" xmi:id="_M3CYy2PREeWyNbIEfiGf0A" name="OneWayResiliency">
+      <generalization xmi:type="uml:Generalization" xmi:id="_M3CYzGPREeWyNbIEfiGf0A" general="_crT1sGPEEeWAFfMNIf5-6Q"/>
+      <generalization xmi:type="uml:Generalization" xmi:id="_M3CYzWPREeWyNbIEfiGf0A" general="_crT1sGPEEeWAFfMNIf5-6Q"/>
+      <generalization xmi:type="uml:Generalization" xmi:id="_M3CYzmPREeWyNbIEfiGf0A" general="_crT1sGPEEeWAFfMNIf5-6Q"/>
+      <generalization xmi:type="uml:Generalization" xmi:id="_M3CYz2PREeWyNbIEfiGf0A" general="_crT1sGPEEeWAFfMNIf5-6Q"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_M3CY0GPREeWyNbIEfiGf0A" name="dt">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_M3CY0WPREeWyNbIEfiGf0A" name="C">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
+        <qualifier xmi:type="uml:Property" xmi:id="_M3CY0mPREeWyNbIEfiGf0A" name="C">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
+        </qualifier>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_M3CY02PREeWyNbIEfiGf0A" name="p">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_M3CY1GPREeWyNbIEfiGf0A" name="L">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_M3CY1WPREeWyNbIEfiGf0A" name="B">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+      </ownedAttribute>
+    </nestedClassifier>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Association" xmi:id="_V311c2PSEeWyNbIEfiGf0A" name="EVCPerformance" memberEnd="_V311dGPSEeWyNbIEfiGf0A _V311cGPSEeWyNbIEfiGf0A">
+    <ownedEnd xmi:type="uml:Property" xmi:id="_V311dGPSEeWyNbIEfiGf0A" type="_6eiEYAifEeWgbbgaC4xhOQ" association="_V311c2PSEeWyNbIEfiGf0A">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_V311dWPSEeWyNbIEfiGf0A"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_V311dmPSEeWyNbIEfiGf0A" value="1"/>
+    </ownedEnd>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_C_wDMGPUEeWyNbIEfiGf0A" name="SLSMgr">
+    <nestedClassifier xmi:type="uml:Class" xmi:id="_2M7bgGPUEeWyNbIEfiGf0A" name="CoSRepo">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_qXCnsGX6EeWycoIPYbKzNg" type="_ULm8wGX5EeWycoIPYbKzNg" association="_qXDOwGX6EeWycoIPYbKzNg">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qXCnsWX6EeWycoIPYbKzNg"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qXCnsmX6EeWycoIPYbKzNg" value="*"/>
+      </ownedAttribute>
+    </nestedClassifier>
+    <nestedClassifier xmi:type="uml:Class" xmi:id="_QG7s4GbqEeWGp9Z_qQVBGA" name="BWProfileRepo">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_fbVEAGbqEeWGp9Z_qQVBGA" type="_HUlpMGYIEeWycoIPYbKzNg" association="_fbWSIGbqEeWGp9Z_qQVBGA">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_fbVEAWbqEeWGp9Z_qQVBGA"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fbVEAmbqEeWGp9Z_qQVBGA" value="*"/>
+      </ownedAttribute>
+    </nestedClassifier>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_crT1sGPEEeWAFfMNIf5-6Q" name="CosPerformanceMetric" visibility="protected">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_Oi2CAGPLEeWyNbIEfiGf0A" name="cosName">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_1iqpcGPHEeWyNbIEfiGf0A" name="T">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_JMaTY2PMEeWyNbIEfiGf0A" name="S" type="_i-GFkGPIEeWyNbIEfiGf0A">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_JMaTZGPMEeWyNbIEfiGf0A"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JMaTZWPMEeWyNbIEfiGf0A" value="*"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_ULm8wGX5EeWycoIPYbKzNg" name="CoSName">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_ULm8wWX5EeWycoIPYbKzNg" name="name">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_Pu_yEGX6EeWycoIPYbKzNg" type="_crT1sGPEEeWAFfMNIf5-6Q" association="_PvAZIGX6EeWycoIPYbKzNg">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Pu_yEWX6EeWycoIPYbKzNg"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Pu_yEmX6EeWycoIPYbKzNg" value="*"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Association" xmi:id="_PvAZIGX6EeWycoIPYbKzNg" name="performanceMetrics" memberEnd="_PvAZIWX6EeWycoIPYbKzNg _Pu_yEGX6EeWycoIPYbKzNg">
+    <ownedEnd xmi:type="uml:Property" xmi:id="_PvAZIWX6EeWycoIPYbKzNg" type="_ULm8wGX5EeWycoIPYbKzNg" association="_PvAZIGX6EeWycoIPYbKzNg">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_PvAZImX6EeWycoIPYbKzNg" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PvAZI2X6EeWycoIPYbKzNg" value="1"/>
+    </ownedEnd>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Association" xmi:id="_qXDOwGX6EeWycoIPYbKzNg" name="cosList" memberEnd="_qXDOwWX6EeWycoIPYbKzNg _qXCnsGX6EeWycoIPYbKzNg">
+    <ownedEnd xmi:type="uml:Property" xmi:id="_qXDOwWX6EeWycoIPYbKzNg" type="_2M7bgGPUEeWyNbIEfiGf0A" association="_qXDOwGX6EeWycoIPYbKzNg">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qXDOwmX6EeWycoIPYbKzNg" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qXDOw2X6EeWycoIPYbKzNg" value="1"/>
+    </ownedEnd>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_HUlpMGYIEeWycoIPYbKzNg" name="BandwidthProfile">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_HUlpMWYIEeWycoIPYbKzNg" type="_rc30MAotEeWkNoOTovCSlw">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HUlpMmYIEeWycoIPYbKzNg" value="2"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HUlpM2YIEeWycoIPYbKzNg" value="2"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_HUlpNGYIEeWycoIPYbKzNg" type="_wZ4UICD_EeWFusc4sUZ9zQ">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HUlpNWYIEeWycoIPYbKzNg"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HUlpNmYIEeWycoIPYbKzNg" value="*"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_HUlpN2YIEeWycoIPYbKzNg" type="_OnjDQC-_EeWtJpOtnfchGg">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HUlpOGYIEeWycoIPYbKzNg"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HUlpOWYIEeWycoIPYbKzNg" value="*"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_tLpU8GYIEeWycoIPYbKzNg" name="name">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_Dc1poGYKEeWisPYqI1z_rA" type="_8JT2EAidEeWgbbgaC4xhOQ" association="_Dc2QsGYKEeWisPYqI1z_rA">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Dc1poWYKEeWisPYqI1z_rA"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Dc1pomYKEeWisPYqI1z_rA" value="*"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_VLT3oGboEeWGp9Z_qQVBGA" name="CFo">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Association" xmi:id="_Dc2QsGYKEeWisPYqI1z_rA" name="BWProfileFlows" memberEnd="_Dc2QsWYKEeWisPYqI1z_rA _Dc1poGYKEeWisPYqI1z_rA">
+    <ownedEnd xmi:type="uml:Property" xmi:id="_Dc2QsWYKEeWisPYqI1z_rA" type="_HUlpMGYIEeWycoIPYbKzNg" association="_Dc2QsGYKEeWisPYqI1z_rA">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Dc2QsmYKEeWisPYqI1z_rA" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Dc2Qs2YKEeWisPYqI1z_rA" value="1"/>
+    </ownedEnd>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Enumeration" xmi:id="_vO9wMGYLEeWIk-zXg3ayAw" name="ColorMode">
+    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_vO9wMWYLEeWIk-zXg3ayAw" name="COLOR-AWARE"/>
+    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_vO9wMmYLEeWIk-zXg3ayAw" name="COLOR-BLIND"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_dEHjwGbkEeWGp9Z_qQVBGA" name="DataFrameCoSIdMap">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_9KEzkGbkEeWGp9Z_qQVBGA" name="cosIDStart">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_9_YD4GbkEeWGp9Z_qQVBGA" name="cosIDEnd"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_EggOkGblEeWGp9Z_qQVBGA" name="cosName">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Enumeration" xmi:id="_61z1cGblEeWGp9Z_qQVBGA" name="DataFrameCosId">
+    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_61z1cWblEeWGp9Z_qQVBGA" name="EVC"/>
+    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_61z1cmblEeWGp9Z_qQVBGA" name="CE_VLAN"/>
+    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_VHZ58GbmEeWGp9Z_qQVBGA" name="IP"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Association" xmi:id="_n8TjY2bmEeWGp9Z_qQVBGA" name="dataFrameCoSIdMap" memberEnd="_n8TjZGbmEeWGp9Z_qQVBGA _n8TjYGbmEeWGp9Z_qQVBGA">
+    <ownedEnd xmi:type="uml:Property" xmi:id="_n8TjZGbmEeWGp9Z_qQVBGA" type="_rc30MAotEeWkNoOTovCSlw" association="_n8TjY2bmEeWGp9Z_qQVBGA">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_n8TjZWbmEeWGp9Z_qQVBGA" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_n8TjZmbmEeWGp9Z_qQVBGA" value="1"/>
+    </ownedEnd>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_O3MYwGbpEeWGp9Z_qQVBGA" name="IngressBWProflesCoSIdMap">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_O3MYwWbpEeWGp9Z_qQVBGA" name="cosIDStart">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_O3MYwmbpEeWGp9Z_qQVBGA" name="cosIDEnd"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_O3MYw2bpEeWGp9Z_qQVBGA" name="BWProfileName">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_7QErYGbsEeWGp9Z_qQVBGA" name="BWProfileFlowIdx">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Association" xmi:id="_fbWSIGbqEeWGp9Z_qQVBGA" name="BWProfileList" memberEnd="_fbWSIWbqEeWGp9Z_qQVBGA _fbVEAGbqEeWGp9Z_qQVBGA">
+    <ownedEnd xmi:type="uml:Property" xmi:id="_fbWSIWbqEeWGp9Z_qQVBGA" type="_QG7s4GbqEeWGp9Z_qQVBGA" association="_fbWSIGbqEeWGp9Z_qQVBGA">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_fbWSImbqEeWGp9Z_qQVBGA" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fbWSI2bqEeWGp9Z_qQVBGA" value="1"/>
+    </ownedEnd>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Association" xmi:id="_0XrFo2brEeWGp9Z_qQVBGA" name="IngressBWProfileCosIDMap" memberEnd="_0XrFpGbrEeWGp9Z_qQVBGA _0XrFoGbrEeWGp9Z_qQVBGA">
+    <ownedEnd xmi:type="uml:Property" xmi:id="_0XrFpGbrEeWGp9Z_qQVBGA" type="_rc30MAotEeWkNoOTovCSlw" association="_0XrFo2brEeWGp9Z_qQVBGA">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0XrFpWbrEeWGp9Z_qQVBGA" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0XrFpmbrEeWGp9Z_qQVBGA" value="1"/>
+    </ownedEnd>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_SuQwsGeIEeWmi5ydVYW0lA" name="Host"/>
   <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_a15EkAoREeWNdNIyeR54mg">
     <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a2I8MAoREeWNdNIyeR54mg" source="http://www.eclipse.org/uml2/2.0.0/UML">
       <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_sYse0YZLEeKyw49uR6nx3g"/>
author	SteveAtSentosa <steve@sentosatech.com>	2015-10-02 15:46:08 -0600
committer	SteveAtSentosa <steve@sentosatech.com>	2015-10-02 15:46:53 -0600
commit	97c32a1ef1a91d9c8251154a7b15eba2605d5018 (patch)
tree	89d705c697f6a1503708b3a5381af4df54a60f0d /model
parent	e257faf98c345415b8d3d9e582f0fe27f8206567 (diff)