Example Model: Align diagrams, switch to private state and add comments

Change-Id: I41a7da8d8bbc9e9cab5fb4f5c3d49daf3ec68ed7
Signed-off-by: Philip Langer <planger@eclipsesource.com>
Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>
diff --git a/examples/org.eclipse.papyrus.information.modeling.examples/ProjectManagement/DataTypes.notation b/examples/org.eclipse.papyrus.information.modeling.examples/ProjectManagement/DataTypes.notation
index 29ac50a..88a80c0 100644
--- a/examples/org.eclipse.papyrus.information.modeling.examples/ProjectManagement/DataTypes.notation
+++ b/examples/org.eclipse.papyrus.information.modeling.examples/ProjectManagement/DataTypes.notation
@@ -33,7 +33,7 @@
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_im7bZizBEeaEGtvmx1EULw"/>
         </children>
         <element xmi:type="uml:DataType" href="DataTypes.uml#_im60QSzBEeaEGtvmx1EULw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_im7baizBEeaEGtvmx1EULw" x="14" y="10" width="161"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_im7baizBEeaEGtvmx1EULw" x="14" y="10" width="160" height="120"/>
       </children>
       <children xmi:type="notation:Shape" xmi:id="_nOzOUC6CEeacqrhFmauLrw" type="DataType_Shape_CN">
         <children xmi:type="notation:DecorationNode" xmi:id="_nOzOUi6CEeacqrhFmauLrw" type="DataType_NameLabel_CN"/>
@@ -61,7 +61,7 @@
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nOz1aS6CEeacqrhFmauLrw"/>
         </children>
         <element xmi:type="uml:DataType" href="DataTypes.uml#_nOwLAC6CEeacqrhFmauLrw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nOzOUS6CEeacqrhFmauLrw" x="194" y="10" width="133"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nOzOUS6CEeacqrhFmauLrw" x="194" y="10" width="133" height="120"/>
       </children>
       <children xmi:type="notation:Shape" xmi:id="_yf6WMC6CEeacqrhFmauLrw" type="DataType_Shape_CN">
         <children xmi:type="notation:DecorationNode" xmi:id="_yf6WMS6CEeacqrhFmauLrw" type="DataType_NameLabel_CN"/>
@@ -89,7 +89,7 @@
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yf6WQS6CEeacqrhFmauLrw"/>
         </children>
         <element xmi:type="uml:DataType" href="DataTypes.uml#_yf5IEC6CEeacqrhFmauLrw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yf6WRS6CEeacqrhFmauLrw" x="346" y="10" width="133"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yf6WRS6CEeacqrhFmauLrw" x="346" y="10" width="133" height="120"/>
       </children>
       <children xmi:type="notation:Shape" xmi:id="_8SrQwC6CEeacqrhFmauLrw" type="Enumeration_Shape_CN">
         <children xmi:type="notation:DecorationNode" xmi:id="_8Sr30C6CEeacqrhFmauLrw" type="Enumeration_NameLabel_CN"/>
@@ -121,7 +121,7 @@
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tz0doyzZEea8G-9zdH7vYw"/>
     </children>
     <element xmi:type="uml:Package" href="DataTypes.uml#_tzuXACzZEea8G-9zdH7vYw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tzz2kSzZEea8G-9zdH7vYw" x="20" y="16" width="622" height="175"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tzz2kSzZEea8G-9zdH7vYw" x="20" y="16" width="633" height="184"/>
   </children>
   <styles xmi:type="notation:StringValueStyle" xmi:id="_g4tmASzBEeaEGtvmx1EULw" name="diagram_compatibility_version" stringValue="1.2.0"/>
   <styles xmi:type="notation:DiagramStyle" xmi:id="_g4tmAizBEeaEGtvmx1EULw"/>
diff --git a/examples/org.eclipse.papyrus.information.modeling.examples/ProjectManagement/ProjectManagement.di b/examples/org.eclipse.papyrus.information.modeling.examples/ProjectManagement/ProjectManagement.di
index 4736309..bf9abab 100644
--- a/examples/org.eclipse.papyrus.information.modeling.examples/ProjectManagement/ProjectManagement.di
+++ b/examples/org.eclipse.papyrus.information.modeling.examples/ProjectManagement/ProjectManagement.di
@@ -1,24 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
-    <windows>
-      <children xsi:type="di:TabFolder">
-        <children>
-          <emfPageIdentifier href="papyrus.welcome:dynamic#/"/>
-        </children>
-        <children>
-          <emfPageIdentifier href="ProjectManagement.notation#_W4UzUC57EeacqrhFmauLrw"/>
-        </children>
-        <children>
-          <emfPageIdentifier href="ProjectManagement.notation#_DnXDgC58EeacqrhFmauLrw"/>
-        </children>
-        <children>
-          <emfPageIdentifier href="ProjectManagement.notation#_4L5FwC57EeacqrhFmauLrw"/>
-        </children>
-        <children>
-          <emfPageIdentifier href="ProjectManagement.notation#_NtDrsC59EeacqrhFmauLrw"/>
-        </children>
-      </children>
-    </windows>
-  </sashModel>
-</di:SashWindowsMngr>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/examples/org.eclipse.papyrus.information.modeling.examples/ProjectManagement/ProjectManagement.notation b/examples/org.eclipse.papyrus.information.modeling.examples/ProjectManagement/ProjectManagement.notation
index 754d9cc..e642da5 100644
--- a/examples/org.eclipse.papyrus.information.modeling.examples/ProjectManagement/ProjectManagement.notation
+++ b/examples/org.eclipse.papyrus.information.modeling.examples/ProjectManagement/ProjectManagement.notation
@@ -13,7 +13,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dx56Qy57EeacqrhFmauLrw"/>
       </children>
       <element xmi:type="uml:Package" href="ProjectManagement.uml#_dxuUEC57EeacqrhFmauLrw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dx4FES57EeacqrhFmauLrw" x="98" y="278"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dx4FES57EeacqrhFmauLrw" x="98" y="259"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_f72CQC57EeacqrhFmauLrw" type="Package_Shape">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_bbuw0C7uEeaQWPj9PM9XcQ" source="PapyrusHyperLink_Page" references="_NtDrsC59EeacqrhFmauLrw">
@@ -27,7 +27,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f72pUy57EeacqrhFmauLrw"/>
       </children>
       <element xmi:type="uml:Package" href="ProjectManagement.uml#_f700IC57EeacqrhFmauLrw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f72CQS57EeacqrhFmauLrw" x="346" y="278" height="100"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f72CQS57EeacqrhFmauLrw" x="357" y="259" height="100"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_hdzkQC57EeacqrhFmauLrw" type="Package_Shape">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fDceYC7uEeaQWPj9PM9XcQ" source="PapyrusHyperLink_Page" references="_DnXDgC58EeacqrhFmauLrw">
@@ -41,7 +41,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hd0LUy57EeacqrhFmauLrw"/>
       </children>
       <element xmi:type="uml:Package" href="ProjectManagement.uml#_hdxvEC57EeacqrhFmauLrw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hdzkQS57EeacqrhFmauLrw" x="98" y="114"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hdzkQS57EeacqrhFmauLrw" x="98" y="96"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_oATn8C57EeacqrhFmauLrw" type="Package_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_oAUPAC57EeacqrhFmauLrw" type="Package_NameLabel"/>
@@ -50,12 +50,12 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oAUPAy57EeacqrhFmauLrw"/>
       </children>
       <element xmi:type="uml:Package" href="DataTypes.uml#_tzuXACzZEea8G-9zdH7vYw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oATn8S57EeacqrhFmauLrw" x="98" y="448"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oATn8S57EeacqrhFmauLrw" x="98" y="418"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_5rTt0C7uEeaQWPj9PM9XcQ" type="Comment_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_5rTt0i7uEeaQWPj9PM9XcQ" type="Comment_BodyLabel"/>
       <element xmi:type="uml:Comment" href="ProjectManagement.uml#_5rNnMC7uEeaQWPj9PM9XcQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5rTt0S7uEeaQWPj9PM9XcQ" x="399" y="198" width="201" height="41"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5rTt0S7uEeaQWPj9PM9XcQ" x="356" y="91" width="201" height="41"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_03i3gC8oEeaDELFt-ELOvw" type="Comment_Shape" fillColor="15592411">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_03i3gS8oEeaDELFt-ELOvw" source="PapyrusCSSForceValue">
@@ -64,7 +64,12 @@
       </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_03i3hC8oEeaDELFt-ELOvw" type="Comment_BodyLabel"/>
       <element xmi:type="uml:Comment" href="ProjectManagement.uml#_03gbQC8oEeaDELFt-ELOvw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_03i3hS8oEeaDELFt-ELOvw" x="38" y="26" width="489" height="34"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_03i3hS8oEeaDELFt-ELOvw" x="26" y="24" width="531" height="29"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_GGECID1EEeaeMKxSH8FZ1Q" type="Comment_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_GGECIT1EEeaeMKxSH8FZ1Q" type="Comment_BodyLabel"/>
+      <element xmi:type="uml:Comment" href="ProjectManagement.uml#_GF_JoD1EEeaeMKxSH8FZ1Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GGECIj1EEeaeMKxSH8FZ1Q" x="411" y="377" width="301" height="41"/>
     </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_W4UzUS57EeacqrhFmauLrw" name="diagram_compatibility_version" stringValue="1.2.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_W4UzUi57EeacqrhFmauLrw"/>
@@ -80,18 +85,18 @@
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_r8ctYS57EeacqrhFmauLrw"/>
       <element xmi:type="uml:PackageImport" href="ProjectManagement.uml#_r8SVUC57EeacqrhFmauLrw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_r8ctYi57EeacqrhFmauLrw" points="[-20, 246, -643984, -643984]$[85, 345, -643984, -643984]"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_r8ctYi57EeacqrhFmauLrw" points="[-20, 228, -643984, -643984]$[85, 327, -643984, -643984]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_r8uaMC57EeacqrhFmauLrw" id="(0.55,1.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_r8vBQC57EeacqrhFmauLrw" id="(0.55,0.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_xAYhUC57EeacqrhFmauLrw" type="PackageImport_Edge" source="_hdzkQC57EeacqrhFmauLrw" target="_oATn8C57EeacqrhFmauLrw">
       <children xmi:type="notation:DecorationNode" xmi:id="_xAYhUy57EeacqrhFmauLrw" type="PackageImport_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_hECj8C58EeacqrhFmauLrw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xAYhVC57EeacqrhFmauLrw" x="-1" y="65"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xAYhVC57EeacqrhFmauLrw" x="-2" y="58"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_xAYhUS57EeacqrhFmauLrw"/>
       <element xmi:type="uml:PackageImport" href="ProjectManagement.uml#_xANiMC57EeacqrhFmauLrw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xAYhUi57EeacqrhFmauLrw" points="[98, 194, -643984, -643984]$[55, 194, -643984, -643984]$[55, 485, -643984, -643984]$[98, 485, -643984, -643984]"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xAYhUi57EeacqrhFmauLrw" points="[98, 176, -643984, -643984]$[55, 176, -643984, -643984]$[55, 455, -643984, -643984]$[98, 455, -643984, -643984]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xAl8sC57EeacqrhFmauLrw" id="(0.0,0.8)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xAmjwC57EeacqrhFmauLrw" id="(0.0,0.37)"/>
     </edges>
@@ -102,29 +107,29 @@
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_P8fNIS58EeacqrhFmauLrw"/>
       <element xmi:type="uml:PackageImport" href="ProjectManagement.uml#_P8a7sC58EeacqrhFmauLrw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_P8fNIi58EeacqrhFmauLrw" points="[98, 236, -643984, -643984]$[41, 236, -643984, -643984]"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_P8fNIi58EeacqrhFmauLrw" points="[98, 218, -643984, -643984]$[41, 218, -643984, -643984]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_P8o-IC58EeacqrhFmauLrw" id="(0.53,1.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_P8o-IS58EeacqrhFmauLrw" id="(0.53,0.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_Lf2NQC59EeacqrhFmauLrw" type="PackageImport_Edge" source="_f72CQC57EeacqrhFmauLrw" target="_oATn8C57EeacqrhFmauLrw">
       <children xmi:type="notation:DecorationNode" xmi:id="_Lf2NQy59EeacqrhFmauLrw" type="PackageImport_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_4P3U4C59EeacqrhFmauLrw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Lf20UC59EeacqrhFmauLrw" x="7" y="55"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Lf20UC59EeacqrhFmauLrw" y="58"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_Lf2NQS59EeacqrhFmauLrw"/>
       <element xmi:type="uml:PackageImport" href="ProjectManagement.uml#_LfxUwC59EeacqrhFmauLrw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Lf2NQi59EeacqrhFmauLrw" points="[375, 365, -643984, -643984]$[375, 491, -643984, -643984]$[298, 491, -643984, -643984]"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Lf2NQi59EeacqrhFmauLrw" points="[386, 359, -643984, -643984]$[386, 461, -643984, -643984]$[298, 461, -643984, -643984]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LgGE4C59EeacqrhFmauLrw" id="(0.145,1.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LgGr8C59EeacqrhFmauLrw" id="(1.0,0.43)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_L_WMsC59EeacqrhFmauLrw" type="PackageImport_Edge" source="_f72CQC57EeacqrhFmauLrw" target="_hdzkQC57EeacqrhFmauLrw">
       <children xmi:type="notation:DecorationNode" xmi:id="_L_WMsy59EeacqrhFmauLrw" type="PackageImport_StereotypeLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_-Gr-UC59EeacqrhFmauLrw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_L_WMtC59EeacqrhFmauLrw" x="20" y="-42"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_L_WMtC59EeacqrhFmauLrw" x="55" y="12"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_L_WMsS59EeacqrhFmauLrw"/>
       <element xmi:type="uml:PackageImport" href="ProjectManagement.uml#_L_R7QC59EeacqrhFmauLrw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_L_WMsi59EeacqrhFmauLrw" points="[375, 265, -643984, -643984]$[375, 197, -643984, -643984]$[298, 197, -643984, -643984]"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_L_WMsi59EeacqrhFmauLrw" points="[386, 259, -643984, -643984]$[386, 179, -643984, -643984]$[298, 179, -643984, -643984]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_L_jBAC59EeacqrhFmauLrw" id="(0.145,0.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_L_jBAS59EeacqrhFmauLrw" id="(1.0,0.83)"/>
     </edges>
@@ -135,10 +140,31 @@
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_57rWcS59EeacqrhFmauLrw"/>
       <element xmi:type="uml:PackageImport" href="ProjectManagement.uml#_57md8C59EeacqrhFmauLrw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_57rWci59EeacqrhFmauLrw" points="[346, 331, -643984, -643984]$[285, 331, -643984, -643984]"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_57rWci59EeacqrhFmauLrw" points="[346, 313, -643984, -643984]$[285, 313, -643984, -643984]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_573jsC59EeacqrhFmauLrw" id="(0.0,0.53)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_573jsS59EeacqrhFmauLrw" id="(1.0,0.53)"/>
     </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_qdXLUD1EEeaeMKxSH8FZ1Q" type="Comment_AnnotatedElementEdge" source="_GGECID1EEeaeMKxSH8FZ1Q" target="_oATn8C57EeacqrhFmauLrw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_qdXLUT1EEeaeMKxSH8FZ1Q"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qdXLUj1EEeaeMKxSH8FZ1Q" points="[408, 411, -643984, -643984]$[298, 475, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qdyCED1EEeaeMKxSH8FZ1Q" id="(0.0,0.7687074829931972)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qdyCET1EEeaeMKxSH8FZ1Q" id="(1.0,0.72)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_yisTsD1EEeaeMKxSH8FZ1Q" type="Comment_AnnotatedElementEdge" source="_5rTt0C7uEeaQWPj9PM9XcQ" target="_hdzkQC57EeacqrhFmauLrw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_yisTsT1EEeaeMKxSH8FZ1Q"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_yisTsj1EEeaeMKxSH8FZ1Q" points="[385, 133, -643984, -643984]$[385, 156, -643984, -643984]$[298, 156, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yjIYkD1EEeaeMKxSH8FZ1Q" id="(0.14427860696517414,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yjIYkT1EEeaeMKxSH8FZ1Q" id="(1.0,0.6)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_zRn2QD1EEeaeMKxSH8FZ1Q" type="Comment_AnnotatedElementEdge" source="_5rTt0C7uEeaQWPj9PM9XcQ" target="_f72CQC57EeacqrhFmauLrw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_zRn2QT1EEeaeMKxSH8FZ1Q"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zRn2Qj1EEeaeMKxSH8FZ1Q" points="[436, 133, -643984, -643984]$[477, 281, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zSAQwD1EEeaeMKxSH8FZ1Q" id="(0.6019900497512438,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zSAQwT1EEeaeMKxSH8FZ1Q" id="(0.6013030303030302,0.22)"/>
+    </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_4L5FwC57EeacqrhFmauLrw" type="PapyrusUMLClassDiagram" name="UserManagement" measurementUnit="Pixel">
     <children xmi:type="notation:Shape" xmi:id="_7MzSAC57EeacqrhFmauLrw" type="Class_Shape_CN">
@@ -181,7 +207,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7MzSGi57EeacqrhFmauLrw"/>
       </children>
       <element xmi:type="uml:Class" href="ProjectManagement.uml#_7Myq-i57EeacqrhFmauLrw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7MzSHi57EeacqrhFmauLrw" x="24" y="170" height="95"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7MzSHi57EeacqrhFmauLrw" x="25" y="222" width="219" height="119"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_7Mz5EC57EeacqrhFmauLrw" type="Class_Shape_CN">
       <children xmi:type="notation:DecorationNode" xmi:id="_7Mz5ES57EeacqrhFmauLrw" type="Class_NameLabel_CN"/>
@@ -211,7 +237,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7Mz5JC57EeacqrhFmauLrw"/>
       </children>
       <element xmi:type="uml:Class" href="ProjectManagement.uml#_7MyD4C57EeacqrhFmauLrw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7Mz5KC57EeacqrhFmauLrw" x="55" y="29" height="50"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7Mz5KC57EeacqrhFmauLrw" x="69" y="81" height="50"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_7Mz5QC57EeacqrhFmauLrw" type="DataType_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_7Mz5QS57EeacqrhFmauLrw" type="DataType_NameLabel"/>
@@ -243,7 +269,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7Mz5Uy57EeacqrhFmauLrw"/>
       </children>
       <element xmi:type="uml:DataType" href="ProjectManagement.uml#_7Myq8C57EeacqrhFmauLrw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7Mz5Vy57EeacqrhFmauLrw" x="259" y="170" width="175" height="95"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7Mz5Vy57EeacqrhFmauLrw" x="260" y="222" width="173" height="119"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_IvCb0S8oEeaDELFt-ELOvw" type="Comment_Shape" fillColor="15592411">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hLkcIC8oEeaDELFt-ELOvw" source="PapyrusCSSForceValue">
@@ -252,7 +278,12 @@
       </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_IvCb0i8oEeaDELFt-ELOvw" type="Comment_BodyLabel"/>
       <element xmi:type="uml:Comment" href="ProjectManagement.uml#_IvCb0C8oEeaDELFt-ELOvw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IvCb0y8oEeaDELFt-ELOvw" x="262" y="29" width="168"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IvCb0y8oEeaDELFt-ELOvw" x="37" y="21" width="392" height="29"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="__GstMD1MEeaeMKxSH8FZ1Q" type="Comment_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="__GyMwD1MEeaeMKxSH8FZ1Q" type="Comment_BodyLabel"/>
+      <element xmi:type="uml:Comment" href="ProjectManagement.uml#__GU5wD1MEeaeMKxSH8FZ1Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__GstMT1MEeaeMKxSH8FZ1Q" x="260" y="81" width="175"/>
     </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_4L5FwS57EeacqrhFmauLrw" name="diagram_compatibility_version" stringValue="1.2.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_4L5Fwi57EeacqrhFmauLrw"/>
@@ -288,9 +319,23 @@
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_7Mz5PC57EeacqrhFmauLrw"/>
       <element xmi:type="uml:Association" href="ProjectManagement.uml#_7MyrBy57EeacqrhFmauLrw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7Mz5PS57EeacqrhFmauLrw" points="[110, 117, -643984, -643984]$[110, 218, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7Mz5Pi57EeacqrhFmauLrw" id="(0.4927536231884058,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7Mz5Py57EeacqrhFmauLrw" id="(0.495,0.0)"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7Mz5PS57EeacqrhFmauLrw" points="[111, 169, -643984, -643984]$[111, 270, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7Mz5Pi57EeacqrhFmauLrw" id="(0.5210084033613446,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7Mz5Py57EeacqrhFmauLrw" id="(0.4840182648401826,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_IHv28D1NEeaeMKxSH8FZ1Q" type="Comment_AnnotatedElementEdge" source="__GstMD1MEeaeMKxSH8FZ1Q" target="_7Mz5QC57EeacqrhFmauLrw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_IHweAD1NEeaeMKxSH8FZ1Q"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IHweAT1NEeaeMKxSH8FZ1Q" points="[349, 153, -643984, -643984]$[349, 222, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IIHqYD1NEeaeMKxSH8FZ1Q" id="(0.5085714285714286,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IIIRcD1NEeaeMKxSH8FZ1Q" id="(0.5085714285714286,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_I8CaoD1NEeaeMKxSH8FZ1Q" type="Comment_AnnotatedElementEdge" source="__GstMD1MEeaeMKxSH8FZ1Q" target="_7MzSAC57EeacqrhFmauLrw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_I8CaoT1NEeaeMKxSH8FZ1Q"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_I8Caoj1NEeaeMKxSH8FZ1Q" points="[294, 153, -643984, -643984]$[195, 222, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_I8YY4D1NEeaeMKxSH8FZ1Q" id="(0.19428571428571462,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_I8YY4T1NEeaeMKxSH8FZ1Q" id="(0.9289617486338798,0.0)"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_NtDrsC59EeacqrhFmauLrw" type="PapyrusUMLClassDiagram" name="IssueTracking" measurementUnit="Pixel">
@@ -324,7 +369,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O6YagS59EeacqrhFmauLrw"/>
       </children>
       <element xmi:type="uml:Class" href="ProjectManagement.uml#_H9FtoC58EeacqrhFmauLrw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O6XzYS59EeacqrhFmauLrw" x="235" y="69" width="116" height="32"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O6XzYS59EeacqrhFmauLrw" x="192" y="93" width="116" height="32"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_S7hUoC59EeacqrhFmauLrw" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_S7hUoi59EeacqrhFmauLrw" type="Class_NameLabel"/>
@@ -362,7 +407,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_S7h7ty59EeacqrhFmauLrw"/>
       </children>
       <element xmi:type="uml:Class" href="ProjectManagement.uml#_S7Z_4C59EeacqrhFmauLrw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_S7hUoS59EeacqrhFmauLrw" x="234" y="392" width="162" height="99"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_S7hUoS59EeacqrhFmauLrw" x="205" y="410" width="170" height="99"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_UufHEC59EeacqrhFmauLrw" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_UufHEi59EeacqrhFmauLrw" type="Class_NameLabel"/>
@@ -396,7 +441,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UufHIy59EeacqrhFmauLrw"/>
       </children>
       <element xmi:type="uml:Class" href="ProjectManagement.uml#_Uua1oC59EeacqrhFmauLrw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UufHES59EeacqrhFmauLrw" x="593" y="179"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UufHES59EeacqrhFmauLrw" x="570" y="203" width="143"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_bSHMIC59EeacqrhFmauLrw" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_bSHMIi59EeacqrhFmauLrw" type="Class_NameLabel"/>
@@ -450,7 +495,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bSHMMy59EeacqrhFmauLrw"/>
       </children>
       <element xmi:type="uml:Class" href="ProjectManagement.uml#_bSC6sC59EeacqrhFmauLrw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bSHMIS59EeacqrhFmauLrw" x="243" y="179" height="142"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bSHMIS59EeacqrhFmauLrw" x="207" y="173" width="204" height="178"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_DXOD0C5-EeacqrhFmauLrw" type="Class_Shape">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yXOCUC6EEeacqrhFmauLrw" source="PapyrusHyperLink_Page" references="_4L5FwC57EeacqrhFmauLrw">
@@ -481,7 +526,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DXOq7S5-EeacqrhFmauLrw"/>
       </children>
       <element xmi:type="uml:Class" href="ProjectManagement.uml#_7Myq-i57EeacqrhFmauLrw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DXOD0S5-EeacqrhFmauLrw" x="593" y="68" width="154" height="33"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DXOD0S5-EeacqrhFmauLrw" x="557" y="92" width="154" height="33"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_cUjrIC5-EeacqrhFmauLrw" type="Enumeration_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_cUjrIi5-EeacqrhFmauLrw" type="Enumeration_NameLabel"/>
@@ -519,7 +564,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cUjrKS5-EeacqrhFmauLrw"/>
       </children>
       <element xmi:type="uml:Enumeration" href="ProjectManagement.uml#_cUc9cC5-EeacqrhFmauLrw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cUjrIS5-EeacqrhFmauLrw" x="911" y="215" width="116"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cUjrIS5-EeacqrhFmauLrw" x="877" y="227" width="116"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_qNYcIC5-EeacqrhFmauLrw" type="Enumeration_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_qNYcIi5-EeacqrhFmauLrw" type="Enumeration_NameLabel"/>
@@ -553,7 +598,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qNYcKS5-EeacqrhFmauLrw"/>
       </children>
       <element xmi:type="uml:Enumeration" href="ProjectManagement.uml#_qNUxwC5-EeacqrhFmauLrw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qNYcIS5-EeacqrhFmauLrw" x="911" y="69" width="116"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qNYcIS5-EeacqrhFmauLrw" x="877" y="58" width="116"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_2c1bkC5-EeacqrhFmauLrw" type="Enumeration_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_2c1bki5-EeacqrhFmauLrw" type="Enumeration_NameLabel"/>
@@ -587,7 +632,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2c1bmS5-EeacqrhFmauLrw"/>
       </children>
       <element xmi:type="uml:Enumeration" href="ProjectManagement.uml#_2cxKIC5-EeacqrhFmauLrw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2c1bkS5-EeacqrhFmauLrw" x="911" y="381" width="116"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2c1bkS5-EeacqrhFmauLrw" x="877" y="414" width="116"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_drmhIC5_EeacqrhFmauLrw" type="AssociationClass_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_drnIMC5_EeacqrhFmauLrw" type="AssociationClass_NameLabel"/>
@@ -621,7 +666,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_drnIQS5_EeacqrhFmauLrw"/>
       </children>
       <element xmi:type="uml:AssociationClass" href="ProjectManagement.uml#_dqyo0C5_EeacqrhFmauLrw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_drmhIS5_EeacqrhFmauLrw" x="417" y="392" width="223" height="99"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_drmhIS5_EeacqrhFmauLrw" x="395" y="410" width="223" height="99"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_WacyRi6AEeacqrhFmauLrw" type="Enumeration_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_WacyRy6AEeacqrhFmauLrw" type="Enumeration_NameLabel"/>
@@ -647,13 +692,13 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WacyWC6AEeacqrhFmauLrw"/>
       </children>
       <element xmi:type="uml:Enumeration" href="ProjectManagement.uml#_WacyQC6AEeacqrhFmauLrw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WacyXC6AEeacqrhFmauLrw" x="657" y="392" width="168"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WacyXC6AEeacqrhFmauLrw" x="631" y="410" width="168"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_d_NJQC7lEeay7tB9IM4hXA" type="Constraint_PackagedElementShape">
       <children xmi:type="notation:DecorationNode" xmi:id="_d_NwUC7lEeay7tB9IM4hXA" type="Constraint_NameLabel"/>
       <children xmi:type="notation:DecorationNode" xmi:id="_d_NwUS7lEeay7tB9IM4hXA" type="Constraint_BodyLabel"/>
       <element xmi:type="uml:Constraint" href="ProjectManagement.uml#_d_AU8C7lEeay7tB9IM4hXA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_d_NJQS7lEeay7tB9IM4hXA" x="68" y="218" width="156"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_d_NJQS7lEeay7tB9IM4hXA" x="32" y="242" width="156"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_9UAi8C8nEeaDELFt-ELOvw" type="Comment_Shape" fillColor="15592411" lineColor="0">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tj7f8C8oEeaDELFt-ELOvw" source="PapyrusCSSForceValue">
@@ -661,7 +706,7 @@
       </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_9UAi8S8nEeaDELFt-ELOvw" type="Comment_BodyLabel"/>
       <element xmi:type="uml:Comment" href="ProjectManagement.uml#_9T_74C8nEeaDELFt-ELOvw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9UAi8i8nEeaDELFt-ELOvw" x="14" y="13" width="199"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9UAi8i8nEeaDELFt-ELOvw" x="50" y="9" width="960" height="24"/>
     </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_NtDrsS59EeacqrhFmauLrw" name="diagram_compatibility_version" stringValue="1.2.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_NtDrsi59EeacqrhFmauLrw"/>
@@ -677,24 +722,24 @@
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_cTkCES59EeacqrhFmauLrw"/>
       <element xmi:type="uml:Generalization" href="ProjectManagement.uml#_cTg-wC59EeacqrhFmauLrw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_cTkCEi59EeacqrhFmauLrw" points="[426, 139, -643984, -643984]$[336, 125, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cTwPUC59EeacqrhFmauLrw" id="(0.2849162011173184,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cTwPUS59EeacqrhFmauLrw" id="(0.51,1.0)"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_cTkCEi59EeacqrhFmauLrw" points="[390, 163, -643984, -643984]$[300, 149, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cTwPUC59EeacqrhFmauLrw" id="(0.21568627450980393,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cTwPUS59EeacqrhFmauLrw" id="(0.5086206896551724,1.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_drDukC5_EeacqrhFmauLrw" type="AssociationClass_Edge" source="_bSHMIC59EeacqrhFmauLrw" target="_bSHMIC59EeacqrhFmauLrw">
       <children xmi:type="notation:DecorationNode" xmi:id="_drEVoC5_EeacqrhFmauLrw" type="AssociationClass_SourceRoleLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_e_B34C5_EeacqrhFmauLrw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_drEVoS5_EeacqrhFmauLrw" x="-24" y="7"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_drEVoS5_EeacqrhFmauLrw" x="-9" y="-19"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_drEVoi5_EeacqrhFmauLrw" type="AssociationClass_TargetRoleLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_e_M3AC5_EeacqrhFmauLrw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_drEVoy5_EeacqrhFmauLrw" x="26" y="-13"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_drEVoy5_EeacqrhFmauLrw" x="5" y="-10"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_drDukS5_EeacqrhFmauLrw"/>
       <element xmi:type="uml:AssociationClass" href="ProjectManagement.uml#_dqyo0C5_EeacqrhFmauLrw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_drDuki5_EeacqrhFmauLrw" points="[422, 263, -643984, -643984]$[484, 285, -643984, -643984]$[484, 356, -643984, -643984]$[400, 356, -643984, -643984]$[400, 321, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_drcwIC5_EeacqrhFmauLrw" id="(1.0,0.7464788732394366)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_drcwIS5_EeacqrhFmauLrw" id="(0.8770949720670391,1.0)"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_drDuki5_EeacqrhFmauLrw" points="[411, 305, -643984, -643984]$[448, 305, -643984, -643984]$[448, 380, -643984, -643984]$[385, 380, -643984, -643984]$[385, 351, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_drcwIC5_EeacqrhFmauLrw" id="(1.0,0.7415730337078652)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_drcwIS5_EeacqrhFmauLrw" id="(0.8725490196078431,1.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_dsEbMC5_EeacqrhFmauLrw" type="AssociationClass_TetherEdge" source="_drDukC5_EeacqrhFmauLrw" target="_drmhIC5_EeacqrhFmauLrw">
       <styles xmi:type="notation:FontStyle" xmi:id="_dsEbMS5_EeacqrhFmauLrw"/>
@@ -730,8 +775,8 @@
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_zz70wS6AEeacqrhFmauLrw"/>
       <element xmi:type="uml:Association" href="ProjectManagement.uml#_zzrWEC6AEeacqrhFmauLrw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zz70wi6AEeacqrhFmauLrw" points="[422, 205, -643984, -643984]$[566, 205, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_z0kG4C6AEeacqrhFmauLrw" id="(1.0,0.18309859154929578)"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zz70wi6AEeacqrhFmauLrw" points="[386, 229, -643984, -643984]$[530, 229, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_z0kG4C6AEeacqrhFmauLrw" id="(1.0,0.3146067415730337)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_z0kG4S6AEeacqrhFmauLrw" id="(0.0,0.26)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_Cd8yIC6BEeacqrhFmauLrw" type="Association_Edge" source="_bSHMIC59EeacqrhFmauLrw" target="_DXOD0C5-EeacqrhFmauLrw">
@@ -745,7 +790,7 @@
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_Cd8yJy6BEeacqrhFmauLrw" type="Association_TargetRoleLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_DUzhoC6BEeacqrhFmauLrw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Cd8yKC6BEeacqrhFmauLrw" x="17" y="1"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Cd8yKC6BEeacqrhFmauLrw" x="17" y="12"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_Cd8yKS6BEeacqrhFmauLrw" type="Association_SourceRoleLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_DU9SoC6BEeacqrhFmauLrw" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -761,8 +806,8 @@
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_Cd8yIS6BEeacqrhFmauLrw"/>
       <element xmi:type="uml:Association" href="ProjectManagement.uml#_CdamoC6BEeacqrhFmauLrw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Cd8yIi6BEeacqrhFmauLrw" points="[417, 179, -643984, -643984]$[417, 85, -643984, -643984]$[593, 85, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CeXo4C6BEeacqrhFmauLrw" id="(0.9720670391061452,0.0)"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Cd8yIi6BEeacqrhFmauLrw" points="[369, 203, -643984, -643984]$[369, 109, -643984, -643984]$[557, 109, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CeXo4C6BEeacqrhFmauLrw" id="(0.7941176470588235,0.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CeXo4S6BEeacqrhFmauLrw" id="(0.0,0.5151515151515151)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_NbGcMC6BEeacqrhFmauLrw" type="Association_Edge" source="_UufHEC59EeacqrhFmauLrw" target="_DXOD0C5-EeacqrhFmauLrw">
@@ -776,7 +821,7 @@
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_NbHDRC6BEeacqrhFmauLrw" type="Association_TargetRoleLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_XiimQC6BEeacqrhFmauLrw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_NbHDRS6BEeacqrhFmauLrw" x="13" y="-1"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_NbHDRS6BEeacqrhFmauLrw" x="15" y="9"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_NbHDRi6BEeacqrhFmauLrw" type="Association_SourceRoleLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_XirJIC6BEeacqrhFmauLrw" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -784,7 +829,7 @@
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_NbHDSC6BEeacqrhFmauLrw" type="Association_SourceMultiplicityLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_Xi6ZsC6BEeacqrhFmauLrw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_NbHDSS6BEeacqrhFmauLrw" x="12" y="-33"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_NbHDSS6BEeacqrhFmauLrw" x="15" y="-31"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_NbHDSi6BEeacqrhFmauLrw" type="Association_TargetMultiplicityLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_XjJDMC6BEeacqrhFmauLrw" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -792,9 +837,9 @@
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_NbGcMS6BEeacqrhFmauLrw"/>
       <element xmi:type="uml:Association" href="ProjectManagement.uml#_NasMgC6BEeacqrhFmauLrw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NbGcMi6BEeacqrhFmauLrw" points="[641, 179, -643984, -643984]$[641, 127, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Nbgr4C6BEeacqrhFmauLrw" id="(0.5064935064935064,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Nbgr4S6BEeacqrhFmauLrw" id="(0.51,1.0)"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NbGcMi6BEeacqrhFmauLrw" points="[605, 203, -643984, -643984]$[605, 151, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Nbgr4C6BEeacqrhFmauLrw" id="(0.4676258992805755,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Nbgr4S6BEeacqrhFmauLrw" id="(0.512987012987013,1.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_pd5YkC6BEeacqrhFmauLrw" type="Association_Edge" source="_bSHMIC59EeacqrhFmauLrw" target="_DXOD0C5-EeacqrhFmauLrw">
       <children xmi:type="notation:DecorationNode" xmi:id="_pd5_oC6BEeacqrhFmauLrw" type="Association_StereotypeLabel">
@@ -811,7 +856,7 @@
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_pd5_pi6BEeacqrhFmauLrw" type="Association_SourceRoleLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_p6DJEC6BEeacqrhFmauLrw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_pd5_py6BEeacqrhFmauLrw" x="-27" y="66"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_pd5_py6BEeacqrhFmauLrw" x="-13" y="78"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_pd5_qC6BEeacqrhFmauLrw" type="Association_SourceMultiplicityLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_p6PWUC6BEeacqrhFmauLrw" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -819,12 +864,12 @@
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_pd5_qi6BEeacqrhFmauLrw" type="Association_TargetMultiplicityLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_p6YgQC6BEeacqrhFmauLrw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_pd5_qy6BEeacqrhFmauLrw" x="-27" y="-2"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_pd5_qy6BEeacqrhFmauLrw" x="-17" y="-7"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_pd5YkS6BEeacqrhFmauLrw"/>
       <element xmi:type="uml:Association" href="ProjectManagement.uml#_pdbegC6BEeacqrhFmauLrw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pd5Yki6BEeacqrhFmauLrw" points="[367, 179, -643984, -643984]$[367, 31, -643984, -643984]$[637, 31, -643984, -643984]$[637, 68, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pea9AC6BEeacqrhFmauLrw" id="(0.6927374301675978,0.0)"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pd5Yki6BEeacqrhFmauLrw" points="[331, 203, -643984, -643984]$[331, 65, -643984, -643984]$[601, 65, -643984, -643984]$[601, 92, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pea9AC6BEeacqrhFmauLrw" id="(0.6078431372549019,0.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pea9AS6BEeacqrhFmauLrw" id="(0.2857142857142857,0.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_2rjssC6BEeacqrhFmauLrw" type="Association_Edge" source="_UufHEC59EeacqrhFmauLrw" target="_UufHEC59EeacqrhFmauLrw">
@@ -838,11 +883,11 @@
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_2rjsty6BEeacqrhFmauLrw" type="Association_TargetRoleLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3LaRcC6BEeacqrhFmauLrw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_2rjsuC6BEeacqrhFmauLrw" x="23" y="-13"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_2rjsuC6BEeacqrhFmauLrw" x="23" y="-19"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_2rjsuS6BEeacqrhFmauLrw" type="Association_SourceRoleLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3Lns0C6BEeacqrhFmauLrw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_2rjsui6BEeacqrhFmauLrw" x="-20" y="3"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_2rjsui6BEeacqrhFmauLrw" x="-18" y="3"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_2rjsuy6BEeacqrhFmauLrw" type="Association_SourceMultiplicityLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3Lyr8C6BEeacqrhFmauLrw" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -850,13 +895,13 @@
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_2rjsvS6BEeacqrhFmauLrw" type="Association_TargetMultiplicityLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_3MBVcC6BEeacqrhFmauLrw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_2rjsvi6BEeacqrhFmauLrw" x="-19" y="-32"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_2rjsvi6BEeacqrhFmauLrw" x="-18" y="-23"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_2rjssS6BEeacqrhFmauLrw"/>
       <element xmi:type="uml:Association" href="ProjectManagement.uml#_2rT1EC6BEeacqrhFmauLrw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2rjssi6BEeacqrhFmauLrw" points="[747, 264, -643984, -643984]$[809, 264, -643984, -643984]$[809, 330, -643984, -643984]$[665, 330, -643984, -643984]$[665, 279, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2sBmwC6BEeacqrhFmauLrw" id="(1.0,0.85)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2sBmwS6BEeacqrhFmauLrw" id="(0.4675324675324675,1.0)"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2rjssi6BEeacqrhFmauLrw" points="[713, 287, -643984, -643984]$[788, 287, -643984, -643984]$[788, 344, -643984, -643984]$[636, 344, -643984, -643984]$[636, 303, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2sBmwC6BEeacqrhFmauLrw" id="(1.0,0.84)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2sBmwS6BEeacqrhFmauLrw" id="(0.46153846153846156,1.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_VujOMC6DEeacqrhFmauLrw" type="Association_Edge" source="_bSHMIC59EeacqrhFmauLrw" target="_S7hUoC59EeacqrhFmauLrw">
       <children xmi:type="notation:DecorationNode" xmi:id="_VujOMy6DEeacqrhFmauLrw" type="Association_StereotypeLabel">
@@ -869,11 +914,11 @@
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_VujONy6DEeacqrhFmauLrw" type="Association_TargetRoleLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_diiu8C6DEeacqrhFmauLrw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_VujOOC6DEeacqrhFmauLrw" x="10" y="54"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_VujOOC6DEeacqrhFmauLrw" x="12" y="46"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_VujOOS6DEeacqrhFmauLrw" type="Association_SourceRoleLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_di2Q8C6DEeacqrhFmauLrw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_VujOOi6DEeacqrhFmauLrw" x="-11" y="95"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_VujOOi6DEeacqrhFmauLrw" x="-14" y="87"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_VujOOy6DEeacqrhFmauLrw" type="Association_SourceMultiplicityLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_djLoIC6DEeacqrhFmauLrw" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -885,9 +930,9 @@
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_VujOMS6DEeacqrhFmauLrw"/>
       <element xmi:type="uml:Association" href="ProjectManagement.uml#_VuQ6UC6DEeacqrhFmauLrw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VujOMi6DEeacqrhFmauLrw" points="[310, 321, -643984, -643984]$[310, 376, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VvCWYC6DEeacqrhFmauLrw" id="(0.36312849162011174,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VvC9cC6DEeacqrhFmauLrw" id="(0.4603174603174603,0.0)"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VujOMi6DEeacqrhFmauLrw" points="[309, 351, -643984, -643984]$[291, 410, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VvCWYC6DEeacqrhFmauLrw" id="(0.5,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VvC9cC6DEeacqrhFmauLrw" id="(0.611764705882353,0.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_yDWgkC6DEeacqrhFmauLrw" type="Association_Edge" source="_S7hUoC59EeacqrhFmauLrw" target="_DXOD0C5-EeacqrhFmauLrw">
       <children xmi:type="notation:DecorationNode" xmi:id="_yDWgky6DEeacqrhFmauLrw" type="Association_StereotypeLabel">
@@ -900,7 +945,7 @@
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_yDWgly6DEeacqrhFmauLrw" type="Association_TargetRoleLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ytitEC6DEeacqrhFmauLrw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_yDWgmC6DEeacqrhFmauLrw" x="67" y="-11"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_yDWgmC6DEeacqrhFmauLrw" x="19" y="-17"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_yDWgmS6DEeacqrhFmauLrw" type="Association_SourceRoleLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ytx9oC6DEeacqrhFmauLrw" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -908,7 +953,7 @@
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_yDWgmy6DEeacqrhFmauLrw" type="Association_SourceMultiplicityLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_yuB1QC6DEeacqrhFmauLrw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_yDWgnC6DEeacqrhFmauLrw" x="44" y="-6"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_yDWgnC6DEeacqrhFmauLrw" x="19" y="23"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_yDWgnS6DEeacqrhFmauLrw" type="Association_TargetMultiplicityLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_yuOCgC6DEeacqrhFmauLrw" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -916,8 +961,8 @@
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_yDWgkS6DEeacqrhFmauLrw"/>
       <element xmi:type="uml:Association" href="ProjectManagement.uml#_yC6bsC6DEeacqrhFmauLrw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_yDWgki6DEeacqrhFmauLrw" points="[378, 491, -643984, -643984]$[378, 546, -643984, -643984]$[871, 546, -643984, -643984]$[871, 89, -643984, -643984]$[747, 89, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yD6hQC6DEeacqrhFmauLrw" id="(0.8888888888888888,1.0)"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_yDWgki6DEeacqrhFmauLrw" points="[356, 509, -643984, -643984]$[356, 535, -643984, -643984]$[500, 535, -643984, -643984]$[835, 535, -643984, -643984]$[835, 113, -643984, -643984]$[711, 113, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yD6hQC6DEeacqrhFmauLrw" id="(0.888235294117647,1.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yD6hQS6DEeacqrhFmauLrw" id="(1.0,0.6363636363636364)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_egYjsC7lEeay7tB9IM4hXA" type="Constraint_ContextEdge" source="_d_NJQC7lEeay7tB9IM4hXA" target="_bSHMIC59EeacqrhFmauLrw">
@@ -927,7 +972,7 @@
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_egYjsS7lEeay7tB9IM4hXA"/>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_egYjsi7lEeay7tB9IM4hXA" points="[220, 261, -643984, -643984]$[197, 186, -643984, -643984]$[243, 186, -643984, -643984]"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_egYjsi7lEeay7tB9IM4hXA" points="[184, 285, -643984, -643984]$[161, 210, -643984, -643984]$[207, 210, -643984, -643984]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ehYCMC7lEeay7tB9IM4hXA" id="(0.5192307692307693,0.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ehYCMS7lEeay7tB9IM4hXA" id="(0.0,0.04929577464788732)"/>
     </edges>
@@ -961,7 +1006,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H9G72i58EeacqrhFmauLrw"/>
       </children>
       <element xmi:type="uml:Class" href="ProjectManagement.uml#_H9Ftoi58EeacqrhFmauLrw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H9G73i58EeacqrhFmauLrw" x="60" y="101" height="47"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H9G73i58EeacqrhFmauLrw" x="39" y="101" width="190" height="47"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_H9G73y58EeacqrhFmauLrw" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_H9G74C58EeacqrhFmauLrw" type="Class_NameLabel"/>
@@ -999,7 +1044,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H9G79S58EeacqrhFmauLrw"/>
       </children>
       <element xmi:type="uml:Class" href="ProjectManagement.uml#_H9D4cC58EeacqrhFmauLrw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H9G7-S58EeacqrhFmauLrw" x="39" y="343" width="190" height="81"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H9G7-S58EeacqrhFmauLrw" x="39" y="343" width="194" height="91"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_H9Hi0C58EeacqrhFmauLrw" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_H9Hi0S58EeacqrhFmauLrw" type="Class_NameLabel"/>
@@ -1033,7 +1078,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H9Hi5i58EeacqrhFmauLrw"/>
       </children>
       <element xmi:type="uml:Class" href="ProjectManagement.uml#_H9FGoy58EeacqrhFmauLrw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H9Hi6i58EeacqrhFmauLrw" x="39" y="211" height="65"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H9Hi6i58EeacqrhFmauLrw" x="39" y="211" width="190" height="72"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_H9IJ9y58EeacqrhFmauLrw" type="Class_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_H9IJ-C58EeacqrhFmauLrw" type="Class_NameLabel"/>
@@ -1063,7 +1108,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H9IKCS58EeacqrhFmauLrw"/>
       </children>
       <element xmi:type="uml:Class" href="ProjectManagement.uml#_H9FtoC58EeacqrhFmauLrw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H9IKDS58EeacqrhFmauLrw" x="376" y="343" height="81"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H9IKDS58EeacqrhFmauLrw" x="392" y="343" width="155" height="91"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_VioWQC58EeacqrhFmauLrw" type="Class_Shape">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AHnJsC59EeacqrhFmauLrw" source="PapyrusHyperLink_Page" references="_4L5FwC57EeacqrhFmauLrw">
@@ -1094,12 +1139,12 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Vio9YC58EeacqrhFmauLrw"/>
       </children>
       <element xmi:type="uml:Class" href="ProjectManagement.uml#_7Myq-i57EeacqrhFmauLrw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VioWQS58EeacqrhFmauLrw" x="416" y="101" height="35"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VioWQS58EeacqrhFmauLrw" x="416" y="101" width="105" height="35"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_hj7HMC8nEeaDELFt-ELOvw" type="Comment_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_hj8VUC8nEeaDELFt-ELOvw" type="Comment_BodyLabel"/>
       <element xmi:type="uml:Comment" href="ProjectManagement.uml#_hjZiwC8nEeaDELFt-ELOvw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hj7HMS8nEeaDELFt-ELOvw" x="541" y="101" width="220"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hj7HMS8nEeaDELFt-ELOvw" x="564" y="24" width="208" height="146"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_PB4S4S8oEeaDELFt-ELOvw" type="Comment_Shape" fillColor="15592411">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZR4jEC8oEeaDELFt-ELOvw" source="PapyrusCSSForceValue">
@@ -1108,7 +1153,12 @@
       </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_PB4S4i8oEeaDELFt-ELOvw" type="Comment_BodyLabel"/>
       <element xmi:type="uml:Comment" href="ProjectManagement.uml#_PB4S4C8oEeaDELFt-ELOvw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PB4S4y8oEeaDELFt-ELOvw" x="28" y="16" width="489" height="34"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PB4S4y8oEeaDELFt-ELOvw" x="32" y="24" width="489" height="26"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_QsCWwD1OEeaeMKxSH8FZ1Q" type="Comment_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_QsC90D1OEeaeMKxSH8FZ1Q" type="Comment_BodyLabel"/>
+      <element xmi:type="uml:Comment" href="ProjectManagement.uml#_QrwC4D1OEeaeMKxSH8FZ1Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsCWwT1OEeaeMKxSH8FZ1Q" x="578" y="343" width="171" height="81"/>
     </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_DnXDgS58EeacqrhFmauLrw" name="diagram_compatibility_version" stringValue="1.2.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_DnXDgi58EeacqrhFmauLrw"/>
@@ -1159,11 +1209,11 @@
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_H9GUzi58EeacqrhFmauLrw" type="Association_TargetRoleLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_H9GUzy58EeacqrhFmauLrw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_H9GU0C58EeacqrhFmauLrw" x="25" y="-11"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_H9GU0C58EeacqrhFmauLrw" x="25" y="-17"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_H9GU0S58EeacqrhFmauLrw" type="Association_SourceRoleLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_H9GU0i58EeacqrhFmauLrw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_H9GU0y58EeacqrhFmauLrw" x="-38" y="24"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_H9GU0y58EeacqrhFmauLrw" x="-31" y="40"/>
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_H9GU1C58EeacqrhFmauLrw" type="Association_SourceMultiplicityLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_H9GU1S58EeacqrhFmauLrw" name="IS_UPDATED_POSITION" booleanValue="true"/>
@@ -1171,13 +1221,13 @@
       </children>
       <children xmi:type="notation:DecorationNode" xmi:id="_H9GU1y58EeacqrhFmauLrw" type="Association_TargetMultiplicityLabel">
         <styles xmi:type="notation:BooleanValueStyle" xmi:id="_H9G7wC58EeacqrhFmauLrw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_H9G7wS58EeacqrhFmauLrw" x="-16" y="11"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_H9G7wS58EeacqrhFmauLrw" x="-30" y="13"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_H9G7wi58EeacqrhFmauLrw"/>
       <element xmi:type="uml:Association" href="ProjectManagement.uml#_H9EfjC58EeacqrhFmauLrw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_H9G7wy58EeacqrhFmauLrw" points="[220, 250, -643984, -643984]$[299, 250, -643984, -643984]$[299, 301, -643984, -643984]$[197, 301, -643984, -643984]$[197, 276, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H9G7xC58EeacqrhFmauLrw" id="(1.0,0.6)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H9G7xS58EeacqrhFmauLrw" id="(0.8729281767955801,1.0)"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_H9G7wy58EeacqrhFmauLrw" points="[229, 254, -643984, -643984]$[299, 254, -643984, -643984]$[299, 301, -643984, -643984]$[204, 301, -643984, -643984]$[204, 283, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H9G7xC58EeacqrhFmauLrw" id="(1.0,0.5972222222222222)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H9G7xS58EeacqrhFmauLrw" id="(0.868421052631579,1.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_H9Hi6y58EeacqrhFmauLrw" type="Association_Edge" source="_H9G7xi58EeacqrhFmauLrw" target="_H9Hi0C58EeacqrhFmauLrw">
       <children xmi:type="notation:DecorationNode" xmi:id="_H9Hi7C58EeacqrhFmauLrw" type="Association_StereotypeLabel">
@@ -1207,8 +1257,8 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_H9Hi-C58EeacqrhFmauLrw"/>
       <element xmi:type="uml:Association" href="ProjectManagement.uml#_H9EfiS58EeacqrhFmauLrw"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_H9Hi-S58EeacqrhFmauLrw"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H9Hi-i58EeacqrhFmauLrw" id="(0.47101449275362317,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H9Hi-y58EeacqrhFmauLrw" id="(0.477124183006536,0.0)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H9Hi-i58EeacqrhFmauLrw" id="(0.5157894736842106,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H9Hi-y58EeacqrhFmauLrw" id="(0.5157894736842106,0.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_H9Hi_C58EeacqrhFmauLrw" type="Association_Edge" source="_H9IJ9y58EeacqrhFmauLrw" target="_VioWQC58EeacqrhFmauLrw">
       <children xmi:type="notation:DecorationNode" xmi:id="_H9Hi_S58EeacqrhFmauLrw" type="Association_StereotypeLabel">
@@ -1238,8 +1288,8 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_H9HjCS58EeacqrhFmauLrw"/>
       <element xmi:type="uml:Association" href="ProjectManagement.uml#_H9FGkC58EeacqrhFmauLrw"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_H9HjCi58EeacqrhFmauLrw" points="[415, 333, -643984, -643984]$[415, 138, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H9HjCy58EeacqrhFmauLrw" id="(0.4883720930232558,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H9HjDC58EeacqrhFmauLrw" id="(0.44,1.0)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H9HjCy58EeacqrhFmauLrw" id="(0.4864864864864865,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H9HjDC58EeacqrhFmauLrw" id="(0.48,1.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_H9HjDS58EeacqrhFmauLrw" type="Association_Edge" source="_H9G73y58EeacqrhFmauLrw" target="_H9IJ9y58EeacqrhFmauLrw">
       <children xmi:type="notation:DecorationNode" xmi:id="_H9HjDi58EeacqrhFmauLrw" type="Association_StereotypeLabel">
@@ -1268,9 +1318,9 @@
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_H9HjIC58EeacqrhFmauLrw"/>
       <element xmi:type="uml:Association" href="ProjectManagement.uml#_H9DRYC58EeacqrhFmauLrw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_H9HjIS58EeacqrhFmauLrw" points="[208, 362, -643984, -643984]$[366, 362, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H9HjIi58EeacqrhFmauLrw" id="(1.0,0.4264705882352941)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H9HjIy58EeacqrhFmauLrw" id="(0.0,0.4264705882352941)"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_H9HjIS58EeacqrhFmauLrw" points="[233, 381, -643984, -643984]$[392, 377, -643984, -643984]$[392, 377, -643984, -643984]$[392, 377, -643984, -643984]$[392, 377, -643984, -643984]$[392, 377, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H9HjIi58EeacqrhFmauLrw" id="(1.0,0.37362637362637363)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H9HjIy58EeacqrhFmauLrw" id="(0.0,0.37362637362637363)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_H9IJ4C58EeacqrhFmauLrw" type="Association_Edge" source="_H9Hi0C58EeacqrhFmauLrw" target="_H9G73y58EeacqrhFmauLrw">
       <children xmi:type="notation:DecorationNode" xmi:id="_H9IJ4S58EeacqrhFmauLrw" type="Association_StereotypeLabel">
@@ -1300,8 +1350,22 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_H9IJ8y58EeacqrhFmauLrw"/>
       <element xmi:type="uml:Association" href="ProjectManagement.uml#_H9EfgC58EeacqrhFmauLrw"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_H9IJ9C58EeacqrhFmauLrw"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H9IJ9S58EeacqrhFmauLrw" id="(0.47058823529411764,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H9IJ9i58EeacqrhFmauLrw" id="(0.4473684210526316,0.0)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H9IJ9S58EeacqrhFmauLrw" id="(0.531578947368421,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H9IJ9i58EeacqrhFmauLrw" id="(0.520618556701031,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_vEt3UD1MEeaeMKxSH8FZ1Q" type="Comment_AnnotatedElementEdge" source="_hj7HMC8nEeaDELFt-ELOvw" target="_VioWQC58EeacqrhFmauLrw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_vEt3UT1MEeaeMKxSH8FZ1Q"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vEt3Uj1MEeaeMKxSH8FZ1Q" points="[541, 151, -643984, -643984]$[521, 132, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vFky8D1MEeaeMKxSH8FZ1Q" id="(0.0,0.1404109589041096)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vFky8T1MEeaeMKxSH8FZ1Q" id="(1.0,0.6571428571428571)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_Xjq88D1OEeaeMKxSH8FZ1Q" type="Comment_AnnotatedElementEdge" source="_QsCWwD1OEeaeMKxSH8FZ1Q" target="_H9IJ9y58EeacqrhFmauLrw">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Xjq88T1OEeaeMKxSH8FZ1Q"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Xjq88j1OEeaeMKxSH8FZ1Q" points="[578, 358, -643984, -643984]$[547, 370, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XkSA8D1OEeaeMKxSH8FZ1Q" id="(0.0,0.3333333333333333)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XkSA8T1OEeaeMKxSH8FZ1Q" id="(1.0,0.3333333333333333)"/>
     </edges>
   </notation:Diagram>
 </xmi:XMI>
diff --git a/examples/org.eclipse.papyrus.information.modeling.examples/ProjectManagement/ProjectManagement.uml b/examples/org.eclipse.papyrus.information.modeling.examples/ProjectManagement/ProjectManagement.uml
index 9390c81..73ba695 100644
--- a/examples/org.eclipse.papyrus.information.modeling.examples/ProjectManagement/ProjectManagement.uml
+++ b/examples/org.eclipse.papyrus.information.modeling.examples/ProjectManagement/ProjectManagement.uml
@@ -1,11 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_W36joC57EeacqrhFmauLrw" name="ProjectManagement">
-  <ownedComment xmi:type="uml:Comment" xmi:id="_5rNnMC7uEeaQWPj9PM9XcQ">
+  <ownedComment xmi:type="uml:Comment" xmi:id="_5rNnMC7uEeaQWPj9PM9XcQ" annotatedElement="_hdxvEC57EeacqrhFmauLrw _f700IC57EeacqrhFmauLrw">
     <body>&lt;p>Double-click the packages to navigate to their diagrams.&lt;/p>
 </body>
   </ownedComment>
   <ownedComment xmi:type="uml:Comment" xmi:id="_03gbQC8oEeaDELFt-ELOvw">
-    <body>&lt;p>This diagram gives and overview of all packages in this model and their relationship. Additionally, this diagram also includes an imported package that is located in a different model named DataTypes.&lt;/p>
+    <body>&lt;p>This diagram gives an overview of all packages in this model and their package imports.&lt;/p>
+</body>
+  </ownedComment>
+  <ownedComment xmi:type="uml:Comment" xmi:id="_GF_JoD1EEeaeMKxSH8FZ1Q">
+    <annotatedElement xmi:type="uml:Package" href="DataTypes.uml#_tzuXACzZEea8G-9zdH7vYw"/>
+    <body>&lt;p>As indicated by the little arrow icon on the upper right-hand side of package &amp;quot;Common&amp;quot;, this package is contained somewhere else and is only&amp;nbsp;shown&amp;nbsp;in this diagram as a shortcut. The package &amp;quot;Common&amp;quot; is in fact located in a different model, called DataTypes, alongside this model.&lt;/p>
+
+&lt;p>Other model resources can be loaded by right-clicking&amp;nbsp;anywhere in the&amp;nbsp;diagram and selecting &amp;quot;Load resource...&amp;quot;.&lt;/p>
 </body>
   </ownedComment>
   <packageImport xmi:type="uml:PackageImport" xmi:id="_W_TlEC57EeacqrhFmauLrw">
@@ -19,6 +26,10 @@
       <body>&lt;p>This diagram shows the contents of the package UserManagement.&lt;/p>
 </body>
     </ownedComment>
+    <ownedComment xmi:type="uml:Comment" xmi:id="__GU5wD1MEeaeMKxSH8FZ1Q" annotatedElement="_7Myq8C57EeacqrhFmauLrw _7Myq-i57EeacqrhFmauLrw">
+      <body>&lt;p>The element &amp;quot;Credentials&amp;quot; is a data type, which is used as a type of a property in class User.&lt;/p>
+</body>
+    </ownedComment>
     <packagedElement xmi:type="uml:Class" xmi:id="_7MyD4C57EeacqrhFmauLrw" name="Group">
       <ownedAttribute xmi:type="uml:Property" xmi:id="_7MyD4S57EeacqrhFmauLrw" name="name">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
@@ -113,7 +124,7 @@
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CRh_YC6EEeacqrhFmauLrw" value="1"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_GHhZgC6EEeacqrhFmauLrw" name="path" visibility="public">
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_N64oIC6EEeacqrhFmauLrw" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_N7GDgC6EEeacqrhFmauLrw" value="1"/>
       </ownedAttribute>
@@ -279,12 +290,16 @@
     </packagedElement>
   </packagedElement>
   <packagedElement xmi:type="uml:Package" xmi:id="_hdxvEC57EeacqrhFmauLrw" name="ProductPlanning">
-    <ownedComment xmi:type="uml:Comment" xmi:id="_hjZiwC8nEeaDELFt-ELOvw">
-      <body>&lt;p>The class User has actually been defined in UserManagement, but is shown here too. Additionally, a hyperlink has been set, to allow navigating to the diagram UserManagement.&lt;/p>
+    <ownedComment xmi:type="uml:Comment" xmi:id="_hjZiwC8nEeaDELFt-ELOvw" annotatedElement="_7Myq-i57EeacqrhFmauLrw">
+      <body>&lt;p>The class User has actually been defined in the package &amp;quot;UserManagement&amp;quot;, but is shown here too. Note that the shape representing this class does not show all details, such as the properties of User. Double-click the class User, to navigate to the diagram UserManagement, where it is shown with all its properties.&lt;/p>
 </body>
     </ownedComment>
     <ownedComment xmi:type="uml:Comment" xmi:id="_PB4S4C8oEeaDELFt-ELOvw">
-      <body>&lt;p>This diagram shows the contents of the package ProductPlanning and the used class User, which is actually located in package UserManagement.&lt;/p>
+      <body>&lt;p>This diagram shows the contents of the package ProductPlanning.&lt;/p>
+</body>
+    </ownedComment>
+    <ownedComment xmi:type="uml:Comment" xmi:id="_QrwC4D1OEeaeMKxSH8FZ1Q" annotatedElement="_H9FtoC58EeacqrhFmauLrw">
+      <body>&lt;p>The data type &amp;quot;Estimate&amp;quot; is defined in the imported external model called DataTypes.&lt;/p>
 </body>
     </ownedComment>
     <packageImport xmi:type="uml:PackageImport" xmi:id="_xANiMC57EeacqrhFmauLrw">