429744: [UML 2.5] Migrate Papyrus to UML 2.5

https://bugs.eclipse.org/bugs/show_bug.cgi?id=429744 - Regenerate the EastADL profile
author: Camille Letavernier 2014-03-06 15:25:20 +0000
committer: Camille Letavernier 2014-03-06 15:25:20 +0000
commit: e70c14b2a0bcab60cf10aad9ea37be871b3ece01 (patch)
tree: 8b2eb1c37e1422e560a5fc598224a7220d5bb583 /extraplugins/marte/org.eclipse.papyrus.marte.static.profile
parent: 5b3797b60cdc537f12156d075071840b01d17767 (diff)
download: org.eclipse.papyrus-e70c14b2a0bcab60cf10aad9ea37be871b3ece01.tar.gz
org.eclipse.papyrus-e70c14b2a0bcab60cf10aad9ea37be871b3ece01.tar.xz
org.eclipse.papyrus-e70c14b2a0bcab60cf10aad9ea37be871b3ece01.zip
3 files changed, 1193 insertions, 1193 deletions
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE.profile.di b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE.profile.di
index 9f51d97108d..3bcdccc2f8a 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE.profile.di
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE.profile.di
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ASCII"?>
+<?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" xmi:id="_cwbFEPfhEd-f4r3MXmUB9g">
   <pageList xmi:id="_cwbFEffhEd-f4r3MXmUB9g">
     <availablePage xmi:id="_cwbFEvfhEd-f4r3MXmUB9g">
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE.profile.notation b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE.profile.notation
index 53225b4bdd2..541bff83e5d 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE.profile.notation
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE.profile.notation
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
   <notation:Diagram xmi:id="_winU0Ji4Ed-m0Oaexd_lJA" type="PapyrusUMLProfileDiagram" name="NewDiagram" measurementUnit="Pixel">
     <children xmi:type="notation:Shape" xmi:id="_xCDp4Ji4Ed-m0Oaexd_lJA" type="2007" fontHeight="8" lineColor="0">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xCDp4pi4Ed-m0Oaexd_lJA" source="ShadowFigure">
@@ -16,7 +16,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xCDp6pi4Ed-m0Oaexd_lJA"/>
       </children>
       <element xmi:type="uml:Package" href="MARTE.profile.uml#_u8y4wAPMEdyuUt-4qHuVvQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xCDp4Zi4Ed-m0Oaexd_lJA" x="25" y="25"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xCDp4Zi4Ed-m0Oaexd_lJA" x="42" y="66"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_sd7DALG0Ed-tmN4hwNCxXQ" type="1026" fontHeight="8" lineColor="0">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sd7DArG0Ed-tmN4hwNCxXQ" source="ShadowFigure">
@@ -40,7 +40,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sd7DELG0Ed-tmN4hwNCxXQ"/>
       </children>
       <element xmi:type="uml:Stereotype" href="MARTE.profile.uml#_XYaMIBKYEdyGYuetzx6T5A"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sd7DAbG0Ed-tmN4hwNCxXQ" x="275" width="304" height="198"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sd7DAbG0Ed-tmN4hwNCxXQ" x="292" y="41" width="304" height="198"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_8b-bILG0Ed-tmN4hwNCxXQ" type="1026" fontHeight="8" lineColor="0">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8b-bIrG0Ed-tmN4hwNCxXQ" source="ShadowFigure">
@@ -64,7 +64,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8b-bMLG0Ed-tmN4hwNCxXQ"/>
       </children>
       <element xmi:type="uml:Stereotype" href="MARTE.profile.uml#_eXMtwBKZEdyGYuetzx6T5A"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8b-bIbG0Ed-tmN4hwNCxXQ" x="878" y="-8" width="266" height="206"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8b-bIbG0Ed-tmN4hwNCxXQ" x="895" y="33" width="266" height="206"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_uFzKULG1Ed-tmN4hwNCxXQ" type="1026" fontHeight="8" lineColor="0">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uFzKUrG1Ed-tmN4hwNCxXQ" source="ShadowFigure">
@@ -88,7 +88,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uFzKYLG1Ed-tmN4hwNCxXQ"/>
       </children>
       <element xmi:type="uml:Stereotype" href="MARTE.profile.uml#_noixsBD2EdyybZnLxHsjyA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uFzKUbG1Ed-tmN4hwNCxXQ" x="15" y="355"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uFzKUbG1Ed-tmN4hwNCxXQ" x="32" y="396"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_uyLvMLG1Ed-tmN4hwNCxXQ" type="1026" fontHeight="8" lineColor="0">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uyLvMrG1Ed-tmN4hwNCxXQ" source="ShadowFigure">
@@ -112,7 +112,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uyLvQLG1Ed-tmN4hwNCxXQ"/>
       </children>
       <element xmi:type="uml:Stereotype" href="MARTE.profile.uml#_xRmWoBD2EdyybZnLxHsjyA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uyLvMbG1Ed-tmN4hwNCxXQ" x="210" y="355"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uyLvMbG1Ed-tmN4hwNCxXQ" x="227" y="396"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_wC6-ULG1Ed-tmN4hwNCxXQ" type="1026" fontHeight="8" lineColor="0">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wC6-UrG1Ed-tmN4hwNCxXQ" source="ShadowFigure">
@@ -136,7 +136,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wC6-YLG1Ed-tmN4hwNCxXQ"/>
       </children>
       <element xmi:type="uml:Stereotype" href="MARTE.profile.uml#_llNagBBSEdyt6tGzWCpUVA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wC6-UbG1Ed-tmN4hwNCxXQ" x="125" y="175"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wC6-UbG1Ed-tmN4hwNCxXQ" x="142" y="216"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_4O8kkLG1Ed-tmN4hwNCxXQ" type="1026" fontHeight="8" lineColor="0">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4O8kkrG1Ed-tmN4hwNCxXQ" source="ShadowFigure">
@@ -160,7 +160,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4O8koLG1Ed-tmN4hwNCxXQ"/>
       </children>
       <element xmi:type="uml:Stereotype" href="MARTE.profile.uml#_i_gjkBBSEdyt6tGzWCpUVA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4O8kkbG1Ed-tmN4hwNCxXQ" x="1210" y="135"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4O8kkbG1Ed-tmN4hwNCxXQ" x="1227" y="176"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_8fiQALG1Ed-tmN4hwNCxXQ" type="1031" fontHeight="8" lineColor="0">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8fiQArG1Ed-tmN4hwNCxXQ" source="ShadowFigure">
@@ -174,7 +174,7 @@
       </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_8fiQCLG1Ed-tmN4hwNCxXQ" type="1084"/>
       <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Event"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8fiQAbG1Ed-tmN4hwNCxXQ" x="1210"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8fiQAbG1Ed-tmN4hwNCxXQ" x="1227" y="41"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_8vZusGqWEeC2YbiYAwBrzg" type="1026" fontName="Segoe UI" lineColor="0">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8vi4oGqWEeC2YbiYAwBrzg" source="ShadowFigure">
@@ -202,7 +202,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8vi4rmqWEeC2YbiYAwBrzg"/>
       </children>
       <element xmi:type="uml:Stereotype" href="MARTE.profile.uml#_HYVowA-NEdyLh7muGbCqMw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8vZusWqWEeC2YbiYAwBrzg" x="740" y="315"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8vZusWqWEeC2YbiYAwBrzg" x="757" y="356"/>
     </children>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_winU0Zi4Ed-m0Oaexd_lJA"/>
     <element xmi:type="uml:Profile" href="MARTE.profile.uml#_zaC5cAPHEdyeNfbOYuD9pg"/>
@@ -407,7 +407,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jjFEqvfhEd-f4r3MXmUB9g"/>
       </children>
       <element xmi:type="uml:Profile" href="MARTE.profile.uml#_jg_Z8PfhEd-f4r3MXmUB9g"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jjFEoffhEd-f4r3MXmUB9g" x="150" y="120" width="846" height="346"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jjFEoffhEd-f4r3MXmUB9g" x="150" y="120" width="846" height="378"/>
     </children>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_iSm7QffhEd-f4r3MXmUB9g"/>
     <element xmi:type="uml:Profile" href="MARTE.profile.uml#_CHiIYA-LEdyNj8xzjk-DoA"/>
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE.profile.uml b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE.profile.uml
index 9fb35418656..ce918deebd4 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE.profile.uml
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE.profile.uml
@@ -1,165 +1,165 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA">
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA">
   <uml:Profile xmi:id="_zaC5cAPHEdyeNfbOYuD9pg" name="MARTE" metaclassReference="_zBwmMAPQEdyme8Xu4jGRhA _zCDhIAPQEdyme8Xu4jGRhA _zCDhIQPQEdyme8Xu4jGRhA _XaGqQA4vEdysTsAUPnp57Q _XaGqQQ4vEdysTsAUPnp57Q _Ry6UsBBSEdyt6tGzWCpUVA _RzEFsBBSEdyt6tGzWCpUVA _RzEFsRBSEdyt6tGzWCpUVA _RzNPoBBSEdyt6tGzWCpUVA _RzXAoBBSEdyt6tGzWCpUVA _RzXAoRBSEdyt6tGzWCpUVA _cTjB4BBSEdyt6tGzWCpUVA _cTjB4RBSEdyt6tGzWCpUVA _cTsy4BBSEdyt6tGzWCpUVA _cTsy4RBSEdyt6tGzWCpUVA _cTsy4hBSEdyt6tGzWCpUVA _Ci6f8BBTEdyt6tGzWCpUVA _Wh8vUBBVEdyt6tGzWCpUVA _ufbqkBGyEdyb1KzJ7GkiGA _uflbkBGyEdyb1KzJ7GkiGA _uflbkRGyEdyb1KzJ7GkiGA _ufulgBGyEdyb1KzJ7GkiGA _uf4WgBGyEdyb1KzJ7GkiGA _uf4WgRGyEdyb1KzJ7GkiGA _ugBgcBGyEdyb1KzJ7GkiGA _22h4YBGyEdyb1KzJ7GkiGA _qClZ4BG0Edyb1KzJ7GkiGA _aWUyABHYEdyWC5IKDhzksw _aWejABHYEdyWC5IKDhzksw _aWns8BHYEdyWC5IKDhzksw _hO5sABHbEdyWC5IKDhzksw _CjjjkBHcEdyWC5IKDhzksw _Xa_sgBHcEdyWC5IKDhzksw _1tsx0BHjEdy7mJMaejUq5Q _1t2i0BHjEdy7mJMaejUq5Q _ptDNgBJeEdy3Td9UhuLFPg _kMRaoBJgEdy3Td9UhuLFPg _DykoEBJjEdypOJGS7WfJjQ _5a2VkBJ-EdyT_7R0WVpWAw">
-    <elementImport xmi:id="_zBwmMAPQEdyme8Xu4jGRhA" alias="DataType">
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_zBwmMAPQEdyme8Xu4jGRhA" alias="DataType">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#DataType"/>
     </elementImport>
-    <elementImport xmi:id="_zCDhIAPQEdyme8Xu4jGRhA" alias="Property">
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_zCDhIAPQEdyme8Xu4jGRhA" alias="Property">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
     </elementImport>
-    <elementImport xmi:id="_zCDhIQPQEdyme8Xu4jGRhA" alias="NamedElement">
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_zCDhIQPQEdyme8Xu4jGRhA" alias="NamedElement">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#NamedElement"/>
     </elementImport>
-    <elementImport xmi:id="_XaGqQA4vEdysTsAUPnp57Q" alias="EnumerationLiteral">
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_XaGqQA4vEdysTsAUPnp57Q" alias="EnumerationLiteral">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#EnumerationLiteral"/>
     </elementImport>
-    <elementImport xmi:id="_XaGqQQ4vEdysTsAUPnp57Q" alias="Constraint">
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_XaGqQQ4vEdysTsAUPnp57Q" alias="Constraint">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Constraint"/>
     </elementImport>
-    <elementImport xmi:id="_Ry6UsBBSEdyt6tGzWCpUVA" alias="Package">
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_Ry6UsBBSEdyt6tGzWCpUVA" alias="Package">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>
     </elementImport>
-    <elementImport xmi:id="_RzEFsBBSEdyt6tGzWCpUVA" alias="InstanceSpecification">
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_RzEFsBBSEdyt6tGzWCpUVA" alias="InstanceSpecification">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#InstanceSpecification"/>
     </elementImport>
-    <elementImport xmi:id="_RzEFsRBSEdyt6tGzWCpUVA" alias="Class">
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_RzEFsRBSEdyt6tGzWCpUVA" alias="Class">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
     </elementImport>
-    <elementImport xmi:id="_RzNPoBBSEdyt6tGzWCpUVA" alias="ValueSpecification">
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_RzNPoBBSEdyt6tGzWCpUVA" alias="ValueSpecification">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ValueSpecification"/>
     </elementImport>
-    <elementImport xmi:id="_RzXAoBBSEdyt6tGzWCpUVA" alias="TimeObservation">
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_RzXAoBBSEdyt6tGzWCpUVA" alias="TimeObservation">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TimeObservation"/>
     </elementImport>
-    <elementImport xmi:id="_RzXAoRBSEdyt6tGzWCpUVA" alias="DurationObservation">
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_RzXAoRBSEdyt6tGzWCpUVA" alias="DurationObservation">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#DurationObservation"/>
     </elementImport>
-    <elementImport xmi:id="_cTjB4BBSEdyt6tGzWCpUVA" alias="TimeEvent">
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_cTjB4BBSEdyt6tGzWCpUVA" alias="TimeEvent">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TimeEvent"/>
     </elementImport>
-    <elementImport xmi:id="_cTjB4RBSEdyt6tGzWCpUVA" alias="Action">
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_cTjB4RBSEdyt6tGzWCpUVA" alias="Action">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Action"/>
     </elementImport>
-    <elementImport xmi:id="_cTsy4BBSEdyt6tGzWCpUVA" alias="Event">
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_cTsy4BBSEdyt6tGzWCpUVA" alias="Event">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Event"/>
     </elementImport>
-    <elementImport xmi:id="_cTsy4RBSEdyt6tGzWCpUVA" alias="Behavior">
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_cTsy4RBSEdyt6tGzWCpUVA" alias="Behavior">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Behavior"/>
     </elementImport>
-    <elementImport xmi:id="_cTsy4hBSEdyt6tGzWCpUVA" alias="Message">
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_cTsy4hBSEdyt6tGzWCpUVA" alias="Message">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Message"/>
     </elementImport>
-    <elementImport xmi:id="_Ci6f8BBTEdyt6tGzWCpUVA" alias="Enumeration">
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_Ci6f8BBTEdyt6tGzWCpUVA" alias="Enumeration">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Enumeration"/>
     </elementImport>
-    <elementImport xmi:id="_Wh8vUBBVEdyt6tGzWCpUVA" alias="Operation">
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_Wh8vUBBVEdyt6tGzWCpUVA" alias="Operation">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>
     </elementImport>
-    <elementImport xmi:id="_ufbqkBGyEdyb1KzJ7GkiGA" alias="Lifeline">
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_ufbqkBGyEdyb1KzJ7GkiGA" alias="Lifeline">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Lifeline"/>
     </elementImport>
-    <elementImport xmi:id="_uflbkBGyEdyb1KzJ7GkiGA" alias="ConnectableElement">
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_uflbkBGyEdyb1KzJ7GkiGA" alias="ConnectableElement">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ConnectableElement"/>
     </elementImport>
-    <elementImport xmi:id="_uflbkRGyEdyb1KzJ7GkiGA" alias="Connector">
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_uflbkRGyEdyb1KzJ7GkiGA" alias="Connector">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Connector"/>
     </elementImport>
-    <elementImport xmi:id="_ufulgBGyEdyb1KzJ7GkiGA" alias="Collaboration">
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_ufulgBGyEdyb1KzJ7GkiGA" alias="Collaboration">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Collaboration"/>
     </elementImport>
-    <elementImport xmi:id="_uf4WgBGyEdyb1KzJ7GkiGA" alias="ExecutionSpecification">
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_uf4WgBGyEdyb1KzJ7GkiGA" alias="ExecutionSpecification">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ExecutionSpecification"/>
     </elementImport>
-    <elementImport xmi:id="_uf4WgRGyEdyb1KzJ7GkiGA" alias="BehavioralFeature">
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_uf4WgRGyEdyb1KzJ7GkiGA" alias="BehavioralFeature">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
     </elementImport>
-    <elementImport xmi:id="_ugBgcBGyEdyb1KzJ7GkiGA" alias="CollaborationUse">
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_ugBgcBGyEdyb1KzJ7GkiGA" alias="CollaborationUse">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#CollaborationUse"/>
     </elementImport>
-    <elementImport xmi:id="_22h4YBGyEdyb1KzJ7GkiGA" alias="Classifier">
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_22h4YBGyEdyb1KzJ7GkiGA" alias="Classifier">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Classifier"/>
     </elementImport>
-    <elementImport xmi:id="_qClZ4BG0Edyb1KzJ7GkiGA" alias="OpaqueExpression">
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_qClZ4BG0Edyb1KzJ7GkiGA" alias="OpaqueExpression">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#OpaqueExpression"/>
     </elementImport>
-    <elementImport xmi:id="_aWUyABHYEdyWC5IKDhzksw" alias="Port">
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_aWUyABHYEdyWC5IKDhzksw" alias="Port">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Port"/>
     </elementImport>
-    <elementImport xmi:id="_aWejABHYEdyWC5IKDhzksw" alias="InvocationAction">
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_aWejABHYEdyWC5IKDhzksw" alias="InvocationAction">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#InvocationAction"/>
     </elementImport>
-    <elementImport xmi:id="_aWns8BHYEdyWC5IKDhzksw" alias="Interface">
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_aWns8BHYEdyWC5IKDhzksw" alias="Interface">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Interface"/>
     </elementImport>
-    <elementImport xmi:id="_hO5sABHbEdyWC5IKDhzksw" alias="Abstraction">
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_hO5sABHbEdyWC5IKDhzksw" alias="Abstraction">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Abstraction"/>
     </elementImport>
-    <elementImport xmi:id="_CjjjkBHcEdyWC5IKDhzksw" alias="ActivityPartition">
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_CjjjkBHcEdyWC5IKDhzksw" alias="ActivityPartition">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ActivityPartition"/>
     </elementImport>
-    <elementImport xmi:id="_Xa_sgBHcEdyWC5IKDhzksw" alias="Dependency">
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_Xa_sgBHcEdyWC5IKDhzksw" alias="Dependency">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Dependency"/>
     </elementImport>
-    <elementImport xmi:id="_1tsx0BHjEdy7mJMaejUq5Q" alias="BehavioredClassifier">
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_1tsx0BHjEdy7mJMaejUq5Q" alias="BehavioredClassifier">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioredClassifier"/>
     </elementImport>
-    <elementImport xmi:id="_1t2i0BHjEdy7mJMaejUq5Q" alias="Signal">
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_1t2i0BHjEdy7mJMaejUq5Q" alias="Signal">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Signal"/>
     </elementImport>
-    <elementImport xmi:id="_ptDNgBJeEdy3Td9UhuLFPg" alias="TypedElement">
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_ptDNgBJeEdy3Td9UhuLFPg" alias="TypedElement">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
     </elementImport>
-    <elementImport xmi:id="_kMRaoBJgEdy3Td9UhuLFPg" alias="Element">
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_kMRaoBJgEdy3Td9UhuLFPg" alias="Element">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
     </elementImport>
-    <elementImport xmi:id="_DykoEBJjEdypOJGS7WfJjQ" alias="Namespace">
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_DykoEBJjEdypOJGS7WfJjQ" alias="Namespace">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Namespace"/>
     </elementImport>
-    <elementImport xmi:id="_5a2VkBJ-EdyT_7R0WVpWAw" alias="Association">
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_5a2VkBJ-EdyT_7R0WVpWAw" alias="Association">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Association"/>
     </elementImport>
-    <packageImport xmi:id="_zaC5cQPHEdyeNfbOYuD9pg">
+    <packageImport xmi:type="uml:PackageImport" xmi:id="_zaC5cQPHEdyeNfbOYuD9pg">
       <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
     </packageImport>
-    <packageImport xmi:id="_packageImport.0">
+    <packageImport xmi:type="uml:PackageImport" xmi:id="_packageImport.0">
       <importedPackage xmi:type="uml:Model" href="pathmap://UML_METAMODELS/Ecore.metamodel.uml#_0"/>
     </packageImport>
-    <packageImport xmi:id="_xrCkwA9eEdy-lroUn0KWEw">
-      <importedPackage href="MARTE_Library.library.uml#_uBlQkA73EdyML4mHwjNDrw"/>
+    <packageImport xmi:type="uml:PackageImport" xmi:id="_xrCkwA9eEdy-lroUn0KWEw">
+      <importedPackage xmi:type="uml:Package" href="MARTE_Library.library.uml#_uBlQkA73EdyML4mHwjNDrw"/>
     </packageImport>
-    <packageImport xmi:id="_xrCkwQ9eEdy-lroUn0KWEw">
-      <importedPackage href="MARTE_Library.library.uml#_dDxjEAeNEdytasR0-Ec7ew"/>
+    <packageImport xmi:type="uml:PackageImport" xmi:id="_xrCkwQ9eEdy-lroUn0KWEw">
+      <importedPackage xmi:type="uml:Package" href="MARTE_Library.library.uml#_dDxjEAeNEdytasR0-Ec7ew"/>
     </packageImport>
-    <packageImport xmi:id="_xrMVwA9eEdy-lroUn0KWEw">
-      <importedPackage href="MARTE_Library.library.uml#_3DJKAA4uEdysTsAUPnp57Q"/>
+    <packageImport xmi:type="uml:PackageImport" xmi:id="_xrMVwA9eEdy-lroUn0KWEw">
+      <importedPackage xmi:type="uml:Package" href="MARTE_Library.library.uml#_3DJKAA4uEdysTsAUPnp57Q"/>
     </packageImport>
-    <packageImport xmi:id="_xrMVwQ9eEdy-lroUn0KWEw">
-      <importedPackage href="MARTE_Library.library.uml#_X3JtMAeNEdytasR0-Ec7ew"/>
+    <packageImport xmi:type="uml:PackageImport" xmi:id="_xrMVwQ9eEdy-lroUn0KWEw">
+      <importedPackage xmi:type="uml:Package" href="MARTE_Library.library.uml#_X3JtMAeNEdytasR0-Ec7ew"/>
     </packageImport>
-    <packageImport xmi:id="_xrMVwg9eEdy-lroUn0KWEw">
-      <importedPackage href="MARTE_Library.library.uml#_g2qR8A74EdyML4mHwjNDrw"/>
+    <packageImport xmi:type="uml:PackageImport" xmi:id="_xrMVwg9eEdy-lroUn0KWEw">
+      <importedPackage xmi:type="uml:Package" href="MARTE_Library.library.uml#_g2qR8A74EdyML4mHwjNDrw"/>
     </packageImport>
-    <packageImport xmi:id="_xrVfsA9eEdy-lroUn0KWEw">
-      <importedPackage href="MARTE_Library.library.uml#_l6ms8A74EdyML4mHwjNDrw"/>
+    <packageImport xmi:type="uml:PackageImport" xmi:id="_xrVfsA9eEdy-lroUn0KWEw">
+      <importedPackage xmi:type="uml:Package" href="MARTE_Library.library.uml#_l6ms8A74EdyML4mHwjNDrw"/>
     </packageImport>
-    <packageImport xmi:id="_xrVfsQ9eEdy-lroUn0KWEw">
-      <importedPackage href="MARTE_Library.library.uml#_x9l9sA74EdyML4mHwjNDrw"/>
+    <packageImport xmi:type="uml:PackageImport" xmi:id="_xrVfsQ9eEdy-lroUn0KWEw">
+      <importedPackage xmi:type="uml:Package" href="MARTE_Library.library.uml#_x9l9sA74EdyML4mHwjNDrw"/>
     </packageImport>
-    <packageImport xmi:id="_xrVfsg9eEdy-lroUn0KWEw">
-      <importedPackage href="MARTE_Library.library.uml#_2GPOEA74EdyML4mHwjNDrw"/>
+    <packageImport xmi:type="uml:PackageImport" xmi:id="_xrVfsg9eEdy-lroUn0KWEw">
+      <importedPackage xmi:type="uml:Package" href="MARTE_Library.library.uml#_2GPOEA74EdyML4mHwjNDrw"/>
     </packageImport>
     <packagedElement xmi:type="uml:Package" xmi:id="_jG1CQAPKEdy6wIwMc4WDOQ" name="MARTE_Foundations">
       <packagedElement xmi:type="uml:Profile" xmi:id="_U_GAoAPMEdyuUt-4qHuVvQ" name="NFPs" metaclassReference="_exWKQECJEd6UTJZnztgOLw">
-        <elementImport xmi:id="_exWKQECJEd6UTJZnztgOLw" alias="Enumeration">
+        <elementImport xmi:type="uml:ElementImport" xmi:id="_exWKQECJEd6UTJZnztgOLw" alias="Enumeration">
           <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Enumeration"/>
         </elementImport>
         <packagedElement xmi:type="uml:Enumeration" xmi:id="_ZCtm0A4vEdysTsAUPnp57Q" name="ConstraintKind">
-          <ownedLiteral xmi:id="_bn9x0A4vEdysTsAUPnp57Q" name="required"/>
-          <ownedLiteral xmi:id="_b3A6cA4vEdysTsAUPnp57Q" name="offered"/>
-          <ownedLiteral xmi:id="_cD1OcA4vEdysTsAUPnp57Q" name="contract"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_bn9x0A4vEdysTsAUPnp57Q" name="required"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_b3A6cA4vEdysTsAUPnp57Q" name="offered"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_cD1OcA4vEdysTsAUPnp57Q" name="contract"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_lCt1AA4vEdysTsAUPnp57Q" name="Nfp">
-          <ownedAttribute xmi:id="_rI-ooQ4vEdysTsAUPnp57Q" name="base_Property" isUnique="false" association="_rI03oA4vEdysTsAUPnp57Q">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_rI-ooQ4vEdysTsAUPnp57Q" name="base_Property" isUnique="false" association="_rI03oA4vEdysTsAUPnp57Q">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
           </ownedAttribute>
         </packagedElement>
@@ -167,7 +167,7 @@
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_rI-ooA4vEdysTsAUPnp57Q" name="extension_NFP" type="_lCt1AA4vEdysTsAUPnp57Q" aggregation="composite" association="_rI03oA4vEdysTsAUPnp57Q"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_xNTikA4vEdysTsAUPnp57Q" name="Unit">
-          <ownedAttribute xmi:id="_zHCrYA4vEdysTsAUPnp57Q" name="convFactor" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_zHCrYA4vEdysTsAUPnp57Q" name="convFactor" visibility="public" isUnique="false">
             <type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_beo90AnpEdy9WM11hWri2g"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8bFpoA4vEdysTsAUPnp57Q"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8bPaoA4vEdysTsAUPnp57Q" value="1"/>
@@ -175,7 +175,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_zMkEkA4vEdysTsAUPnp57Q" name="convOffset" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_zMkEkA4vEdysTsAUPnp57Q" name="convOffset" visibility="public" isUnique="false">
             <type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_beo90AnpEdy9WM11hWri2g"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DoSQIA4wEdysTsAUPnp57Q"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DobaEA4wEdysTsAUPnp57Q" value="1"/>
@@ -183,14 +183,14 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_zReZwA4vEdysTsAUPnp57Q" name="baseUnit" visibility="public" type="_xNTikA4vEdysTsAUPnp57Q" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_zReZwA4vEdysTsAUPnp57Q" name="baseUnit" visibility="public" type="_xNTikA4vEdysTsAUPnp57Q" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ge-JYA4wEdysTsAUPnp57Q"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ge-JYQ4wEdysTsAUPnp57Q" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_GfH6YA4wEdysTsAUPnp57Q">
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_J9vWUA4wEdysTsAUPnp57Q" name="base_EnumerationLiteral" isUnique="false" association="_J9cbYA4wEdysTsAUPnp57Q">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_J9vWUA4wEdysTsAUPnp57Q" name="base_EnumerationLiteral" isUnique="false" association="_J9cbYA4wEdysTsAUPnp57Q">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#EnumerationLiteral"/>
           </ownedAttribute>
         </packagedElement>
@@ -198,17 +198,17 @@
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_J9mMYA4wEdysTsAUPnp57Q" name="extension_Unit" type="_xNTikA4vEdysTsAUPnp57Q" aggregation="composite" association="_J9cbYA4wEdysTsAUPnp57Q"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_P9c2AA4wEdysTsAUPnp57Q" name="NfpConstraint">
-          <ownedAttribute xmi:id="_Ru_sIA4wEdysTsAUPnp57Q" name="kind" visibility="public" type="_ZCtm0A4vEdysTsAUPnp57Q" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Ru_sIA4wEdysTsAUPnp57Q" name="kind" visibility="public" type="_ZCtm0A4vEdysTsAUPnp57Q" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_USducA4wEdysTsAUPnp57Q"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_USm4YA4wEdysTsAUPnp57Q" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_TgPnUQ4wEdysTsAUPnp57Q">
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_aZUX8Q4wEdysTsAUPnp57Q" name="base_Constraint" isUnique="false" association="_aZKm8A4wEdysTsAUPnp57Q">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_aZUX8Q4wEdysTsAUPnp57Q" name="base_Constraint" isUnique="false" association="_aZKm8A4wEdysTsAUPnp57Q">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Constraint"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_ynxogECREd6UTJZnztgOLw" name="mode" type="_yeqiEECMEd6UTJZnztgOLw" isUnique="false" association="_ymHboECREd6UTJZnztgOLw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_ynxogECREd6UTJZnztgOLw" name="mode" type="_yeqiEECMEd6UTJZnztgOLw" isUnique="false" association="_ymHboECREd6UTJZnztgOLw">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yo6Q8ECREd6UTJZnztgOLw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yo_JcECREd6UTJZnztgOLw" value="*"/>
           </ownedAttribute>
@@ -217,8 +217,8 @@
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_aZUX8A4wEdysTsAUPnp57Q" name="extension_NfpConstraint" type="_P9c2AA4wEdysTsAUPnp57Q" aggregation="composite" association="_aZKm8A4wEdysTsAUPnp57Q"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_-Z87EBFFEdyBd9q9NMDXUQ" name="NfpType">
-          <generalization xmi:id="_AqDVcBFGEdyBd9q9NMDXUQ" general="_IkLw0A-NEdyLh7muGbCqMw"/>
-          <ownedAttribute xmi:id="_DA2NsBFGEdyBd9q9NMDXUQ" name="valueAttrib" visibility="public" isUnique="false" subsettedProperty="_Xy1aYA-PEdyLh7muGbCqMw">
+          <generalization xmi:type="uml:Generalization" xmi:id="_AqDVcBFGEdyBd9q9NMDXUQ" general="_IkLw0A-NEdyLh7muGbCqMw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_DA2NsBFGEdyBd9q9NMDXUQ" name="valueAttrib" visibility="public" isUnique="false" subsettedProperty="_Xy1aYA-PEdyLh7muGbCqMw">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HCVtMBFGEdyBd9q9NMDXUQ"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HCVtMRFGEdyBd9q9NMDXUQ" value="1"/>
@@ -226,7 +226,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_J2pA0BFGEdyBd9q9NMDXUQ" name="unitAttrib" visibility="public" isUnique="false" subsettedProperty="_Xy1aYA-PEdyLh7muGbCqMw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_J2pA0BFGEdyBd9q9NMDXUQ" name="unitAttrib" visibility="public" isUnique="false" subsettedProperty="_Xy1aYA-PEdyLh7muGbCqMw">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L69pABFGEdyBd9q9NMDXUQ"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L7HaABFGEdyBd9q9NMDXUQ" value="1"/>
@@ -234,7 +234,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_MyZnUBFGEdyBd9q9NMDXUQ" name="exprAttrib" visibility="public" isUnique="false" subsettedProperty="_Xy1aYA-PEdyLh7muGbCqMw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_MyZnUBFGEdyBd9q9NMDXUQ" name="exprAttrib" visibility="public" isUnique="false" subsettedProperty="_Xy1aYA-PEdyLh7muGbCqMw">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_PToN8BFGEdyBd9q9NMDXUQ"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PTx-8BFGEdyBd9q9NMDXUQ" value="1"/>
@@ -244,7 +244,7 @@
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_gX6fcECJEd6UTJZnztgOLw" name="Dimension">
-          <ownedAttribute xmi:id="_o2jfsECJEd6UTJZnztgOLw" name="symbol" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_o2jfsECJEd6UTJZnztgOLw" name="symbol" visibility="public" isUnique="false">
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VU8PUECLEd6UTJZnztgOLw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VVIckECLEd6UTJZnztgOLw" value="1"/>
@@ -252,14 +252,14 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_o683gECJEd6UTJZnztgOLw" name="baseDimension" visibility="public" type="_gX6fcECJEd6UTJZnztgOLw" isOrdered="true" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_o683gECJEd6UTJZnztgOLw" name="baseDimension" visibility="public" type="_gX6fcECJEd6UTJZnztgOLw" isOrdered="true" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Z57dcECLEd6UTJZnztgOLw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Z6DZQECLEd6UTJZnztgOLw" value="*"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_Z6HqsECLEd6UTJZnztgOLw">
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_o_eLIECJEd6UTJZnztgOLw" name="baseExponent" visibility="public" isOrdered="true" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_o_eLIECJEd6UTJZnztgOLw" name="baseExponent" visibility="public" isOrdered="true" isUnique="false">
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_exozQECLEd6UTJZnztgOLw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_extEsECLEd6UTJZnztgOLw" value="*"/>
@@ -267,7 +267,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_hLtpAECLEd6UTJZnztgOLw" name="base_Enumeration" isUnique="false" association="_hIze8ECLEd6UTJZnztgOLw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_hLtpAECLEd6UTJZnztgOLw" name="base_Enumeration" isUnique="false" association="_hIze8ECLEd6UTJZnztgOLw">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Enumeration"/>
           </ownedAttribute>
         </packagedElement>
@@ -275,25 +275,25 @@
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_hLPH4ECLEd6UTJZnztgOLw" name="extension_Dimension" type="_gX6fcECJEd6UTJZnztgOLw" aggregation="composite" association="_hIze8ECLEd6UTJZnztgOLw"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Association" xmi:id="_ymHboECREd6UTJZnztgOLw" name="A_NfpConstraint_Mode" memberEnd="_ynxogECREd6UTJZnztgOLw _ypCMwECREd6UTJZnztgOLw">
-          <ownedEnd xmi:id="_ypCMwECREd6UTJZnztgOLw" name="nfpConstraint" type="_P9c2AA4wEdysTsAUPnp57Q" isUnique="false" association="_ymHboECREd6UTJZnztgOLw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_ypCMwECREd6UTJZnztgOLw" name="nfpConstraint" type="_P9c2AA4wEdysTsAUPnp57Q" isUnique="false" association="_ymHboECREd6UTJZnztgOLw">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yprF8ECREd6UTJZnztgOLw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ypm0gECREd6UTJZnztgOLw" value="*"/>
           </ownedEnd>
         </packagedElement>
       </packagedElement>
       <packagedElement xmi:type="uml:Profile" xmi:id="_WStkoAPMEdyuUt-4qHuVvQ" name="Time">
-        <packageImport xmi:id="_MbX8EA9REdyey4B16cv6mQ" importedPackage="_U_GAoAPMEdyuUt-4qHuVvQ"/>
-        <packageImport xmi:id="_vg6ygBBOEdyt6tGzWCpUVA" importedPackage="_9FdqwA-MEdyLh7muGbCqMw"/>
-        <packageImport xmi:id="_oCiOABBREdyt6tGzWCpUVA">
-          <importedPackage href="MARTE_Library.library.uml#_x9l9sA74EdyML4mHwjNDrw"/>
+        <packageImport xmi:type="uml:PackageImport" xmi:id="_MbX8EA9REdyey4B16cv6mQ" importedPackage="_U_GAoAPMEdyuUt-4qHuVvQ"/>
+        <packageImport xmi:type="uml:PackageImport" xmi:id="_vg6ygBBOEdyt6tGzWCpUVA" importedPackage="_9FdqwA-MEdyLh7muGbCqMw"/>
+        <packageImport xmi:type="uml:PackageImport" xmi:id="_oCiOABBREdyt6tGzWCpUVA">
+          <importedPackage xmi:type="uml:Package" href="MARTE_Library.library.uml#_x9l9sA74EdyML4mHwjNDrw"/>
         </packageImport>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_hEbW8BBSEdyt6tGzWCpUVA" name="TimedDomain">
-          <ownedAttribute xmi:id="_ul_fAECaEd6UTJZnztgOLw" name="base_Namespace" isUnique="false" association="_ujKNcECaEd6UTJZnztgOLw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_ul_fAECaEd6UTJZnztgOLw" name="base_Namespace" isUnique="false" association="_ujKNcECaEd6UTJZnztgOLw">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Namespace"/>
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_i_gjkBBSEdyt6tGzWCpUVA" name="Clock">
-          <ownedAttribute xmi:id="_odZIkBBSEdyt6tGzWCpUVA" name="standard" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_odZIkBBSEdyt6tGzWCpUVA" name="standard" visibility="public" isUnique="false">
             <type xmi:type="uml:Enumeration" href="MARTE_Library.library.uml#_MDyyoA-KEdyNj8xzjk-DoA"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_sjNHYBBSEdyt6tGzWCpUVA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sjW4YBBSEdyt6tGzWCpUVA" value="1"/>
@@ -301,26 +301,26 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="__Lr-EBBVEdyt6tGzWCpUVA" name="base_InstanceSpecification" isUnique="false" association="__LZDIBBVEdyt6tGzWCpUVA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="__Lr-EBBVEdyt6tGzWCpUVA" name="base_InstanceSpecification" isUnique="false" association="__LZDIBBVEdyt6tGzWCpUVA">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#InstanceSpecification"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_skGj0BCVEdyu4qthTScrTA" name="type" type="_j4bvoBBSEdyt6tGzWCpUVA" isUnique="false" association="_sj8y0BCVEdyu4qthTScrTA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_skGj0BCVEdyu4qthTScrTA" name="type" type="_j4bvoBBSEdyt6tGzWCpUVA" isUnique="false" association="_sj8y0BCVEdyu4qthTScrTA">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ssbX0GqGEdyHVMM3AaZxvA" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ssfpQGqGEdyHVMM3AaZxvA" value="1"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_7R2xsRCVEdyu4qthTScrTA" name="unit" type="_xNTikA4vEdysTsAUPnp57Q" isUnique="false" association="_7R2xsBCVEdyu4qthTScrTA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_7R2xsRCVEdyu4qthTScrTA" name="unit" type="_xNTikA4vEdysTsAUPnp57Q" isUnique="false" association="_7R2xsBCVEdyu4qthTScrTA">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A66E4BCWEdyu4qthTScrTA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A7D14BCWEdyu4qthTScrTA" value="1"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_dkEmIDJLEd211cMdxu944g" name="base_Property" isUnique="false" association="_dZML0DJLEd211cMdxu944g">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_dkEmIDJLEd211cMdxu944g" name="base_Property" isUnique="false" association="_dZML0DJLEd211cMdxu944g">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_9d8ZALG1Ed-tmN4hwNCxXQ" name="base_Event" association="_9d8ZAbG1Ed-tmN4hwNCxXQ">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_9d8ZALG1Ed-tmN4hwNCxXQ" name="base_Event" association="_9d8ZAbG1Ed-tmN4hwNCxXQ">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Event"/>
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_j4bvoBBSEdyt6tGzWCpUVA" name="ClockType">
-          <ownedAttribute xmi:id="_wZrCoBBSEdyt6tGzWCpUVA" name="nature" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_wZrCoBBSEdyt6tGzWCpUVA" name="nature" visibility="public" isUnique="false">
             <type xmi:type="uml:Enumeration" href="MARTE_Library.library.uml#_WAvb0A75EdyML4mHwjNDrw"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1KGrwBBSEdyt6tGzWCpUVA" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1KP1sBBSEdyt6tGzWCpUVA" value="1"/>
@@ -328,7 +328,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_we450BBSEdyt6tGzWCpUVA" name="unitType" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_we450BBSEdyt6tGzWCpUVA" name="unitType" visibility="public" isUnique="false">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Enumeration"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__RQh8BBSEdyt6tGzWCpUVA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__RaS8BBSEdyt6tGzWCpUVA" value="1"/>
@@ -336,13 +336,13 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_wn-kYBBSEdyt6tGzWCpUVA" name="isLogical" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_wn-kYBBSEdyt6tGzWCpUVA" name="isLogical" visibility="public" isUnique="false">
             <type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_McqMQBBTEdyt6tGzWCpUVA" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Mcz9QBBTEdyt6tGzWCpUVA" value="1"/>
             <defaultValue xmi:type="uml:LiteralBoolean" xmi:id="_JhtzMBBVEdyt6tGzWCpUVA"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_wt8CcBBSEdyt6tGzWCpUVA" name="resolAttr" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_wt8CcBBSEdyt6tGzWCpUVA" name="resolAttr" visibility="public" isUnique="false">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_MYZscBBVEdyt6tGzWCpUVA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MYZscRBVEdyt6tGzWCpUVA" value="1"/>
@@ -350,7 +350,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_wzJ5oBBSEdyt6tGzWCpUVA" name="maxValAttr" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_wzJ5oBBSEdyt6tGzWCpUVA" name="maxValAttr" visibility="public" isUnique="false">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Puh6wBBVEdyt6tGzWCpUVA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PurrwBBVEdyt6tGzWCpUVA" value="1"/>
@@ -358,7 +358,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_w4XJwBBSEdyt6tGzWCpUVA" name="offsetAttr" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_w4XJwBBSEdyt6tGzWCpUVA" name="offsetAttr" visibility="public" isUnique="false">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_S5Vp4BBVEdyt6tGzWCpUVA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_S5Vp4RBVEdyt6tGzWCpUVA" value="1"/>
@@ -366,7 +366,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_w9SGABBSEdyt6tGzWCpUVA" name="getTime" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_w9SGABBSEdyt6tGzWCpUVA" name="getTime" visibility="public" isUnique="false">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_U1d_YBBVEdyt6tGzWCpUVA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_U1d_YRBVEdyt6tGzWCpUVA" value="1"/>
@@ -374,7 +374,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_xESF4BBSEdyt6tGzWCpUVA" name="setTime" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_xESF4BBSEdyt6tGzWCpUVA" name="setTime" visibility="public" isUnique="false">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZolJEBBVEdyt6tGzWCpUVA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZolJERBVEdyt6tGzWCpUVA" value="1"/>
@@ -382,7 +382,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_xJpuEBBSEdyt6tGzWCpUVA" name="indexToValue" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_xJpuEBBSEdyt6tGzWCpUVA" name="indexToValue" visibility="public" isUnique="false">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_cAkUIBBVEdyt6tGzWCpUVA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cAuFIBBVEdyt6tGzWCpUVA" value="1"/>
@@ -390,12 +390,12 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_-lZaIBBVEdyt6tGzWCpUVA" name="base_Class" isUnique="false" association="_-lF4IBBVEdyt6tGzWCpUVA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_-lZaIBBVEdyt6tGzWCpUVA" name="base_Class" isUnique="false" association="_-lF4IBBVEdyt6tGzWCpUVA">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_llNagBBSEdyt6tGzWCpUVA" name="TimedElement" isAbstract="true">
-          <ownedAttribute xmi:id="_Fp8a8BBWEdyt6tGzWCpUVA" name="on" type="_i_gjkBBSEdyt6tGzWCpUVA" isUnique="false" association="_FpfvABBWEdyt6tGzWCpUVA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Fp8a8BBWEdyt6tGzWCpUVA" name="on" type="_i_gjkBBSEdyt6tGzWCpUVA" isUnique="false" association="_FpfvABBWEdyt6tGzWCpUVA">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_JBaGABBWEdyt6tGzWCpUVA" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JBaGARBWEdyt6tGzWCpUVA" value="*"/>
           </ownedAttribute>
@@ -407,26 +407,26 @@
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="__Li0IBBVEdyt6tGzWCpUVA" name="extension_Clock" type="_i_gjkBBSEdyt6tGzWCpUVA" aggregation="composite" association="__LZDIBBVEdyt6tGzWCpUVA"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Association" xmi:id="_FpfvABBWEdyt6tGzWCpUVA" name="Association_TimedElement_Clock" memberEnd="_Fp8a8BBWEdyt6tGzWCpUVA _FqFk4BBWEdyt6tGzWCpUVA">
-          <ownedEnd xmi:id="_FqFk4BBWEdyt6tGzWCpUVA" name="timedElement" type="_llNagBBSEdyt6tGzWCpUVA" isUnique="false" association="_FpfvABBWEdyt6tGzWCpUVA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_FqFk4BBWEdyt6tGzWCpUVA" name="timedElement" type="_llNagBBSEdyt6tGzWCpUVA" isUnique="false" association="_FpfvABBWEdyt6tGzWCpUVA">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_FqPV4RBWEdyt6tGzWCpUVA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FqPV4BBWEdyt6tGzWCpUVA" value="*"/>
           </ownedEnd>
         </packagedElement>
         <packagedElement xmi:type="uml:Association" xmi:id="_sj8y0BCVEdyu4qthTScrTA" name="Association_Clock_ClockType" memberEnd="_skGj0BCVEdyu4qthTScrTA _skQU0hCVEdyu4qthTScrTA">
-          <ownedEnd xmi:id="_skQU0hCVEdyu4qthTScrTA" name="clock" type="_i_gjkBBSEdyt6tGzWCpUVA" isUnique="false" association="_sj8y0BCVEdyu4qthTScrTA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_skQU0hCVEdyu4qthTScrTA" name="clock" type="_i_gjkBBSEdyt6tGzWCpUVA" isUnique="false" association="_sj8y0BCVEdyu4qthTScrTA">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_skjPwRCVEdyu4qthTScrTA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_skjPwBCVEdyu4qthTScrTA" value="*"/>
           </ownedEnd>
         </packagedElement>
         <packagedElement xmi:type="uml:Association" xmi:id="_7R2xsBCVEdyu4qthTScrTA" name="Association_Clock_Unit" memberEnd="_7R2xsRCVEdyu4qthTScrTA _7SAishCVEdyu4qthTScrTA">
-          <ownedEnd xmi:id="_7SAishCVEdyu4qthTScrTA" name="clock" type="_i_gjkBBSEdyt6tGzWCpUVA" isUnique="false" association="_7R2xsBCVEdyu4qthTScrTA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_7SAishCVEdyu4qthTScrTA" name="clock" type="_i_gjkBBSEdyt6tGzWCpUVA" isUnique="false" association="_7R2xsBCVEdyu4qthTScrTA">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_7SJsoRCVEdyu4qthTScrTA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7SJsoBCVEdyu4qthTScrTA" value="*"/>
           </ownedEnd>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_JUPuYBCWEdyu4qthTScrTA" name="TimedValueSpecification">
-          <generalization xmi:id="_WruF0BCWEdyu4qthTScrTA" general="_llNagBBSEdyt6tGzWCpUVA"/>
-          <ownedAttribute xmi:id="_LerloBCWEdyu4qthTScrTA" name="interpretation" visibility="public" isUnique="false">
+          <generalization xmi:type="uml:Generalization" xmi:id="_WruF0BCWEdyu4qthTScrTA" general="_llNagBBSEdyt6tGzWCpUVA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_LerloBCWEdyu4qthTScrTA" name="interpretation" visibility="public" isUnique="false">
             <type xmi:type="uml:Enumeration" href="MARTE_Library.library.uml#_a_LrwA75EdyML4mHwjNDrw"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_SItNoBCWEdyu4qthTScrTA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SI2XkBCWEdyu4qthTScrTA" value="1"/>
@@ -434,7 +434,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_eSY8QBCWEdyu4qthTScrTA" name="base_ValueSpecification" isUnique="false" association="_eSGBUBCWEdyu4qthTScrTA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_eSY8QBCWEdyu4qthTScrTA" name="base_ValueSpecification" isUnique="false" association="_eSGBUBCWEdyu4qthTScrTA">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ValueSpecification"/>
           </ownedAttribute>
         </packagedElement>
@@ -442,9 +442,9 @@
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_eSPyUBCWEdyu4qthTScrTA" name="extension_TimedValueSpecification" type="_JUPuYBCWEdyu4qthTScrTA" aggregation="composite" association="_eSGBUBCWEdyu4qthTScrTA"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_n90TkBD1EdyybZnLxHsjyA" name="TimedConstraint">
-          <generalization xmi:id="_JuyTsBD2EdyybZnLxHsjyA" general="_P9c2AA4wEdysTsAUPnp57Q"/>
-          <generalization xmi:id="_KnZ9wBD2EdyybZnLxHsjyA" general="_llNagBBSEdyt6tGzWCpUVA"/>
-          <ownedAttribute xmi:id="_1EwUoBD1EdyybZnLxHsjyA" name="interpretation" visibility="public" isUnique="false">
+          <generalization xmi:type="uml:Generalization" xmi:id="_JuyTsBD2EdyybZnLxHsjyA" general="_P9c2AA4wEdysTsAUPnp57Q"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_KnZ9wBD2EdyybZnLxHsjyA" general="_llNagBBSEdyt6tGzWCpUVA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_1EwUoBD1EdyybZnLxHsjyA" name="interpretation" visibility="public" isUnique="false">
             <type xmi:type="uml:Enumeration" href="MARTE_Library.library.uml#_a_LrwA75EdyML4mHwjNDrw"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_3Rt7cBD1EdyybZnLxHsjyA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3R3scBD1EdyybZnLxHsjyA" value="1"/>
@@ -454,9 +454,9 @@
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_og1hEBD1EdyybZnLxHsjyA" name="ClockConstraint">
-          <generalization xmi:id="_LlZQABD2EdyybZnLxHsjyA" general="_llNagBBSEdyt6tGzWCpUVA"/>
-          <generalization xmi:id="_NyziwBD2EdyybZnLxHsjyA" general="_P9c2AA4wEdysTsAUPnp57Q"/>
-          <ownedAttribute xmi:id="_JaIsYECaEd6UTJZnztgOLw" name="isCoincidenceBased" visibility="public" isUnique="false">
+          <generalization xmi:type="uml:Generalization" xmi:id="_LlZQABD2EdyybZnLxHsjyA" general="_llNagBBSEdyt6tGzWCpUVA"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_NyziwBD2EdyybZnLxHsjyA" general="_P9c2AA4wEdysTsAUPnp57Q"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_JaIsYECaEd6UTJZnztgOLw" name="isCoincidenceBased" visibility="public" isUnique="false">
             <type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_P1-HYECaEd6UTJZnztgOLw" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P2E1EECaEd6UTJZnztgOLw" value="1"/>
@@ -464,7 +464,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_Jfr6wECaEd6UTJZnztgOLw" name="isPrecedenceBased" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Jfr6wECaEd6UTJZnztgOLw" name="isPrecedenceBased" visibility="public" isUnique="false">
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YrvOMECaEd6UTJZnztgOLw" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YsFMcECaEd6UTJZnztgOLw" value="1"/>
@@ -472,7 +472,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_JnyG0ECaEd6UTJZnztgOLw" name="isChronometricBased" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_JnyG0ECaEd6UTJZnztgOLw" name="isChronometricBased" visibility="public" isUnique="false">
             <type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bUwe4ECaEd6UTJZnztgOLw" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bU6P4ECaEd6UTJZnztgOLw" value="1"/>
@@ -482,8 +482,8 @@
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_noixsBD2EdyybZnLxHsjyA" name="TimedInstantObservation">
-          <generalization xmi:id="_w6LWcLG1Ed-tmN4hwNCxXQ" general="_llNagBBSEdyt6tGzWCpUVA"/>
-          <ownedAttribute xmi:id="_qlx-4BD2EdyybZnLxHsjyA" name="obsKind" visibility="public" isUnique="false">
+          <generalization xmi:type="uml:Generalization" xmi:id="_w6LWcLG1Ed-tmN4hwNCxXQ" general="_llNagBBSEdyt6tGzWCpUVA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_qlx-4BD2EdyybZnLxHsjyA" name="obsKind" visibility="public" isUnique="false">
             <type xmi:type="uml:Enumeration" href="MARTE_Library.library.uml#_eMs4wA-KEdyNj8xzjk-DoA"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_unbPYBD2EdyybZnLxHsjyA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_unbPYRD2EdyybZnLxHsjyA" value="1"/>
@@ -491,13 +491,13 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_Gvg0QBD4EdyybZnLxHsjyA" name="base_TimeObservation" isUnique="false" association="_GvXqUBD4EdyybZnLxHsjyA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Gvg0QBD4EdyybZnLxHsjyA" name="base_TimeObservation" isUnique="false" association="_GvXqUBD4EdyybZnLxHsjyA">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TimeObservation"/>
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_xRmWoBD2EdyybZnLxHsjyA" name="TimedDurationObservation">
-          <generalization xmi:id="_yHVtILG1Ed-tmN4hwNCxXQ" general="_llNagBBSEdyt6tGzWCpUVA"/>
-          <ownedAttribute xmi:id="_2QLwgBD2EdyybZnLxHsjyA" name="obsKind" visibility="public" isUnique="false">
+          <generalization xmi:type="uml:Generalization" xmi:id="_yHVtILG1Ed-tmN4hwNCxXQ" general="_llNagBBSEdyt6tGzWCpUVA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_2QLwgBD2EdyybZnLxHsjyA" name="obsKind" visibility="public" isUnique="false">
             <type xmi:type="uml:Enumeration" href="MARTE_Library.library.uml#_eMs4wA-KEdyNj8xzjk-DoA"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4XyWMBD2EdyybZnLxHsjyA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4XyWMRD2EdyybZnLxHsjyA" value="2"/>
@@ -505,7 +505,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_HkHhABD4EdyybZnLxHsjyA" name="base_DurationObservation" isUnique="false" association="_Hj9wABD4EdyybZnLxHsjyA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_HkHhABD4EdyybZnLxHsjyA" name="base_DurationObservation" isUnique="false" association="_Hj9wABD4EdyybZnLxHsjyA">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#DurationObservation"/>
           </ownedAttribute>
         </packagedElement>
@@ -516,8 +516,8 @@
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_Hj9wARD4EdyybZnLxHsjyA" name="extension_TimedDurationObservation" type="_xRmWoBD2EdyybZnLxHsjyA" aggregation="composite" association="_Hj9wABD4EdyybZnLxHsjyA"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_gp3dcBD4EdyybZnLxHsjyA" name="TimedEvent">
-          <generalization xmi:id="_y_yE0BD4EdyybZnLxHsjyA" general="_llNagBBSEdyt6tGzWCpUVA"/>
-          <ownedAttribute xmi:id="_jA93sBD4EdyybZnLxHsjyA" name="repetition" visibility="public" isUnique="false">
+          <generalization xmi:type="uml:Generalization" xmi:id="_y_yE0BD4EdyybZnLxHsjyA" general="_llNagBBSEdyt6tGzWCpUVA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_jA93sBD4EdyybZnLxHsjyA" name="repetition" visibility="public" isUnique="false">
             <type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_HJ1zcAnfEdy9WM11hWri2g"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mSU6wBD4EdyybZnLxHsjyA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mSeEsBD4EdyybZnLxHsjyA" value="1"/>
@@ -525,10 +525,10 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_74jcUBD4EdyybZnLxHsjyA" name="base_TimeEvent" isUnique="false" association="_74QhYBD4EdyybZnLxHsjyA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_74jcUBD4EdyybZnLxHsjyA" name="base_TimeEvent" isUnique="false" association="_74QhYBD4EdyybZnLxHsjyA">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TimeEvent"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_zA-VgBKWEdyGYuetzx6T5A" name="every" isUnique="false" aggregation="composite" association="_zAhpkBKWEdyGYuetzx6T5A">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_zA-VgBKWEdyGYuetzx6T5A" name="every" isUnique="false" aggregation="composite" association="_zAhpkBKWEdyGYuetzx6T5A">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ValueSpecification"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1c17ABKWEdyGYuetzx6T5A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1c_E8BKWEdyGYuetzx6T5A" value="1"/>
@@ -538,27 +538,27 @@
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_74aSYBD4EdyybZnLxHsjyA" name="extension_TimedEvent" type="_gp3dcBD4EdyybZnLxHsjyA" aggregation="composite" association="_74QhYBD4EdyybZnLxHsjyA"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_3V3e0BD5EdyybZnLxHsjyA" name="TimedProcessing">
-          <generalization xmi:id="_-kwcgBD7EdyybZnLxHsjyA" general="_llNagBBSEdyt6tGzWCpUVA"/>
-          <ownedAttribute xmi:id="_7197ABD7EdyybZnLxHsjyA" name="base_Action" isUnique="false" association="_71hPEBD7EdyybZnLxHsjyA">
+          <generalization xmi:type="uml:Generalization" xmi:id="_-kwcgBD7EdyybZnLxHsjyA" general="_llNagBBSEdyt6tGzWCpUVA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_7197ABD7EdyybZnLxHsjyA" name="base_Action" isUnique="false" association="_71hPEBD7EdyybZnLxHsjyA">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Action"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_8ZuvYRD7EdyybZnLxHsjyA" name="base_Behavior" isUnique="false" association="_8Zk-YBD7EdyybZnLxHsjyA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_8ZuvYRD7EdyybZnLxHsjyA" name="base_Behavior" isUnique="false" association="_8Zk-YBD7EdyybZnLxHsjyA">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Behavior"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_9M_YUBD7EdyybZnLxHsjyA" name="base_Message" isUnique="false" association="_9MsdYBD7EdyybZnLxHsjyA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_9M_YUBD7EdyybZnLxHsjyA" name="base_Message" isUnique="false" association="_9MsdYBD7EdyybZnLxHsjyA">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Message"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_OAQb4BKWEdyGYuetzx6T5A" name="duration" isUnique="false" aggregation="composite" association="_N_zv8BKWEdyGYuetzx6T5A">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_OAQb4BKWEdyGYuetzx6T5A" name="duration" isUnique="false" aggregation="composite" association="_N_zv8BKWEdyGYuetzx6T5A">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ValueSpecification"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Y8sUQBKWEdyGYuetzx6T5A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Y81eMBKWEdyGYuetzx6T5A" value="1"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_dJUFsBKWEdyGYuetzx6T5A" name="start" isUnique="false" association="_dJBKwBKWEdyGYuetzx6T5A">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_dJUFsBKWEdyGYuetzx6T5A" name="start" isUnique="false" association="_dJBKwBKWEdyGYuetzx6T5A">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Event"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_k_gl4BKWEdyGYuetzx6T5A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_k_qW4BKWEdyGYuetzx6T5A" value="1"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_n3A-gBKWEdyGYuetzx6T5A" name="finish" isUnique="false" association="_n2uDkBKWEdyGYuetzx6T5A">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_n3A-gBKWEdyGYuetzx6T5A" name="finish" isUnique="false" association="_n2uDkBKWEdyGYuetzx6T5A">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Event"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_p2NPEBKWEdyGYuetzx6T5A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_p2WZABKWEdyGYuetzx6T5A" value="1"/>
@@ -574,25 +574,25 @@
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_9M1nUBD7EdyybZnLxHsjyA" name="extension_TimedProcessing" type="_3V3e0BD5EdyybZnLxHsjyA" aggregation="composite" association="_9MsdYBD7EdyybZnLxHsjyA"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Association" xmi:id="_N_zv8BKWEdyGYuetzx6T5A" name="Association_TimedProcessing_ValueSpecification" memberEnd="_OAQb4BKWEdyGYuetzx6T5A _OBcHoRKWEdyGYuetzx6T5A">
-          <ownedEnd xmi:id="_OBcHoRKWEdyGYuetzx6T5A" name="timedProcessing" type="_3V3e0BD5EdyybZnLxHsjyA" isUnique="false" association="_N_zv8BKWEdyGYuetzx6T5A">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_OBcHoRKWEdyGYuetzx6T5A" name="timedProcessing" type="_3V3e0BD5EdyybZnLxHsjyA" isUnique="false" association="_N_zv8BKWEdyGYuetzx6T5A">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_OCVfgBKWEdyGYuetzx6T5A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OCLugBKWEdyGYuetzx6T5A" value="*"/>
           </ownedEnd>
         </packagedElement>
         <packagedElement xmi:type="uml:Association" xmi:id="_dJBKwBKWEdyGYuetzx6T5A" name="Association_TimedProcessing_Event" memberEnd="_dJUFsBKWEdyGYuetzx6T5A _dKpicBKWEdyGYuetzx6T5A">
-          <ownedEnd xmi:id="_dKpicBKWEdyGYuetzx6T5A" name="timedProcessing" type="_3V3e0BD5EdyybZnLxHsjyA" isUnique="false" association="_dJBKwBKWEdyGYuetzx6T5A">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_dKpicBKWEdyGYuetzx6T5A" name="timedProcessing" type="_3V3e0BD5EdyybZnLxHsjyA" isUnique="false" association="_dJBKwBKWEdyGYuetzx6T5A">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_dLZJUBKWEdyGYuetzx6T5A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dLPYUBKWEdyGYuetzx6T5A" value="*"/>
           </ownedEnd>
         </packagedElement>
         <packagedElement xmi:type="uml:Association" xmi:id="_n2uDkBKWEdyGYuetzx6T5A" name="Association_TimedProcessing_Event" memberEnd="_n3A-gBKWEdyGYuetzx6T5A _n4WbQBKWEdyGYuetzx6T5A">
-          <ownedEnd xmi:id="_n4WbQBKWEdyGYuetzx6T5A" name="timedProcessing" type="_3V3e0BD5EdyybZnLxHsjyA" isUnique="false" association="_n2uDkBKWEdyGYuetzx6T5A">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_n4WbQBKWEdyGYuetzx6T5A" name="timedProcessing" type="_3V3e0BD5EdyybZnLxHsjyA" isUnique="false" association="_n2uDkBKWEdyGYuetzx6T5A">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_n5GCIBKWEdyGYuetzx6T5A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_n484MBKWEdyGYuetzx6T5A" value="*"/>
           </ownedEnd>
         </packagedElement>
         <packagedElement xmi:type="uml:Association" xmi:id="_zAhpkBKWEdyGYuetzx6T5A" name="Association_TimedEvent_ValueSpecification" memberEnd="_zA-VgBKWEdyGYuetzx6T5A _zCKoUBKWEdyGYuetzx6T5A">
-          <ownedEnd xmi:id="_zCKoUBKWEdyGYuetzx6T5A" name="timedEvent" type="_gp3dcBD4EdyybZnLxHsjyA" isUnique="false" association="_zAhpkBKWEdyGYuetzx6T5A">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_zCKoUBKWEdyGYuetzx6T5A" name="timedEvent" type="_gp3dcBD4EdyybZnLxHsjyA" isUnique="false" association="_zAhpkBKWEdyGYuetzx6T5A">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_zC5oIRKWEdyGYuetzx6T5A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zC5oIBKWEdyGYuetzx6T5A" value="1"/>
           </ownedEnd>
@@ -609,13 +609,13 @@
       </packagedElement>
       <packagedElement xmi:type="uml:Profile" xmi:id="_XVWGUAPMEdyuUt-4qHuVvQ" name="GRM">
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_BthQEBGzEdyb1KzJ7GkiGA" name="Resource">
-          <ownedAttribute xmi:id="_CmJhMBGzEdyb1KzJ7GkiGA" name="resMult" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_CmJhMBGzEdyb1KzJ7GkiGA" name="resMult" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_0KWSgBFQEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_F7iIoBGzEdyb1KzJ7GkiGA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_F7rSkBGzEdyb1KzJ7GkiGA" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_F7rSkRGzEdyb1KzJ7GkiGA" value="1"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_G2PdYBGzEdyb1KzJ7GkiGA" name="isProtected" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_G2PdYBGzEdyb1KzJ7GkiGA" name="isProtected" visibility="public" isUnique="false">
             <type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_I8W1UBGzEdyb1KzJ7GkiGA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_I8W1URGzEdyb1KzJ7GkiGA" value="1"/>
@@ -623,7 +623,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_HNL9wBGzEdyb1KzJ7GkiGA" name="isActive" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_HNL9wBGzEdyb1KzJ7GkiGA" name="isActive" visibility="public" isUnique="false">
             <type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LiWnMBGzEdyb1KzJ7GkiGA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LifxIBGzEdyb1KzJ7GkiGA" value="1"/>
@@ -631,19 +631,19 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_Nw9MwBGzEdyb1KzJ7GkiGA" name="base_Property" isUnique="false" association="_NwqR0BGzEdyb1KzJ7GkiGA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Nw9MwBGzEdyb1KzJ7GkiGA" name="base_Property" isUnique="false" association="_NwqR0BGzEdyb1KzJ7GkiGA">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_OMFCgBGzEdyb1KzJ7GkiGA" name="base_InstanceSpecification" isUnique="false" association="_OL7RgBGzEdyb1KzJ7GkiGA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_OMFCgBGzEdyb1KzJ7GkiGA" name="base_InstanceSpecification" isUnique="false" association="_OL7RgBGzEdyb1KzJ7GkiGA">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#InstanceSpecification"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_OztqQBGzEdyb1KzJ7GkiGA" name="base_Classifier" isUnique="false" association="_OzavUBGzEdyb1KzJ7GkiGA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_OztqQBGzEdyb1KzJ7GkiGA" name="base_Classifier" isUnique="false" association="_OzavUBGzEdyb1KzJ7GkiGA">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Classifier"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_PWu3wBGzEdyb1KzJ7GkiGA" name="base_Lifeline" isUnique="false" association="_PWb80BGzEdyb1KzJ7GkiGA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_PWu3wBGzEdyb1KzJ7GkiGA" name="base_Lifeline" isUnique="false" association="_PWb80BGzEdyb1KzJ7GkiGA">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Lifeline"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_P1ug4BGzEdyb1KzJ7GkiGA" name="base_ConnectableElement" isUnique="false" association="_P1bl8BGzEdyb1KzJ7GkiGA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P1ug4BGzEdyb1KzJ7GkiGA" name="base_ConnectableElement" isUnique="false" association="_P1bl8BGzEdyb1KzJ7GkiGA">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ConnectableElement"/>
           </ownedAttribute>
         </packagedElement>
@@ -663,8 +663,8 @@
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_P1kv4BGzEdyb1KzJ7GkiGA" name="extension_Resource" type="_BthQEBGzEdyb1KzJ7GkiGA" aggregation="composite" association="_P1bl8BGzEdyb1KzJ7GkiGA"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_Sh-rwBGzEdyb1KzJ7GkiGA" name="StorageResource">
-          <generalization xmi:id="_aRAM8BGzEdyb1KzJ7GkiGA" general="_BthQEBGzEdyb1KzJ7GkiGA"/>
-          <ownedAttribute xmi:id="_UAAwABGzEdyb1KzJ7GkiGA" name="elementSize" visibility="public" isUnique="false">
+          <generalization xmi:type="uml:Generalization" xmi:id="_aRAM8BGzEdyb1KzJ7GkiGA" general="_BthQEBGzEdyb1KzJ7GkiGA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_UAAwABGzEdyb1KzJ7GkiGA" name="elementSize" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_0KWSgBFQEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WlaE8BGzEdyb1KzJ7GkiGA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WlaE8RGzEdyb1KzJ7GkiGA" value="1"/>
@@ -674,8 +674,8 @@
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_cGRFcBGzEdyb1KzJ7GkiGA" name="CommunicationEndPoint">
-          <generalization xmi:id="_k5-90BGzEdyb1KzJ7GkiGA" general="_BthQEBGzEdyb1KzJ7GkiGA"/>
-          <ownedAttribute xmi:id="_ejU9wBGzEdyb1KzJ7GkiGA" name="packetSize" visibility="public" isUnique="false">
+          <generalization xmi:type="uml:Generalization" xmi:id="_k5-90BGzEdyb1KzJ7GkiGA" general="_BthQEBGzEdyb1KzJ7GkiGA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_ejU9wBGzEdyb1KzJ7GkiGA" name="packetSize" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_0KWSgBFQEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gmwOEBGzEdyb1KzJ7GkiGA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gmwOERGzEdyb1KzJ7GkiGA" value="1"/>
@@ -685,26 +685,26 @@
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_p4uIsBGzEdyb1KzJ7GkiGA" name="SynchronizationResource">
-          <generalization xmi:id="_3bX1YBGzEdyb1KzJ7GkiGA" general="_BthQEBGzEdyb1KzJ7GkiGA"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_3bX1YBGzEdyb1KzJ7GkiGA" general="_BthQEBGzEdyb1KzJ7GkiGA"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_qkhewBGzEdyb1KzJ7GkiGA" name="ConcurrencyResource">
-          <generalization xmi:id="_4Qth8BGzEdyb1KzJ7GkiGA" general="_BthQEBGzEdyb1KzJ7GkiGA"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_4Qth8BGzEdyb1KzJ7GkiGA" general="_BthQEBGzEdyb1KzJ7GkiGA"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_rU9dMBGzEdyb1KzJ7GkiGA" name="Scheduler">
-          <generalization xmi:id="_4tBqgBGzEdyb1KzJ7GkiGA" general="_BthQEBGzEdyb1KzJ7GkiGA"/>
-          <ownedAttribute xmi:id="_X9p00BG0Edyb1KzJ7GkiGA" name="isPreemptible" visibility="public" isUnique="false">
+          <generalization xmi:type="uml:Generalization" xmi:id="_4tBqgBGzEdyb1KzJ7GkiGA" general="_BthQEBGzEdyb1KzJ7GkiGA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_X9p00BG0Edyb1KzJ7GkiGA" name="isPreemptible" visibility="public" isUnique="false">
             <type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_cVf-0BG0Edyb1KzJ7GkiGA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cVpv0BG0Edyb1KzJ7GkiGA" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_cVpv0RG0Edyb1KzJ7GkiGA" value="true"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_YBrZMBG0Edyb1KzJ7GkiGA" name="schedPolicy" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_YBrZMBG0Edyb1KzJ7GkiGA" name="schedPolicy" visibility="public" isUnique="false">
             <type xmi:type="uml:Enumeration" href="MARTE_Library.library.uml#_4GfMYBFaEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ipnoQBG0Edyb1KzJ7GkiGA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ipnoQRG0Edyb1KzJ7GkiGA" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_ipxZQBG0Edyb1KzJ7GkiGA" value="FixedPriority"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_YE9WsBG0Edyb1KzJ7GkiGA" name="otherSchedPolicy" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_YE9WsBG0Edyb1KzJ7GkiGA" name="otherSchedPolicy" visibility="public" isUnique="false">
             <type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_qZ3GUAnxEdy9WM11hWri2g"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_lSmcsBG0Edyb1KzJ7GkiGA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lSwNsBG0Edyb1KzJ7GkiGA" value="1"/>
@@ -712,7 +712,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_YIFjMBG0Edyb1KzJ7GkiGA" name="schedule" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_YIFjMBG0Edyb1KzJ7GkiGA" name="schedule" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_HRbMoLGzEd-tmN4hwNCxXQ"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nsiIgBG0Edyb1KzJ7GkiGA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nsiIgRG0Edyb1KzJ7GkiGA" value="1"/>
@@ -720,32 +720,32 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_6-SlsBG3Edyb1KzJ7GkiGA" name="processingUnits" type="_O_i04BG1Edyb1KzJ7GkiGA" isUnique="false" association="_6-I0sBG3Edyb1KzJ7GkiGA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_6-SlsBG3Edyb1KzJ7GkiGA" name="processingUnits" type="_O_i04BG1Edyb1KzJ7GkiGA" isUnique="false" association="_6-I0sBG3Edyb1KzJ7GkiGA">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6-lgoBG3Edyb1KzJ7GkiGA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6-lgoRG3Edyb1KzJ7GkiGA" value="*"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_G3vf8BG4Edyb1KzJ7GkiGA" name="host" type="_e_tF0BG1Edyb1KzJ7GkiGA" isUnique="false" association="_G3lu8BG4Edyb1KzJ7GkiGA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_G3vf8BG4Edyb1KzJ7GkiGA" name="host" type="_e_tF0BG1Edyb1KzJ7GkiGA" isUnique="false" association="_G3lu8BG4Edyb1KzJ7GkiGA">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_J9B14BG4Edyb1KzJ7GkiGA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_J9B14RG4Edyb1KzJ7GkiGA" value="1"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_NN8NABG4Edyb1KzJ7GkiGA" name="protectedSharedResources" type="_y3mvQBGzEdyb1KzJ7GkiGA" association="_NNgIIBG4Edyb1KzJ7GkiGA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_NN8NABG4Edyb1KzJ7GkiGA" name="protectedSharedResources" type="_y3mvQBGzEdyb1KzJ7GkiGA" association="_NNgIIBG4Edyb1KzJ7GkiGA">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NOY48BG4Edyb1KzJ7GkiGA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NOPvABG4Edyb1KzJ7GkiGA" value="*"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_h01_khG4Edyb1KzJ7GkiGA" name="schedulableResources" type="_1zYucBG0Edyb1KzJ7GkiGA" association="_h0jEoBG4Edyb1KzJ7GkiGA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_h01_khG4Edyb1KzJ7GkiGA" name="schedulableResources" type="_1zYucBG0Edyb1KzJ7GkiGA" association="_h0jEoBG4Edyb1KzJ7GkiGA">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_h1SrgRG4Edyb1KzJ7GkiGA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_h1SrgBG4Edyb1KzJ7GkiGA" value="*"/>
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_y3mvQBGzEdyb1KzJ7GkiGA" name="MutualExclusionResource">
-          <generalization xmi:id="_2y-_sBGzEdyb1KzJ7GkiGA" general="_BthQEBGzEdyb1KzJ7GkiGA"/>
-          <ownedAttribute xmi:id="_8HCTQBGzEdyb1KzJ7GkiGA" name="protectKind" visibility="public" isUnique="false">
+          <generalization xmi:type="uml:Generalization" xmi:id="_2y-_sBGzEdyb1KzJ7GkiGA" general="_BthQEBGzEdyb1KzJ7GkiGA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_8HCTQBGzEdyb1KzJ7GkiGA" name="protectKind" visibility="public" isUnique="false">
             <type xmi:type="uml:Enumeration" href="MARTE_Library.library.uml#_HkE7wBFbEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VTHq4GqNEdyHVMM3AaZxvA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VTLVQGqNEdyHVMM3AaZxvA" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_ARdsUBG0Edyb1KzJ7GkiGA" value="PriorityInheritance"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_8tB8QBGzEdyb1KzJ7GkiGA" name="ceiling" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_8tB8QBGzEdyb1KzJ7GkiGA" name="ceiling" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_0KWSgBFQEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HF7CsBG0Edyb1KzJ7GkiGA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HGEMoBG0Edyb1KzJ7GkiGA" value="1"/>
@@ -753,7 +753,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_8xgMkBGzEdyb1KzJ7GkiGA" name="otherProtectProtocol" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_8xgMkBGzEdyb1KzJ7GkiGA" name="otherProtectProtocol" visibility="public" isUnique="false">
             <type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_qZ3GUAnxEdy9WM11hWri2g"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_K7fmEBG0Edyb1KzJ7GkiGA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_K7fmERG0Edyb1KzJ7GkiGA" value="1"/>
@@ -761,21 +761,21 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_NNpSEBG4Edyb1KzJ7GkiGA" name="scheduler" type="_rU9dMBGzEdyb1KzJ7GkiGA" isUnique="false" association="_NNgIIBG4Edyb1KzJ7GkiGA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_NNpSEBG4Edyb1KzJ7GkiGA" name="scheduler" type="_rU9dMBGzEdyb1KzJ7GkiGA" isUnique="false" association="_NNgIIBG4Edyb1KzJ7GkiGA">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_PTT-EBG4Edyb1KzJ7GkiGA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PTdIABG4Edyb1KzJ7GkiGA" value="1"/>
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_vVI4oBG0Edyb1KzJ7GkiGA" name="SecondaryScheduler">
-          <generalization xmi:id="_0jhCABG0Edyb1KzJ7GkiGA" general="_rU9dMBGzEdyb1KzJ7GkiGA"/>
-          <ownedAttribute xmi:id="_kCaDUhG4Edyb1KzJ7GkiGA" name="virtualProcessingUnits" type="_1zYucBG0Edyb1KzJ7GkiGA" association="_kB9XYBG4Edyb1KzJ7GkiGA">
+          <generalization xmi:type="uml:Generalization" xmi:id="_0jhCABG0Edyb1KzJ7GkiGA" general="_rU9dMBGzEdyb1KzJ7GkiGA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_kCaDUhG4Edyb1KzJ7GkiGA" name="virtualProcessingUnits" type="_1zYucBG0Edyb1KzJ7GkiGA" association="_kB9XYBG4Edyb1KzJ7GkiGA">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kC2vQRG4Edyb1KzJ7GkiGA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kC2vQBG4Edyb1KzJ7GkiGA" value="*"/>
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_1zYucBG0Edyb1KzJ7GkiGA" name="SchedulableResource">
-          <generalization xmi:id="_IGLJUBG1Edyb1KzJ7GkiGA" general="_BthQEBGzEdyb1KzJ7GkiGA"/>
-          <ownedAttribute xmi:id="_5BUqEBG0Edyb1KzJ7GkiGA" name="schedParams" visibility="public">
+          <generalization xmi:type="uml:Generalization" xmi:id="_IGLJUBG1Edyb1KzJ7GkiGA" general="_BthQEBGzEdyb1KzJ7GkiGA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5BUqEBG0Edyb1KzJ7GkiGA" name="schedParams" visibility="public">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_d6I-0BFbEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__ZBL8BG0Edyb1KzJ7GkiGA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__ZBL8RG0Edyb1KzJ7GkiGA" value="*"/>
@@ -783,31 +783,31 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_h0jEoRG4Edyb1KzJ7GkiGA" name="host" type="_rU9dMBGzEdyb1KzJ7GkiGA" isUnique="false" association="_h0jEoBG4Edyb1KzJ7GkiGA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_h0jEoRG4Edyb1KzJ7GkiGA" name="host" type="_rU9dMBGzEdyb1KzJ7GkiGA" isUnique="false" association="_h0jEoBG4Edyb1KzJ7GkiGA">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_scVisBG4Edyb1KzJ7GkiGA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_scVisRG4Edyb1KzJ7GkiGA" value="1"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_kCHIYBG4Edyb1KzJ7GkiGA" name="dependentScheduler" type="_vVI4oBG0Edyb1KzJ7GkiGA" isUnique="false" association="_kB9XYBG4Edyb1KzJ7GkiGA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_kCHIYBG4Edyb1KzJ7GkiGA" name="dependentScheduler" type="_vVI4oBG0Edyb1KzJ7GkiGA" isUnique="false" association="_kB9XYBG4Edyb1KzJ7GkiGA">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-EqEQBG4Edyb1KzJ7GkiGA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-EqEQRG4Edyb1KzJ7GkiGA" value="1"/>
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_O_i04BG1Edyb1KzJ7GkiGA" name="ProcessingResource">
-          <generalization xmi:id="_VH5TMBG1Edyb1KzJ7GkiGA" general="_BthQEBGzEdyb1KzJ7GkiGA"/>
-          <ownedAttribute xmi:id="_RHTLkBG1Edyb1KzJ7GkiGA" name="speedFactor" visibility="public" isUnique="false">
+          <generalization xmi:type="uml:Generalization" xmi:id="_VH5TMBG1Edyb1KzJ7GkiGA" general="_BthQEBGzEdyb1KzJ7GkiGA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_RHTLkBG1Edyb1KzJ7GkiGA" name="speedFactor" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AUNLgGqOEdyHVMM3AaZxvA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AUQO0GqOEdyHVMM3AaZxvA" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_SwDSEBG1Edyb1KzJ7GkiGA" value="1.0"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_6RlQsBG3Edyb1KzJ7GkiGA" name="mainScheduler" type="_rU9dMBGzEdyb1KzJ7GkiGA" isUnique="false" association="_6RSVwBG3Edyb1KzJ7GkiGA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_6RlQsBG3Edyb1KzJ7GkiGA" name="mainScheduler" type="_rU9dMBGzEdyb1KzJ7GkiGA" isUnique="false" association="_6RSVwBG3Edyb1KzJ7GkiGA">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_EIWhgBG4Edyb1KzJ7GkiGA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EIpccBG4Edyb1KzJ7GkiGA" value="1"/>
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_XpH50BG1Edyb1KzJ7GkiGA" name="CommunicationMedia">
-          <generalization xmi:id="_eEsPEBG1Edyb1KzJ7GkiGA" general="_O_i04BG1Edyb1KzJ7GkiGA"/>
-          <ownedAttribute xmi:id="_ZUkH8BG1Edyb1KzJ7GkiGA" name="elementSize" visibility="public" isUnique="false">
+          <generalization xmi:type="uml:Generalization" xmi:id="_eEsPEBG1Edyb1KzJ7GkiGA" general="_O_i04BG1Edyb1KzJ7GkiGA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_ZUkH8BG1Edyb1KzJ7GkiGA" name="elementSize" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_0KWSgBFQEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bMEcIBG1Edyb1KzJ7GkiGA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bMEcIRG1Edyb1KzJ7GkiGA" value="1"/>
@@ -815,10 +815,10 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_v1W0UBG1Edyb1KzJ7GkiGA" name="base_Connector" isUnique="false" association="_v1D5YBG1Edyb1KzJ7GkiGA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_v1W0UBG1Edyb1KzJ7GkiGA" name="base_Connector" isUnique="false" association="_v1D5YBG1Edyb1KzJ7GkiGA">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Connector"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_uCvcwBKdEdymP89M8JXkzA" name="transmMode" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_uCvcwBKdEdymP89M8JXkzA" name="transmMode" visibility="public" isUnique="false">
             <type xmi:type="uml:Enumeration" href="MARTE_Library.library.uml#_wBn7gBEBEdyx6M3BlUjlCQ"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8UuUoBKdEdymP89M8JXkzA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8U3ekBKdEdymP89M8JXkzA" value="1"/>
@@ -826,7 +826,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_t9PRsBKdEdymP89M8JXkzA" name="blockT" visibility="public">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_t9PRsBKdEdymP89M8JXkzA" name="blockT" visibility="public">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6kWjMBKdEdymP89M8JXkzA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6kftIBKdEdymP89M8JXkzA" value="*"/>
@@ -834,7 +834,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_t4oegBKdEdymP89M8JXkzA" name="packetT" visibility="public">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_t4oegBKdEdymP89M8JXkzA" name="packetT" visibility="public">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4vX-kBKdEdymP89M8JXkzA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4vhIgBKdEdymP89M8JXkzA" value="*"/>
@@ -842,7 +842,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_tamesBKdEdymP89M8JXkzA" name="capacity" visibility="public">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_tamesBKdEdymP89M8JXkzA" name="capacity" visibility="public">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#__NI1EBFREdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2uMxABKdEdymP89M8JXkzA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2uWiABKdEdymP89M8JXkzA" value="*"/>
@@ -852,23 +852,23 @@
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_e_tF0BG1Edyb1KzJ7GkiGA" name="ComputingResource">
-          <generalization xmi:id="_lzaOQBG1Edyb1KzJ7GkiGA" general="_O_i04BG1Edyb1KzJ7GkiGA"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_lzaOQBG1Edyb1KzJ7GkiGA" general="_O_i04BG1Edyb1KzJ7GkiGA"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_h-cH0BG1Edyb1KzJ7GkiGA" name="DeviceResource">
-          <generalization xmi:id="_mNC2QBG1Edyb1KzJ7GkiGA" general="_O_i04BG1Edyb1KzJ7GkiGA"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_mNC2QBG1Edyb1KzJ7GkiGA" general="_O_i04BG1Edyb1KzJ7GkiGA"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Extension" xmi:id="_v1D5YBG1Edyb1KzJ7GkiGA" name="Extension_CommunicationMedia" memberEnd="_v1NDUBG1Edyb1KzJ7GkiGA _v1W0UBG1Edyb1KzJ7GkiGA">
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_v1NDUBG1Edyb1KzJ7GkiGA" name="extension_CommunicationMedia" type="_XpH50BG1Edyb1KzJ7GkiGA" aggregation="composite" association="_v1D5YBG1Edyb1KzJ7GkiGA"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_v37KsBG2Edyb1KzJ7GkiGA" name="TimingResource">
-          <generalization xmi:id="_1GTUEBG2Edyb1KzJ7GkiGA" general="_BthQEBGzEdyb1KzJ7GkiGA"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_1GTUEBG2Edyb1KzJ7GkiGA" general="_BthQEBGzEdyb1KzJ7GkiGA"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_3bd0oBG2Edyb1KzJ7GkiGA" name="ClockResource">
-          <generalization xmi:id="_5zATwBG2Edyb1KzJ7GkiGA" general="_v37KsBG2Edyb1KzJ7GkiGA"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_5zATwBG2Edyb1KzJ7GkiGA" general="_v37KsBG2Edyb1KzJ7GkiGA"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_7IF3YBG2Edyb1KzJ7GkiGA" name="TimerResource">
-          <generalization xmi:id="_G5Mt8BG3Edyb1KzJ7GkiGA" general="_v37KsBG2Edyb1KzJ7GkiGA"/>
-          <ownedAttribute xmi:id="_9OzFMBG2Edyb1KzJ7GkiGA" name="duration" visibility="public" isUnique="false">
+          <generalization xmi:type="uml:Generalization" xmi:id="_G5Mt8BG3Edyb1KzJ7GkiGA" general="_v37KsBG2Edyb1KzJ7GkiGA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_9OzFMBG2Edyb1KzJ7GkiGA" name="duration" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__pBr8BG2Edyb1KzJ7GkiGA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__pLc8BG2Edyb1KzJ7GkiGA" value="1"/>
@@ -876,7 +876,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_9UnZUBG2Edyb1KzJ7GkiGA" name="isPeriodic" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_9UnZUBG2Edyb1KzJ7GkiGA" name="isPeriodic" visibility="public" isUnique="false">
             <type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C9g7gBG3Edyb1KzJ7GkiGA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C9qsgBG3Edyb1KzJ7GkiGA" value="1"/>
@@ -886,19 +886,19 @@
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Association" xmi:id="_6RSVwBG3Edyb1KzJ7GkiGA" name="Association_ProcessingResource_Scheduler" memberEnd="_6RlQsBG3Edyb1KzJ7GkiGA _6R4yshG3Edyb1KzJ7GkiGA">
-          <ownedEnd xmi:id="_6R4yshG3Edyb1KzJ7GkiGA" name="processingResource" type="_O_i04BG1Edyb1KzJ7GkiGA" isUnique="false" association="_6RSVwBG3Edyb1KzJ7GkiGA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_6R4yshG3Edyb1KzJ7GkiGA" name="processingResource" type="_O_i04BG1Edyb1KzJ7GkiGA" isUnique="false" association="_6RSVwBG3Edyb1KzJ7GkiGA">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6SVeoRG3Edyb1KzJ7GkiGA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6SVeoBG3Edyb1KzJ7GkiGA" value="*"/>
           </ownedEnd>
         </packagedElement>
         <packagedElement xmi:type="uml:Association" xmi:id="_6-I0sBG3Edyb1KzJ7GkiGA" name="Association_Scheduler_ProcessingResource" memberEnd="_6-SlsBG3Edyb1KzJ7GkiGA _6-lgohG3Edyb1KzJ7GkiGA">
-          <ownedEnd xmi:id="_6-lgohG3Edyb1KzJ7GkiGA" name="scheduler" type="_rU9dMBGzEdyb1KzJ7GkiGA" isUnique="false" association="_6-I0sBG3Edyb1KzJ7GkiGA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_6-lgohG3Edyb1KzJ7GkiGA" name="scheduler" type="_rU9dMBGzEdyb1KzJ7GkiGA" isUnique="false" association="_6-I0sBG3Edyb1KzJ7GkiGA">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6_CMkRG3Edyb1KzJ7GkiGA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6_CMkBG3Edyb1KzJ7GkiGA" value="*"/>
           </ownedEnd>
         </packagedElement>
         <packagedElement xmi:type="uml:Association" xmi:id="_G3lu8BG4Edyb1KzJ7GkiGA" name="Association_Scheduler_ComputingResource" memberEnd="_G3vf8BG4Edyb1KzJ7GkiGA _G4Ca4hG4Edyb1KzJ7GkiGA">
-          <ownedEnd xmi:id="_G4Ca4hG4Edyb1KzJ7GkiGA" name="scheduler" type="_rU9dMBGzEdyb1KzJ7GkiGA" isUnique="false" association="_G3lu8BG4Edyb1KzJ7GkiGA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_G4Ca4hG4Edyb1KzJ7GkiGA" name="scheduler" type="_rU9dMBGzEdyb1KzJ7GkiGA" isUnique="false" association="_G3lu8BG4Edyb1KzJ7GkiGA">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_G4fG0RG4Edyb1KzJ7GkiGA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_G4fG0BG4Edyb1KzJ7GkiGA" value="*"/>
           </ownedEnd>
@@ -907,26 +907,26 @@
         <packagedElement xmi:type="uml:Association" xmi:id="_h0jEoBG4Edyb1KzJ7GkiGA" name="Association_SchedulableResource_Scheduler" memberEnd="_h0jEoRG4Edyb1KzJ7GkiGA _h01_khG4Edyb1KzJ7GkiGA"/>
         <packagedElement xmi:type="uml:Association" xmi:id="_kB9XYBG4Edyb1KzJ7GkiGA" name="Association_SchedulableResource_SecondaryScheduler" memberEnd="_kCHIYBG4Edyb1KzJ7GkiGA _kCaDUhG4Edyb1KzJ7GkiGA"/>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_dDjlYBG5Edyb1KzJ7GkiGA" name="GrService">
-          <ownedAttribute xmi:id="_ecz3UBG5Edyb1KzJ7GkiGA" name="owner" visibility="public" type="_BthQEBGzEdyb1KzJ7GkiGA" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_ecz3UBG5Edyb1KzJ7GkiGA" name="owner" visibility="public" type="_BthQEBGzEdyb1KzJ7GkiGA" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gKVJEBG5Edyb1KzJ7GkiGA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gKe6EBG5Edyb1KzJ7GkiGA" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_gKorEBG5Edyb1KzJ7GkiGA">
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_i7g3QBG5Edyb1KzJ7GkiGA" name="base_ExecutionSpecification" isUnique="false" association="_i7ELUBG5Edyb1KzJ7GkiGA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_i7g3QBG5Edyb1KzJ7GkiGA" name="base_ExecutionSpecification" isUnique="false" association="_i7ELUBG5Edyb1KzJ7GkiGA">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ExecutionSpecification"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_jaWvYBG5Edyb1KzJ7GkiGA" name="base_BehavioralFeature" isUnique="false" association="_jZ6DcBG5Edyb1KzJ7GkiGA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_jaWvYBG5Edyb1KzJ7GkiGA" name="base_BehavioralFeature" isUnique="false" association="_jZ6DcBG5Edyb1KzJ7GkiGA">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_j2hG8BG5Edyb1KzJ7GkiGA" name="base_Behavior" isUnique="false" association="_j2EbABG5Edyb1KzJ7GkiGA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_j2hG8BG5Edyb1KzJ7GkiGA" name="base_Behavior" isUnique="false" association="_j2EbABG5Edyb1KzJ7GkiGA">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Behavior"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_kMk2gBG5Edyb1KzJ7GkiGA" name="base_Collaboration" isUnique="false" association="_kMRUgBG5Edyb1KzJ7GkiGA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_kMk2gBG5Edyb1KzJ7GkiGA" name="base_Collaboration" isUnique="false" association="_kMRUgBG5Edyb1KzJ7GkiGA">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Collaboration"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_kkj4sBG5Edyb1KzJ7GkiGA" name="base_CollaborationUse" isUnique="false" association="_kkHMwBG5Edyb1KzJ7GkiGA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_kkj4sBG5Edyb1KzJ7GkiGA" name="base_CollaborationUse" isUnique="false" association="_kkHMwBG5Edyb1KzJ7GkiGA">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#CollaborationUse"/>
           </ownedAttribute>
         </packagedElement>
@@ -946,11 +946,11 @@
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_kkQ9wBG5Edyb1KzJ7GkiGA" name="extension_GRService" type="_dDjlYBG5Edyb1KzJ7GkiGA" aggregation="composite" association="_kkHMwBG5Edyb1KzJ7GkiGA"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_pNGKEBG5Edyb1KzJ7GkiGA" name="Release">
-          <generalization xmi:id="_ru7NoBG5Edyb1KzJ7GkiGA" general="_dDjlYBG5Edyb1KzJ7GkiGA"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_ru7NoBG5Edyb1KzJ7GkiGA" general="_dDjlYBG5Edyb1KzJ7GkiGA"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_sONxsBG5Edyb1KzJ7GkiGA" name="Acquire">
-          <generalization xmi:id="_wgPnkBG5Edyb1KzJ7GkiGA" general="_dDjlYBG5Edyb1KzJ7GkiGA"/>
-          <ownedAttribute xmi:id="_tJOBYBG5Edyb1KzJ7GkiGA" name="isBlocking" visibility="public" isUnique="false">
+          <generalization xmi:type="uml:Generalization" xmi:id="_wgPnkBG5Edyb1KzJ7GkiGA" general="_dDjlYBG5Edyb1KzJ7GkiGA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_tJOBYBG5Edyb1KzJ7GkiGA" name="isBlocking" visibility="public" isUnique="false">
             <type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_u3MmIBG5Edyb1KzJ7GkiGA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_u3VwEBG5Edyb1KzJ7GkiGA" value="1"/>
@@ -960,7 +960,7 @@
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_8JKLcBG5Edyb1KzJ7GkiGA" name="ResourceUsage">
-          <ownedAttribute xmi:id="_CqZD0BG6Edyb1KzJ7GkiGA" name="execTime" visibility="public" isOrdered="true">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_CqZD0BG6Edyb1KzJ7GkiGA" name="execTime" visibility="public" isOrdered="true">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_fkEk4BG6Edyb1KzJ7GkiGA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fkEk4RG6Edyb1KzJ7GkiGA" value="*"/>
@@ -968,7 +968,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_DDuJ0BG6Edyb1KzJ7GkiGA" name="allocatedMemory" visibility="public" isOrdered="true">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_DDuJ0BG6Edyb1KzJ7GkiGA" name="allocatedMemory" visibility="public" isOrdered="true">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gs7qYBG6Edyb1KzJ7GkiGA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gs7qYRG6Edyb1KzJ7GkiGA" value="*"/>
@@ -976,7 +976,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_DR36kBG6Edyb1KzJ7GkiGA" name="usedMemory" visibility="public" isOrdered="true">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_DR36kBG6Edyb1KzJ7GkiGA" name="usedMemory" visibility="public" isOrdered="true">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hWXB4BG6Edyb1KzJ7GkiGA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hWXB4RG6Edyb1KzJ7GkiGA" value="*"/>
@@ -984,7 +984,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_DYI6oBG6Edyb1KzJ7GkiGA" name="powerPeak" visibility="public" isOrdered="true">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_DYI6oBG6Edyb1KzJ7GkiGA" name="powerPeak" visibility="public" isOrdered="true">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_nWsu8BFSEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZsHTABG6Edyb1KzJ7GkiGA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZsREABG6Edyb1KzJ7GkiGA" value="*"/>
@@ -992,7 +992,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_DcwU4BG6Edyb1KzJ7GkiGA" name="energy" visibility="public" isOrdered="true">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_DcwU4BG6Edyb1KzJ7GkiGA" name="energy" visibility="public" isOrdered="true">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_QmcNwBFTEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_eLaI0BG6Edyb1KzJ7GkiGA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_eLj50BG6Edyb1KzJ7GkiGA" value="*"/>
@@ -1000,18 +1000,18 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_ma550BG6Edyb1KzJ7GkiGA" name="base_NamedElement" isUnique="false" association="_mad08BG6Edyb1KzJ7GkiGA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_ma550BG6Edyb1KzJ7GkiGA" name="base_NamedElement" isUnique="false" association="_mad08BG6Edyb1KzJ7GkiGA">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#NamedElement"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_uuI7URG6Edyb1KzJ7GkiGA" name="subUsage" type="_8JKLcBG5Edyb1KzJ7GkiGA" isUnique="false" association="_uuI7UBG6Edyb1KzJ7GkiGA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_uuI7URG6Edyb1KzJ7GkiGA" name="subUsage" type="_8JKLcBG5Edyb1KzJ7GkiGA" isUnique="false" association="_uuI7UBG6Edyb1KzJ7GkiGA">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_uub2QBG6Edyb1KzJ7GkiGA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uulAMBG6Edyb1KzJ7GkiGA" value="*"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_nUkswBG6Edyb1KzJ7GkiGA" name="usedResources" type="_BthQEBGzEdyb1KzJ7GkiGA" isOrdered="true" isUnique="false" association="_nUbi0BG6Edyb1KzJ7GkiGA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_nUkswBG6Edyb1KzJ7GkiGA" name="usedResources" type="_BthQEBGzEdyb1KzJ7GkiGA" isOrdered="true" isUnique="false" association="_nUbi0BG6Edyb1KzJ7GkiGA">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nVBYsBG6Edyb1KzJ7GkiGA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nVLJsBG6Edyb1KzJ7GkiGA" value="*"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_hIfDQG0_Ed2Ua4_dHwAW8g" name="msgSize" visibility="public" isOrdered="true">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_hIfDQG0_Ed2Ua4_dHwAW8g" name="msgSize" visibility="public" isOrdered="true">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6O01kG0_Ed2Ua4_dHwAW8g"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6PIXkG0_Ed2Ua4_dHwAW8g" value="*"/>
@@ -1024,43 +1024,43 @@
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_mam-4BG6Edyb1KzJ7GkiGA" name="extension_ResourceUsage" type="_8JKLcBG5Edyb1KzJ7GkiGA" aggregation="composite" association="_mad08BG6Edyb1KzJ7GkiGA"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Association" xmi:id="_nUbi0BG6Edyb1KzJ7GkiGA" name="Association_ResourceUsage_Resource" memberEnd="_nUkswBG6Edyb1KzJ7GkiGA _nVLJsRG6Edyb1KzJ7GkiGA">
-          <ownedEnd xmi:id="_nVLJsRG6Edyb1KzJ7GkiGA" name="resourceUsage" type="_8JKLcBG5Edyb1KzJ7GkiGA" isUnique="false" association="_nUbi0BG6Edyb1KzJ7GkiGA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_nVLJsRG6Edyb1KzJ7GkiGA" name="resourceUsage" type="_8JKLcBG5Edyb1KzJ7GkiGA" isUnique="false" association="_nUbi0BG6Edyb1KzJ7GkiGA">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nVn1oRG6Edyb1KzJ7GkiGA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nVn1oBG6Edyb1KzJ7GkiGA" value="*"/>
           </ownedEnd>
         </packagedElement>
         <packagedElement xmi:type="uml:Association" xmi:id="_uuI7UBG6Edyb1KzJ7GkiGA" name="Association_ResourceUsage_ResourceUsage" memberEnd="_uuI7URG6Edyb1KzJ7GkiGA _uulAMRG6Edyb1KzJ7GkiGA">
-          <ownedEnd xmi:id="_uulAMRG6Edyb1KzJ7GkiGA" name="resourceUsage" type="_8JKLcBG5Edyb1KzJ7GkiGA" isUnique="false" association="_uuI7UBG6Edyb1KzJ7GkiGA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_uulAMRG6Edyb1KzJ7GkiGA" name="resourceUsage" type="_8JKLcBG5Edyb1KzJ7GkiGA" isUnique="false" association="_uuI7UBG6Edyb1KzJ7GkiGA">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_uvBsIRG6Edyb1KzJ7GkiGA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uvBsIBG6Edyb1KzJ7GkiGA" value="*"/>
           </ownedEnd>
         </packagedElement>
       </packagedElement>
       <packagedElement xmi:type="uml:Profile" xmi:id="_ar8OsAPMEdyuUt-4qHuVvQ" name="Alloc" metaclassReference="_2t-cUECmEd6UTJZnztgOLw">
-        <elementImport xmi:id="_2t-cUECmEd6UTJZnztgOLw" alias="Comment">
+        <elementImport xmi:type="uml:ElementImport" xmi:id="_2t-cUECmEd6UTJZnztgOLw" alias="Comment">
           <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Comment"/>
         </elementImport>
-        <packageImport xmi:id="_TEkwwBHaEdyWC5IKDhzksw" importedPackage="_U_GAoAPMEdyuUt-4qHuVvQ"/>
-        <packageImport xmi:id="_TegTsBHaEdyWC5IKDhzksw" importedPackage="_WStkoAPMEdyuUt-4qHuVvQ"/>
+        <packageImport xmi:type="uml:PackageImport" xmi:id="_TEkwwBHaEdyWC5IKDhzksw" importedPackage="_U_GAoAPMEdyuUt-4qHuVvQ"/>
+        <packageImport xmi:type="uml:PackageImport" xmi:id="_TegTsBHaEdyWC5IKDhzksw" importedPackage="_WStkoAPMEdyuUt-4qHuVvQ"/>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_lpPl0BHaEdyWC5IKDhzksw" name="Allocated">
-          <ownedAttribute xmi:id="_wS99kBHaEdyWC5IKDhzksw" name="base_NamedElement" isUnique="false" association="_wShRoBHaEdyWC5IKDhzksw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_wS99kBHaEdyWC5IKDhzksw" name="base_NamedElement" isUnique="false" association="_wShRoBHaEdyWC5IKDhzksw">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#NamedElement"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_gTngIDJMEd211cMdxu944g" name="allocatedTo" visibility="public" type="_lpPl0BHaEdyWC5IKDhzksw" isUnique="false" isDerived="true">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_gTngIDJMEd211cMdxu944g" name="allocatedTo" visibility="public" type="_lpPl0BHaEdyWC5IKDhzksw" isUnique="false" isDerived="true">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_llOjsDJMEd211cMdxu944g"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_llYUsDJMEd211cMdxu944g" value="*"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_llheoDJMEd211cMdxu944g">
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_gadvADJMEd211cMdxu944g" name="allocatedFrom" visibility="public" type="_lpPl0BHaEdyWC5IKDhzksw" isUnique="false" isDerived="true">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_gadvADJMEd211cMdxu944g" name="allocatedFrom" visibility="public" type="_lpPl0BHaEdyWC5IKDhzksw" isUnique="false" isDerived="true">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_oZlhsDJMEd211cMdxu944g"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oZvSsDJMEd211cMdxu944g" value="*"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_oaCNoDJMEd211cMdxu944g">
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_gfFwUDJMEd211cMdxu944g" name="kind" visibility="public" type="_XIxhMDJMEd211cMdxu944g" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_gfFwUDJMEd211cMdxu944g" name="kind" visibility="public" type="_XIxhMDJMEd211cMdxu944g" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_tcTNoDJMEd211cMdxu944g"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tccXkDJMEd211cMdxu944g" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_tcmIkDJMEd211cMdxu944g">
@@ -1072,33 +1072,33 @@
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_wSrCoBHaEdyWC5IKDhzksw" name="extension_Allocated" type="_lpPl0BHaEdyWC5IKDhzksw" aggregation="composite" association="_wShRoBHaEdyWC5IKDhzksw"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Enumeration" xmi:id="_VYSDUBHbEdyWC5IKDhzksw" name="AllocationNature">
-          <ownedLiteral xmi:id="_XvhngBHbEdyWC5IKDhzksw" name="spatialDistribution"/>
-          <ownedLiteral xmi:id="_X5gp8BHbEdyWC5IKDhzksw" name="timeScheduling"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_XvhngBHbEdyWC5IKDhzksw" name="spatialDistribution"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_X5gp8BHbEdyWC5IKDhzksw" name="timeScheduling"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Enumeration" xmi:id="_VxKdYBHbEdyWC5IKDhzksw" name="AllocationKind">
-          <ownedLiteral xmi:id="_bJ1LMBHbEdyWC5IKDhzksw" name="structural"/>
-          <ownedLiteral xmi:id="_bdfuEBHbEdyWC5IKDhzksw" name="behavioral"/>
-          <ownedLiteral xmi:id="_bjm9IBHbEdyWC5IKDhzksw" name="hybrid"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_bJ1LMBHbEdyWC5IKDhzksw" name="structural"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_bdfuEBHbEdyWC5IKDhzksw" name="behavioral"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_bjm9IBHbEdyWC5IKDhzksw" name="hybrid"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_kzoXABHbEdyWC5IKDhzksw" name="Allocate">
-          <ownedAttribute xmi:id="_ll2eIBHbEdyWC5IKDhzksw" name="kind" visibility="public" type="_VxKdYBHbEdyWC5IKDhzksw" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_ll2eIBHbEdyWC5IKDhzksw" name="kind" visibility="public" type="_VxKdYBHbEdyWC5IKDhzksw" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nuovkBHbEdyWC5IKDhzksw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nuygkBHbEdyWC5IKDhzksw" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_nu8RkBHbEdyWC5IKDhzksw">
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_lx6kMBHbEdyWC5IKDhzksw" name="nature" visibility="public" type="_VYSDUBHbEdyWC5IKDhzksw" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_lx6kMBHbEdyWC5IKDhzksw" name="nature" visibility="public" type="_VYSDUBHbEdyWC5IKDhzksw" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qqGbIBHbEdyWC5IKDhzksw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qqPlEBHbEdyWC5IKDhzksw" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_qqPlERHbEdyWC5IKDhzksw">
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_tKIu8BHbEdyWC5IKDhzksw" name="base_Abstraction" isUnique="false" association="_tJsDABHbEdyWC5IKDhzksw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_tKIu8BHbEdyWC5IKDhzksw" name="base_Abstraction" isUnique="false" association="_tJsDABHbEdyWC5IKDhzksw">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Abstraction"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_y9BTkBHbEdyWC5IKDhzksw" name="impliedConstraint" type="_P9c2AA4wEdysTsAUPnp57Q" isUnique="false" association="_y84JoBHbEdyWC5IKDhzksw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_y9BTkBHbEdyWC5IKDhzksw" name="impliedConstraint" type="_P9c2AA4wEdysTsAUPnp57Q" isUnique="false" association="_y84JoBHbEdyWC5IKDhzksw">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_y9d_gBHbEdyWC5IKDhzksw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_y9d_gRHbEdyWC5IKDhzksw" value="*"/>
           </ownedAttribute>
@@ -1107,19 +1107,19 @@
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_tJ10ABHbEdyWC5IKDhzksw" name="extension_Allocate" type="_kzoXABHbEdyWC5IKDhzksw" aggregation="composite" association="_tJsDABHbEdyWC5IKDhzksw"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Association" xmi:id="_y84JoBHbEdyWC5IKDhzksw" name="Association_Allocate_NfpConstraint" memberEnd="_y9BTkBHbEdyWC5IKDhzksw _y9d_ghHbEdyWC5IKDhzksw">
-          <ownedEnd xmi:id="_y9d_ghHbEdyWC5IKDhzksw" name="allocate" type="_kzoXABHbEdyWC5IKDhzksw" isUnique="false" association="_y84JoBHbEdyWC5IKDhzksw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_y9d_ghHbEdyWC5IKDhzksw" name="allocate" type="_kzoXABHbEdyWC5IKDhzksw" isUnique="false" association="_y84JoBHbEdyWC5IKDhzksw">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_y-EccRHbEdyWC5IKDhzksw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_y-EccBHbEdyWC5IKDhzksw" value="*"/>
           </ownedEnd>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_FeRBMBHcEdyWC5IKDhzksw" name="AllocateActivityGroup">
-          <ownedAttribute xmi:id="_G6DpwBHcEdyWC5IKDhzksw" name="isUnique" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_G6DpwBHcEdyWC5IKDhzksw" name="isUnique" visibility="public" isUnique="false">
             <type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_J2aGIBHcEdyWC5IKDhzksw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_J2jQEBHcEdyWC5IKDhzksw" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_J2jQERHcEdyWC5IKDhzksw" value="false"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_ManIQBHcEdyWC5IKDhzksw" name="base_ActivityPartition" isUnique="false" association="_MaUNUBHcEdyWC5IKDhzksw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_ManIQBHcEdyWC5IKDhzksw" name="base_ActivityPartition" isUnique="false" association="_MaUNUBHcEdyWC5IKDhzksw">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ActivityPartition"/>
           </ownedAttribute>
         </packagedElement>
@@ -1127,10 +1127,10 @@
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_Mad-UBHcEdyWC5IKDhzksw" name="extension_AllocateActivityGroup" type="_FeRBMBHcEdyWC5IKDhzksw" aggregation="composite" association="_MaUNUBHcEdyWC5IKDhzksw"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_NdrHwBHcEdyWC5IKDhzksw" name="NfpRefine">
-          <ownedAttribute xmi:id="_ayKcoBHcEdyWC5IKDhzksw" name="base_Dependency" isUnique="false" association="_axtwsBHcEdyWC5IKDhzksw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_ayKcoBHcEdyWC5IKDhzksw" name="base_Dependency" isUnique="false" association="_axtwsBHcEdyWC5IKDhzksw">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Dependency"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_bzbsYBHcEdyWC5IKDhzksw" name="constraint" type="_P9c2AA4wEdysTsAUPnp57Q" isUnique="false" association="_bzR7YBHcEdyWC5IKDhzksw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_bzbsYBHcEdyWC5IKDhzksw" name="constraint" type="_P9c2AA4wEdysTsAUPnp57Q" isUnique="false" association="_bzR7YBHcEdyWC5IKDhzksw">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bz4YUBHcEdyWC5IKDhzksw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bz4YURHcEdyWC5IKDhzksw" value="*"/>
           </ownedAttribute>
@@ -1139,73 +1139,73 @@
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_ax3hsBHcEdyWC5IKDhzksw" name="extension_ClockRefine" type="_NdrHwBHcEdyWC5IKDhzksw" aggregation="composite" association="_axtwsBHcEdyWC5IKDhzksw"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Association" xmi:id="_bzR7YBHcEdyWC5IKDhzksw" name="A_NfpRefine_NfpConstraint" memberEnd="_bzbsYBHcEdyWC5IKDhzksw _b0CJUBHcEdyWC5IKDhzksw">
-          <ownedEnd xmi:id="_b0CJUBHcEdyWC5IKDhzksw" name="clockRefine" type="_NdrHwBHcEdyWC5IKDhzksw" isUnique="false" association="_bzR7YBHcEdyWC5IKDhzksw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_b0CJUBHcEdyWC5IKDhzksw" name="clockRefine" type="_NdrHwBHcEdyWC5IKDhzksw" isUnique="false" association="_bzR7YBHcEdyWC5IKDhzksw">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_b0n_MBHcEdyWC5IKDhzksw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_b0eOMBHcEdyWC5IKDhzksw" value="*"/>
           </ownedEnd>
         </packagedElement>
         <packagedElement xmi:type="uml:Enumeration" xmi:id="_XIxhMDJMEd211cMdxu944g" name="AllocationEndKind">
-          <ownedLiteral xmi:id="_aWBgUDJMEd211cMdxu944g" name="undef"/>
-          <ownedLiteral xmi:id="_ajmCQDJMEd211cMdxu944g" name="application"/>
-          <ownedLiteral xmi:id="_arfaADJMEd211cMdxu944g" name="executionPlatform"/>
-          <ownedLiteral xmi:id="_axmpEDJMEd211cMdxu944g" name="both"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_aWBgUDJMEd211cMdxu944g" name="undef"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ajmCQDJMEd211cMdxu944g" name="application"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_arfaADJMEd211cMdxu944g" name="executionPlatform"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_axmpEDJMEd211cMdxu944g" name="both"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_455hUECmEd6UTJZnztgOLw" name="Assign">
-          <ownedAttribute xmi:id="_6JoD0ECmEd6UTJZnztgOLw" name="kind" visibility="public" type="_FeC-YECnEd6UTJZnztgOLw" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_6JoD0ECmEd6UTJZnztgOLw" name="kind" visibility="public" type="_FeC-YECnEd6UTJZnztgOLw" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ov3GMECnEd6UTJZnztgOLw" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_owDTcECnEd6UTJZnztgOLw" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_owKBIECnEd6UTJZnztgOLw">
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_6N2cgECmEd6UTJZnztgOLw" name="nature" visibility="public" type="_9MtaUECmEd6UTJZnztgOLw" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_6N2cgECmEd6UTJZnztgOLw" name="nature" visibility="public" type="_9MtaUECmEd6UTJZnztgOLw" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_skDJgECnEd6UTJZnztgOLw" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_skLsYECnEd6UTJZnztgOLw" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_skVdYECnEd6UTJZnztgOLw">
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_txAr4ECnEd6UTJZnztgOLw" name="impliedConstraint" type="_P9c2AA4wEdysTsAUPnp57Q" isUnique="false" association="_tuSIAECnEd6UTJZnztgOLw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_txAr4ECnEd6UTJZnztgOLw" name="impliedConstraint" type="_P9c2AA4wEdysTsAUPnp57Q" isUnique="false" association="_tuSIAECnEd6UTJZnztgOLw">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_txhCMECnEd6UTJZnztgOLw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_txkFgECnEd6UTJZnztgOLw" value="*"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_xKa3sECnEd6UTJZnztgOLw" name="from" isUnique="false" association="_xHQO8ECnEd6UTJZnztgOLw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_xKa3sECnEd6UTJZnztgOLw" name="from" isUnique="false" association="_xHQO8ECnEd6UTJZnztgOLw">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_zYDz8ECnEd6UTJZnztgOLw" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zYRPUECnEd6UTJZnztgOLw" value="*"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_2NV_AECnEd6UTJZnztgOLw" name="to" isUnique="false" association="_2K-ngECnEd6UTJZnztgOLw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_2NV_AECnEd6UTJZnztgOLw" name="to" isUnique="false" association="_2K-ngECnEd6UTJZnztgOLw">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_3hUvYECnEd6UTJZnztgOLw" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3hknAECnEd6UTJZnztgOLw" value="*"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_8-rv8ECnEd6UTJZnztgOLw" name="base_Comment" isUnique="false" association="_87_BQECnEd6UTJZnztgOLw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_8-rv8ECnEd6UTJZnztgOLw" name="base_Comment" isUnique="false" association="_87_BQECnEd6UTJZnztgOLw">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Comment"/>
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Enumeration" xmi:id="_9MtaUECmEd6UTJZnztgOLw" name="AssignmentNature">
-          <ownedLiteral xmi:id="_AOnsIECnEd6UTJZnztgOLw" name="spatialDistribution"/>
-          <ownedLiteral xmi:id="_AXRR0ECnEd6UTJZnztgOLw" name="timeScheduling"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_AOnsIECnEd6UTJZnztgOLw" name="spatialDistribution"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_AXRR0ECnEd6UTJZnztgOLw" name="timeScheduling"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Enumeration" xmi:id="_FeC-YECnEd6UTJZnztgOLw" name="AssignmentKind">
-          <ownedLiteral xmi:id="_JnRdkECnEd6UTJZnztgOLw" name="structural"/>
-          <ownedLiteral xmi:id="_JuBl0ECnEd6UTJZnztgOLw" name="behavioral"/>
-          <ownedLiteral xmi:id="_J0FxkECnEd6UTJZnztgOLw" name="hybrid"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_JnRdkECnEd6UTJZnztgOLw" name="structural"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_JuBl0ECnEd6UTJZnztgOLw" name="behavioral"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_J0FxkECnEd6UTJZnztgOLw" name="hybrid"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Association" xmi:id="_tuSIAECnEd6UTJZnztgOLw" name="A_Assign_NfpConstraint" memberEnd="_txAr4ECnEd6UTJZnztgOLw _txnI0ECnEd6UTJZnztgOLw">
-          <ownedEnd xmi:id="_txnI0ECnEd6UTJZnztgOLw" name="assign" type="_455hUECmEd6UTJZnztgOLw" isUnique="false" association="_tuSIAECnEd6UTJZnztgOLw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_txnI0ECnEd6UTJZnztgOLw" name="assign" type="_455hUECmEd6UTJZnztgOLw" isUnique="false" association="_tuSIAECnEd6UTJZnztgOLw">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_tyPa8ECnEd6UTJZnztgOLw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tyJ7YECnEd6UTJZnztgOLw" value="*"/>
           </ownedEnd>
         </packagedElement>
         <packagedElement xmi:type="uml:Association" xmi:id="_xHQO8ECnEd6UTJZnztgOLw" name="A_Assign_Element" memberEnd="_xKa3sECnEd6UTJZnztgOLw _xLB7sECnEd6UTJZnztgOLw">
-          <ownedEnd xmi:id="_xLB7sECnEd6UTJZnztgOLw" name="assign" type="_455hUECmEd6UTJZnztgOLw" isUnique="false" association="_xHQO8ECnEd6UTJZnztgOLw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_xLB7sECnEd6UTJZnztgOLw" name="assign" type="_455hUECmEd6UTJZnztgOLw" isUnique="false" association="_xHQO8ECnEd6UTJZnztgOLw">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xLpmwECnEd6UTJZnztgOLw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xLmjcECnEd6UTJZnztgOLw" value="*"/>
           </ownedEnd>
         </packagedElement>
         <packagedElement xmi:type="uml:Association" xmi:id="_2K-ngECnEd6UTJZnztgOLw" name="A_Assign_Element" memberEnd="_2NV_AECnEd6UTJZnztgOLw _2OLFcECnEd6UTJZnztgOLw">
-          <ownedEnd xmi:id="_2OLFcECnEd6UTJZnztgOLw" name="assign" type="_455hUECmEd6UTJZnztgOLw" isUnique="false" association="_2K-ngECnEd6UTJZnztgOLw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_2OLFcECnEd6UTJZnztgOLw" name="assign" type="_455hUECmEd6UTJZnztgOLw" isUnique="false" association="_2K-ngECnEd6UTJZnztgOLw">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2OywgECnEd6UTJZnztgOLw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2OvtMECnEd6UTJZnztgOLw" value="*"/>
           </ownedEnd>
@@ -1215,30 +1215,30 @@
         </packagedElement>
       </packagedElement>
       <packagedElement xmi:type="uml:Profile" xmi:id="_-wEewECLEd6UTJZnztgOLw" name="CoreElements" metaclassReference="_Sy23oECMEd6UTJZnztgOLw _S6ZDAECMEd6UTJZnztgOLw _TGu14ECMEd6UTJZnztgOLw _TYU8MECMEd6UTJZnztgOLw">
-        <elementImport xmi:id="_Sy23oECMEd6UTJZnztgOLw" alias="State">
+        <elementImport xmi:type="uml:ElementImport" xmi:id="_Sy23oECMEd6UTJZnztgOLw" alias="State">
           <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#State"/>
         </elementImport>
-        <elementImport xmi:id="_S6ZDAECMEd6UTJZnztgOLw" alias="Transition">
+        <elementImport xmi:type="uml:ElementImport" xmi:id="_S6ZDAECMEd6UTJZnztgOLw" alias="Transition">
           <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Transition"/>
         </elementImport>
-        <elementImport xmi:id="_TGu14ECMEd6UTJZnztgOLw" alias="StateMachine">
+        <elementImport xmi:type="uml:ElementImport" xmi:id="_TGu14ECMEd6UTJZnztgOLw" alias="StateMachine">
           <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#StateMachine"/>
         </elementImport>
-        <elementImport xmi:id="_TYU8MECMEd6UTJZnztgOLw" alias="StructuredClassifier">
+        <elementImport xmi:type="uml:ElementImport" xmi:id="_TYU8MECMEd6UTJZnztgOLw" alias="StructuredClassifier">
           <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#StructuredClassifier"/>
         </elementImport>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_yeqiEECMEd6UTJZnztgOLw" name="Mode">
-          <ownedAttribute xmi:id="_CaNYwECNEd6UTJZnztgOLw" name="base_State" isUnique="false" association="_CMdQoECNEd6UTJZnztgOLw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_CaNYwECNEd6UTJZnztgOLw" name="base_State" isUnique="false" association="_CMdQoECNEd6UTJZnztgOLw">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#State"/>
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_2-EsoECMEd6UTJZnztgOLw" name="ModeTransition">
-          <ownedAttribute xmi:id="_DTtMkECNEd6UTJZnztgOLw" name="base_Transition" isUnique="false" association="_DFrXoECNEd6UTJZnztgOLw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_DTtMkECNEd6UTJZnztgOLw" name="base_Transition" isUnique="false" association="_DFrXoECNEd6UTJZnztgOLw">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Transition"/>
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_8DKXIECMEd6UTJZnztgOLw" name="ModeBehavior">
-          <ownedAttribute xmi:id="_EC3_sECNEd6UTJZnztgOLw" name="base_StateMachine" isUnique="false" association="_Dw6F8ECNEd6UTJZnztgOLw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_EC3_sECNEd6UTJZnztgOLw" name="base_StateMachine" isUnique="false" association="_Dw6F8ECNEd6UTJZnztgOLw">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#StateMachine"/>
           </ownedAttribute>
         </packagedElement>
@@ -1252,13 +1252,13 @@
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_ECiogECNEd6UTJZnztgOLw" name="extension_ModeBehavior" type="_8DKXIECMEd6UTJZnztgOLw" aggregation="composite" association="_Dw6F8ECNEd6UTJZnztgOLw"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_H0HcsECNEd6UTJZnztgOLw" name="Configuration">
-          <ownedAttribute xmi:id="_NM9wsECNEd6UTJZnztgOLw" name="base_StructuredClassifier" isUnique="false" association="_M-2cMECNEd6UTJZnztgOLw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_NM9wsECNEd6UTJZnztgOLw" name="base_StructuredClassifier" isUnique="false" association="_M-2cMECNEd6UTJZnztgOLw">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#StructuredClassifier"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_PSU6sECNEd6UTJZnztgOLw" name="base_Package" isUnique="false" association="_PEJ70ECNEd6UTJZnztgOLw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_PSU6sECNEd6UTJZnztgOLw" name="base_Package" isUnique="false" association="_PEJ70ECNEd6UTJZnztgOLw">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_SEp4YECNEd6UTJZnztgOLw" name="mode" type="_yeqiEECMEd6UTJZnztgOLw" isUnique="false" association="_R3Jn4ECNEd6UTJZnztgOLw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_SEp4YECNEd6UTJZnztgOLw" name="mode" type="_yeqiEECMEd6UTJZnztgOLw" isUnique="false" association="_R3Jn4ECNEd6UTJZnztgOLw">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_SFJAkECNEd6UTJZnztgOLw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SFMD4ECNEd6UTJZnztgOLw" value="*"/>
           </ownedAttribute>
@@ -1270,30 +1270,30 @@
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_PSAKkECNEd6UTJZnztgOLw" name="extension_Configuration" type="_H0HcsECNEd6UTJZnztgOLw" aggregation="composite" association="_PEJ70ECNEd6UTJZnztgOLw"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Association" xmi:id="_R3Jn4ECNEd6UTJZnztgOLw" name="A_Configuration_Mode" memberEnd="_SEp4YECNEd6UTJZnztgOLw _SFOgIECNEd6UTJZnztgOLw">
-          <ownedEnd xmi:id="_SFOgIECNEd6UTJZnztgOLw" name="configuration" type="_H0HcsECNEd6UTJZnztgOLw" isUnique="false" association="_R3Jn4ECNEd6UTJZnztgOLw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_SFOgIECNEd6UTJZnztgOLw" name="configuration" type="_H0HcsECNEd6UTJZnztgOLw" isUnique="false" association="_R3Jn4ECNEd6UTJZnztgOLw">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_SF2LMECNEd6UTJZnztgOLw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SFzH4ECNEd6UTJZnztgOLw" value="*"/>
           </ownedEnd>
         </packagedElement>
       </packagedElement>
     </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_tADfQAPMEdyuUt-4qHuVvQ" clientDependency="_y9JiUA9dEdy-lroUn0KWEw" name="MARTE_DesignModel">
+    <packagedElement xmi:type="uml:Package" xmi:id="_tADfQAPMEdyuUt-4qHuVvQ" name="MARTE_DesignModel">
       <packagedElement xmi:type="uml:Profile" xmi:id="_yNSZIAPMEdyuUt-4qHuVvQ" name="HLAM" metaclassReference="_rjz80EFdEd6UW4qJC-Vahw _TzV70EFeEd6UW4qJC-Vahw">
-        <elementImport xmi:id="_rjz80EFdEd6UW4qJC-Vahw" alias="InvocationAction">
+        <elementImport xmi:type="uml:ElementImport" xmi:id="_rjz80EFdEd6UW4qJC-Vahw" alias="InvocationAction">
           <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#InvocationAction"/>
         </elementImport>
-        <elementImport xmi:id="_TzV70EFeEd6UW4qJC-Vahw" alias="Comment">
+        <elementImport xmi:type="uml:ElementImport" xmi:id="_TzV70EFeEd6UW4qJC-Vahw" alias="Comment">
           <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Comment"/>
         </elementImport>
-        <packageImport xmi:id="_4m6EgBHsEdyrucu8LC-xBw" importedPackage="_WStkoAPMEdyuUt-4qHuVvQ"/>
+        <packageImport xmi:type="uml:PackageImport" xmi:id="_4m6EgBHsEdyrucu8LC-xBw" importedPackage="_WStkoAPMEdyuUt-4qHuVvQ"/>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_4bAFkBHjEdy7mJMaejUq5Q" name="RtUnit">
-          <ownedAttribute xmi:id="_Uur9oBHkEdy7mJMaejUq5Q" name="isDynamic" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Uur9oBHkEdy7mJMaejUq5Q" name="isDynamic" visibility="public" isUnique="false">
             <type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YONYgBHkEdy7mJMaejUq5Q" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YOWicBHkEdy7mJMaejUq5Q" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_YOgTcBHkEdy7mJMaejUq5Q" value="true"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_VM7_4BHkEdy7mJMaejUq5Q" name="isMain" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_VM7_4BHkEdy7mJMaejUq5Q" name="isMain" visibility="public" isUnique="false">
             <type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_atWUcBHkEdy7mJMaejUq5Q"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_atWUcRHkEdy7mJMaejUq5Q" value="1"/>
@@ -1301,7 +1301,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_VRaQMBHkEdy7mJMaejUq5Q" name="srPoolSize" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_VRaQMBHkEdy7mJMaejUq5Q" name="srPoolSize" visibility="public" isUnique="false">
             <type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_HJ1zcAnfEdy9WM11hWri2g"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_czdsYBHkEdy7mJMaejUq5Q"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_czm2UBHkEdy7mJMaejUq5Q" value="1"/>
@@ -1309,14 +1309,14 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_VVuvgBHkEdy7mJMaejUq5Q" name="srPoolPolicy" visibility="public" type="_FWK7gBHkEdy7mJMaejUq5Q" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_VVuvgBHkEdy7mJMaejUq5Q" name="srPoolPolicy" visibility="public" type="_FWK7gBHkEdy7mJMaejUq5Q" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_f2qXoBHkEdy7mJMaejUq5Q"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_f20IoBHkEdy7mJMaejUq5Q" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_f295oBHkEdy7mJMaejUq5Q">
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_VZcx4BHkEdy7mJMaejUq5Q" name="srPoolWaitingTime" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_VZcx4BHkEdy7mJMaejUq5Q" name="srPoolWaitingTime" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_i-MJQBHkEdy7mJMaejUq5Q"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_i-V6QBHkEdy7mJMaejUq5Q" value="1"/>
@@ -1324,7 +1324,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_VdLbUBHkEdy7mJMaejUq5Q" name="operationalMode" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_VdLbUBHkEdy7mJMaejUq5Q" name="operationalMode" visibility="public" isUnique="false">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Behavior"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nbs2YBHkEdy7mJMaejUq5Q"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nb2AUBHkEdy7mJMaejUq5Q" value="1"/>
@@ -1332,7 +1332,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_VhWwsBHkEdy7mJMaejUq5Q" name="main" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_VhWwsBHkEdy7mJMaejUq5Q" name="main" visibility="public" isUnique="false">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_p4m9sBHkEdy7mJMaejUq5Q"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_p4wHoBHkEdy7mJMaejUq5Q" value="1"/>
@@ -1340,7 +1340,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_VkoHIBHkEdy7mJMaejUq5Q" name="memorySize" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_VkoHIBHkEdy7mJMaejUq5Q" name="memorySize" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_sj0mwBHkEdy7mJMaejUq5Q"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sj0mwRHkEdy7mJMaejUq5Q" value="1"/>
@@ -1348,10 +1348,10 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_ujYDsBHkEdy7mJMaejUq5Q" name="base_BehavioredClassifier" isUnique="false" association="_uixmwBHkEdy7mJMaejUq5Q">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_ujYDsBHkEdy7mJMaejUq5Q" name="base_BehavioredClassifier" isUnique="false" association="_uixmwBHkEdy7mJMaejUq5Q">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioredClassifier"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_IIBhAEFaEd6UW4qJC-Vahw" name="queueSchedPolicy" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_IIBhAEFaEd6UW4qJC-Vahw" name="queueSchedPolicy" visibility="public" isUnique="false">
             <type xmi:type="uml:Enumeration" href="MARTE_Library.library.uml#_4GfMYBFaEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_OnEoEEFaEd6UW4qJC-Vahw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OnamUEFaEd6UW4qJC-Vahw" value="1"/>
@@ -1359,7 +1359,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_IWuEUEFaEd6UW4qJC-Vahw" name="queueSize" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_IWuEUEFaEd6UW4qJC-Vahw" name="queueSize" visibility="public" isUnique="false">
             <type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_HJ1zcAnfEdy9WM11hWri2g"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_SNSg0EFaEd6UW4qJC-Vahw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SNZOgEFaEd6UW4qJC-Vahw" value="1"/>
@@ -1367,7 +1367,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_Ieh8gEFaEd6UW4qJC-Vahw" name="msgMaxSize" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Ieh8gEFaEd6UW4qJC-Vahw" name="msgMaxSize" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_V2AT8EFaEd6UW4qJC-Vahw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_V2KE8EFaEd6UW4qJC-Vahw" value="1"/>
@@ -1377,14 +1377,14 @@
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_5cHkUBHjEdy7mJMaejUq5Q" name="PpUnit">
-          <ownedAttribute xmi:id="_7KPTABHjEdy7mJMaejUq5Q" name="concPolicy" visibility="public" type="_9CDJMBHjEdy7mJMaejUq5Q" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_7KPTABHjEdy7mJMaejUq5Q" name="concPolicy" visibility="public" type="_9CDJMBHjEdy7mJMaejUq5Q" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_PdLAsBHkEdy7mJMaejUq5Q"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PdUxsBHkEdy7mJMaejUq5Q" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_PdeisBHkEdy7mJMaejUq5Q">
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_P4S2cBHkEdy7mJMaejUq5Q" name="memorySize" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_P4S2cBHkEdy7mJMaejUq5Q" name="memorySize" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_R_mhMBHkEdy7mJMaejUq5Q"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_R_vrIBHkEdy7mJMaejUq5Q" value="1"/>
@@ -1392,21 +1392,21 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_T4ANQBHkEdy7mJMaejUq5Q" name="base_BehavioredClassifier" isUnique="false" association="_T3ZwUBHkEdy7mJMaejUq5Q">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_T4ANQBHkEdy7mJMaejUq5Q" name="base_BehavioredClassifier" isUnique="false" association="_T3ZwUBHkEdy7mJMaejUq5Q">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioredClassifier"/>
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Enumeration" xmi:id="_9CDJMBHjEdy7mJMaejUq5Q" name="CallConcurrencyKind">
-          <ownedLiteral xmi:id="_-g0NQBHjEdy7mJMaejUq5Q" name="sequential"/>
-          <ownedLiteral xmi:id="_-r_igBHjEdy7mJMaejUq5Q" name="guarded"/>
-          <ownedLiteral xmi:id="_-xNZsBHjEdy7mJMaejUq5Q" name="concurrent"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_-g0NQBHjEdy7mJMaejUq5Q" name="sequential"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_-r_igBHjEdy7mJMaejUq5Q" name="guarded"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_-xNZsBHjEdy7mJMaejUq5Q" name="concurrent"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Enumeration" xmi:id="_FWK7gBHkEdy7mJMaejUq5Q" name="PoolMgtPolicyKind">
-          <ownedLiteral xmi:id="_G07_kBHkEdy7mJMaejUq5Q" name="infiniteWait"/>
-          <ownedLiteral xmi:id="_G5HU8BHkEdy7mJMaejUq5Q" name="timedWait"/>
-          <ownedLiteral xmi:id="_G9I5UBHkEdy7mJMaejUq5Q" name="dynamic"/>
-          <ownedLiteral xmi:id="_HCM_gBHkEdy7mJMaejUq5Q" name="exception"/>
-          <ownedLiteral xmi:id="_HY2k8BHkEdy7mJMaejUq5Q" name="other"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_G07_kBHkEdy7mJMaejUq5Q" name="infiniteWait"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_G5HU8BHkEdy7mJMaejUq5Q" name="timedWait"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_G9I5UBHkEdy7mJMaejUq5Q" name="dynamic"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_HCM_gBHkEdy7mJMaejUq5Q" name="exception"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_HY2k8BHkEdy7mJMaejUq5Q" name="other"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Extension" xmi:id="_T3ZwUBHkEdy7mJMaejUq5Q" name="Extension_PpUnit" memberEnd="_T3srQBHkEdy7mJMaejUq5Q _T4ANQBHkEdy7mJMaejUq5Q">
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_T3srQBHkEdy7mJMaejUq5Q" name="extension_PpUnit" type="_5cHkUBHjEdy7mJMaejUq5Q" aggregation="composite" association="_T3ZwUBHkEdy7mJMaejUq5Q"/>
@@ -1415,25 +1415,25 @@
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_ujFIwBHkEdy7mJMaejUq5Q" name="extension_RtUnit" type="_4bAFkBHjEdy7mJMaejUq5Q" aggregation="composite" association="_uixmwBHkEdy7mJMaejUq5Q"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_XsQskBHlEdy7mJMaejUq5Q" name="RtFeature">
-          <ownedAttribute xmi:id="_fLVGMBHlEdy7mJMaejUq5Q" name="base_BehavioralFeature" isUnique="false" association="_fLCLQBHlEdy7mJMaejUq5Q">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_fLVGMBHlEdy7mJMaejUq5Q" name="base_BehavioralFeature" isUnique="false" association="_fLCLQBHlEdy7mJMaejUq5Q">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_fqUvUBHlEdy7mJMaejUq5Q" name="base_Message" isUnique="false" association="_fp4qcBHlEdy7mJMaejUq5Q">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_fqUvUBHlEdy7mJMaejUq5Q" name="base_Message" isUnique="false" association="_fp4qcBHlEdy7mJMaejUq5Q">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Message"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_f3lvQBHlEdy7mJMaejUq5Q" name="base_Signal" isUnique="false" association="_f3JDUBHlEdy7mJMaejUq5Q">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_f3lvQBHlEdy7mJMaejUq5Q" name="base_Signal" isUnique="false" association="_f3JDUBHlEdy7mJMaejUq5Q">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Signal"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_mnoWsEFdEd6UW4qJC-Vahw" name="base_Port" isUnique="false" association="_mk5LwEFdEd6UW4qJC-Vahw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_mnoWsEFdEd6UW4qJC-Vahw" name="base_Port" isUnique="false" association="_mk5LwEFdEd6UW4qJC-Vahw">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Port"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_t1RCEEFdEd6UW4qJC-Vahw" name="base_InvocationAction" isUnique="false" association="_tx92cEFdEd6UW4qJC-Vahw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_t1RCEEFdEd6UW4qJC-Vahw" name="base_InvocationAction" isUnique="false" association="_tx92cEFdEd6UW4qJC-Vahw">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#InvocationAction"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_yUZqYEFeEd6UW4qJC-Vahw" name="specification" type="_AZ8eMEFeEd6UW4qJC-Vahw" isUnique="false" isDerived="true" association="_yRuJ0EFeEd6UW4qJC-Vahw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yUZqYEFeEd6UW4qJC-Vahw" name="specification" type="_AZ8eMEFeEd6UW4qJC-Vahw" isUnique="false" isDerived="true" association="_yRuJ0EFeEd6UW4qJC-Vahw">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_7AtTMEFeEd6UW4qJC-Vahw" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7BA1MEFeEd6UW4qJC-Vahw" value="*"/>
-            <subsettedProperty href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element-ownedComment"/>
+            <subsettedProperty xmi:type="uml:Property" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element-ownedComment"/>
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Extension" xmi:id="_fLCLQBHlEdy7mJMaejUq5Q" name="Extension_rtFeature" memberEnd="_fLL8QBHlEdy7mJMaejUq5Q _fLVGMBHlEdy7mJMaejUq5Q">
@@ -1446,27 +1446,27 @@
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_f3S0UBHlEdy7mJMaejUq5Q" name="extension_rtf" type="_XsQskBHlEdy7mJMaejUq5Q" aggregation="composite" association="_f3JDUBHlEdy7mJMaejUq5Q"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Enumeration" xmi:id="_nptJQBH8EdyRosSELpiTmA" name="SynchronizationKind">
-          <ownedLiteral xmi:id="_qHzjYBH8EdyRosSELpiTmA" name="synchronous"/>
-          <ownedLiteral xmi:id="_qRMv8BH8EdyRosSELpiTmA" name="asynchronous"/>
-          <ownedLiteral xmi:id="_qacLgBH8EdyRosSELpiTmA" name="delayedSynchronous"/>
-          <ownedLiteral xmi:id="_qioeMBH8EdyRosSELpiTmA" name="rendezVous"/>
-          <ownedLiteral xmi:id="_q6LbgBH8EdyRosSELpiTmA" name="other"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_qHzjYBH8EdyRosSELpiTmA" name="synchronous"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_qRMv8BH8EdyRosSELpiTmA" name="asynchronous"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_qacLgBH8EdyRosSELpiTmA" name="delayedSynchronous"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_qioeMBH8EdyRosSELpiTmA" name="rendezVous"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_q6LbgBH8EdyRosSELpiTmA" name="other"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_CkIvYBH9EdyRosSELpiTmA" name="RtAction">
-          <ownedAttribute xmi:id="_DnV40BH9EdyRosSELpiTmA" name="isAtomic" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_DnV40BH9EdyRosSELpiTmA" name="isAtomic" visibility="public" isUnique="false">
             <type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_GQUGMBH9EdyRosSELpiTmA" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GQUGMRH9EdyRosSELpiTmA" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_GQd3MBH9EdyRosSELpiTmA" value="false"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_DxBZQBH9EdyRosSELpiTmA" name="synchKind" visibility="public" type="_nptJQBH8EdyRosSELpiTmA" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_DxBZQBH9EdyRosSELpiTmA" name="synchKind" visibility="public" type="_nptJQBH8EdyRosSELpiTmA" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IZtboBH9EdyRosSELpiTmA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IZ2lkBH9EdyRosSELpiTmA" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_IaAWkBH9EdyRosSELpiTmA">
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_D1fpkBH9EdyRosSELpiTmA" name="msgSize" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_D1fpkBH9EdyRosSELpiTmA" name="msgSize" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LDSF8BH9EdyRosSELpiTmA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LDbP4BH9EdyRosSELpiTmA" value="1"/>
@@ -1474,10 +1474,10 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_ODqGsBH9EdyRosSELpiTmA" name="base_BehavioralFeature" isUnique="false" association="_ODDpwBH9EdyRosSELpiTmA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_ODqGsBH9EdyRosSELpiTmA" name="base_BehavioralFeature" isUnique="false" association="_ODDpwBH9EdyRosSELpiTmA">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_OgRKMBH9EdyRosSELpiTmA" name="base_InvocationAction" isUnique="false" association="_Of9oMBH9EdyRosSELpiTmA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_OgRKMBH9EdyRosSELpiTmA" name="base_InvocationAction" isUnique="false" association="_Of9oMBH9EdyRosSELpiTmA">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#InvocationAction"/>
           </ownedAttribute>
         </packagedElement>
@@ -1488,44 +1488,44 @@
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_OgHZMBH9EdyRosSELpiTmA" name="extension_RtAction" type="_CkIvYBH9EdyRosSELpiTmA" aggregation="composite" association="_Of9oMBH9EdyRosSELpiTmA"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Enumeration" xmi:id="_RjxXcBH9EdyRosSELpiTmA" name="ExecutionKind">
-          <ownedLiteral xmi:id="_TkqRIBH9EdyRosSELpiTmA" name="deferred"/>
-          <ownedLiteral xmi:id="_UJBicBH9EdyRosSELpiTmA" name="remoteImmediate"/>
-          <ownedLiteral xmi:id="_UYqg8BH9EdyRosSELpiTmA" name="localImmediate"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_TkqRIBH9EdyRosSELpiTmA" name="deferred"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_UJBicBH9EdyRosSELpiTmA" name="remoteImmediate"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_UYqg8BH9EdyRosSELpiTmA" name="localImmediate"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Enumeration" xmi:id="_ZcnjABH9EdyRosSELpiTmA" name="ConcurrencyKind">
-          <ownedLiteral xmi:id="_a0FsQBH9EdyRosSELpiTmA" name="reader"/>
-          <ownedLiteral xmi:id="_a9CM4BH9EdyRosSELpiTmA" name="writer"/>
-          <ownedLiteral xmi:id="_bFrLgBH9EdyRosSELpiTmA" name="parallel"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_a0FsQBH9EdyRosSELpiTmA" name="reader"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_a9CM4BH9EdyRosSELpiTmA" name="writer"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_bFrLgBH9EdyRosSELpiTmA" name="parallel"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_gr5NIBH9EdyRosSELpiTmA" name="RtService">
-          <ownedAttribute xmi:id="_h2Z4cBH9EdyRosSELpiTmA" name="concPolicy" visibility="public" type="_ZcnjABH9EdyRosSELpiTmA" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_h2Z4cBH9EdyRosSELpiTmA" name="concPolicy" visibility="public" type="_ZcnjABH9EdyRosSELpiTmA" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_lLC5ABH9EdyRosSELpiTmA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lLMC8BH9EdyRosSELpiTmA" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_lLMC8RH9EdyRosSELpiTmA">
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_iJLqgBH9EdyRosSELpiTmA" name="exeKind" visibility="public" type="_RjxXcBH9EdyRosSELpiTmA" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_iJLqgBH9EdyRosSELpiTmA" name="exeKind" visibility="public" type="_RjxXcBH9EdyRosSELpiTmA" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nuDoUBH9EdyRosSELpiTmA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nuNZUBH9EdyRosSELpiTmA" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_nuNZURH9EdyRosSELpiTmA">
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_iNWY0BH9EdyRosSELpiTmA" name="isAtomic" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_iNWY0BH9EdyRosSELpiTmA" name="isAtomic" visibility="public" isUnique="false">
             <type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_sLHpgBH9EdyRosSELpiTmA" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sLRagBH9EdyRosSELpiTmA" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_sLRagRH9EdyRosSELpiTmA" value="false"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_iROMMBH9EdyRosSELpiTmA" name="synchKind" visibility="public" type="_nptJQBH8EdyRosSELpiTmA" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_iROMMBH9EdyRosSELpiTmA" name="synchKind" visibility="public" type="_nptJQBH8EdyRosSELpiTmA" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ut_O4BH9EdyRosSELpiTmA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uuI_4BH9EdyRosSELpiTmA" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_uuI_4RH9EdyRosSELpiTmA">
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_2MnjoBH9EdyRosSELpiTmA" name="base_BehavioralFeature" isUnique="false" association="_2MK3sBH9EdyRosSELpiTmA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_2MnjoBH9EdyRosSELpiTmA" name="base_BehavioralFeature" isUnique="false" association="_2MK3sBH9EdyRosSELpiTmA">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
           </ownedAttribute>
         </packagedElement>
@@ -1539,7 +1539,7 @@
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_t02yYEFdEd6UW4qJC-Vahw" name="extension_RtFeature" type="_XsQskBHlEdy7mJMaejUq5Q" aggregation="composite" association="_tx92cEFdEd6UW4qJC-Vahw"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_AZ8eMEFeEd6UW4qJC-Vahw" name="RtSpecification">
-          <ownedAttribute xmi:id="_GhcA4EFeEd6UW4qJC-Vahw" name="utility" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_GhcA4EFeEd6UW4qJC-Vahw" name="utility" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_4TENQBEBEdyx6M3BlUjlCQ"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YpUzUEFeEd6UW4qJC-Vahw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YpbhAEFeEd6UW4qJC-Vahw" value="1"/>
@@ -1547,7 +1547,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_GnciQEFeEd6UW4qJC-Vahw" name="occKind" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_GnciQEFeEd6UW4qJC-Vahw" name="occKind" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_VDec8BFXEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bUyUAEFeEd6UW4qJC-Vahw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bU5owEFeEd6UW4qJC-Vahw" value="1"/>
@@ -1555,14 +1555,14 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_Gs5qAEFeEd6UW4qJC-Vahw" name="tRef" visibility="public" type="_noixsBD2EdyybZnLxHsjyA" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Gs5qAEFeEd6UW4qJC-Vahw" name="tRef" visibility="public" type="_noixsBD2EdyybZnLxHsjyA" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ec8XwEFeEd6UW4qJC-Vahw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_edDFcEFeEd6UW4qJC-Vahw" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_edKaMEFeEd6UW4qJC-Vahw">
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_GyacIEFeEd6UW4qJC-Vahw" name="relDl" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_GyacIEFeEd6UW4qJC-Vahw" name="relDl" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hb1KwEFeEd6UW4qJC-Vahw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hb8fgEFeEd6UW4qJC-Vahw" value="1"/>
@@ -1570,7 +1570,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_G4GNYEFeEd6UW4qJC-Vahw" name="absDl" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_G4GNYEFeEd6UW4qJC-Vahw" name="absDl" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_NIDGMBFREdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kJecwEFeEd6UW4qJC-Vahw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kJu7cEFeEd6UW4qJC-Vahw" value="1"/>
@@ -1578,7 +1578,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_G9sfEEFeEd6UW4qJC-Vahw" name="boundDl" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_G9sfEEFeEd6UW4qJC-Vahw" name="boundDl" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_n9ncwEFeEd6UW4qJC-Vahw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_n9uxgEFeEd6UW4qJC-Vahw" value="1"/>
@@ -1586,7 +1586,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_HDu1oEFeEd6UW4qJC-Vahw" name="rdTime" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_HDu1oEFeEd6UW4qJC-Vahw" name="rdTime" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_rS9A4EFeEd6UW4qJC-Vahw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rTFjwEFeEd6UW4qJC-Vahw" value="1"/>
@@ -1594,7 +1594,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_HJsTsEFeEd6UW4qJC-Vahw" name="miss" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_HJsTsEFeEd6UW4qJC-Vahw" name="miss" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_ZPC-IBFaEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_tvKkoEFeEd6UW4qJC-Vahw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tveGoEFeEd6UW4qJC-Vahw" value="1"/>
@@ -1602,7 +1602,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_HQWVUEFeEd6UW4qJC-Vahw" name="priority" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_HQWVUEFeEd6UW4qJC-Vahw" name="priority" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_0KWSgBFQEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wfKAAEFeEd6UW4qJC-Vahw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wfZQkEFeEd6UW4qJC-Vahw" value="1"/>
@@ -1610,10 +1610,10 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_Vpe-EEFeEd6UW4qJC-Vahw" name="base_Comment" isUnique="false" association="_Vl7TwEFeEd6UW4qJC-Vahw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Vpe-EEFeEd6UW4qJC-Vahw" name="base_Comment" isUnique="false" association="_Vl7TwEFeEd6UW4qJC-Vahw">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Comment"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_frwVIJinEd-m0Oaexd_lJA" name="context" isDerived="true">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_frwVIJinEd-m0Oaexd_lJA" name="context" isDerived="true">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ziiSUJinEd-m0Oaexd_lJA"/>
           </ownedAttribute>
@@ -1622,7 +1622,7 @@
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_VpKN8EFeEd6UW4qJC-Vahw" name="extension_RtSpecification" type="_AZ8eMEFeEd6UW4qJC-Vahw" aggregation="composite" association="_Vl7TwEFeEd6UW4qJC-Vahw"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Association" xmi:id="_yRuJ0EFeEd6UW4qJC-Vahw" name="A_RtFeature_RtSpecification" memberEnd="_yUZqYEFeEd6UW4qJC-Vahw _yVOJwEFeEd6UW4qJC-Vahw">
-          <ownedEnd xmi:id="_yVOJwEFeEd6UW4qJC-Vahw" name="rtFeature" type="_XsQskBHlEdy7mJMaejUq5Q" isUnique="false" association="_yRuJ0EFeEd6UW4qJC-Vahw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_yVOJwEFeEd6UW4qJC-Vahw" name="rtFeature" type="_XsQskBHlEdy7mJMaejUq5Q" isUnique="false" association="_yRuJ0EFeEd6UW4qJC-Vahw">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yV6GQEFeEd6UW4qJC-Vahw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yV2b4EFeEd6UW4qJC-Vahw" value="*"/>
           </ownedEnd>
@@ -1630,33 +1630,33 @@
       </packagedElement>
       <packagedElement xmi:type="uml:Profile" xmi:id="_2dtsgAPMEdyuUt-4qHuVvQ" name="HRM">
         <packagedElement xmi:type="uml:Profile" xmi:id="_P80EcBJwEdygQ5HMNSpiZw" name="HwLogical">
-          <packageImport xmi:id="_kFnUkEIbEd6dmI2dd6jVFQ" importedPackage="_WGZ44BJwEdygQ5HMNSpiZw"/>
+          <packageImport xmi:type="uml:PackageImport" xmi:id="_kFnUkEIbEd6dmI2dd6jVFQ" importedPackage="_WGZ44BJwEdygQ5HMNSpiZw"/>
           <packagedElement xmi:type="uml:Profile" xmi:id="_aMhZsBJwEdygQ5HMNSpiZw" name="HwComputing">
             <packagedElement xmi:type="uml:Enumeration" xmi:id="_HVDSgBJyEdygQ5HMNSpiZw" name="ISA_Type">
-              <ownedLiteral xmi:id="_IrSssBJyEdygQ5HMNSpiZw" name="RISC"/>
-              <ownedLiteral xmi:id="_I3qUwBJyEdygQ5HMNSpiZw" name="CISC"/>
-              <ownedLiteral xmi:id="_I71DEBJyEdygQ5HMNSpiZw" name="VLIW"/>
-              <ownedLiteral xmi:id="_JBowIBJyEdygQ5HMNSpiZw" name="SIMD"/>
-              <ownedLiteral xmi:id="_JHv_MBJyEdygQ5HMNSpiZw" name="other"/>
-              <ownedLiteral xmi:id="_JM0FYBJyEdygQ5HMNSpiZw" name="undef"/>
+              <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_IrSssBJyEdygQ5HMNSpiZw" name="RISC"/>
+              <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_I3qUwBJyEdygQ5HMNSpiZw" name="CISC"/>
+              <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_I71DEBJyEdygQ5HMNSpiZw" name="VLIW"/>
+              <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_JBowIBJyEdygQ5HMNSpiZw" name="SIMD"/>
+              <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_JHv_MBJyEdygQ5HMNSpiZw" name="other"/>
+              <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_JM0FYBJyEdygQ5HMNSpiZw" name="undef"/>
             </packagedElement>
             <packagedElement xmi:type="uml:Enumeration" xmi:id="_QewpABJyEdygQ5HMNSpiZw" name="PLD_Technology">
-              <ownedLiteral xmi:id="_SFFtoBJyEdygQ5HMNSpiZw" name="SRAM"/>
-              <ownedLiteral xmi:id="_SK5asBJyEdygQ5HMNSpiZw" name="antifuse"/>
-              <ownedLiteral xmi:id="_SPXrABJyEdygQ5HMNSpiZw" name="flash"/>
-              <ownedLiteral xmi:id="_Splh0BJyEdygQ5HMNSpiZw" name="other"/>
-              <ownedLiteral xmi:id="_SwI1wBJyEdygQ5HMNSpiZw" name="undef"/>
+              <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_SFFtoBJyEdygQ5HMNSpiZw" name="SRAM"/>
+              <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_SK5asBJyEdygQ5HMNSpiZw" name="antifuse"/>
+              <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_SPXrABJyEdygQ5HMNSpiZw" name="flash"/>
+              <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Splh0BJyEdygQ5HMNSpiZw" name="other"/>
+              <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_SwI1wBJyEdygQ5HMNSpiZw" name="undef"/>
             </packagedElement>
             <packagedElement xmi:type="uml:Enumeration" xmi:id="_XMDncBJyEdygQ5HMNSpiZw" name="PLD_Class">
-              <ownedLiteral xmi:id="_ZDqpUBJyEdygQ5HMNSpiZw" name="symetricalArray"/>
-              <ownedLiteral xmi:id="_ZISqoBJyEdygQ5HMNSpiZw" name="rowBased"/>
-              <ownedLiteral xmi:id="_ZjQIUBJyEdygQ5HMNSpiZw" name="seaOfGates"/>
-              <ownedLiteral xmi:id="_byPvcBJyEdygQ5HMNSpiZw" name="hierarchicalPLD"/>
-              <ownedLiteral xmi:id="_b3KrsBJyEdygQ5HMNSpiZw" name="other"/>
-              <ownedLiteral xmi:id="_b6vkIBJyEdygQ5HMNSpiZw" name="undef"/>
+              <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ZDqpUBJyEdygQ5HMNSpiZw" name="symetricalArray"/>
+              <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ZISqoBJyEdygQ5HMNSpiZw" name="rowBased"/>
+              <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ZjQIUBJyEdygQ5HMNSpiZw" name="seaOfGates"/>
+              <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_byPvcBJyEdygQ5HMNSpiZw" name="hierarchicalPLD"/>
+              <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_b3KrsBJyEdygQ5HMNSpiZw" name="other"/>
+              <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_b6vkIBJyEdygQ5HMNSpiZw" name="undef"/>
             </packagedElement>
             <packagedElement xmi:type="uml:DataType" xmi:id="_j_oAkBJyEdygQ5HMNSpiZw" name="PLD_Organization">
-              <ownedAttribute xmi:id="_mjMJgBJyEdygQ5HMNSpiZw" name="nbRows" visibility="public" isUnique="false">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_mjMJgBJyEdygQ5HMNSpiZw" name="nbRows" visibility="public" isUnique="false">
                 <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_0KWSgBFQEdyUJeMeN__D-A"/>
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ppvqwBJyEdygQ5HMNSpiZw"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_pp5bwBJyEdygQ5HMNSpiZw" value="1"/>
@@ -1664,7 +1664,7 @@
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_mngo0BJyEdygQ5HMNSpiZw" name="nbColumns" visibility="public" isUnique="false">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_mngo0BJyEdygQ5HMNSpiZw" name="nbColumns" visibility="public" isUnique="false">
                 <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_sZq0sBJyEdygQ5HMNSpiZw"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sZ0lsBJyEdygQ5HMNSpiZw" value="1"/>
@@ -1672,7 +1672,7 @@
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_mqfEUBJyEdygQ5HMNSpiZw" name="class" visibility="public" type="_XMDncBJyEdygQ5HMNSpiZw" isUnique="false">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_mqfEUBJyEdygQ5HMNSpiZw" name="class" visibility="public" type="_XMDncBJyEdygQ5HMNSpiZw" isUnique="false">
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_uFNwgBJyEdygQ5HMNSpiZw"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uFXhgBJyEdygQ5HMNSpiZw" value="1"/>
                 <defaultValue xmi:type="uml:LiteralString" xmi:id="_uFhSgBJyEdygQ5HMNSpiZw">
@@ -1681,8 +1681,8 @@
               </ownedAttribute>
             </packagedElement>
             <packagedElement xmi:type="uml:Stereotype" xmi:id="_z0aH8BJyEdygQ5HMNSpiZw" name="HwProcessor">
-              <generalization xmi:id="_XsBrgBJzEdygQ5HMNSpiZw" general="_NrpywBJzEdygQ5HMNSpiZw"/>
-              <ownedAttribute xmi:id="_2rUqsBJyEdygQ5HMNSpiZw" name="architecture" visibility="public" isUnique="false" isDerived="true">
+              <generalization xmi:type="uml:Generalization" xmi:id="_XsBrgBJzEdygQ5HMNSpiZw" general="_NrpywBJzEdygQ5HMNSpiZw"/>
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_2rUqsBJyEdygQ5HMNSpiZw" name="architecture" visibility="public" isUnique="false" isDerived="true">
                 <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5d7VMBJyEdygQ5HMNSpiZw"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5eFGMBJyEdygQ5HMNSpiZw" value="1"/>
@@ -1690,7 +1690,7 @@
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_2uwZMBJyEdygQ5HMNSpiZw" name="mips" visibility="public" isUnique="false">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_2uwZMBJyEdygQ5HMNSpiZw" name="mips" visibility="public" isUnique="false">
                 <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_7p9H4BJyEdygQ5HMNSpiZw"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7qGR0BJyEdygQ5HMNSpiZw" value="1"/>
@@ -1698,7 +1698,7 @@
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_2yLgoBJyEdygQ5HMNSpiZw" name="ipc" visibility="public" isUnique="false" isDerived="true">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_2yLgoBJyEdygQ5HMNSpiZw" name="ipc" visibility="public" isUnique="false" isDerived="true">
                 <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-B5PoBJyEdygQ5HMNSpiZw"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-CCZkBJyEdygQ5HMNSpiZw" value="1"/>
@@ -1706,7 +1706,7 @@
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_22WO8BJyEdygQ5HMNSpiZw" name="nbCores" visibility="public" isUnique="false">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_22WO8BJyEdygQ5HMNSpiZw" name="nbCores" visibility="public" isUnique="false">
                 <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Atf6QBJzEdygQ5HMNSpiZw"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Atf6QRJzEdygQ5HMNSpiZw" value="1"/>
@@ -1714,7 +1714,7 @@
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_26XzUBJyEdygQ5HMNSpiZw" name="nbPipelines" visibility="public" isUnique="false">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_26XzUBJyEdygQ5HMNSpiZw" name="nbPipelines" visibility="public" isUnique="false">
                 <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DHOKsBJzEdygQ5HMNSpiZw"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DHX7sBJzEdygQ5HMNSpiZw" value="1"/>
@@ -1722,7 +1722,7 @@
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_2_SvkBJyEdygQ5HMNSpiZw" name="nbStages" visibility="public" isUnique="false">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_2_SvkBJyEdygQ5HMNSpiZw" name="nbStages" visibility="public" isUnique="false">
                 <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_FYAhkBJzEdygQ5HMNSpiZw"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FYKSkBJzEdygQ5HMNSpiZw" value="1"/>
@@ -1730,7 +1730,7 @@
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_3Dmn0BJyEdygQ5HMNSpiZw" name="nbALUs" visibility="public" isUnique="false">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_3Dmn0BJyEdygQ5HMNSpiZw" name="nbALUs" visibility="public" isUnique="false">
                 <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_H9NCMBJzEdygQ5HMNSpiZw"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_H9WzMBJzEdygQ5HMNSpiZw" value="1"/>
@@ -1738,7 +1738,7 @@
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_3HoMMBJyEdygQ5HMNSpiZw" name="nbFPUs" visibility="public" isUnique="false">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_3HoMMBJyEdygQ5HMNSpiZw" name="nbFPUs" visibility="public" isUnique="false">
                 <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_KqvmgBJzEdygQ5HMNSpiZw"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Kq5XgBJzEdygQ5HMNSpiZw" value="1"/>
@@ -1746,32 +1746,32 @@
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_ezcksBJ0EdygQ5HMNSpiZw" name="ownedISAs" type="_HQmlcBJ0EdygQ5HMNSpiZw" aggregation="composite" association="_ezSzsBJ0EdygQ5HMNSpiZw">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_ezcksBJ0EdygQ5HMNSpiZw" name="ownedISAs" type="_HQmlcBJ0EdygQ5HMNSpiZw" aggregation="composite" association="_ezSzsBJ0EdygQ5HMNSpiZw">
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_e0CakBJ0EdygQ5HMNSpiZw"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_e0CakRJ0EdygQ5HMNSpiZw" value="*"/>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_frSLoBJ0EdygQ5HMNSpiZw" name="predictors" type="_UUddUBJ0EdygQ5HMNSpiZw" aggregation="composite" association="_frIaoBJ0EdygQ5HMNSpiZw">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_frSLoBJ0EdygQ5HMNSpiZw" name="predictors" type="_UUddUBJ0EdygQ5HMNSpiZw" aggregation="composite" association="_frIaoBJ0EdygQ5HMNSpiZw">
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_fr4BgBJ0EdygQ5HMNSpiZw"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fsBygBJ0EdygQ5HMNSpiZw" value="*"/>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_Blc8UBJ7Edyix70umlP_zg" name="caches" type="_z6yqgBJ3EdygFI18IOWZzA" aggregation="composite" association="_BlKBYBJ7Edyix70umlP_zg">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_Blc8UBJ7Edyix70umlP_zg" name="caches" type="_z6yqgBJ3EdygFI18IOWZzA" aggregation="composite" association="_BlKBYBJ7Edyix70umlP_zg">
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_BmWUMBJ7Edyix70umlP_zg"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BmWUMRJ7Edyix70umlP_zg" value="*"/>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_0c0AMBJ8Edyix70umlP_zg" name="ownedMMUs" type="_JnXu4BJ8Edyix70umlP_zg" aggregation="composite" association="_0chFQBJ8Edyix70umlP_zg">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_0c0AMBJ8Edyix70umlP_zg" name="ownedMMUs" type="_JnXu4BJ8Edyix70umlP_zg" aggregation="composite" association="_0chFQBJ8Edyix70umlP_zg">
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0dtYEBJ8Edyix70umlP_zg"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0dtYERJ8Edyix70umlP_zg" value="*"/>
               </ownedAttribute>
-              <icon xmi:id="_r8U74HBWEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%16%16%16%32%32%32%40%40%40%48%48%48%64%64%64%72%72%72%80%80%80%105%105%105%113%113%113%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-107%-107%-107%-99%-99%-99%-82%-82%-82%-74%-74%-74%-70%-70%-70%-66%-66%-66%-50%-50%-50%-46%-46%-46%-42%-42%-42%-38%-38%-38%-34%-34%-34%-30%-30%-30%-26%-26%-26%-22%-22%-22%-18%-18%-18%-14%-14%-14%-10%-10%-10%-6%-6%-6%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%65%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%35%74%-100%-40%-80%65%-127%-117%24%51%106%-36%-88%-15%64%65%1%16%38%-120%28%73%-78%-92%-55%-111%15%4%16%-76%48%-128%98%65%7%8%8%54%72%-32%-110%-32%1%8%54%113%-42%20%24%-128%3%-63%-98%4%61%108%-72%-96%-63%-61%67%10%4%8%34%37%-56%-95%-24%-121%14%28%58%56%-100%41%-109%-90%-64%12%24%10%102%-56%0%66%-88%84%-124%55%9%22%-104%48%-80%-62%-63%11%24%46%92%-80%-112%-43%-96%-121%0%70%5%-66%-115%11%66%-61%65%13%18%62%8%-68%-96%-73%-32%-124%2%4%-1%14%-4%-80%97%96%-122%-66%27%-52%30%-34%-48%-105%-32%-126%5%-114%33%11%-4%96%-41%-32%6%9%82%63%96%104%60%112%-84%88%-78%3%45%28%-60%-112%-106%116%-27%-96%112%7%-50%37%72%90%107%-42%-89%116%3%3%30%24%-63%-128%65%-45%28%56%-96%-27%124%80%1%3%-126%9%26%32%-44%-112%-127%3%111%-124%4%40%16%76%-66%19%4%-121%0%76%-95%55%-121%-32%113%32%-11%-26%32%-126%3%23%-34%-100%121%103%0%-32%-61%-117%15%31%79%126%-68%74%-20%-24%-45%-85%95%-49%-66%-67%-63%-128%0%59%">
-                <eAnnotations xmi:id="_sa35EHBWEd2Nss_u28cvSA" source="image_papyrus">
-                  <details xmi:id="_sbBqEHBWEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+              <icon xmi:type="uml:Image" xmi:id="_r8U74HBWEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%16%16%16%32%32%32%40%40%40%48%48%48%64%64%64%72%72%72%80%80%80%105%105%105%113%113%113%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-107%-107%-107%-99%-99%-99%-82%-82%-82%-74%-74%-74%-70%-70%-70%-66%-66%-66%-50%-50%-50%-46%-46%-46%-42%-42%-42%-38%-38%-38%-34%-34%-34%-30%-30%-30%-26%-26%-26%-22%-22%-22%-18%-18%-18%-14%-14%-14%-10%-10%-10%-6%-6%-6%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%65%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%35%74%-100%-40%-80%65%-127%-117%24%51%106%-36%-88%-15%64%65%1%16%38%-120%28%73%-78%-92%-55%-111%15%4%16%-76%48%-128%98%65%7%8%8%54%72%-32%-110%-32%1%8%54%113%-42%20%24%-128%3%-63%-98%4%61%108%-72%-96%-63%-61%67%10%4%8%34%37%-56%-95%-24%-121%14%28%58%56%-100%41%-109%-90%-64%12%24%10%102%-56%0%66%-88%84%-124%55%9%22%-104%48%-80%-62%-63%11%24%46%92%-80%-112%-43%-96%-121%0%70%5%-66%-115%11%66%-61%65%13%18%62%8%-68%-96%-73%-32%-124%2%4%-1%14%-4%-80%97%96%-122%-66%27%-52%30%-34%-48%-105%-32%-126%5%-114%33%11%-4%96%-41%-32%6%9%82%63%96%104%60%112%-84%88%-78%3%45%28%-60%-112%-106%116%-27%-96%112%7%-50%37%72%90%107%-42%-89%116%3%3%30%24%-63%-128%65%-45%28%56%-96%-27%124%80%1%3%-126%9%26%32%-44%-112%-127%3%111%-124%4%40%16%76%-66%19%4%-121%0%76%-95%55%-121%-32%113%32%-11%-26%32%-126%3%23%-34%-100%121%103%0%-32%-61%-117%15%31%79%126%-68%74%-20%-24%-45%-85%95%-49%-66%-67%-63%-128%0%59%">
+                <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sa35EHBWEd2Nss_u28cvSA" source="image_papyrus">
+                  <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_sbBqEHBWEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
                 </eAnnotations>
               </icon>
             </packagedElement>
             <packagedElement xmi:type="uml:Stereotype" xmi:id="_NrpywBJzEdygQ5HMNSpiZw" name="HwComputingResource">
-              <generalization xmi:id="_WU45cBJzEdygQ5HMNSpiZw" general="_e_tF0BG1Edyb1KzJ7GkiGA"/>
-              <generalization xmi:id="_XSGvoBJzEdygQ5HMNSpiZw" general="_LDER0BJxEdygQ5HMNSpiZw"/>
-              <ownedAttribute xmi:id="_PHjwEBJzEdygQ5HMNSpiZw" name="op_Frequencies" visibility="public" isUnique="false">
+              <generalization xmi:type="uml:Generalization" xmi:id="_WU45cBJzEdygQ5HMNSpiZw" general="_e_tF0BG1Edyb1KzJ7GkiGA"/>
+              <generalization xmi:type="uml:Generalization" xmi:id="_XSGvoBJzEdygQ5HMNSpiZw" general="_LDER0BJxEdygQ5HMNSpiZw"/>
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_PHjwEBJzEdygQ5HMNSpiZw" name="op_Frequencies" visibility="public" isUnique="false">
                 <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_DaoHAB14EdyUAqqkOL30sg"/>
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mFMwgBJzEdygQ5HMNSpiZw"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mFWhgBJzEdygQ5HMNSpiZw" value="1"/>
@@ -1779,37 +1779,37 @@
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <icon xmi:id="_wDvdMHBWEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%16%16%16%32%32%32%40%40%40%48%48%48%64%64%64%72%72%72%80%80%80%105%105%105%113%113%113%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-107%-107%-107%-99%-99%-99%-82%-82%-82%-74%-74%-74%-70%-70%-70%-66%-66%-66%-50%-50%-50%-46%-46%-46%-42%-42%-42%-38%-38%-38%-34%-34%-34%-30%-30%-30%-26%-26%-26%-22%-22%-22%-18%-18%-18%-14%-14%-14%-10%-10%-10%-6%-6%-6%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%65%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%35%74%-100%-40%-80%65%-127%-117%24%51%106%-36%-88%-15%64%65%1%16%38%-120%28%73%-78%-92%-55%-111%15%4%16%-76%48%-128%98%65%7%8%8%54%72%-32%-110%-32%1%8%54%113%-42%20%24%-128%3%-63%-98%4%61%108%-72%-96%-63%-61%67%10%4%8%34%37%-56%-95%-24%-121%14%28%58%56%-100%41%-109%-90%-64%12%24%10%102%-56%0%66%-88%84%-124%55%9%22%-104%48%-80%-62%-63%11%24%46%92%-80%-112%-43%-96%-121%0%70%5%-66%-115%11%66%-61%65%13%18%62%8%-68%-96%-73%-32%-124%2%4%-1%14%-4%-80%97%96%-122%-66%27%-52%30%-34%-48%-105%-32%-126%5%-114%33%11%-4%96%-41%-32%6%9%82%63%96%104%60%112%-84%88%-78%3%45%28%-60%-112%-106%116%-27%-96%112%7%-50%37%72%90%107%-42%-89%116%3%3%30%24%-63%-128%65%-45%28%56%-96%-27%124%80%1%3%-126%9%26%32%-44%-112%-127%3%111%-124%4%40%16%76%-66%19%4%-121%0%76%-95%55%-121%-32%113%32%-11%-26%32%-126%3%23%-34%-100%121%103%0%-32%-61%-117%15%31%79%126%-68%74%-20%-24%-45%-85%95%-49%-66%-67%-63%-128%0%59%">
-                <eAnnotations xmi:id="_wpJQUHBWEd2Nss_u28cvSA" source="image_papyrus">
-                  <details xmi:id="_wpSaQHBWEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+              <icon xmi:type="uml:Image" xmi:id="_wDvdMHBWEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%16%16%16%32%32%32%40%40%40%48%48%48%64%64%64%72%72%72%80%80%80%105%105%105%113%113%113%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-107%-107%-107%-99%-99%-99%-82%-82%-82%-74%-74%-74%-70%-70%-70%-66%-66%-66%-50%-50%-50%-46%-46%-46%-42%-42%-42%-38%-38%-38%-34%-34%-34%-30%-30%-30%-26%-26%-26%-22%-22%-22%-18%-18%-18%-14%-14%-14%-10%-10%-10%-6%-6%-6%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%65%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%35%74%-100%-40%-80%65%-127%-117%24%51%106%-36%-88%-15%64%65%1%16%38%-120%28%73%-78%-92%-55%-111%15%4%16%-76%48%-128%98%65%7%8%8%54%72%-32%-110%-32%1%8%54%113%-42%20%24%-128%3%-63%-98%4%61%108%-72%-96%-63%-61%67%10%4%8%34%37%-56%-95%-24%-121%14%28%58%56%-100%41%-109%-90%-64%12%24%10%102%-56%0%66%-88%84%-124%55%9%22%-104%48%-80%-62%-63%11%24%46%92%-80%-112%-43%-96%-121%0%70%5%-66%-115%11%66%-61%65%13%18%62%8%-68%-96%-73%-32%-124%2%4%-1%14%-4%-80%97%96%-122%-66%27%-52%30%-34%-48%-105%-32%-126%5%-114%33%11%-4%96%-41%-32%6%9%82%63%96%104%60%112%-84%88%-78%3%45%28%-60%-112%-106%116%-27%-96%112%7%-50%37%72%90%107%-42%-89%116%3%3%30%24%-63%-128%65%-45%28%56%-96%-27%124%80%1%3%-126%9%26%32%-44%-112%-127%3%111%-124%4%40%16%76%-66%19%4%-121%0%76%-95%55%-121%-32%113%32%-11%-26%32%-126%3%23%-34%-100%121%103%0%-32%-61%-117%15%31%79%126%-68%74%-20%-24%-45%-85%95%-49%-66%-67%-63%-128%0%59%">
+                <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wpJQUHBWEd2Nss_u28cvSA" source="image_papyrus">
+                  <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wpSaQHBWEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
                 </eAnnotations>
               </icon>
             </packagedElement>
             <packagedElement xmi:type="uml:Stereotype" xmi:id="_dHZvEBJzEdygQ5HMNSpiZw" name="HwASIC">
-              <generalization xmi:id="_gN0tcBJzEdygQ5HMNSpiZw" general="_NrpywBJzEdygQ5HMNSpiZw"/>
-              <icon xmi:id="_yrgwsHBWEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%16%16%16%32%32%32%40%40%40%48%48%48%64%64%64%72%72%72%80%80%80%105%105%105%113%113%113%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-107%-107%-107%-99%-99%-99%-82%-82%-82%-74%-74%-74%-70%-70%-70%-66%-66%-66%-50%-50%-50%-46%-46%-46%-42%-42%-42%-38%-38%-38%-34%-34%-34%-30%-30%-30%-26%-26%-26%-22%-22%-22%-18%-18%-18%-14%-14%-14%-10%-10%-10%-6%-6%-6%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%65%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%35%74%-100%-40%-80%65%-127%-117%24%51%106%-36%-88%-15%64%65%1%16%38%-120%28%73%-78%-92%-55%-111%15%4%16%-76%48%-128%98%65%7%8%8%54%72%-32%-110%-32%1%8%54%113%-42%20%24%-128%3%-63%-98%4%61%108%-72%-96%-63%-61%67%10%4%8%34%37%-56%-95%-24%-121%14%28%58%56%-100%41%-109%-90%-64%12%24%10%102%-56%0%66%-88%84%-124%55%9%22%-104%48%-80%-62%-63%11%24%46%92%-80%-112%-43%-96%-121%0%70%5%-66%-115%11%66%-61%65%13%18%62%8%-68%-96%-73%-32%-124%2%4%-1%14%-4%-80%97%96%-122%-66%27%-52%30%-34%-48%-105%-32%-126%5%-114%33%11%-4%96%-41%-32%6%9%82%63%96%104%60%112%-84%88%-78%3%45%28%-60%-112%-106%116%-27%-96%112%7%-50%37%72%90%107%-42%-89%116%3%3%30%24%-63%-128%65%-45%28%56%-96%-27%124%80%1%3%-126%9%26%32%-44%-112%-127%3%111%-124%4%40%16%76%-66%19%4%-121%0%76%-95%55%-121%-32%113%32%-11%-26%32%-126%3%23%-34%-100%121%103%0%-32%-61%-117%15%31%79%126%-68%74%-20%-24%-45%-85%95%-49%-66%-67%-63%-128%0%59%">
-                <eAnnotations xmi:id="_zX58oHBWEd2Nss_u28cvSA" source="image_papyrus">
-                  <details xmi:id="_zYDtoHBWEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+              <generalization xmi:type="uml:Generalization" xmi:id="_gN0tcBJzEdygQ5HMNSpiZw" general="_NrpywBJzEdygQ5HMNSpiZw"/>
+              <icon xmi:type="uml:Image" xmi:id="_yrgwsHBWEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%16%16%16%32%32%32%40%40%40%48%48%48%64%64%64%72%72%72%80%80%80%105%105%105%113%113%113%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-107%-107%-107%-99%-99%-99%-82%-82%-82%-74%-74%-74%-70%-70%-70%-66%-66%-66%-50%-50%-50%-46%-46%-46%-42%-42%-42%-38%-38%-38%-34%-34%-34%-30%-30%-30%-26%-26%-26%-22%-22%-22%-18%-18%-18%-14%-14%-14%-10%-10%-10%-6%-6%-6%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%65%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%35%74%-100%-40%-80%65%-127%-117%24%51%106%-36%-88%-15%64%65%1%16%38%-120%28%73%-78%-92%-55%-111%15%4%16%-76%48%-128%98%65%7%8%8%54%72%-32%-110%-32%1%8%54%113%-42%20%24%-128%3%-63%-98%4%61%108%-72%-96%-63%-61%67%10%4%8%34%37%-56%-95%-24%-121%14%28%58%56%-100%41%-109%-90%-64%12%24%10%102%-56%0%66%-88%84%-124%55%9%22%-104%48%-80%-62%-63%11%24%46%92%-80%-112%-43%-96%-121%0%70%5%-66%-115%11%66%-61%65%13%18%62%8%-68%-96%-73%-32%-124%2%4%-1%14%-4%-80%97%96%-122%-66%27%-52%30%-34%-48%-105%-32%-126%5%-114%33%11%-4%96%-41%-32%6%9%82%63%96%104%60%112%-84%88%-78%3%45%28%-60%-112%-106%116%-27%-96%112%7%-50%37%72%90%107%-42%-89%116%3%3%30%24%-63%-128%65%-45%28%56%-96%-27%124%80%1%3%-126%9%26%32%-44%-112%-127%3%111%-124%4%40%16%76%-66%19%4%-121%0%76%-95%55%-121%-32%113%32%-11%-26%32%-126%3%23%-34%-100%121%103%0%-32%-61%-117%15%31%79%126%-68%74%-20%-24%-45%-85%95%-49%-66%-67%-63%-128%0%59%">
+                <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zX58oHBWEd2Nss_u28cvSA" source="image_papyrus">
+                  <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zYDtoHBWEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
                 </eAnnotations>
               </icon>
             </packagedElement>
             <packagedElement xmi:type="uml:Stereotype" xmi:id="_goLuMBJzEdygQ5HMNSpiZw" name="HwPLD">
-              <generalization xmi:id="_GfCloBJ0EdygQ5HMNSpiZw" general="_NrpywBJzEdygQ5HMNSpiZw"/>
-              <ownedAttribute xmi:id="_hwI0wBJzEdygQ5HMNSpiZw" name="technology" visibility="public" type="_QewpABJyEdygQ5HMNSpiZw" isUnique="false">
+              <generalization xmi:type="uml:Generalization" xmi:id="_GfCloBJ0EdygQ5HMNSpiZw" general="_NrpywBJzEdygQ5HMNSpiZw"/>
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_hwI0wBJzEdygQ5HMNSpiZw" name="technology" visibility="public" type="_QewpABJyEdygQ5HMNSpiZw" isUnique="false">
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kDwdMBJzEdygQ5HMNSpiZw"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kD5nIBJzEdygQ5HMNSpiZw" value="1"/>
                 <defaultValue xmi:type="uml:LiteralString" xmi:id="_kEDYIBJzEdygQ5HMNSpiZw">
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_hzaLMBJzEdygQ5HMNSpiZw" name="organization" visibility="public" type="_j_oAkBJyEdygQ5HMNSpiZw" isUnique="false">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_hzaLMBJzEdygQ5HMNSpiZw" name="organization" visibility="public" type="_j_oAkBJyEdygQ5HMNSpiZw" isUnique="false">
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_7UCs0BJzEdygQ5HMNSpiZw"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7UMd0BJzEdygQ5HMNSpiZw" value="1"/>
                 <defaultValue xmi:type="uml:LiteralString" xmi:id="_7UVnwBJzEdygQ5HMNSpiZw">
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_h3R-kBJzEdygQ5HMNSpiZw" name="nbLUTs" visibility="public" isUnique="false">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_h3R-kBJzEdygQ5HMNSpiZw" name="nbLUTs" visibility="public" isUnique="false">
                 <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-qENcBJzEdygQ5HMNSpiZw"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-qN-cBJzEdygQ5HMNSpiZw" value="1"/>
@@ -1817,7 +1817,7 @@
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_h7Jx8BJzEdygQ5HMNSpiZw" name="ndLUT_Inputs" visibility="public" isUnique="false">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_h7Jx8BJzEdygQ5HMNSpiZw" name="ndLUT_Inputs" visibility="public" isUnique="false">
                 <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_BfWYgBJ0EdygQ5HMNSpiZw"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BfficBJ0EdygQ5HMNSpiZw" value="1"/>
@@ -1825,7 +1825,7 @@
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_h-4bYBJzEdygQ5HMNSpiZw" name="nbFlipFlops" visibility="public" isUnique="false">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_h-4bYBJzEdygQ5HMNSpiZw" name="nbFlipFlops" visibility="public" isUnique="false">
                 <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ewdj8BJ0EdygQ5HMNSpiZw"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ewmt4BJ0EdygQ5HMNSpiZw" value="1"/>
@@ -1833,23 +1833,23 @@
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_AXPcwBJ7Edyix70umlP_zg" name="blocksRAM" type="_WSmywBJ5EdygFI18IOWZzA" aggregation="composite" association="_AW8h0BJ7Edyix70umlP_zg">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_AXPcwBJ7Edyix70umlP_zg" name="blocksRAM" type="_WSmywBJ5EdygFI18IOWZzA" aggregation="composite" association="_AW8h0BJ7Edyix70umlP_zg">
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AYI0oBJ7Edyix70umlP_zg"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AYI0oRJ7Edyix70umlP_zg" value="*"/>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_sBjpUGqbEdyHVMM3AaZxvA" name="blocksComputing" type="_NrpywBJzEdygQ5HMNSpiZw" aggregation="composite" association="_sAvxAGqbEdyHVMM3AaZxvA">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_sBjpUGqbEdyHVMM3AaZxvA" name="blocksComputing" type="_NrpywBJzEdygQ5HMNSpiZw" aggregation="composite" association="_sAvxAGqbEdyHVMM3AaZxvA">
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_sBxEsGqbEdyHVMM3AaZxvA"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sByS0GqbEdyHVMM3AaZxvA" value="*"/>
               </ownedAttribute>
-              <icon xmi:id="_1WP4oHBWEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%16%16%16%32%32%32%40%40%40%48%48%48%64%64%64%72%72%72%80%80%80%105%105%105%113%113%113%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-107%-107%-107%-99%-99%-99%-82%-82%-82%-74%-74%-74%-70%-70%-70%-66%-66%-66%-50%-50%-50%-46%-46%-46%-42%-42%-42%-38%-38%-38%-34%-34%-34%-30%-30%-30%-26%-26%-26%-22%-22%-22%-18%-18%-18%-14%-14%-14%-10%-10%-10%-6%-6%-6%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%65%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%35%74%-100%-40%-80%65%-127%-117%24%51%106%-36%-88%-15%64%65%1%16%38%-120%28%73%-78%-92%-55%-111%15%4%16%-76%48%-128%98%65%7%8%8%54%72%-32%-110%-32%1%8%54%113%-42%20%24%-128%3%-63%-98%4%61%108%-72%-96%-63%-61%67%10%4%8%34%37%-56%-95%-24%-121%14%28%58%56%-100%41%-109%-90%-64%12%24%10%102%-56%0%66%-88%84%-124%55%9%22%-104%48%-80%-62%-63%11%24%46%92%-80%-112%-43%-96%-121%0%70%5%-66%-115%11%66%-61%65%13%18%62%8%-68%-96%-73%-32%-124%2%4%-1%14%-4%-80%97%96%-122%-66%27%-52%30%-34%-48%-105%-32%-126%5%-114%33%11%-4%96%-41%-32%6%9%82%63%96%104%60%112%-84%88%-78%3%45%28%-60%-112%-106%116%-27%-96%112%7%-50%37%72%90%107%-42%-89%116%3%3%30%24%-63%-128%65%-45%28%56%-96%-27%124%80%1%3%-126%9%26%32%-44%-112%-127%3%111%-124%4%40%16%76%-66%19%4%-121%0%76%-95%55%-121%-32%113%32%-11%-26%32%-126%3%23%-34%-100%121%103%0%-32%-61%-117%15%31%79%126%-68%74%-20%-24%-45%-85%95%-49%-66%-67%-63%-128%0%59%">
-                <eAnnotations xmi:id="_1-x4QHBWEd2Nss_u28cvSA" source="image_papyrus">
-                  <details xmi:id="_1-7CMHBWEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+              <icon xmi:type="uml:Image" xmi:id="_1WP4oHBWEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%16%16%16%32%32%32%40%40%40%48%48%48%64%64%64%72%72%72%80%80%80%105%105%105%113%113%113%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-107%-107%-107%-99%-99%-99%-82%-82%-82%-74%-74%-74%-70%-70%-70%-66%-66%-66%-50%-50%-50%-46%-46%-46%-42%-42%-42%-38%-38%-38%-34%-34%-34%-30%-30%-30%-26%-26%-26%-22%-22%-22%-18%-18%-18%-14%-14%-14%-10%-10%-10%-6%-6%-6%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%65%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%35%74%-100%-40%-80%65%-127%-117%24%51%106%-36%-88%-15%64%65%1%16%38%-120%28%73%-78%-92%-55%-111%15%4%16%-76%48%-128%98%65%7%8%8%54%72%-32%-110%-32%1%8%54%113%-42%20%24%-128%3%-63%-98%4%61%108%-72%-96%-63%-61%67%10%4%8%34%37%-56%-95%-24%-121%14%28%58%56%-100%41%-109%-90%-64%12%24%10%102%-56%0%66%-88%84%-124%55%9%22%-104%48%-80%-62%-63%11%24%46%92%-80%-112%-43%-96%-121%0%70%5%-66%-115%11%66%-61%65%13%18%62%8%-68%-96%-73%-32%-124%2%4%-1%14%-4%-80%97%96%-122%-66%27%-52%30%-34%-48%-105%-32%-126%5%-114%33%11%-4%96%-41%-32%6%9%82%63%96%104%60%112%-84%88%-78%3%45%28%-60%-112%-106%116%-27%-96%112%7%-50%37%72%90%107%-42%-89%116%3%3%30%24%-63%-128%65%-45%28%56%-96%-27%124%80%1%3%-126%9%26%32%-44%-112%-127%3%111%-124%4%40%16%76%-66%19%4%-121%0%76%-95%55%-121%-32%113%32%-11%-26%32%-126%3%23%-34%-100%121%103%0%-32%-61%-117%15%31%79%126%-68%74%-20%-24%-45%-85%95%-49%-66%-67%-63%-128%0%59%">
+                <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1-x4QHBWEd2Nss_u28cvSA" source="image_papyrus">
+                  <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1-7CMHBWEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
                 </eAnnotations>
               </icon>
             </packagedElement>
             <packagedElement xmi:type="uml:Stereotype" xmi:id="_HQmlcBJ0EdygQ5HMNSpiZw" name="HwISA">
-              <generalization xmi:id="_cdO7QBJ0EdygQ5HMNSpiZw" general="_LDER0BJxEdygQ5HMNSpiZw"/>
-              <ownedAttribute xmi:id="_IL2FsBJ0EdygQ5HMNSpiZw" name="family" visibility="public" isUnique="false">
+              <generalization xmi:type="uml:Generalization" xmi:id="_cdO7QBJ0EdygQ5HMNSpiZw" general="_LDER0BJxEdygQ5HMNSpiZw"/>
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_IL2FsBJ0EdygQ5HMNSpiZw" name="family" visibility="public" isUnique="false">
                 <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_B5VngBFQEdyUJeMeN__D-A"/>
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_KgheEBJ0EdygQ5HMNSpiZw"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KgrPEBJ0EdygQ5HMNSpiZw" value="1"/>
@@ -1857,7 +1857,7 @@
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_IRMfwBJ0EdygQ5HMNSpiZw" name="inst_Width" visibility="public" isUnique="false">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_IRMfwBJ0EdygQ5HMNSpiZw" name="inst_Width" visibility="public" isUnique="false">
                 <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NlIekBJ0EdygQ5HMNSpiZw"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NlSPkBJ0EdygQ5HMNSpiZw" value="1"/>
@@ -1865,7 +1865,7 @@
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_IUUsQBJ0EdygQ5HMNSpiZw" name="type" visibility="public" type="_HVDSgBJyEdygQ5HMNSpiZw" isUnique="false">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_IUUsQBJ0EdygQ5HMNSpiZw" name="type" visibility="public" type="_HVDSgBJyEdygQ5HMNSpiZw" isUnique="false">
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_PO9jIBJ0EdygQ5HMNSpiZw"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PPGtEBJ0EdygQ5HMNSpiZw" value="1"/>
                 <defaultValue xmi:type="uml:LiteralString" xmi:id="_PPQeEBJ0EdygQ5HMNSpiZw">
@@ -1874,40 +1874,40 @@
               </ownedAttribute>
             </packagedElement>
             <packagedElement xmi:type="uml:Stereotype" xmi:id="_UUddUBJ0EdygQ5HMNSpiZw" name="HwBranchPredictor">
-              <generalization xmi:id="_dzarEBJ0EdygQ5HMNSpiZw" general="_LDER0BJxEdygQ5HMNSpiZw"/>
+              <generalization xmi:type="uml:Generalization" xmi:id="_dzarEBJ0EdygQ5HMNSpiZw" general="_LDER0BJxEdygQ5HMNSpiZw"/>
             </packagedElement>
             <packagedElement xmi:type="uml:Association" xmi:id="_ezSzsBJ0EdygQ5HMNSpiZw" name="Association_HwProcessor_HwISA" memberEnd="_ezcksBJ0EdygQ5HMNSpiZw _e0MLkBJ0EdygQ5HMNSpiZw">
-              <ownedEnd xmi:id="_e0MLkBJ0EdygQ5HMNSpiZw" name="hwProcessor" type="_z0aH8BJyEdygQ5HMNSpiZw" isUnique="false" association="_ezSzsBJ0EdygQ5HMNSpiZw">
+              <ownedEnd xmi:type="uml:Property" xmi:id="_e0MLkBJ0EdygQ5HMNSpiZw" name="hwProcessor" type="_z0aH8BJyEdygQ5HMNSpiZw" isUnique="false" association="_ezSzsBJ0EdygQ5HMNSpiZw">
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_e1FjcRJ0EdygQ5HMNSpiZw"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_e1FjcBJ0EdygQ5HMNSpiZw" value="*"/>
               </ownedEnd>
             </packagedElement>
             <packagedElement xmi:type="uml:Association" xmi:id="_frIaoBJ0EdygQ5HMNSpiZw" name="Association_HwProcessor_HwBranchPredictor" memberEnd="_frSLoBJ0EdygQ5HMNSpiZw _fsBygRJ0EdygQ5HMNSpiZw">
-              <ownedEnd xmi:id="_fsBygRJ0EdygQ5HMNSpiZw" name="hwProcessor" type="_z0aH8BJyEdygQ5HMNSpiZw" isUnique="false" association="_frIaoBJ0EdygQ5HMNSpiZw">
+              <ownedEnd xmi:type="uml:Property" xmi:id="_fsBygRJ0EdygQ5HMNSpiZw" name="hwProcessor" type="_z0aH8BJyEdygQ5HMNSpiZw" isUnique="false" association="_frIaoBJ0EdygQ5HMNSpiZw">
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_fs7KYBJ0EdygQ5HMNSpiZw"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fsxZYBJ0EdygQ5HMNSpiZw" value="*"/>
               </ownedEnd>
             </packagedElement>
             <packagedElement xmi:type="uml:Association" xmi:id="_AW8h0BJ7Edyix70umlP_zg" name="Association_HwPLD_HwRAM" memberEnd="_AXPcwBJ7Edyix70umlP_zg _AYR-kBJ7Edyix70umlP_zg">
-              <ownedEnd xmi:id="_AYR-kBJ7Edyix70umlP_zg" name="hwPLD" type="_goLuMBJzEdygQ5HMNSpiZw" isUnique="false" association="_AW8h0BJ7Edyix70umlP_zg">
+              <ownedEnd xmi:type="uml:Property" xmi:id="_AYR-kBJ7Edyix70umlP_zg" name="hwPLD" type="_goLuMBJzEdygQ5HMNSpiZw" isUnique="false" association="_AW8h0BJ7Edyix70umlP_zg">
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AZBlcRJ7Edyix70umlP_zg"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AZBlcBJ7Edyix70umlP_zg" value="*"/>
               </ownedEnd>
             </packagedElement>
             <packagedElement xmi:type="uml:Association" xmi:id="_BlKBYBJ7Edyix70umlP_zg" name="Association_HwProcessor_HWCache" memberEnd="_Blc8UBJ7Edyix70umlP_zg _BmgFMBJ7Edyix70umlP_zg">
-              <ownedEnd xmi:id="_BmgFMBJ7Edyix70umlP_zg" name="hwProcessor" type="_z0aH8BJyEdygQ5HMNSpiZw" isUnique="false" association="_BlKBYBJ7Edyix70umlP_zg">
+              <ownedEnd xmi:type="uml:Property" xmi:id="_BmgFMBJ7Edyix70umlP_zg" name="hwProcessor" type="_z0aH8BJyEdygQ5HMNSpiZw" isUnique="false" association="_BlKBYBJ7Edyix70umlP_zg">
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_BnPsEBJ7Edyix70umlP_zg"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BnF7EBJ7Edyix70umlP_zg" value="*"/>
               </ownedEnd>
             </packagedElement>
             <packagedElement xmi:type="uml:Association" xmi:id="_0chFQBJ8Edyix70umlP_zg" name="Association_HwProcessor_HwMMU" memberEnd="_0c0AMBJ8Edyix70umlP_zg _0d3JEBJ8Edyix70umlP_zg">
-              <ownedEnd xmi:id="_0d3JEBJ8Edyix70umlP_zg" name="hwProcessor" type="_z0aH8BJyEdygQ5HMNSpiZw" isUnique="false" association="_0chFQBJ8Edyix70umlP_zg">
+              <ownedEnd xmi:type="uml:Property" xmi:id="_0d3JEBJ8Edyix70umlP_zg" name="hwProcessor" type="_z0aH8BJyEdygQ5HMNSpiZw" isUnique="false" association="_0chFQBJ8Edyix70umlP_zg">
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0emv8BJ8Edyix70umlP_zg"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0ec-8BJ8Edyix70umlP_zg" value="*"/>
               </ownedEnd>
             </packagedElement>
             <packagedElement xmi:type="uml:Association" xmi:id="_sAvxAGqbEdyHVMM3AaZxvA" name="Association_HwPLD_HwComputingResource" memberEnd="_sBjpUGqbEdyHVMM3AaZxvA _sB0IAGqbEdyHVMM3AaZxvA">
-              <ownedEnd xmi:id="_sB0IAGqbEdyHVMM3AaZxvA" name="hwPLD" type="_goLuMBJzEdygQ5HMNSpiZw" isUnique="false" association="_sAvxAGqbEdyHVMM3AaZxvA">
+              <ownedEnd xmi:type="uml:Property" xmi:id="_sB0IAGqbEdyHVMM3AaZxvA" name="hwPLD" type="_goLuMBJzEdygQ5HMNSpiZw" isUnique="false" association="_sAvxAGqbEdyHVMM3AaZxvA">
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_sCF00GqbEdyHVMM3AaZxvA"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sCEmsGqbEdyHVMM3AaZxvA" value="1"/>
               </ownedEnd>
@@ -1915,24 +1915,24 @@
           </packagedElement>
           <packagedElement xmi:type="uml:Profile" xmi:id="_bmL7UBJwEdygQ5HMNSpiZw" name="HwCommunication">
             <packagedElement xmi:type="uml:Stereotype" xmi:id="_tE4T4BJ9EdyT_7R0WVpWAw" name="HwCommunicationResource">
-              <generalization xmi:id="_wqfIoBJ9EdyT_7R0WVpWAw" general="_LDER0BJxEdygQ5HMNSpiZw"/>
+              <generalization xmi:type="uml:Generalization" xmi:id="_wqfIoBJ9EdyT_7R0WVpWAw" general="_LDER0BJxEdygQ5HMNSpiZw"/>
             </packagedElement>
             <packagedElement xmi:type="uml:Stereotype" xmi:id="_KryuYBJ-EdyT_7R0WVpWAw" name="HwArbiter">
-              <generalization xmi:id="_QFmEoBJ-EdyT_7R0WVpWAw" general="_tE4T4BJ9EdyT_7R0WVpWAw"/>
-              <ownedAttribute xmi:id="_U1bk8BKLEdy1B7_71Kp_8Q" name="controlledMedias" type="_Q4QQoBJ-EdyT_7R0WVpWAw" association="_U0-5ABKLEdy1B7_71Kp_8Q">
+              <generalization xmi:type="uml:Generalization" xmi:id="_QFmEoBJ-EdyT_7R0WVpWAw" general="_tE4T4BJ9EdyT_7R0WVpWAw"/>
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_U1bk8BKLEdy1B7_71Kp_8Q" name="controlledMedias" type="_Q4QQoBJ-EdyT_7R0WVpWAw" association="_U0-5ABKLEdy1B7_71Kp_8Q">
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_U2n3wBKLEdy1B7_71Kp_8Q"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_U2n3wRKLEdy1B7_71Kp_8Q" value="*"/>
               </ownedAttribute>
-              <icon xmi:id="_6LQfwHBWEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%8%8%8%12%12%12%28%28%28%44%44%44%48%48%48%64%64%64%80%80%80%93%93%93%97%97%97%101%101%101%109%109%109%113%113%113%125%125%125%-115%-115%-115%-103%-103%-103%-82%-82%-82%-66%-66%-66%-62%-62%-62%-54%-54%-54%-26%-26%-26%-18%-18%-18%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-47%0%45%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%33%66%8%13%34%74%-100%72%-79%-94%69%-119%11%6%40%96%-64%-79%-93%-57%-113%32%67%34%0%0%96%-64%4%10%40%83%-86%92%-55%-110%-27%-125%0%14%74%-98%108%73%-77%38%-123%4%2%36%88%-112%105%-77%-89%74%2%3%42%8%-28%-23%-45%-26%4%1%7%8%18%45%-38%-14%-91%-125%-126%75%-103%-86%-60%-87%19%-86%73%-87%43%-127%10%53%24%-107%-23%-47%-92%8%-69%-6%116%-86%80%-84%77%-86%11%-51%-46%-44%-54%80%-19%-54%-81%14%-35%-90%36%27%-9%-22%-39%-100%14%-121%-38%93%27%52%-81%-34%-103%44%-31%-6%-3%-37%20%-26%-32%-127%98%-47%30%38%-4%-77%-17%98%-58%20%4%63%102%76%119%50%97%-59%-106%-1%-78%-51%-116%120%64%0%2%17%66%-117%30%77%-70%-76%-23%8%0%10%20%48%-64%-70%-75%-21%-41%-80%99%-77%6%-53%-71%-74%109%-53%1%1%0%59%">
-                <eAnnotations xmi:id="_6le9oHBWEd2Nss_u28cvSA" source="image_papyrus">
-                  <details xmi:id="_6loHkHBWEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+              <icon xmi:type="uml:Image" xmi:id="_6LQfwHBWEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%8%8%8%12%12%12%28%28%28%44%44%44%48%48%48%64%64%64%80%80%80%93%93%93%97%97%97%101%101%101%109%109%109%113%113%113%125%125%125%-115%-115%-115%-103%-103%-103%-82%-82%-82%-66%-66%-66%-62%-62%-62%-54%-54%-54%-26%-26%-26%-18%-18%-18%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-47%0%45%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%33%66%8%13%34%74%-100%72%-79%-94%69%-119%11%6%40%96%-64%-79%-93%-57%-113%32%67%34%0%0%96%-64%4%10%40%83%-86%92%-55%-110%-27%-125%0%14%74%-98%108%73%-77%38%-123%4%2%36%88%-112%105%-77%-89%74%2%3%42%8%-28%-23%-45%-26%4%1%7%8%18%45%-38%-14%-91%-125%-126%75%-103%-86%-60%-87%19%-86%73%-87%43%-127%10%53%24%-107%-23%-47%-92%8%-69%-6%116%-86%80%-84%77%-86%11%-51%-46%-44%-54%80%-19%-54%-81%14%-35%-90%36%27%-9%-22%-39%-100%14%-121%-38%93%27%52%-81%-34%-103%44%-31%-6%-3%-37%20%-26%-32%-127%98%-47%30%38%-4%-77%-17%98%-58%20%4%63%102%76%119%50%97%-59%-106%-1%-78%-51%-116%120%64%0%2%17%66%-117%30%77%-70%-76%-23%8%0%10%20%48%-64%-70%-75%-21%-41%-80%99%-77%6%-53%-71%-74%109%-53%1%1%0%59%">
+                <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6le9oHBWEd2Nss_u28cvSA" source="image_papyrus">
+                  <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6loHkHBWEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
                 </eAnnotations>
               </icon>
             </packagedElement>
             <packagedElement xmi:type="uml:Stereotype" xmi:id="_Q4QQoBJ-EdyT_7R0WVpWAw" name="HwMedia">
-              <generalization xmi:id="_3CUhgBKKEdyStbCALv9yvQ" general="_XpH50BG1Edyb1KzJ7GkiGA"/>
-              <generalization xmi:id="_0w4pcBRCEdyCa-N9ek5e_w" general="_tE4T4BJ9EdyT_7R0WVpWAw"/>
-              <ownedAttribute xmi:id="_brZqIBJ-EdyT_7R0WVpWAw" name="bandWidth" visibility="public" isUnique="false">
+              <generalization xmi:type="uml:Generalization" xmi:id="_3CUhgBKKEdyStbCALv9yvQ" general="_XpH50BG1Edyb1KzJ7GkiGA"/>
+              <generalization xmi:type="uml:Generalization" xmi:id="_0w4pcBRCEdyCa-N9ek5e_w" general="_tE4T4BJ9EdyT_7R0WVpWAw"/>
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_brZqIBJ-EdyT_7R0WVpWAw" name="bandWidth" visibility="public" isUnique="false">
                 <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#__NI1EBFREdyUJeMeN__D-A"/>
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_eJL7MBJ-EdyT_7R0WVpWAw"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_eJL7MRJ-EdyT_7R0WVpWAw" value="1"/>
@@ -1940,28 +1940,28 @@
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_U2xowBKLEdy1B7_71Kp_8Q" name="arbiters" type="_KryuYBJ-EdyT_7R0WVpWAw" association="_U0-5ABKLEdy1B7_71Kp_8Q">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_U2xowBKLEdy1B7_71Kp_8Q" name="arbiters" type="_KryuYBJ-EdyT_7R0WVpWAw" association="_U0-5ABKLEdy1B7_71Kp_8Q">
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_U3hPoBKLEdy1B7_71Kp_8Q"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_U3XeoBKLEdy1B7_71Kp_8Q" value="*"/>
               </ownedAttribute>
-              <icon xmi:id="_8p7hoHBWEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%8%8%8%16%16%16%24%24%24%32%32%32%48%48%48%64%64%64%72%72%72%80%80%80%97%97%97%105%105%105%113%113%113%125%125%125%-123%-123%-123%-115%-115%-115%-99%-99%-99%-91%-91%-91%-82%-82%-82%-66%-66%-66%-58%-58%-58%-50%-50%-50%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-79%0%49%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%35%74%-100%72%-79%-94%-59%-117%24%35%36%-72%-72%-32%-127%65%2%5%46%34%16%112%-127%32%4%1%33%45%-114%108%64%-112%64%-125%1%11%98%-54%-100%73%-77%102%76%2%12%6%-108%-60%0%-31%-128%5%-101%64%-125%46%-96%-96%-128%37%6%2%19%48%14%-84%-96%-77%-89%82%-126%69%11%68%120%58%-112%-62%-128%6%10%-88%10%-60%122%97%64%5%-86%93%-65%98%-59%32%33%-126%-39%-77%104%-45%-86%61%-117%97%44%-122%-82%16%2%20%-104%75%-73%-82%-35%-69%115%5%56%-16%58%-80%1%72%-111%4%-78%14%-68%-128%82%36%-128%-81%4%27%24%-72%-104%64%112%65%-60%21%45%-20%-44%74%-71%-78%-27%-53%-104%51%107%110%24%16%0%59%">
-                <eAnnotations xmi:id="_9a8u4HBWEd2Nss_u28cvSA" source="image_papyrus">
-                  <details xmi:id="_9bGf4HBWEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+              <icon xmi:type="uml:Image" xmi:id="_8p7hoHBWEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%8%8%8%16%16%16%24%24%24%32%32%32%48%48%48%64%64%64%72%72%72%80%80%80%97%97%97%105%105%105%113%113%113%125%125%125%-123%-123%-123%-115%-115%-115%-99%-99%-99%-91%-91%-91%-82%-82%-82%-66%-66%-66%-58%-58%-58%-50%-50%-50%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-79%0%49%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%35%74%-100%72%-79%-94%-59%-117%24%35%36%-72%-72%-32%-127%65%2%5%46%34%16%112%-127%32%4%1%33%45%-114%108%64%-112%64%-125%1%11%98%-54%-100%73%-77%102%76%2%12%6%-108%-60%0%-31%-128%5%-101%64%-125%46%-96%-96%-128%37%6%2%19%48%14%-84%-96%-77%-89%82%-126%69%11%68%120%58%-112%-62%-128%6%10%-88%10%-60%122%97%64%5%-86%93%-65%98%-59%32%33%-126%-39%-77%104%-45%-86%61%-117%97%44%-122%-82%16%2%20%-104%75%-73%-82%-35%-69%115%5%56%-16%58%-80%1%72%-111%4%-78%14%-68%-128%82%36%-128%-81%4%27%24%-72%-104%64%112%65%-60%21%45%-20%-44%74%-71%-78%-27%-53%-104%51%107%110%24%16%0%59%">
+                <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9a8u4HBWEd2Nss_u28cvSA" source="image_papyrus">
+                  <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9bGf4HBWEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
                 </eAnnotations>
               </icon>
             </packagedElement>
             <packagedElement xmi:type="uml:Stereotype" xmi:id="_-ZhPABJ-EdyT_7R0WVpWAw" name="HwEndPoint">
-              <generalization xmi:id="_97r3ABRAEdyCa-N9ek5e_w" general="_cGRFcBGzEdyb1KzJ7GkiGA"/>
-              <generalization xmi:id="_iaOvUBRPEdyCa-N9ek5e_w" general="_tE4T4BJ9EdyT_7R0WVpWAw"/>
-              <ownedAttribute xmi:id="_iDcS4BRCEdyCa-N9ek5e_w" name="connectedTo" type="_Q4QQoBJ-EdyT_7R0WVpWAw" isUnique="false" association="_iDJX8BRCEdyCa-N9ek5e_w">
+              <generalization xmi:type="uml:Generalization" xmi:id="_97r3ABRAEdyCa-N9ek5e_w" general="_cGRFcBGzEdyb1KzJ7GkiGA"/>
+              <generalization xmi:type="uml:Generalization" xmi:id="_iaOvUBRPEdyCa-N9ek5e_w" general="_tE4T4BJ9EdyT_7R0WVpWAw"/>
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_iDcS4BRCEdyCa-N9ek5e_w" name="connectedTo" type="_Q4QQoBJ-EdyT_7R0WVpWAw" isUnique="false" association="_iDJX8BRCEdyCa-N9ek5e_w">
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_iEolsBRCEdyCa-N9ek5e_w"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iEyWsBRCEdyCa-N9ek5e_w" value="*"/>
               </ownedAttribute>
             </packagedElement>
             <packagedElement xmi:type="uml:Association" xmi:id="_U0-5ABKLEdy1B7_71Kp_8Q" name="Association_HwArbiter_HwMedia" memberEnd="_U1bk8BKLEdy1B7_71Kp_8Q _U2xowBKLEdy1B7_71Kp_8Q"/>
             <packagedElement xmi:type="uml:Stereotype" xmi:id="_7m3jYBKNEdy1B7_71Kp_8Q" name="HwBus">
-              <generalization xmi:id="_LfsdQBKOEdy1B7_71Kp_8Q" general="_Q4QQoBJ-EdyT_7R0WVpWAw"/>
-              <ownedAttribute xmi:id="_8zvmMBKNEdy1B7_71Kp_8Q" name="adressWidth" visibility="public" isUnique="false">
+              <generalization xmi:type="uml:Generalization" xmi:id="_LfsdQBKOEdy1B7_71Kp_8Q" general="_Q4QQoBJ-EdyT_7R0WVpWAw"/>
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_8zvmMBKNEdy1B7_71Kp_8Q" name="adressWidth" visibility="public" isUnique="false">
                 <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__YXfEBKNEdy1B7_71Kp_8Q"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__YhQEBKNEdy1B7_71Kp_8Q" value="1"/>
@@ -1969,7 +1969,7 @@
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_881QwBKNEdy1B7_71Kp_8Q" name="wordWidth" visibility="public" isUnique="false">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_881QwBKNEdy1B7_71Kp_8Q" name="wordWidth" visibility="public" isUnique="false">
                 <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_FHxR4BKOEdy1B7_71Kp_8Q"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FH7C4BKOEdy1B7_71Kp_8Q" value="1"/>
@@ -1977,7 +1977,7 @@
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_8_zsQBKNEdy1B7_71Kp_8Q" name="isSynchronous" visibility="public" isUnique="false">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_8_zsQBKNEdy1B7_71Kp_8Q" name="isSynchronous" visibility="public" isUnique="false">
                 <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_55fyMBFGEdyBd9q9NMDXUQ"/>
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_G5Jv8BKOEdy1B7_71Kp_8Q"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_G5Tg8BKOEdy1B7_71Kp_8Q" value="1"/>
@@ -1985,7 +1985,7 @@
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_9DOzsBKNEdy1B7_71Kp_8Q" name="isSerial" visibility="public" isUnique="false">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_9DOzsBKNEdy1B7_71Kp_8Q" name="isSerial" visibility="public" isUnique="false">
                 <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_55fyMBFGEdyBd9q9NMDXUQ"/>
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_JBxpUBKOEdy1B7_71Kp_8Q"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JB6zQBKOEdy1B7_71Kp_8Q" value="1"/>
@@ -1993,32 +1993,32 @@
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <icon xmi:id="__yem8HBWEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%8%8%8%16%16%16%24%24%24%32%32%32%48%48%48%64%64%64%72%72%72%80%80%80%97%97%97%105%105%105%113%113%113%125%125%125%-123%-123%-123%-115%-115%-115%-99%-99%-99%-91%-91%-91%-82%-82%-82%-66%-66%-66%-58%-58%-58%-50%-50%-50%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-79%0%49%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%35%74%-100%72%-79%-94%-59%-117%24%35%36%-72%-72%-32%-127%65%2%5%46%34%16%112%-127%32%4%1%33%45%-114%108%64%-112%64%-125%1%11%98%-54%-100%73%-77%102%76%2%12%6%-108%-60%0%-31%-128%5%-101%64%-125%46%-96%-96%-128%37%6%2%19%48%14%-84%-96%-77%-89%82%-126%69%11%68%120%58%-112%-62%-128%6%10%-88%10%-60%122%97%64%5%-86%93%-65%98%-59%32%33%-126%-39%-77%104%-45%-86%61%-117%97%44%-122%-82%16%2%20%-104%75%-73%-82%-35%-69%115%5%56%-16%58%-80%1%72%-111%4%-78%14%-68%-128%82%36%-128%-81%4%27%24%-72%-104%64%112%65%-60%21%45%-20%-44%74%-71%-78%-27%-53%-104%51%107%110%24%16%0%59%">
-                <eAnnotations xmi:id="_AeIMAHBXEd2Nss_u28cvSA" source="image_papyrus">
-                  <details xmi:id="_AeR9AHBXEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+              <icon xmi:type="uml:Image" xmi:id="__yem8HBWEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%8%8%8%16%16%16%24%24%24%32%32%32%48%48%48%64%64%64%72%72%72%80%80%80%97%97%97%105%105%105%113%113%113%125%125%125%-123%-123%-123%-115%-115%-115%-99%-99%-99%-91%-91%-91%-82%-82%-82%-66%-66%-66%-58%-58%-58%-50%-50%-50%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-79%0%49%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%35%74%-100%72%-79%-94%-59%-117%24%35%36%-72%-72%-32%-127%65%2%5%46%34%16%112%-127%32%4%1%33%45%-114%108%64%-112%64%-125%1%11%98%-54%-100%73%-77%102%76%2%12%6%-108%-60%0%-31%-128%5%-101%64%-125%46%-96%-96%-128%37%6%2%19%48%14%-84%-96%-77%-89%82%-126%69%11%68%120%58%-112%-62%-128%6%10%-88%10%-60%122%97%64%5%-86%93%-65%98%-59%32%33%-126%-39%-77%104%-45%-86%61%-117%97%44%-122%-82%16%2%20%-104%75%-73%-82%-35%-69%115%5%56%-16%58%-80%1%72%-111%4%-78%14%-68%-128%82%36%-128%-81%4%27%24%-72%-104%64%112%65%-60%21%45%-20%-44%74%-71%-78%-27%-53%-104%51%107%110%24%16%0%59%">
+                <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AeIMAHBXEd2Nss_u28cvSA" source="image_papyrus">
+                  <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AeR9AHBXEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
                 </eAnnotations>
               </icon>
             </packagedElement>
             <packagedElement xmi:type="uml:Stereotype" xmi:id="_MEDHgBKOEdy1B7_71Kp_8Q" name="HwBridge">
-              <generalization xmi:id="_O-b1ABKOEdy1B7_71Kp_8Q" general="_Q4QQoBJ-EdyT_7R0WVpWAw"/>
-              <ownedAttribute xmi:id="_VzQ-0BKOEdy1B7_71Kp_8Q" name="sides" type="_Q4QQoBJ-EdyT_7R0WVpWAw" isUnique="false" association="_Vyqh4BKOEdy1B7_71Kp_8Q">
+              <generalization xmi:type="uml:Generalization" xmi:id="_O-b1ABKOEdy1B7_71Kp_8Q" general="_Q4QQoBJ-EdyT_7R0WVpWAw"/>
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_VzQ-0BKOEdy1B7_71Kp_8Q" name="sides" type="_Q4QQoBJ-EdyT_7R0WVpWAw" isUnique="false" association="_Vyqh4BKOEdy1B7_71Kp_8Q">
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_V0AlsBKOEdy1B7_71Kp_8Q"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_V0AlsRKOEdy1B7_71Kp_8Q" value="*"/>
               </ownedAttribute>
-              <icon xmi:id="_CJGgEHBXEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%8%8%8%16%16%16%32%32%32%40%40%40%56%56%56%64%64%64%72%72%72%80%80%80%89%89%89%97%97%97%113%113%113%125%125%125%-123%-123%-123%-115%-115%-115%-99%-99%-99%-91%-91%-91%-74%-74%-74%-66%-66%-66%-50%-50%-50%-42%-42%-42%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-65%0%51%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%35%74%-100%72%-79%-94%-64%10%18%50%106%-36%-56%-79%99%-57%9%4%9%20%48%64%-78%-92%-55%-109%40%79%6%-80%48%112%64%5%-117%4%93%-74%124%9%83%-96%76%-101%52%107%-34%-52%-80%19%-26%-50%-98%22%127%-46%68%0%-96%-88%-47%-93%72%-113%10%-72%-128%115%102%-45%-120%55%-123%62%-123%24%53%103%85%-119%87%-97%2%109%-104%-107%39%-51%-83%12%-81%54%48%16%-32%107%1%5%24%28%-114%45%107%-77%-64%-126%8%4%36%12%-92%-96%64%-63%67%-72%114%5%82%48%-32%32%67%4%4%105%51%60%-80%11%-15%111%96%6%12%6%70%56%-112%1%66%-126%-119%-117%5%19%30%-8%-32%0%96%-118%-107%25%27%-116%16%-104%34%-25%-102%-96%67%-117%30%77%-70%-76%105%-121%1%1%0%59%">
-                <eAnnotations xmi:id="_Cm52YHBXEd2Nss_u28cvSA" source="image_papyrus">
-                  <details xmi:id="_CnDAUHBXEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+              <icon xmi:type="uml:Image" xmi:id="_CJGgEHBXEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%8%8%8%16%16%16%32%32%32%40%40%40%56%56%56%64%64%64%72%72%72%80%80%80%89%89%89%97%97%97%113%113%113%125%125%125%-123%-123%-123%-115%-115%-115%-99%-99%-99%-91%-91%-91%-74%-74%-74%-66%-66%-66%-50%-50%-50%-42%-42%-42%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-65%0%51%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%35%74%-100%72%-79%-94%-64%10%18%50%106%-36%-56%-79%99%-57%9%4%9%20%48%64%-78%-92%-55%-109%40%79%6%-80%48%112%64%5%-117%4%93%-74%124%9%83%-96%76%-101%52%107%-34%-52%-80%19%-26%-50%-98%22%127%-46%68%0%-96%-88%-47%-93%72%-113%10%-72%-128%115%102%-45%-120%55%-123%62%-123%24%53%103%85%-119%87%-97%2%109%-104%-107%39%-51%-83%12%-81%54%48%16%-32%107%1%5%24%28%-114%45%107%-77%-64%-126%8%4%36%12%-92%-96%64%-63%67%-72%114%5%82%48%-32%32%67%4%4%105%51%60%-80%11%-15%111%96%6%12%6%70%56%-112%1%66%-126%-119%-117%5%19%30%-8%-32%0%96%-118%-107%25%27%-116%16%-104%34%-25%-102%-96%67%-117%30%77%-70%-76%105%-121%1%1%0%59%">
+                <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Cm52YHBXEd2Nss_u28cvSA" source="image_papyrus">
+                  <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CnDAUHBXEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
                 </eAnnotations>
               </icon>
             </packagedElement>
             <packagedElement xmi:type="uml:Association" xmi:id="_Vyqh4BKOEdy1B7_71Kp_8Q" name="Association_HwBridge_HwMedia" memberEnd="_VzQ-0BKOEdy1B7_71Kp_8Q _V0KWsBKOEdy1B7_71Kp_8Q">
-              <ownedEnd xmi:id="_V0KWsBKOEdy1B7_71Kp_8Q" name="hwBridge" type="_MEDHgBKOEdy1B7_71Kp_8Q" isUnique="false" association="_Vyqh4BKOEdy1B7_71Kp_8Q">
+              <ownedEnd xmi:type="uml:Property" xmi:id="_V0KWsBKOEdy1B7_71Kp_8Q" name="hwBridge" type="_MEDHgBKOEdy1B7_71Kp_8Q" isUnique="false" association="_Vyqh4BKOEdy1B7_71Kp_8Q">
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_V059kBKOEdy1B7_71Kp_8Q"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_V0wMkBKOEdy1B7_71Kp_8Q" value="*"/>
               </ownedEnd>
             </packagedElement>
             <packagedElement xmi:type="uml:Association" xmi:id="_iDJX8BRCEdyCa-N9ek5e_w" name="Association_HwEndPoint_HwMedia" memberEnd="_iDcS4BRCEdyCa-N9ek5e_w _iEyWsRRCEdyCa-N9ek5e_w">
-              <ownedEnd xmi:id="_iEyWsRRCEdyCa-N9ek5e_w" name="hwEndPoint" type="_-ZhPABJ-EdyT_7R0WVpWAw" isUnique="false" association="_iDJX8BRCEdyCa-N9ek5e_w">
+              <ownedEnd xmi:type="uml:Property" xmi:id="_iEyWsRRCEdyCa-N9ek5e_w" name="hwEndPoint" type="_-ZhPABJ-EdyT_7R0WVpWAw" isUnique="false" association="_iDJX8BRCEdyCa-N9ek5e_w">
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_iF-pgBRCEdyCa-N9ek5e_w"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iF04gBRCEdyCa-N9ek5e_w" value="*"/>
               </ownedEnd>
@@ -2026,25 +2026,25 @@
           </packagedElement>
           <packagedElement xmi:type="uml:Profile" xmi:id="_dG2c0BJwEdygQ5HMNSpiZw" name="HwTiming">
             <packagedElement xmi:type="uml:Stereotype" xmi:id="_gVCpkBKQEdyCSNtdGzMSGg" name="HwTimingResource">
-              <generalization xmi:id="_kgnSIBKQEdyCSNtdGzMSGg" general="_LDER0BJxEdygQ5HMNSpiZw"/>
-              <generalization xmi:id="_k_mUMBKQEdyCSNtdGzMSGg" general="_v37KsBG2Edyb1KzJ7GkiGA"/>
-              <icon xmi:id="_RPAvQHBXEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%8%8%8%16%16%16%20%20%20%24%24%24%28%28%28%32%32%32%40%40%40%48%48%48%56%56%56%64%64%64%72%72%72%80%80%80%85%85%85%89%89%89%97%97%97%105%105%105%113%113%113%117%117%117%121%121%121%125%125%125%-123%-123%-123%-119%-119%-119%-115%-115%-115%-107%-107%-107%-99%-99%-99%-91%-91%-91%-82%-82%-82%-74%-74%-74%-66%-66%-66%-58%-58%-58%-50%-50%-50%-42%-42%-42%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%75%8%28%72%80%32%8%5%8%19%62%40%-56%-80%97%-61%12%11%58%72%-108%8%-64%-95%69%-121%25%6%88%24%24%-95%-30%-59%-113%3%73%72%104%48%16%-64%7%-112%40%65%52%40%-112%16%0%-123%-109%40%27%-110%-72%96%-32%-128%4%12%19%47%80%64%64%-128%2%-119%-104%3%57%28%-120%16%-62%-94%8%10%6%50%0%-67%-80%-96%104%65%17%12%69%60%-120%-128%50%2%85%-122%33%14%56%100%-6%-45%-30%-123%-85%88%13%88%-60%0%-63%98%7%5%22%67%-120%-75%24%-31%-126%67%4%48%27%-118%32%112%-111%-124%1%-88%5%-65%126%-12%-24%21%-20%-64%3%32%-10%126%36%65%96%4%65%16%90%5%127%116%-96%-127%96%-123%9%32%-7%90%-44%-32%-128%-32%3%-91%-118%47%126%64%64%80%65%-121%-56%32%71%8%32%104%-64%-23%69%1%113%45%74%78%-32%1%36%-120%4%24%-22%6%32%-56%24%37%9%8%14%12%55%68%76%112%66%5%-96%26%18%-92%14%-70%-128%-32%89%-96%37%94%99%38%8%33%54%65%2%120%99%-50%100%88%-70%96%91%-28%13%55%48%96%56%-30%64%116%-20%2%-31%54%70%36%11%126%96%-122%-123%14%107%-125%-9%-96%-96%-85%76%5%-115%-111%123%64%-16%93%-90%3%-97%49%47%40%-88%111%17%-23%114%-121%27%12%-27%30%74%82%9%-16%-128%6%-83%9%-12%-63%6%16%16%-64%64%96%-27%-115%-112%-127%3%9%0%96%33%2%12%96%-64%95%65%1%1%0%59%">
-                <eAnnotations xmi:id="_Ruv_QHBXEd2Nss_u28cvSA" source="image_papyrus">
-                  <details xmi:id="_Ru5JMHBXEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+              <generalization xmi:type="uml:Generalization" xmi:id="_kgnSIBKQEdyCSNtdGzMSGg" general="_LDER0BJxEdygQ5HMNSpiZw"/>
+              <generalization xmi:type="uml:Generalization" xmi:id="_k_mUMBKQEdyCSNtdGzMSGg" general="_v37KsBG2Edyb1KzJ7GkiGA"/>
+              <icon xmi:type="uml:Image" xmi:id="_RPAvQHBXEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%8%8%8%16%16%16%20%20%20%24%24%24%28%28%28%32%32%32%40%40%40%48%48%48%56%56%56%64%64%64%72%72%72%80%80%80%85%85%85%89%89%89%97%97%97%105%105%105%113%113%113%117%117%117%121%121%121%125%125%125%-123%-123%-123%-119%-119%-119%-115%-115%-115%-107%-107%-107%-99%-99%-99%-91%-91%-91%-82%-82%-82%-74%-74%-74%-66%-66%-66%-58%-58%-58%-50%-50%-50%-42%-42%-42%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%75%8%28%72%80%32%8%5%8%19%62%40%-56%-80%97%-61%12%11%58%72%-108%8%-64%-95%69%-121%25%6%88%24%24%-95%-30%-59%-113%3%73%72%104%48%16%-64%7%-112%40%65%52%40%-112%16%0%-123%-109%40%27%-110%-72%96%-32%-128%4%12%19%47%80%64%64%-128%2%-119%-104%3%57%28%-120%16%-62%-94%8%10%6%50%0%-67%-80%-96%104%65%17%12%69%60%-120%-128%50%2%85%-122%33%14%56%100%-6%-45%-30%-123%-85%88%13%88%-60%0%-63%98%7%5%22%67%-120%-75%24%-31%-126%67%4%48%27%-118%32%112%-111%-124%1%-88%5%-65%126%-12%-24%21%-20%-64%3%32%-10%126%36%65%96%4%65%16%90%5%127%116%-96%-127%96%-123%9%32%-7%90%-44%-32%-128%-32%3%-91%-118%47%126%64%64%80%65%-121%-56%32%71%8%32%104%-64%-23%69%1%113%45%74%78%-32%1%36%-120%4%24%-22%6%32%-56%24%37%9%8%14%12%55%68%76%112%66%5%-96%26%18%-92%14%-70%-128%-32%89%-96%37%94%99%38%8%33%54%65%2%120%99%-50%100%88%-70%96%91%-28%13%55%48%96%56%-30%64%116%-20%2%-31%54%70%36%11%126%96%-122%-123%14%107%-125%-9%-96%-96%-85%76%5%-115%-111%123%64%-16%93%-90%3%-97%49%47%40%-88%111%17%-23%114%-121%27%12%-27%30%74%82%9%-16%-128%6%-83%9%-12%-63%6%16%16%-64%64%96%-27%-115%-112%-127%3%9%0%96%33%2%12%96%-64%95%65%1%1%0%59%">
+                <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ruv_QHBXEd2Nss_u28cvSA" source="image_papyrus">
+                  <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ru5JMHBXEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
                 </eAnnotations>
               </icon>
             </packagedElement>
             <packagedElement xmi:type="uml:Stereotype" xmi:id="_l5QgEBKQEdyCSNtdGzMSGg" name="HwClock">
-              <generalization xmi:id="_ryUlMBKQEdyCSNtdGzMSGg" general="_gVCpkBKQEdyCSNtdGzMSGg"/>
-              <icon xmi:id="_Ty5oUHBXEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%8%8%8%16%16%16%20%20%20%24%24%24%28%28%28%32%32%32%40%40%40%48%48%48%56%56%56%64%64%64%72%72%72%80%80%80%85%85%85%89%89%89%97%97%97%105%105%105%113%113%113%117%117%117%121%121%121%125%125%125%-123%-123%-123%-119%-119%-119%-115%-115%-115%-107%-107%-107%-99%-99%-99%-91%-91%-91%-82%-82%-82%-74%-74%-74%-66%-66%-66%-58%-58%-58%-50%-50%-50%-42%-42%-42%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%75%8%28%72%80%32%8%5%8%19%62%40%-56%-80%97%-61%12%11%58%72%-108%8%-64%-95%69%-121%25%6%88%24%24%-95%-30%-59%-113%3%73%72%104%48%16%-64%7%-112%40%65%52%40%-112%16%0%-123%-109%40%27%-110%-72%96%-32%-128%4%12%19%47%80%64%64%-128%2%-119%-104%3%57%28%-120%16%-62%-94%8%10%6%50%0%-67%-80%-96%104%65%17%12%69%60%-120%-128%50%2%85%-122%33%14%56%100%-6%-45%-30%-123%-85%88%13%88%-60%0%-63%98%7%5%22%67%-120%-75%24%-31%-126%67%4%48%27%-118%32%112%-111%-124%1%-88%5%-65%126%-12%-24%21%-20%-64%3%32%-10%126%36%65%96%4%65%16%90%5%127%116%-96%-127%96%-123%9%32%-7%90%-44%-32%-128%-32%3%-91%-118%47%126%64%64%80%65%-121%-56%32%71%8%32%104%-64%-23%69%1%113%45%74%78%-32%1%36%-120%4%24%-22%6%32%-56%24%37%9%8%14%12%55%68%76%112%66%5%-96%26%18%-92%14%-70%-128%-32%89%-96%37%94%99%38%8%33%54%65%2%120%99%-50%100%88%-70%96%91%-28%13%55%48%96%56%-30%64%116%-20%2%-31%54%70%36%11%126%96%-122%-123%14%107%-125%-9%-96%-96%-85%76%5%-115%-111%123%64%-16%93%-90%3%-97%49%47%40%-88%111%17%-23%114%-121%27%12%-27%30%74%82%9%-16%-128%6%-83%9%-12%-63%6%16%16%-64%64%96%-27%-115%-112%-127%3%9%0%96%33%2%12%96%-64%95%65%1%1%0%59%">
-                <eAnnotations xmi:id="_UYS0YHBXEd2Nss_u28cvSA" source="image_papyrus">
-                  <details xmi:id="_UYclYHBXEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+              <generalization xmi:type="uml:Generalization" xmi:id="_ryUlMBKQEdyCSNtdGzMSGg" general="_gVCpkBKQEdyCSNtdGzMSGg"/>
+              <icon xmi:type="uml:Image" xmi:id="_Ty5oUHBXEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%8%8%8%16%16%16%20%20%20%24%24%24%28%28%28%32%32%32%40%40%40%48%48%48%56%56%56%64%64%64%72%72%72%80%80%80%85%85%85%89%89%89%97%97%97%105%105%105%113%113%113%117%117%117%121%121%121%125%125%125%-123%-123%-123%-119%-119%-119%-115%-115%-115%-107%-107%-107%-99%-99%-99%-91%-91%-91%-82%-82%-82%-74%-74%-74%-66%-66%-66%-58%-58%-58%-50%-50%-50%-42%-42%-42%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%75%8%28%72%80%32%8%5%8%19%62%40%-56%-80%97%-61%12%11%58%72%-108%8%-64%-95%69%-121%25%6%88%24%24%-95%-30%-59%-113%3%73%72%104%48%16%-64%7%-112%40%65%52%40%-112%16%0%-123%-109%40%27%-110%-72%96%-32%-128%4%12%19%47%80%64%64%-128%2%-119%-104%3%57%28%-120%16%-62%-94%8%10%6%50%0%-67%-80%-96%104%65%17%12%69%60%-120%-128%50%2%85%-122%33%14%56%100%-6%-45%-30%-123%-85%88%13%88%-60%0%-63%98%7%5%22%67%-120%-75%24%-31%-126%67%4%48%27%-118%32%112%-111%-124%1%-88%5%-65%126%-12%-24%21%-20%-64%3%32%-10%126%36%65%96%4%65%16%90%5%127%116%-96%-127%96%-123%9%32%-7%90%-44%-32%-128%-32%3%-91%-118%47%126%64%64%80%65%-121%-56%32%71%8%32%104%-64%-23%69%1%113%45%74%78%-32%1%36%-120%4%24%-22%6%32%-56%24%37%9%8%14%12%55%68%76%112%66%5%-96%26%18%-92%14%-70%-128%-32%89%-96%37%94%99%38%8%33%54%65%2%120%99%-50%100%88%-70%96%91%-28%13%55%48%96%56%-30%64%116%-20%2%-31%54%70%36%11%126%96%-122%-123%14%107%-125%-9%-96%-96%-85%76%5%-115%-111%123%64%-16%93%-90%3%-97%49%47%40%-88%111%17%-23%114%-121%27%12%-27%30%74%82%9%-16%-128%6%-83%9%-12%-63%6%16%16%-64%64%96%-27%-115%-112%-127%3%9%0%96%33%2%12%96%-64%95%65%1%1%0%59%">
+                <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UYS0YHBXEd2Nss_u28cvSA" source="image_papyrus">
+                  <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UYclYHBXEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
                 </eAnnotations>
               </icon>
             </packagedElement>
             <packagedElement xmi:type="uml:Stereotype" xmi:id="_sX3iQBKQEdyCSNtdGzMSGg" name="HwTimer">
-              <generalization xmi:id="_08t4MBKQEdyCSNtdGzMSGg" general="_gVCpkBKQEdyCSNtdGzMSGg"/>
-              <ownedAttribute xmi:id="_twN1QBKQEdyCSNtdGzMSGg" name="nbCounters" visibility="public" isUnique="false">
+              <generalization xmi:type="uml:Generalization" xmi:id="_08t4MBKQEdyCSNtdGzMSGg" general="_gVCpkBKQEdyCSNtdGzMSGg"/>
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_twN1QBKQEdyCSNtdGzMSGg" name="nbCounters" visibility="public" isUnique="false">
                 <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xC340BKQEdyCSNtdGzMSGg"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xDBp0BKQEdyCSNtdGzMSGg" value="1"/>
@@ -2052,7 +2052,7 @@
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_t-9b4BKQEdyCSNtdGzMSGg" name="counterWidth" visibility="public" isUnique="false">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_t-9b4BKQEdyCSNtdGzMSGg" name="counterWidth" visibility="public" isUnique="false">
                 <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_znDFwBKQEdyCSNtdGzMSGg"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_znM2wBKQEdyCSNtdGzMSGg" value="1"/>
@@ -2060,18 +2060,18 @@
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_3KZQsBKQEdyCSNtdGzMSGg" name="inputClock" type="_l5QgEBKQEdyCSNtdGzMSGg" isUnique="false" association="_3KGVwBKQEdyCSNtdGzMSGg">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_3KZQsBKQEdyCSNtdGzMSGg" name="inputClock" type="_l5QgEBKQEdyCSNtdGzMSGg" isUnique="false" association="_3KGVwBKQEdyCSNtdGzMSGg">
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_7ybLwBKQEdyCSNtdGzMSGg"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7ykVsBKQEdyCSNtdGzMSGg" value="1"/>
               </ownedAttribute>
-              <icon xmi:id="_Wm4L0HBXEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%8%8%8%16%16%16%20%20%20%24%24%24%28%28%28%32%32%32%40%40%40%48%48%48%56%56%56%64%64%64%72%72%72%80%80%80%85%85%85%89%89%89%97%97%97%105%105%105%113%113%113%117%117%117%121%121%121%125%125%125%-123%-123%-123%-119%-119%-119%-115%-115%-115%-107%-107%-107%-99%-99%-99%-91%-91%-91%-82%-82%-82%-74%-74%-74%-66%-66%-66%-58%-58%-58%-50%-50%-50%-42%-42%-42%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%75%8%28%72%80%32%8%5%8%19%62%40%-56%-80%97%-61%12%11%58%72%-108%8%-64%-95%69%-121%25%6%88%24%24%-95%-30%-59%-113%3%73%72%104%48%16%-64%7%-112%40%65%52%40%-112%16%0%-123%-109%40%27%-110%-72%96%-32%-128%4%12%19%47%80%64%64%-128%2%-119%-104%3%57%28%-120%16%-62%-94%8%10%6%50%0%-67%-80%-96%104%65%17%12%69%60%-120%-128%50%2%85%-122%33%14%56%100%-6%-45%-30%-123%-85%88%13%88%-60%0%-63%98%7%5%22%67%-120%-75%24%-31%-126%67%4%48%27%-118%32%112%-111%-124%1%-88%5%-65%126%-12%-24%21%-20%-64%3%32%-10%126%36%65%96%4%65%16%90%5%127%116%-96%-127%96%-123%9%32%-7%90%-44%-32%-128%-32%3%-91%-118%47%126%64%64%80%65%-121%-56%32%71%8%32%104%-64%-23%69%1%113%45%74%78%-32%1%36%-120%4%24%-22%6%32%-56%24%37%9%8%14%12%55%68%76%112%66%5%-96%26%18%-92%14%-70%-128%-32%89%-96%37%94%99%38%8%33%54%65%2%120%99%-50%100%88%-70%96%91%-28%13%55%48%96%56%-30%64%116%-20%2%-31%54%70%36%11%126%96%-122%-123%14%107%-125%-9%-96%-96%-85%76%5%-115%-111%123%64%-16%93%-90%3%-97%49%47%40%-88%111%17%-23%114%-121%27%12%-27%30%74%82%9%-16%-128%6%-83%9%-12%-63%6%16%16%-64%64%96%-27%-115%-112%-127%3%9%0%96%33%2%12%96%-64%95%65%1%1%0%59%">
-                <eAnnotations xmi:id="_XJctYHBXEd2Nss_u28cvSA" source="image_papyrus">
-                  <details xmi:id="_XJl3UHBXEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+              <icon xmi:type="uml:Image" xmi:id="_Wm4L0HBXEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%8%8%8%16%16%16%20%20%20%24%24%24%28%28%28%32%32%32%40%40%40%48%48%48%56%56%56%64%64%64%72%72%72%80%80%80%85%85%85%89%89%89%97%97%97%105%105%105%113%113%113%117%117%117%121%121%121%125%125%125%-123%-123%-123%-119%-119%-119%-115%-115%-115%-107%-107%-107%-99%-99%-99%-91%-91%-91%-82%-82%-82%-74%-74%-74%-66%-66%-66%-58%-58%-58%-50%-50%-50%-42%-42%-42%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%75%8%28%72%80%32%8%5%8%19%62%40%-56%-80%97%-61%12%11%58%72%-108%8%-64%-95%69%-121%25%6%88%24%24%-95%-30%-59%-113%3%73%72%104%48%16%-64%7%-112%40%65%52%40%-112%16%0%-123%-109%40%27%-110%-72%96%-32%-128%4%12%19%47%80%64%64%-128%2%-119%-104%3%57%28%-120%16%-62%-94%8%10%6%50%0%-67%-80%-96%104%65%17%12%69%60%-120%-128%50%2%85%-122%33%14%56%100%-6%-45%-30%-123%-85%88%13%88%-60%0%-63%98%7%5%22%67%-120%-75%24%-31%-126%67%4%48%27%-118%32%112%-111%-124%1%-88%5%-65%126%-12%-24%21%-20%-64%3%32%-10%126%36%65%96%4%65%16%90%5%127%116%-96%-127%96%-123%9%32%-7%90%-44%-32%-128%-32%3%-91%-118%47%126%64%64%80%65%-121%-56%32%71%8%32%104%-64%-23%69%1%113%45%74%78%-32%1%36%-120%4%24%-22%6%32%-56%24%37%9%8%14%12%55%68%76%112%66%5%-96%26%18%-92%14%-70%-128%-32%89%-96%37%94%99%38%8%33%54%65%2%120%99%-50%100%88%-70%96%91%-28%13%55%48%96%56%-30%64%116%-20%2%-31%54%70%36%11%126%96%-122%-123%14%107%-125%-9%-96%-96%-85%76%5%-115%-111%123%64%-16%93%-90%3%-97%49%47%40%-88%111%17%-23%114%-121%27%12%-27%30%74%82%9%-16%-128%6%-83%9%-12%-63%6%16%16%-64%64%96%-27%-115%-112%-127%3%9%0%96%33%2%12%96%-64%95%65%1%1%0%59%">
+                <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_XJctYHBXEd2Nss_u28cvSA" source="image_papyrus">
+                  <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_XJl3UHBXEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
                 </eAnnotations>
               </icon>
             </packagedElement>
             <packagedElement xmi:type="uml:Association" xmi:id="_3KGVwBKQEdyCSNtdGzMSGg" name="Association_HwTimer_HwClock" memberEnd="_3KZQsBKQEdyCSNtdGzMSGg _3LcZkBKQEdyCSNtdGzMSGg">
-              <ownedEnd xmi:id="_3LcZkBKQEdyCSNtdGzMSGg" name="hwTimer" type="_sX3iQBKQEdyCSNtdGzMSGg" isUnique="false" association="_3KGVwBKQEdyCSNtdGzMSGg">
+              <ownedEnd xmi:type="uml:Property" xmi:id="_3LcZkBKQEdyCSNtdGzMSGg" name="hwTimer" type="_sX3iQBKQEdyCSNtdGzMSGg" isUnique="false" association="_3KGVwBKQEdyCSNtdGzMSGg">
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_3MVKYBKQEdyCSNtdGzMSGg"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3MMAcBKQEdyCSNtdGzMSGg" value="*"/>
               </ownedEnd>
@@ -2079,43 +2079,43 @@
           </packagedElement>
           <packagedElement xmi:type="uml:Profile" xmi:id="_ja8REBJwEdygQ5HMNSpiZw" name="HwDevice">
             <packagedElement xmi:type="uml:Stereotype" xmi:id="_Ljw9kBKREdyCSNtdGzMSGg" name="HwDevice">
-              <generalization xmi:id="_Oe4q4BKREdyCSNtdGzMSGg" general="_LDER0BJxEdygQ5HMNSpiZw"/>
-              <generalization xmi:id="_O_9XoBKREdyCSNtdGzMSGg" general="_h-cH0BG1Edyb1KzJ7GkiGA"/>
-              <icon xmi:id="_z03I8HBXEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%8%8%8%24%24%24%32%32%32%40%40%40%48%48%48%56%56%56%64%64%64%72%72%72%80%80%80%89%89%89%97%97%97%105%105%105%113%113%113%125%125%125%-115%-115%-115%-107%-107%-107%-99%-99%-99%-91%-91%-91%-82%-82%-82%-74%-74%-74%-66%-66%-66%-58%-58%-58%-50%-50%-50%-42%-42%-42%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-73%0%59%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-31%66%9%13%14%72%-100%72%-79%-94%69%-119%12%32%16%-36%-128%64%-63%-125%10%32%67%-118%28%73%18%36%4%6%6%50%8%68%32%-63%97%67%11%5%56%72%80%-32%-46%-95%3%7%11%34%-44%108%120%-95%64%-127%11%59%25%114%8%48%64%101%-48%-123%0%-118%30%69%-86%116%105%-62%-92%70%-99%30%-124%42%21%33%-43%-86%6%-81%98%37%-88%117%-85%-64%-82%94%-63%110%21%-117%-107%108%85%-77%82%-47%58%85%-69%20%0%1%12%94%-71%38%-104%16%87%32%6%2%15%26%-44%-19%16%97%1%-121%2%112%-67%114%24%-96%-95%-61%5%2%16%-94%46%-43%48%-95%0%-123%-127%27%24%12%0%64%-71%-78%-27%-53%-104%41%11%72%16%120%-81%-25%-49%9%3%2%0%59%">
-                <eAnnotations xmi:id="_0SW9QHBXEd2Nss_u28cvSA" source="image_papyrus">
-                  <details xmi:id="_0SguQHBXEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+              <generalization xmi:type="uml:Generalization" xmi:id="_Oe4q4BKREdyCSNtdGzMSGg" general="_LDER0BJxEdygQ5HMNSpiZw"/>
+              <generalization xmi:type="uml:Generalization" xmi:id="_O_9XoBKREdyCSNtdGzMSGg" general="_h-cH0BG1Edyb1KzJ7GkiGA"/>
+              <icon xmi:type="uml:Image" xmi:id="_z03I8HBXEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%8%8%8%24%24%24%32%32%32%40%40%40%48%48%48%56%56%56%64%64%64%72%72%72%80%80%80%89%89%89%97%97%97%105%105%105%113%113%113%125%125%125%-115%-115%-115%-107%-107%-107%-99%-99%-99%-91%-91%-91%-82%-82%-82%-74%-74%-74%-66%-66%-66%-58%-58%-58%-50%-50%-50%-42%-42%-42%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-73%0%59%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-31%66%9%13%14%72%-100%72%-79%-94%69%-119%12%32%16%-36%-128%64%-63%-125%10%32%67%-118%28%73%18%36%4%6%6%50%8%68%32%-63%97%67%11%5%56%72%80%-32%-46%-95%3%7%11%34%-44%108%120%-95%64%-127%11%59%25%114%8%48%64%101%-48%-123%0%-118%30%69%-86%116%105%-62%-92%70%-99%30%-124%42%21%33%-43%-86%6%-81%98%37%-88%117%-85%-64%-82%94%-63%110%21%-117%-107%108%85%-77%82%-47%58%85%-69%20%0%1%12%94%-71%38%-104%16%87%32%6%2%15%26%-44%-19%16%97%1%-121%2%112%-67%114%24%-96%-95%-61%5%2%16%-94%46%-43%48%-95%0%-123%-127%27%24%12%0%64%-71%-78%-27%-53%-104%41%11%72%16%120%-81%-25%-49%9%3%2%0%59%">
+                <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0SW9QHBXEd2Nss_u28cvSA" source="image_papyrus">
+                  <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0SguQHBXEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
                 </eAnnotations>
               </icon>
             </packagedElement>
             <packagedElement xmi:type="uml:Stereotype" xmi:id="_PzqFcBKREdyCSNtdGzMSGg" name="HwI_O">
-              <generalization xmi:id="_WGD3oBKREdyCSNtdGzMSGg" general="_Ljw9kBKREdyCSNtdGzMSGg"/>
-              <icon xmi:id="_4xBg8HBXEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%8%8%8%16%16%16%24%24%24%32%32%32%36%36%36%40%40%40%48%48%48%56%56%56%64%64%64%72%72%72%80%80%80%89%89%89%97%97%97%105%105%105%113%113%113%125%125%125%-115%-115%-115%-107%-107%-107%-99%-99%-99%-91%-91%-91%-82%-82%-82%-74%-74%-74%-66%-66%-66%-58%-58%-58%-50%-50%-50%-42%-42%-42%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-24%0%63%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-31%66%10%15%18%72%-100%72%-79%-94%69%-119%14%36%16%-20%-96%-128%65%-124%11%32%67%-118%28%73%18%-92%4%7%8%54%8%84%64%-63%97%67%12%7%60%80%96%-32%-46%33%4%8%13%38%-44%108%-104%-31%-64%-127%12%59%25%122%8%64%64%101%-48%-123%0%-118%30%21%-24%1%97%82%-93%71%61%24%-48%89%-16%-87%-64%13%10%46%106%-99%40%32%41%85%-127%86%63%120%40%73%86%100%1%0%13%-96%126%8%123%-76%67%90%-125%108%-105%30%-116%43%-73%-86%-46%-70%115%-17%18%-52%-96%-95%110%-36%12%11%0%-88%13%-54%-42%66%0%0%-120%19%43%94%-52%24%40%88%-67%31%56%60%8%-32%120%41%-35%-56%-125%119%94%-58%-69%-42%64%95%-50%85%23%84%0%77%80%-125%-127%8%15%72%15%-100%-48%-64%-61%-127%-49%-96%61%16%-32%-16%33%-125%1%9%-103%119%114%-88%112%-64%-62%-64%14%14%8%48%30%78%28%-15%-128%5%-80%85%43%95%-18%48%32%0%59%">
-                <eAnnotations xmi:id="_5YphoHBXEd2Nss_u28cvSA" source="image_papyrus">
-                  <details xmi:id="_5YzSoHBXEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+              <generalization xmi:type="uml:Generalization" xmi:id="_WGD3oBKREdyCSNtdGzMSGg" general="_Ljw9kBKREdyCSNtdGzMSGg"/>
+              <icon xmi:type="uml:Image" xmi:id="_4xBg8HBXEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%8%8%8%16%16%16%24%24%24%32%32%32%36%36%36%40%40%40%48%48%48%56%56%56%64%64%64%72%72%72%80%80%80%89%89%89%97%97%97%105%105%105%113%113%113%125%125%125%-115%-115%-115%-107%-107%-107%-99%-99%-99%-91%-91%-91%-82%-82%-82%-74%-74%-74%-66%-66%-66%-58%-58%-58%-50%-50%-50%-42%-42%-42%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-24%0%63%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-31%66%10%15%18%72%-100%72%-79%-94%69%-119%14%36%16%-20%-96%-128%65%-124%11%32%67%-118%28%73%18%-92%4%7%8%54%8%84%64%-63%97%67%12%7%60%80%96%-32%-46%33%4%8%13%38%-44%108%-104%-31%-64%-127%12%59%25%122%8%64%64%101%-48%-123%0%-118%30%21%-24%1%97%82%-93%71%61%24%-48%89%-16%-87%-64%13%10%46%106%-99%40%32%41%85%-127%86%63%120%40%73%86%100%1%0%13%-96%126%8%123%-76%67%90%-125%108%-105%30%-116%43%-73%-86%-46%-70%115%-17%18%-52%-96%-95%110%-36%12%11%0%-88%13%-54%-42%66%0%0%-120%19%43%94%-52%24%40%88%-67%31%56%60%8%-32%120%41%-35%-56%-125%119%94%-58%-69%-42%64%95%-50%85%23%84%0%77%80%-125%-127%8%15%72%15%-100%-48%-64%-61%-127%-49%-96%61%16%-32%-16%33%-125%1%9%-103%119%114%-88%112%-64%-62%-64%14%14%8%48%30%78%28%-15%-128%5%-80%85%43%95%-18%48%32%0%59%">
+                <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5YphoHBXEd2Nss_u28cvSA" source="image_papyrus">
+                  <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5YzSoHBXEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
                 </eAnnotations>
               </icon>
             </packagedElement>
             <packagedElement xmi:type="uml:Stereotype" xmi:id="_RZjsQBKREdyCSNtdGzMSGg" name="HwSupport">
-              <generalization xmi:id="_VfeYwBKREdyCSNtdGzMSGg" general="_Ljw9kBKREdyCSNtdGzMSGg"/>
-              <icon xmi:id="_7hk9AHBXEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%8%8%8%24%24%24%32%32%32%40%40%40%48%48%48%56%56%56%64%64%64%72%72%72%80%80%80%89%89%89%97%97%97%105%105%105%113%113%113%125%125%125%-115%-115%-115%-107%-107%-107%-99%-99%-99%-91%-91%-91%-82%-82%-82%-74%-74%-74%-66%-66%-66%-58%-58%-58%-50%-50%-50%-42%-42%-42%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-73%0%59%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-31%66%9%13%14%72%-100%72%-79%-94%69%-119%12%32%16%-36%-128%64%-63%-125%10%32%67%-118%28%73%18%36%4%6%6%50%8%68%32%-63%97%67%11%5%56%72%80%-32%-46%-95%3%7%11%34%-44%108%120%-95%64%-127%11%59%25%114%8%48%64%101%-48%-123%0%-118%30%69%-86%116%105%-62%-92%70%-99%30%-124%42%21%33%-43%-86%6%-81%98%37%-88%117%-85%-64%-82%94%-63%110%21%-117%-107%108%85%-77%82%-47%58%85%-69%20%0%1%12%94%-71%38%-104%16%87%32%6%2%15%26%-44%-19%16%97%1%-121%2%112%-67%114%24%-96%-95%-61%5%2%16%-94%46%-43%48%-95%0%-123%-127%27%24%12%0%64%-71%-78%-27%-53%-104%41%11%72%16%120%-81%-25%-49%9%3%2%0%59%">
-                <eAnnotations xmi:id="_8sEaMHBXEd2Nss_u28cvSA" source="image_papyrus">
-                  <details xmi:id="_8sOLMHBXEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+              <generalization xmi:type="uml:Generalization" xmi:id="_VfeYwBKREdyCSNtdGzMSGg" general="_Ljw9kBKREdyCSNtdGzMSGg"/>
+              <icon xmi:type="uml:Image" xmi:id="_7hk9AHBXEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%8%8%8%24%24%24%32%32%32%40%40%40%48%48%48%56%56%56%64%64%64%72%72%72%80%80%80%89%89%89%97%97%97%105%105%105%113%113%113%125%125%125%-115%-115%-115%-107%-107%-107%-99%-99%-99%-91%-91%-91%-82%-82%-82%-74%-74%-74%-66%-66%-66%-58%-58%-58%-50%-50%-50%-42%-42%-42%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-73%0%59%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-31%66%9%13%14%72%-100%72%-79%-94%69%-119%12%32%16%-36%-128%64%-63%-125%10%32%67%-118%28%73%18%36%4%6%6%50%8%68%32%-63%97%67%11%5%56%72%80%-32%-46%-95%3%7%11%34%-44%108%120%-95%64%-127%11%59%25%114%8%48%64%101%-48%-123%0%-118%30%69%-86%116%105%-62%-92%70%-99%30%-124%42%21%33%-43%-86%6%-81%98%37%-88%117%-85%-64%-82%94%-63%110%21%-117%-107%108%85%-77%82%-47%58%85%-69%20%0%1%12%94%-71%38%-104%16%87%32%6%2%15%26%-44%-19%16%97%1%-121%2%112%-67%114%24%-96%-95%-61%5%2%16%-94%46%-43%48%-95%0%-123%-127%27%24%12%0%64%-71%-78%-27%-53%-104%41%11%72%16%120%-81%-25%-49%9%3%2%0%59%">
+                <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8sEaMHBXEd2Nss_u28cvSA" source="image_papyrus">
+                  <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8sOLMHBXEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
                 </eAnnotations>
               </icon>
             </packagedElement>
             <packagedElement xmi:type="uml:Stereotype" xmi:id="_PHH9sDL2Ed2HYNz2hI9A2g" name="HWActuator">
-              <generalization xmi:id="_ZMsfgDL2Ed2HYNz2hI9A2g" general="_PzqFcBKREdyCSNtdGzMSGg"/>
+              <generalization xmi:type="uml:Generalization" xmi:id="_ZMsfgDL2Ed2HYNz2hI9A2g" general="_PzqFcBKREdyCSNtdGzMSGg"/>
             </packagedElement>
             <packagedElement xmi:type="uml:Stereotype" xmi:id="_SuQccDL2Ed2HYNz2hI9A2g" name="HWSensor">
-              <generalization xmi:id="_Z7ffMDL2Ed2HYNz2hI9A2g" general="_PzqFcBKREdyCSNtdGzMSGg"/>
+              <generalization xmi:type="uml:Generalization" xmi:id="_Z7ffMDL2Ed2HYNz2hI9A2g" general="_PzqFcBKREdyCSNtdGzMSGg"/>
             </packagedElement>
           </packagedElement>
           <packagedElement xmi:type="uml:Profile" xmi:id="_ZJjPoEIbEd6dmI2dd6jVFQ" name="HwStorage">
             <packagedElement xmi:type="uml:Profile" xmi:id="_gHI-ABJwEdygQ5HMNSpiZw" name="HwMemory">
               <packagedElement xmi:type="uml:Stereotype" xmi:id="_A9LDEBJ1EdygQ5HMNSpiZw" name="HwMemory">
-                <generalization xmi:id="_WpXpwBJ1EdygQ5HMNSpiZw" general="_Sh-rwBGzEdyb1KzJ7GkiGA"/>
-                <generalization xmi:id="_XIf1wBJ1EdygQ5HMNSpiZw" general="_LDER0BJxEdygQ5HMNSpiZw"/>
-                <ownedAttribute xmi:id="_N7DOwBJ1EdygQ5HMNSpiZw" name="memorySize" visibility="public" isUnique="false">
+                <generalization xmi:type="uml:Generalization" xmi:id="_WpXpwBJ1EdygQ5HMNSpiZw" general="_Sh-rwBGzEdyb1KzJ7GkiGA"/>
+                <generalization xmi:type="uml:Generalization" xmi:id="_XIf1wBJ1EdygQ5HMNSpiZw" general="_LDER0BJxEdygQ5HMNSpiZw"/>
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_N7DOwBJ1EdygQ5HMNSpiZw" name="memorySize" visibility="public" isUnique="false">
                   <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_QMP1UBJ1EdygQ5HMNSpiZw"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_QMZmUBJ1EdygQ5HMNSpiZw" value="1"/>
@@ -2123,7 +2123,7 @@
                     <value xsi:nil="true"/>
                   </defaultValue>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_OIAFoBJ1EdygQ5HMNSpiZw" name="adressSize" visibility="public" isUnique="false">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_OIAFoBJ1EdygQ5HMNSpiZw" name="adressSize" visibility="public" isUnique="false">
                   <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_SsMpkBJ1EdygQ5HMNSpiZw"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SsVzgBJ1EdygQ5HMNSpiZw" value="1"/>
@@ -2131,14 +2131,14 @@
                     <value xsi:nil="true"/>
                   </defaultValue>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_OMeV8BJ1EdygQ5HMNSpiZw" name="timings" visibility="public" type="_DGwlwBJ1EdygQ5HMNSpiZw">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_OMeV8BJ1EdygQ5HMNSpiZw" name="timings" visibility="public" type="_DGwlwBJ1EdygQ5HMNSpiZw">
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_UvjBYBJ1EdygQ5HMNSpiZw"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UvsyYBJ1EdygQ5HMNSpiZw" value="*"/>
                   <defaultValue xmi:type="uml:LiteralString" xmi:id="_Uv18UBJ1EdygQ5HMNSpiZw">
                     <value xsi:nil="true"/>
                   </defaultValue>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_PRVNIDL3Ed2HYNz2hI9A2g" name="throughput" visibility="public" isUnique="false">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_PRVNIDL3Ed2HYNz2hI9A2g" name="throughput" visibility="public" isUnique="false">
                   <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#__NI1EBFREdyUJeMeN__D-A"/>
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Q-3F8DL3Ed2HYNz2hI9A2g"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Q_KA4DL3Ed2HYNz2hI9A2g" value="1"/>
@@ -2146,14 +2146,14 @@
                     <value xsi:nil="true"/>
                   </defaultValue>
                 </ownedAttribute>
-                <icon xmi:id="_aWTq8HBXEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%4%4%4%8%8%8%12%12%12%16%16%16%24%24%24%28%28%28%32%32%32%36%36%36%40%40%40%44%44%44%48%48%48%52%52%52%56%56%56%60%60%60%64%64%64%68%68%68%72%72%72%80%80%80%89%89%89%93%93%93%97%97%97%105%105%105%113%113%113%121%121%121%125%125%125%-127%-127%-127%-123%-123%-123%-119%-119%-119%-115%-115%-115%-107%-107%-107%-103%-103%-103%-99%-99%-99%-95%-95%-95%-91%-91%-91%-86%-86%-86%-82%-82%-82%-78%-78%-78%-74%-74%-74%-66%-66%-66%-58%-58%-58%-54%-54%-54%-50%-50%-50%-42%-42%-42%-34%-34%-34%-30%-30%-30%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%99%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%11%-102%-56%96%-31%-63%3%1%0%50%2%-80%88%33%3%9%24%14%81%76%16%16%33%-125%-121%19%39%64%14%68%9%34%-125%4%1%18%68%40%68%-79%-96%-127%8%-107%14%73%76%56%64%-62%32%-116%10%13%84%68%36%-56%66%66%-124%23%3%97%72%0%49%-12%-96%-119%7%72%99%76%-112%-39%-12%32%-118%7%48%76%68%-88%-102%-16%66%-121%10%76%-71%30%84%-79%96%-128%9%-79%7%95%0%8%-64%1%-83%65%21%107%29%-72%45%120%97%-19%2%-86%115%-81%102%4%-79%116%-18%83%-75%1%32%-4%-116%-80%-126%-85%-117%10%71%59%0%24%32%64%-96%-119%4%18%-50%66%68%81%-31%64%-40%4%0%14%0%-96%48%-112%68%4%2%18%50%-96%100%81%-48%5%-54%13%19%10%52%0%-95%-78%68%-58%4%33%2%112%30%-8%-126%68%6%-117%-102%55%98%44%96%17%-125%8%23%4%53%0%0%1%64%2%-119%22%1%6%-92%80%-104%50%97%11%3%0%80%-80%56%-32%-63%-126%-64%7%0%8%124%-120%104%2%-6%1%-112%32%42%-64%126%88%80%56%-122%11%6%25%65%99%-40%110%112%68%-122%-44%25%15%-96%16%8%-29%0%112%21%15%72%15%12%-95%0%-93%-58%-75%-1%-83%-123%-128%6%4%-67%-16%-128%100%49%-80%-80%-64%6%9%-95%-64%-127%5%-94%37%4%66%2%-13%21%-120%-63%1%29%68%-11%16%12%32%44%80%1%112%7%-79%112%65%1%18%116%112%-62%66%40%120%-112%90%5%66%45%4%3%9%23%96%-105%-103%69%25%68%-16%0%102%0%52%96%-127%8%26%70%-60%2%74%25%-104%112%66%121%115%21%105%-28%-111%4%5%4%0%59%">
-                  <eAnnotations xmi:id="_a2ow0HBXEd2Nss_u28cvSA" source="image_papyrus">
-                    <details xmi:id="_a2yh0HBXEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+                <icon xmi:type="uml:Image" xmi:id="_aWTq8HBXEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%4%4%4%8%8%8%12%12%12%16%16%16%24%24%24%28%28%28%32%32%32%36%36%36%40%40%40%44%44%44%48%48%48%52%52%52%56%56%56%60%60%60%64%64%64%68%68%68%72%72%72%80%80%80%89%89%89%93%93%93%97%97%97%105%105%105%113%113%113%121%121%121%125%125%125%-127%-127%-127%-123%-123%-123%-119%-119%-119%-115%-115%-115%-107%-107%-107%-103%-103%-103%-99%-99%-99%-95%-95%-95%-91%-91%-91%-86%-86%-86%-82%-82%-82%-78%-78%-78%-74%-74%-74%-66%-66%-66%-58%-58%-58%-54%-54%-54%-50%-50%-50%-42%-42%-42%-34%-34%-34%-30%-30%-30%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%99%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%11%-102%-56%96%-31%-63%3%1%0%50%2%-80%88%33%3%9%24%14%81%76%16%16%33%-125%-121%19%39%64%14%68%9%34%-125%4%1%18%68%40%68%-79%-96%-127%8%-107%14%73%76%56%64%-62%32%-116%10%13%84%68%36%-56%66%66%-124%23%3%97%72%0%49%-12%-96%-119%7%72%99%76%-112%-39%-12%32%-118%7%48%76%68%-88%-102%-16%66%-121%10%76%-71%30%84%-79%96%-128%9%-79%7%95%0%8%-64%1%-83%65%21%107%29%-72%45%120%97%-19%2%-86%115%-81%102%4%-79%116%-18%83%-75%1%32%-4%-116%-80%-126%-85%-117%10%71%59%0%24%32%64%-96%-119%4%18%-50%66%68%81%-31%64%-40%4%0%14%0%-96%48%-112%68%4%2%18%50%-96%100%81%-48%5%-54%13%19%10%52%0%-95%-78%68%-58%4%33%2%112%30%-8%-126%68%6%-117%-102%55%98%44%96%17%-125%8%23%4%53%0%0%1%64%2%-119%22%1%6%-92%80%-104%50%97%11%3%0%80%-80%56%-32%-63%-126%-64%7%0%8%124%-120%104%2%-6%1%-112%32%42%-64%126%88%80%56%-122%11%6%25%65%99%-40%110%112%68%-122%-44%25%15%-96%16%8%-29%0%112%21%15%72%15%12%-95%0%-93%-58%-75%-1%-83%-123%-128%6%4%-67%-16%-128%100%49%-80%-80%-64%6%9%-95%-64%-127%5%-94%37%4%66%2%-13%21%-120%-63%1%29%68%-11%16%12%32%44%80%1%112%7%-79%112%65%1%18%116%112%-62%66%40%120%-112%90%5%66%45%4%3%9%23%96%-105%-103%69%25%68%-16%0%102%0%52%96%-127%8%26%70%-60%2%74%25%-104%112%66%121%115%21%105%-28%-111%4%5%4%0%59%">
+                  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a2ow0HBXEd2Nss_u28cvSA" source="image_papyrus">
+                    <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a2yh0HBXEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
                   </eAnnotations>
                 </icon>
               </packagedElement>
               <packagedElement xmi:type="uml:DataType" xmi:id="_DGwlwBJ1EdygQ5HMNSpiZw" name="Timing">
-                <ownedAttribute xmi:id="_EhJgIBJ1EdygQ5HMNSpiZw" name="notation" visibility="public" isUnique="false">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_EhJgIBJ1EdygQ5HMNSpiZw" name="notation" visibility="public" isUnique="false">
                   <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_B5VngBFQEdyUJeMeN__D-A"/>
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_GfajoBJ1EdygQ5HMNSpiZw"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GfjtkBJ1EdygQ5HMNSpiZw" value="1"/>
@@ -2161,7 +2161,7 @@
                     <value xsi:nil="true"/>
                   </defaultValue>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_EkknkBJ1EdygQ5HMNSpiZw" name="description" visibility="public" isUnique="false">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_EkknkBJ1EdygQ5HMNSpiZw" name="description" visibility="public" isUnique="false">
                   <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_B5VngBFQEdyUJeMeN__D-A"/>
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_JjXc0BJ1EdygQ5HMNSpiZw"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JjhN0BJ1EdygQ5HMNSpiZw" value="1"/>
@@ -2169,7 +2169,7 @@
                     <value xsi:nil="true"/>
                   </defaultValue>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_EnjDEBJ1EdygQ5HMNSpiZw" name="value" visibility="public" isUnique="false">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_EnjDEBJ1EdygQ5HMNSpiZw" name="value" visibility="public" isUnique="false">
                   <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L_4ikBJ1EdygQ5HMNSpiZw"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MACTkBJ1EdygQ5HMNSpiZw" value="1"/>
@@ -2179,37 +2179,37 @@
                 </ownedAttribute>
               </packagedElement>
               <packagedElement xmi:type="uml:Enumeration" xmi:id="_jpkJoBJ1Edy4d8Ako8RhiQ" name="Repl_Policy">
-                <ownedLiteral xmi:id="_lc1eEBJ1Edy4d8Ako8RhiQ" name="LRU"/>
-                <ownedLiteral xmi:id="_lhTHUBJ1Edy4d8Ako8RhiQ" name="NFU"/>
-                <ownedLiteral xmi:id="_lmqvgBJ1Edy4d8Ako8RhiQ" name="FIFO"/>
-                <ownedLiteral xmi:id="_lsK6kBJ1Edy4d8Ako8RhiQ" name="random"/>
-                <ownedLiteral xmi:id="_mId1ABJ1Edy4d8Ako8RhiQ" name="other"/>
-                <ownedLiteral xmi:id="_mPUq8BJ1Edy4d8Ako8RhiQ" name="undef"/>
+                <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_lc1eEBJ1Edy4d8Ako8RhiQ" name="LRU"/>
+                <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_lhTHUBJ1Edy4d8Ako8RhiQ" name="NFU"/>
+                <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_lmqvgBJ1Edy4d8Ako8RhiQ" name="FIFO"/>
+                <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_lsK6kBJ1Edy4d8Ako8RhiQ" name="random"/>
+                <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_mId1ABJ1Edy4d8Ako8RhiQ" name="other"/>
+                <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_mPUq8BJ1Edy4d8Ako8RhiQ" name="undef"/>
               </packagedElement>
               <packagedElement xmi:type="uml:Enumeration" xmi:id="_qkeGQBJ1Edy4d8Ako8RhiQ" name="WritePolicy">
-                <ownedLiteral xmi:id="_sg-PMBJ1Edy4d8Ako8RhiQ" name="writeBack"/>
-                <ownedLiteral xmi:id="_smMGYBJ1Edy4d8Ako8RhiQ" name="writeThrough"/>
-                <ownedLiteral xmi:id="_srQMkBJ1Edy4d8Ako8RhiQ" name="other"/>
-                <ownedLiteral xmi:id="_su-O8BJ1Edy4d8Ako8RhiQ" name="undef"/>
+                <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_sg-PMBJ1Edy4d8Ako8RhiQ" name="writeBack"/>
+                <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_smMGYBJ1Edy4d8Ako8RhiQ" name="writeThrough"/>
+                <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_srQMkBJ1Edy4d8Ako8RhiQ" name="other"/>
+                <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_su-O8BJ1Edy4d8Ako8RhiQ" name="undef"/>
               </packagedElement>
               <packagedElement xmi:type="uml:Enumeration" xmi:id="_xj2TMBJ1Edy4d8Ako8RhiQ" name="CacheType">
-                <ownedLiteral xmi:id="_zoPM0BJ1Edy4d8Ako8RhiQ" name="data"/>
-                <ownedLiteral xmi:id="_zs2nEBJ1Edy4d8Ako8RhiQ" name="instruction"/>
-                <ownedLiteral xmi:id="_z4BVQBJ1Edy4d8Ako8RhiQ" name="unified"/>
-                <ownedLiteral xmi:id="_z_eBEBJ1Edy4d8Ako8RhiQ" name="other"/>
-                <ownedLiteral xmi:id="_0EiHQBJ1Edy4d8Ako8RhiQ" name="undef"/>
+                <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_zoPM0BJ1Edy4d8Ako8RhiQ" name="data"/>
+                <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_zs2nEBJ1Edy4d8Ako8RhiQ" name="instruction"/>
+                <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_z4BVQBJ1Edy4d8Ako8RhiQ" name="unified"/>
+                <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_z_eBEBJ1Edy4d8Ako8RhiQ" name="other"/>
+                <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_0EiHQBJ1Edy4d8Ako8RhiQ" name="undef"/>
               </packagedElement>
               <packagedElement xmi:type="uml:Enumeration" xmi:id="_3_LX4BJ1Edy4d8Ako8RhiQ" name="ROM_Type">
-                <ownedLiteral xmi:id="_5dwOsBJ1Edy4d8Ako8RhiQ" name="maskedROM"/>
-                <ownedLiteral xmi:id="_5h69ABJ1Edy4d8Ako8RhiQ" name="EPROM"/>
-                <ownedLiteral xmi:id="_5mPcUBJ1Edy4d8Ako8RhiQ" name="OTP_EPROM"/>
-                <ownedLiteral xmi:id="_9JNz0BJ1Edy4d8Ako8RhiQ" name="EEPROM"/>
-                <ownedLiteral xmi:id="_9aDFIBJ1Edy4d8Ako8RhiQ" name="Flash"/>
-                <ownedLiteral xmi:id="_9i--sBJ1Edy4d8Ako8RhiQ" name="other"/>
-                <ownedLiteral xmi:id="_9oM14BJ1Edy4d8Ako8RhiQ" name="undef"/>
+                <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5dwOsBJ1Edy4d8Ako8RhiQ" name="maskedROM"/>
+                <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5h69ABJ1Edy4d8Ako8RhiQ" name="EPROM"/>
+                <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5mPcUBJ1Edy4d8Ako8RhiQ" name="OTP_EPROM"/>
+                <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_9JNz0BJ1Edy4d8Ako8RhiQ" name="EEPROM"/>
+                <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_9aDFIBJ1Edy4d8Ako8RhiQ" name="Flash"/>
+                <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_9i--sBJ1Edy4d8Ako8RhiQ" name="other"/>
+                <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_9oM14BJ1Edy4d8Ako8RhiQ" name="undef"/>
               </packagedElement>
               <packagedElement xmi:type="uml:DataType" xmi:id="_BJiOoBJ2Edy4d8Ako8RhiQ" name="CacheStructure">
-                <ownedAttribute xmi:id="_Cy-4sBJ2Edy4d8Ako8RhiQ" name="nbSets" visibility="public" isUnique="false">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_Cy-4sBJ2Edy4d8Ako8RhiQ" name="nbSets" visibility="public" isUnique="false">
                   <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ExksUBJ2Edy4d8Ako8RhiQ"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ExudUBJ2Edy4d8Ako8RhiQ" value="1"/>
@@ -2217,7 +2217,7 @@
                     <value xsi:nil="true"/>
                   </defaultValue>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_C_MvwBJ2Edy4d8Ako8RhiQ" name="blockSize" visibility="public" isUnique="false">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_C_MvwBJ2Edy4d8Ako8RhiQ" name="blockSize" visibility="public" isUnique="false">
                   <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ksC80B_HEdyCRb8Vh0lIfg"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ksPKEB_HEdyCRb8Vh0lIfg" value="1"/>
@@ -2225,7 +2225,7 @@
                     <value xsi:nil="true"/>
                   </defaultValue>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_DEHE8BJ2Edy4d8Ako8RhiQ" name="associativity" visibility="public" isUnique="false">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_DEHE8BJ2Edy4d8Ako8RhiQ" name="associativity" visibility="public" isUnique="false">
                   <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LvCNsBJ2Edy4d8Ako8RhiQ"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LvL-sBJ2Edy4d8Ako8RhiQ" value="1"/>
@@ -2235,7 +2235,7 @@
                 </ownedAttribute>
               </packagedElement>
               <packagedElement xmi:type="uml:DataType" xmi:id="_OUWqIBJ2Edy4d8Ako8RhiQ" name="MemoryOrganization">
-                <ownedAttribute xmi:id="_Sy55EBJ2Edy4d8Ako8RhiQ" name="nbRows" visibility="public" isUnique="false">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_Sy55EBJ2Edy4d8Ako8RhiQ" name="nbRows" visibility="public" isUnique="false">
                   <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VBvIIBJ2Edy4d8Ako8RhiQ"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VBvIIRJ2Edy4d8Ako8RhiQ" value="1"/>
@@ -2243,7 +2243,7 @@
                     <value xsi:nil="true"/>
                   </defaultValue>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_S2exgBJ2Edy4d8Ako8RhiQ" name="nbColumns" visibility="public" isUnique="false">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_S2exgBJ2Edy4d8Ako8RhiQ" name="nbColumns" visibility="public" isUnique="false">
                   <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Xr0IwBJ2Edy4d8Ako8RhiQ"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Xr95wBJ2Edy4d8Ako8RhiQ" value="1"/>
@@ -2251,7 +2251,7 @@
                     <value xsi:nil="true"/>
                   </defaultValue>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_S5wH8BJ2Edy4d8Ako8RhiQ" name="nbBanks" visibility="public" isUnique="false">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_S5wH8BJ2Edy4d8Ako8RhiQ" name="nbBanks" visibility="public" isUnique="false">
                   <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_aJr5YBJ2Edy4d8Ako8RhiQ"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_aJ1qYBJ2Edy4d8Ako8RhiQ" value="1"/>
@@ -2259,7 +2259,7 @@
                     <value xsi:nil="true"/>
                   </defaultValue>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_S9L2cBJ2Edy4d8Ako8RhiQ" name="wordSize" visibility="public" isUnique="false">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_S9L2cBJ2Edy4d8Ako8RhiQ" name="wordSize" visibility="public" isUnique="false">
                   <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_cg2lEBJ2Edy4d8Ako8RhiQ"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_chAWEBJ2Edy4d8Ako8RhiQ" value="1"/>
@@ -2269,8 +2269,8 @@
                 </ownedAttribute>
               </packagedElement>
               <packagedElement xmi:type="uml:Stereotype" xmi:id="_z6yqgBJ3EdygFI18IOWZzA" name="HwCache">
-                <generalization xmi:id="_D8PU4BJ4EdygFI18IOWZzA" general="_A9LDEBJ1EdygQ5HMNSpiZw"/>
-                <ownedAttribute xmi:id="_1EOXwBJ3EdygFI18IOWZzA" name="level" visibility="public" isUnique="false">
+                <generalization xmi:type="uml:Generalization" xmi:id="_D8PU4BJ4EdygFI18IOWZzA" general="_A9LDEBJ1EdygQ5HMNSpiZw"/>
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_1EOXwBJ3EdygFI18IOWZzA" name="level" visibility="public" isUnique="false">
                   <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_3pGIQBJ3EdygFI18IOWZzA"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3pP5QBJ3EdygFI18IOWZzA" value="1"/>
@@ -2278,50 +2278,50 @@
                     <value xsi:nil="true"/>
                   </defaultValue>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_1ShScBJ3EdygFI18IOWZzA" name="type" visibility="public" type="_xj2TMBJ1Edy4d8Ako8RhiQ" isUnique="false">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_1ShScBJ3EdygFI18IOWZzA" name="type" visibility="public" type="_xj2TMBJ1Edy4d8Ako8RhiQ" isUnique="false">
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6ORawBJ3EdygFI18IOWZzA"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6OaksBJ3EdygFI18IOWZzA" value="1"/>
                   <defaultValue xmi:type="uml:LiteralString" xmi:id="_6OkVsBJ3EdygFI18IOWZzA">
                     <value xsi:nil="true"/>
                   </defaultValue>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_1bm9ABJ3EdygFI18IOWZzA" name="structure" visibility="public" type="_BJiOoBJ2Edy4d8Ako8RhiQ" isUnique="false">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_1bm9ABJ3EdygFI18IOWZzA" name="structure" visibility="public" type="_BJiOoBJ2Edy4d8Ako8RhiQ" isUnique="false">
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8Jl38BJ3EdygFI18IOWZzA"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8JvB4BJ3EdygFI18IOWZzA" value="1"/>
                   <defaultValue xmi:type="uml:LiteralString" xmi:id="_8J4y4BJ3EdygFI18IOWZzA">
                     <value xsi:nil="true"/>
                   </defaultValue>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_1g0NIBJ3EdygFI18IOWZzA" name="repl_Policy" visibility="public" type="_jpkJoBJ1Edy4d8Ako8RhiQ" isUnique="false">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_1g0NIBJ3EdygFI18IOWZzA" name="repl_Policy" visibility="public" type="_jpkJoBJ1Edy4d8Ako8RhiQ" isUnique="false">
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__Nl0cBJ3EdygFI18IOWZzA"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__NvlcBJ3EdygFI18IOWZzA" value="1"/>
                   <defaultValue xmi:type="uml:LiteralString" xmi:id="__N4vYBJ3EdygFI18IOWZzA">
                     <value xsi:nil="true"/>
                   </defaultValue>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_1k-7cBJ3EdygFI18IOWZzA" name="writePolicy" visibility="public" type="_qkeGQBJ1Edy4d8Ako8RhiQ" isUnique="false">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_1k-7cBJ3EdygFI18IOWZzA" name="writePolicy" visibility="public" type="_qkeGQBJ1Edy4d8Ako8RhiQ" isUnique="false">
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_BXguUBJ4EdygFI18IOWZzA"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BXqfUBJ4EdygFI18IOWZzA" value="1"/>
                   <defaultValue xmi:type="uml:LiteralString" xmi:id="_BXzpQBJ4EdygFI18IOWZzA">
                     <value xsi:nil="true"/>
                   </defaultValue>
                 </ownedAttribute>
-                <icon xmi:id="_daFlAHBXEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%4%4%4%8%8%8%12%12%12%16%16%16%24%24%24%28%28%28%32%32%32%36%36%36%40%40%40%44%44%44%48%48%48%52%52%52%56%56%56%60%60%60%64%64%64%68%68%68%72%72%72%80%80%80%89%89%89%93%93%93%97%97%97%105%105%105%113%113%113%121%121%121%125%125%125%-127%-127%-127%-123%-123%-123%-119%-119%-119%-115%-115%-115%-107%-107%-107%-103%-103%-103%-99%-99%-99%-95%-95%-95%-91%-91%-91%-86%-86%-86%-82%-82%-82%-78%-78%-78%-74%-74%-74%-66%-66%-66%-58%-58%-58%-54%-54%-54%-50%-50%-50%-42%-42%-42%-34%-34%-34%-30%-30%-30%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%99%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%11%-102%-56%96%-31%-63%3%1%0%50%2%-80%88%33%3%9%24%14%81%76%16%16%33%-125%-121%19%39%64%14%68%9%34%-125%4%1%18%68%40%68%-79%-96%-127%8%-107%14%73%76%56%64%-62%32%-116%10%13%84%68%36%-56%66%66%-124%23%3%97%72%0%49%-12%-96%-119%7%72%99%76%-112%-39%-12%32%-118%7%48%76%68%-88%-102%-16%66%-121%10%76%-71%30%84%-79%96%-128%9%-79%7%95%0%8%-64%1%-83%65%21%107%29%-72%45%120%97%-19%2%-86%115%-81%102%4%-79%116%-18%83%-75%1%32%-4%-116%-80%-126%-85%-117%10%71%59%0%24%32%64%-96%-119%4%18%-50%66%68%81%-31%64%-40%4%0%14%0%-96%48%-112%68%4%2%18%50%-96%100%81%-48%5%-54%13%19%10%52%0%-95%-78%68%-58%4%33%2%112%30%-8%-126%68%6%-117%-102%55%98%44%96%17%-125%8%23%4%53%0%0%1%64%2%-119%22%1%6%-92%80%-104%50%97%11%3%0%80%-80%56%-32%-63%-126%-64%7%0%8%124%-120%104%2%-6%1%-112%32%42%-64%126%88%80%56%-122%11%6%25%65%99%-40%110%112%68%-122%-44%25%15%-96%16%8%-29%0%112%21%15%72%15%12%-95%0%-93%-58%-75%-1%-83%-123%-128%6%4%-67%-16%-128%100%49%-80%-80%-64%6%9%-95%-64%-127%5%-94%37%4%66%2%-13%21%-120%-63%1%29%68%-11%16%12%32%44%80%1%112%7%-79%112%65%1%18%116%112%-62%66%40%120%-112%90%5%66%45%4%3%9%23%96%-105%-103%69%25%68%-16%0%102%0%52%96%-127%8%26%70%-60%2%74%25%-104%112%66%121%115%21%105%-28%-111%4%5%4%0%59%">
-                  <eAnnotations xmi:id="_d2ZGgHBXEd2Nss_u28cvSA" source="image_papyrus">
-                    <details xmi:id="_d2iQcHBXEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+                <icon xmi:type="uml:Image" xmi:id="_daFlAHBXEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%4%4%4%8%8%8%12%12%12%16%16%16%24%24%24%28%28%28%32%32%32%36%36%36%40%40%40%44%44%44%48%48%48%52%52%52%56%56%56%60%60%60%64%64%64%68%68%68%72%72%72%80%80%80%89%89%89%93%93%93%97%97%97%105%105%105%113%113%113%121%121%121%125%125%125%-127%-127%-127%-123%-123%-123%-119%-119%-119%-115%-115%-115%-107%-107%-107%-103%-103%-103%-99%-99%-99%-95%-95%-95%-91%-91%-91%-86%-86%-86%-82%-82%-82%-78%-78%-78%-74%-74%-74%-66%-66%-66%-58%-58%-58%-54%-54%-54%-50%-50%-50%-42%-42%-42%-34%-34%-34%-30%-30%-30%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%99%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%11%-102%-56%96%-31%-63%3%1%0%50%2%-80%88%33%3%9%24%14%81%76%16%16%33%-125%-121%19%39%64%14%68%9%34%-125%4%1%18%68%40%68%-79%-96%-127%8%-107%14%73%76%56%64%-62%32%-116%10%13%84%68%36%-56%66%66%-124%23%3%97%72%0%49%-12%-96%-119%7%72%99%76%-112%-39%-12%32%-118%7%48%76%68%-88%-102%-16%66%-121%10%76%-71%30%84%-79%96%-128%9%-79%7%95%0%8%-64%1%-83%65%21%107%29%-72%45%120%97%-19%2%-86%115%-81%102%4%-79%116%-18%83%-75%1%32%-4%-116%-80%-126%-85%-117%10%71%59%0%24%32%64%-96%-119%4%18%-50%66%68%81%-31%64%-40%4%0%14%0%-96%48%-112%68%4%2%18%50%-96%100%81%-48%5%-54%13%19%10%52%0%-95%-78%68%-58%4%33%2%112%30%-8%-126%68%6%-117%-102%55%98%44%96%17%-125%8%23%4%53%0%0%1%64%2%-119%22%1%6%-92%80%-104%50%97%11%3%0%80%-80%56%-32%-63%-126%-64%7%0%8%124%-120%104%2%-6%1%-112%32%42%-64%126%88%80%56%-122%11%6%25%65%99%-40%110%112%68%-122%-44%25%15%-96%16%8%-29%0%112%21%15%72%15%12%-95%0%-93%-58%-75%-1%-83%-123%-128%6%4%-67%-16%-128%100%49%-80%-80%-64%6%9%-95%-64%-127%5%-94%37%4%66%2%-13%21%-120%-63%1%29%68%-11%16%12%32%44%80%1%112%7%-79%112%65%1%18%116%112%-62%66%40%120%-112%90%5%66%45%4%3%9%23%96%-105%-103%69%25%68%-16%0%102%0%52%96%-127%8%26%70%-60%2%74%25%-104%112%66%121%115%21%105%-28%-111%4%5%4%0%59%">
+                  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_d2ZGgHBXEd2Nss_u28cvSA" source="image_papyrus">
+                    <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_d2iQcHBXEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
                   </eAnnotations>
                 </icon>
               </packagedElement>
               <packagedElement xmi:type="uml:Stereotype" xmi:id="_WSmywBJ5EdygFI18IOWZzA" name="HwRAM">
-                <generalization xmi:id="_rm520BJ5EdygFI18IOWZzA" general="_A9LDEBJ1EdygQ5HMNSpiZw"/>
-                <ownedAttribute xmi:id="_XnilYBJ5EdygFI18IOWZzA" name="organization" visibility="public" type="_OUWqIBJ2Edy4d8Ako8RhiQ" isUnique="false">
+                <generalization xmi:type="uml:Generalization" xmi:id="_rm520BJ5EdygFI18IOWZzA" general="_A9LDEBJ1EdygQ5HMNSpiZw"/>
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_XnilYBJ5EdygFI18IOWZzA" name="organization" visibility="public" type="_OUWqIBJ2Edy4d8Ako8RhiQ" isUnique="false">
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_eLJcUBJ5EdygFI18IOWZzA"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_eLSmQBJ5EdygFI18IOWZzA" value="1"/>
                   <defaultValue xmi:type="uml:LiteralString" xmi:id="_eLcXQBJ5EdygFI18IOWZzA">
                     <value xsi:nil="true"/>
                   </defaultValue>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_Xs6NkBJ5EdygFI18IOWZzA" name="isSynchronous" visibility="public" isUnique="false">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_Xs6NkBJ5EdygFI18IOWZzA" name="isSynchronous" visibility="public" isUnique="false">
                   <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_55fyMBFGEdyBd9q9NMDXUQ"/>
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gZva0BJ5EdygFI18IOWZzA"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gZ5L0BJ5EdygFI18IOWZzA" value="1"/>
@@ -2329,7 +2329,7 @@
                     <value xsi:nil="true"/>
                   </defaultValue>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_Xx0iwBJ5EdygFI18IOWZzA" name="isStatic" visibility="public" isUnique="false">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_Xx0iwBJ5EdygFI18IOWZzA" name="isStatic" visibility="public" isUnique="false">
                   <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_55fyMBFGEdyBd9q9NMDXUQ"/>
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_i564kBJ5EdygFI18IOWZzA"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_i6EpkBJ5EdygFI18IOWZzA" value="1"/>
@@ -2337,7 +2337,7 @@
                     <value xsi:nil="true"/>
                   </defaultValue>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_X1s9MBJ5EdygFI18IOWZzA" name="isNonVolatile" visibility="public" isUnique="false">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_X1s9MBJ5EdygFI18IOWZzA" name="isNonVolatile" visibility="public" isUnique="false">
                   <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_55fyMBFGEdyBd9q9NMDXUQ"/>
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_lPheABJ5EdygFI18IOWZzA"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lPrPABJ5EdygFI18IOWZzA" value="1"/>
@@ -2345,51 +2345,51 @@
                     <value xsi:nil="true"/>
                   </defaultValue>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_X53rgBJ5EdygFI18IOWZzA" name="repl_Policy" visibility="public" type="_jpkJoBJ1Edy4d8Ako8RhiQ" isUnique="false">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_X53rgBJ5EdygFI18IOWZzA" name="repl_Policy" visibility="public" type="_jpkJoBJ1Edy4d8Ako8RhiQ" isUnique="false">
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nOyAABJ5EdygFI18IOWZzA"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nO7J8BJ5EdygFI18IOWZzA" value="1"/>
                   <defaultValue xmi:type="uml:LiteralString" xmi:id="_nPE68BJ5EdygFI18IOWZzA">
                     <value xsi:nil="true"/>
                   </defaultValue>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_X9mU8BJ5EdygFI18IOWZzA" name="writePolicy" visibility="public" type="_qkeGQBJ1Edy4d8Ako8RhiQ" isUnique="false">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_X9mU8BJ5EdygFI18IOWZzA" name="writePolicy" visibility="public" type="_qkeGQBJ1Edy4d8Ako8RhiQ" isUnique="false">
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_pcyIoBJ5EdygFI18IOWZzA"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_pc7SkBJ5EdygFI18IOWZzA" value="1"/>
                   <defaultValue xmi:type="uml:LiteralString" xmi:id="_pdFDkBJ5EdygFI18IOWZzA">
                     <value xsi:nil="true"/>
                   </defaultValue>
                 </ownedAttribute>
-                <icon xmi:id="_gEFGEHBXEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%4%4%4%8%8%8%12%12%12%16%16%16%24%24%24%28%28%28%32%32%32%36%36%36%40%40%40%44%44%44%48%48%48%52%52%52%56%56%56%60%60%60%64%64%64%68%68%68%72%72%72%80%80%80%89%89%89%93%93%93%97%97%97%105%105%105%113%113%113%121%121%121%125%125%125%-127%-127%-127%-123%-123%-123%-119%-119%-119%-115%-115%-115%-107%-107%-107%-103%-103%-103%-99%-99%-99%-95%-95%-95%-91%-91%-91%-86%-86%-86%-82%-82%-82%-78%-78%-78%-74%-74%-74%-66%-66%-66%-58%-58%-58%-54%-54%-54%-50%-50%-50%-42%-42%-42%-34%-34%-34%-30%-30%-30%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%99%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%11%-102%-56%96%-31%-63%3%1%0%50%2%-80%88%33%3%9%24%14%81%76%16%16%33%-125%-121%19%39%64%14%68%9%34%-125%4%1%18%68%40%68%-79%-96%-127%8%-107%14%73%76%56%64%-62%32%-116%10%13%84%68%36%-56%66%66%-124%23%3%97%72%0%49%-12%-96%-119%7%72%99%76%-112%-39%-12%32%-118%7%48%76%68%-88%-102%-16%66%-121%10%76%-71%30%84%-79%96%-128%9%-79%7%95%0%8%-64%1%-83%65%21%107%29%-72%45%120%97%-19%2%-86%115%-81%102%4%-79%116%-18%83%-75%1%32%-4%-116%-80%-126%-85%-117%10%71%59%0%24%32%64%-96%-119%4%18%-50%66%68%81%-31%64%-40%4%0%14%0%-96%48%-112%68%4%2%18%50%-96%100%81%-48%5%-54%13%19%10%52%0%-95%-78%68%-58%4%33%2%112%30%-8%-126%68%6%-117%-102%55%98%44%96%17%-125%8%23%4%53%0%0%1%64%2%-119%22%1%6%-92%80%-104%50%97%11%3%0%80%-80%56%-32%-63%-126%-64%7%0%8%124%-120%104%2%-6%1%-112%32%42%-64%126%88%80%56%-122%11%6%25%65%99%-40%110%112%68%-122%-44%25%15%-96%16%8%-29%0%112%21%15%72%15%12%-95%0%-93%-58%-75%-1%-83%-123%-128%6%4%-67%-16%-128%100%49%-80%-80%-64%6%9%-95%-64%-127%5%-94%37%4%66%2%-13%21%-120%-63%1%29%68%-11%16%12%32%44%80%1%112%7%-79%112%65%1%18%116%112%-62%66%40%120%-112%90%5%66%45%4%3%9%23%96%-105%-103%69%25%68%-16%0%102%0%52%96%-127%8%26%70%-60%2%74%25%-104%112%66%121%115%21%105%-28%-111%4%5%4%0%59%">
-                  <eAnnotations xmi:id="_gqOgEHBXEd2Nss_u28cvSA" source="image_papyrus">
-                    <details xmi:id="_gqXqAHBXEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+                <icon xmi:type="uml:Image" xmi:id="_gEFGEHBXEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%4%4%4%8%8%8%12%12%12%16%16%16%24%24%24%28%28%28%32%32%32%36%36%36%40%40%40%44%44%44%48%48%48%52%52%52%56%56%56%60%60%60%64%64%64%68%68%68%72%72%72%80%80%80%89%89%89%93%93%93%97%97%97%105%105%105%113%113%113%121%121%121%125%125%125%-127%-127%-127%-123%-123%-123%-119%-119%-119%-115%-115%-115%-107%-107%-107%-103%-103%-103%-99%-99%-99%-95%-95%-95%-91%-91%-91%-86%-86%-86%-82%-82%-82%-78%-78%-78%-74%-74%-74%-66%-66%-66%-58%-58%-58%-54%-54%-54%-50%-50%-50%-42%-42%-42%-34%-34%-34%-30%-30%-30%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%99%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%11%-102%-56%96%-31%-63%3%1%0%50%2%-80%88%33%3%9%24%14%81%76%16%16%33%-125%-121%19%39%64%14%68%9%34%-125%4%1%18%68%40%68%-79%-96%-127%8%-107%14%73%76%56%64%-62%32%-116%10%13%84%68%36%-56%66%66%-124%23%3%97%72%0%49%-12%-96%-119%7%72%99%76%-112%-39%-12%32%-118%7%48%76%68%-88%-102%-16%66%-121%10%76%-71%30%84%-79%96%-128%9%-79%7%95%0%8%-64%1%-83%65%21%107%29%-72%45%120%97%-19%2%-86%115%-81%102%4%-79%116%-18%83%-75%1%32%-4%-116%-80%-126%-85%-117%10%71%59%0%24%32%64%-96%-119%4%18%-50%66%68%81%-31%64%-40%4%0%14%0%-96%48%-112%68%4%2%18%50%-96%100%81%-48%5%-54%13%19%10%52%0%-95%-78%68%-58%4%33%2%112%30%-8%-126%68%6%-117%-102%55%98%44%96%17%-125%8%23%4%53%0%0%1%64%2%-119%22%1%6%-92%80%-104%50%97%11%3%0%80%-80%56%-32%-63%-126%-64%7%0%8%124%-120%104%2%-6%1%-112%32%42%-64%126%88%80%56%-122%11%6%25%65%99%-40%110%112%68%-122%-44%25%15%-96%16%8%-29%0%112%21%15%72%15%12%-95%0%-93%-58%-75%-1%-83%-123%-128%6%4%-67%-16%-128%100%49%-80%-80%-64%6%9%-95%-64%-127%5%-94%37%4%66%2%-13%21%-120%-63%1%29%68%-11%16%12%32%44%80%1%112%7%-79%112%65%1%18%116%112%-62%66%40%120%-112%90%5%66%45%4%3%9%23%96%-105%-103%69%25%68%-16%0%102%0%52%96%-127%8%26%70%-60%2%74%25%-104%112%66%121%115%21%105%-28%-111%4%5%4%0%59%">
+                  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_gqOgEHBXEd2Nss_u28cvSA" source="image_papyrus">
+                    <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_gqXqAHBXEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
                   </eAnnotations>
                 </icon>
               </packagedElement>
               <packagedElement xmi:type="uml:Stereotype" xmi:id="_sCeYgBJ5EdygFI18IOWZzA" name="HwROM">
-                <generalization xmi:id="_1SLCQBJ5EdygFI18IOWZzA" general="_A9LDEBJ1EdygQ5HMNSpiZw"/>
-                <ownedAttribute xmi:id="_tLyJ8BJ5EdygFI18IOWZzA" name="type" visibility="public" type="_3_LX4BJ1Edy4d8Ako8RhiQ" isUnique="false">
+                <generalization xmi:type="uml:Generalization" xmi:id="_1SLCQBJ5EdygFI18IOWZzA" general="_A9LDEBJ1EdygQ5HMNSpiZw"/>
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_tLyJ8BJ5EdygFI18IOWZzA" name="type" visibility="public" type="_3_LX4BJ1Edy4d8Ako8RhiQ" isUnique="false">
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wPRwIBJ5EdygFI18IOWZzA"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wPbhIBJ5EdygFI18IOWZzA" value="1"/>
                   <defaultValue xmi:type="uml:LiteralString" xmi:id="_wPbhIRJ5EdygFI18IOWZzA">
                     <value xsi:nil="true"/>
                   </defaultValue>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_tS760BJ5EdygFI18IOWZzA" name="organization" visibility="public" type="_OUWqIBJ2Edy4d8Ako8RhiQ" isUnique="false">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_tS760BJ5EdygFI18IOWZzA" name="organization" visibility="public" type="_OUWqIBJ2Edy4d8Ako8RhiQ" isUnique="false">
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_y3qHoBJ5EdygFI18IOWZzA"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_y3z4oBJ5EdygFI18IOWZzA" value="1"/>
                   <defaultValue xmi:type="uml:LiteralString" xmi:id="_y39CkBJ5EdygFI18IOWZzA">
                     <value xsi:nil="true"/>
                   </defaultValue>
                 </ownedAttribute>
-                <icon xmi:id="_i3K4wHBXEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%4%4%4%8%8%8%12%12%12%16%16%16%24%24%24%28%28%28%32%32%32%36%36%36%40%40%40%44%44%44%48%48%48%52%52%52%56%56%56%60%60%60%64%64%64%68%68%68%72%72%72%80%80%80%89%89%89%93%93%93%97%97%97%105%105%105%113%113%113%121%121%121%125%125%125%-127%-127%-127%-123%-123%-123%-119%-119%-119%-115%-115%-115%-107%-107%-107%-103%-103%-103%-99%-99%-99%-95%-95%-95%-91%-91%-91%-86%-86%-86%-82%-82%-82%-78%-78%-78%-74%-74%-74%-66%-66%-66%-58%-58%-58%-54%-54%-54%-50%-50%-50%-42%-42%-42%-34%-34%-34%-30%-30%-30%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%99%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%11%-102%-56%96%-31%-63%3%1%0%50%2%-80%88%33%3%9%24%14%81%76%16%16%33%-125%-121%19%39%64%14%68%9%34%-125%4%1%18%68%40%68%-79%-96%-127%8%-107%14%73%76%56%64%-62%32%-116%10%13%84%68%36%-56%66%66%-124%23%3%97%72%0%49%-12%-96%-119%7%72%99%76%-112%-39%-12%32%-118%7%48%76%68%-88%-102%-16%66%-121%10%76%-71%30%84%-79%96%-128%9%-79%7%95%0%8%-64%1%-83%65%21%107%29%-72%45%120%97%-19%2%-86%115%-81%102%4%-79%116%-18%83%-75%1%32%-4%-116%-80%-126%-85%-117%10%71%59%0%24%32%64%-96%-119%4%18%-50%66%68%81%-31%64%-40%4%0%14%0%-96%48%-112%68%4%2%18%50%-96%100%81%-48%5%-54%13%19%10%52%0%-95%-78%68%-58%4%33%2%112%30%-8%-126%68%6%-117%-102%55%98%44%96%17%-125%8%23%4%53%0%0%1%64%2%-119%22%1%6%-92%80%-104%50%97%11%3%0%80%-80%56%-32%-63%-126%-64%7%0%8%124%-120%104%2%-6%1%-112%32%42%-64%126%88%80%56%-122%11%6%25%65%99%-40%110%112%68%-122%-44%25%15%-96%16%8%-29%0%112%21%15%72%15%12%-95%0%-93%-58%-75%-1%-83%-123%-128%6%4%-67%-16%-128%100%49%-80%-80%-64%6%9%-95%-64%-127%5%-94%37%4%66%2%-13%21%-120%-63%1%29%68%-11%16%12%32%44%80%1%112%7%-79%112%65%1%18%116%112%-62%66%40%120%-112%90%5%66%45%4%3%9%23%96%-105%-103%69%25%68%-16%0%102%0%52%96%-127%8%26%70%-60%2%74%25%-104%112%66%121%115%21%105%-28%-111%4%5%4%0%59%">
-                  <eAnnotations xmi:id="_jgI9QHBXEd2Nss_u28cvSA" source="image_papyrus">
-                    <details xmi:id="_jgSuQHBXEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+                <icon xmi:type="uml:Image" xmi:id="_i3K4wHBXEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%4%4%4%8%8%8%12%12%12%16%16%16%24%24%24%28%28%28%32%32%32%36%36%36%40%40%40%44%44%44%48%48%48%52%52%52%56%56%56%60%60%60%64%64%64%68%68%68%72%72%72%80%80%80%89%89%89%93%93%93%97%97%97%105%105%105%113%113%113%121%121%121%125%125%125%-127%-127%-127%-123%-123%-123%-119%-119%-119%-115%-115%-115%-107%-107%-107%-103%-103%-103%-99%-99%-99%-95%-95%-95%-91%-91%-91%-86%-86%-86%-82%-82%-82%-78%-78%-78%-74%-74%-74%-66%-66%-66%-58%-58%-58%-54%-54%-54%-50%-50%-50%-42%-42%-42%-34%-34%-34%-30%-30%-30%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%99%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%11%-102%-56%96%-31%-63%3%1%0%50%2%-80%88%33%3%9%24%14%81%76%16%16%33%-125%-121%19%39%64%14%68%9%34%-125%4%1%18%68%40%68%-79%-96%-127%8%-107%14%73%76%56%64%-62%32%-116%10%13%84%68%36%-56%66%66%-124%23%3%97%72%0%49%-12%-96%-119%7%72%99%76%-112%-39%-12%32%-118%7%48%76%68%-88%-102%-16%66%-121%10%76%-71%30%84%-79%96%-128%9%-79%7%95%0%8%-64%1%-83%65%21%107%29%-72%45%120%97%-19%2%-86%115%-81%102%4%-79%116%-18%83%-75%1%32%-4%-116%-80%-126%-85%-117%10%71%59%0%24%32%64%-96%-119%4%18%-50%66%68%81%-31%64%-40%4%0%14%0%-96%48%-112%68%4%2%18%50%-96%100%81%-48%5%-54%13%19%10%52%0%-95%-78%68%-58%4%33%2%112%30%-8%-126%68%6%-117%-102%55%98%44%96%17%-125%8%23%4%53%0%0%1%64%2%-119%22%1%6%-92%80%-104%50%97%11%3%0%80%-80%56%-32%-63%-126%-64%7%0%8%124%-120%104%2%-6%1%-112%32%42%-64%126%88%80%56%-122%11%6%25%65%99%-40%110%112%68%-122%-44%25%15%-96%16%8%-29%0%112%21%15%72%15%12%-95%0%-93%-58%-75%-1%-83%-123%-128%6%4%-67%-16%-128%100%49%-80%-80%-64%6%9%-95%-64%-127%5%-94%37%4%66%2%-13%21%-120%-63%1%29%68%-11%16%12%32%44%80%1%112%7%-79%112%65%1%18%116%112%-62%66%40%120%-112%90%5%66%45%4%3%9%23%96%-105%-103%69%25%68%-16%0%102%0%52%96%-127%8%26%70%-60%2%74%25%-104%112%66%121%115%21%105%-28%-111%4%5%4%0%59%">
+                  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jgI9QHBXEd2Nss_u28cvSA" source="image_papyrus">
+                    <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jgSuQHBXEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
                   </eAnnotations>
                 </icon>
               </packagedElement>
               <packagedElement xmi:type="uml:Stereotype" xmi:id="_14BhUBJ5EdygFI18IOWZzA" name="HwDrive">
-                <generalization xmi:id="_R366sBJ6EdygFI18IOWZzA" general="_A9LDEBJ1EdygQ5HMNSpiZw"/>
-                <ownedAttribute xmi:id="_2QnAcBJ5EdygFI18IOWZzA" name="sectorSize" visibility="public" isUnique="false">
+                <generalization xmi:type="uml:Generalization" xmi:id="_R366sBJ6EdygFI18IOWZzA" general="_A9LDEBJ1EdygQ5HMNSpiZw"/>
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_2QnAcBJ5EdygFI18IOWZzA" name="sectorSize" visibility="public" isUnique="false">
                   <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5baIgBJ5EdygFI18IOWZzA"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5baIgRJ5EdygFI18IOWZzA" value="1"/>
@@ -2397,18 +2397,18 @@
                     <value xsi:nil="true"/>
                   </defaultValue>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_7x5ewBJ5EdygFI18IOWZzA" name="buffer" type="_WSmywBJ5EdygFI18IOWZzA" isUnique="false" aggregation="composite" association="_7xwU0BJ5EdygFI18IOWZzA">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_7x5ewBJ5EdygFI18IOWZzA" name="buffer" type="_WSmywBJ5EdygFI18IOWZzA" isUnique="false" aggregation="composite" association="_7xwU0BJ5EdygFI18IOWZzA">
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AKSbUBJ6EdygFI18IOWZzA"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AKcMUBJ6EdygFI18IOWZzA" value="1"/>
                 </ownedAttribute>
-                <icon xmi:id="_l4jmIHBXEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%4%4%4%8%8%8%12%12%12%16%16%16%24%24%24%28%28%28%32%32%32%36%36%36%40%40%40%44%44%44%48%48%48%52%52%52%56%56%56%60%60%60%64%64%64%68%68%68%72%72%72%80%80%80%89%89%89%93%93%93%97%97%97%105%105%105%113%113%113%121%121%121%125%125%125%-127%-127%-127%-123%-123%-123%-119%-119%-119%-115%-115%-115%-107%-107%-107%-103%-103%-103%-99%-99%-99%-95%-95%-95%-91%-91%-91%-86%-86%-86%-82%-82%-82%-78%-78%-78%-74%-74%-74%-66%-66%-66%-58%-58%-58%-54%-54%-54%-50%-50%-50%-42%-42%-42%-34%-34%-34%-30%-30%-30%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%99%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%11%-102%-56%96%-31%-63%3%1%0%50%2%-80%88%33%3%9%24%14%81%76%16%16%33%-125%-121%19%39%64%14%68%9%34%-125%4%1%18%68%40%68%-79%-96%-127%8%-107%14%73%76%56%64%-62%32%-116%10%13%84%68%36%-56%66%66%-124%23%3%97%72%0%49%-12%-96%-119%7%72%99%76%-112%-39%-12%32%-118%7%48%76%68%-88%-102%-16%66%-121%10%76%-71%30%84%-79%96%-128%9%-79%7%95%0%8%-64%1%-83%65%21%107%29%-72%45%120%97%-19%2%-86%115%-81%102%4%-79%116%-18%83%-75%1%32%-4%-116%-80%-126%-85%-117%10%71%59%0%24%32%64%-96%-119%4%18%-50%66%68%81%-31%64%-40%4%0%14%0%-96%48%-112%68%4%2%18%50%-96%100%81%-48%5%-54%13%19%10%52%0%-95%-78%68%-58%4%33%2%112%30%-8%-126%68%6%-117%-102%55%98%44%96%17%-125%8%23%4%53%0%0%1%64%2%-119%22%1%6%-92%80%-104%50%97%11%3%0%80%-80%56%-32%-63%-126%-64%7%0%8%124%-120%104%2%-6%1%-112%32%42%-64%126%88%80%56%-122%11%6%25%65%99%-40%110%112%68%-122%-44%25%15%-96%16%8%-29%0%112%21%15%72%15%12%-95%0%-93%-58%-75%-1%-83%-123%-128%6%4%-67%-16%-128%100%49%-80%-80%-64%6%9%-95%-64%-127%5%-94%37%4%66%2%-13%21%-120%-63%1%29%68%-11%16%12%32%44%80%1%112%7%-79%112%65%1%18%116%112%-62%66%40%120%-112%90%5%66%45%4%3%9%23%96%-105%-103%69%25%68%-16%0%102%0%52%96%-127%8%26%70%-60%2%74%25%-104%112%66%121%115%21%105%-28%-111%4%5%4%0%59%">
-                  <eAnnotations xmi:id="_mk9ZIHBXEd2Nss_u28cvSA" source="image_papyrus">
-                    <details xmi:id="_mk9ZIXBXEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+                <icon xmi:type="uml:Image" xmi:id="_l4jmIHBXEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%4%4%4%8%8%8%12%12%12%16%16%16%24%24%24%28%28%28%32%32%32%36%36%36%40%40%40%44%44%44%48%48%48%52%52%52%56%56%56%60%60%60%64%64%64%68%68%68%72%72%72%80%80%80%89%89%89%93%93%93%97%97%97%105%105%105%113%113%113%121%121%121%125%125%125%-127%-127%-127%-123%-123%-123%-119%-119%-119%-115%-115%-115%-107%-107%-107%-103%-103%-103%-99%-99%-99%-95%-95%-95%-91%-91%-91%-86%-86%-86%-82%-82%-82%-78%-78%-78%-74%-74%-74%-66%-66%-66%-58%-58%-58%-54%-54%-54%-50%-50%-50%-42%-42%-42%-34%-34%-34%-30%-30%-30%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%99%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%11%-102%-56%96%-31%-63%3%1%0%50%2%-80%88%33%3%9%24%14%81%76%16%16%33%-125%-121%19%39%64%14%68%9%34%-125%4%1%18%68%40%68%-79%-96%-127%8%-107%14%73%76%56%64%-62%32%-116%10%13%84%68%36%-56%66%66%-124%23%3%97%72%0%49%-12%-96%-119%7%72%99%76%-112%-39%-12%32%-118%7%48%76%68%-88%-102%-16%66%-121%10%76%-71%30%84%-79%96%-128%9%-79%7%95%0%8%-64%1%-83%65%21%107%29%-72%45%120%97%-19%2%-86%115%-81%102%4%-79%116%-18%83%-75%1%32%-4%-116%-80%-126%-85%-117%10%71%59%0%24%32%64%-96%-119%4%18%-50%66%68%81%-31%64%-40%4%0%14%0%-96%48%-112%68%4%2%18%50%-96%100%81%-48%5%-54%13%19%10%52%0%-95%-78%68%-58%4%33%2%112%30%-8%-126%68%6%-117%-102%55%98%44%96%17%-125%8%23%4%53%0%0%1%64%2%-119%22%1%6%-92%80%-104%50%97%11%3%0%80%-80%56%-32%-63%-126%-64%7%0%8%124%-120%104%2%-6%1%-112%32%42%-64%126%88%80%56%-122%11%6%25%65%99%-40%110%112%68%-122%-44%25%15%-96%16%8%-29%0%112%21%15%72%15%12%-95%0%-93%-58%-75%-1%-83%-123%-128%6%4%-67%-16%-128%100%49%-80%-80%-64%6%9%-95%-64%-127%5%-94%37%4%66%2%-13%21%-120%-63%1%29%68%-11%16%12%32%44%80%1%112%7%-79%112%65%1%18%116%112%-62%66%40%120%-112%90%5%66%45%4%3%9%23%96%-105%-103%69%25%68%-16%0%102%0%52%96%-127%8%26%70%-60%2%74%25%-104%112%66%121%115%21%105%-28%-111%4%5%4%0%59%">
+                  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_mk9ZIHBXEd2Nss_u28cvSA" source="image_papyrus">
+                    <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mk9ZIXBXEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
                   </eAnnotations>
                 </icon>
               </packagedElement>
               <packagedElement xmi:type="uml:Association" xmi:id="_7xwU0BJ5EdygFI18IOWZzA" name="Association_Stereotype_0_HwRAM" memberEnd="_7x5ewBJ5EdygFI18IOWZzA _7y8AkBJ5EdygFI18IOWZzA">
-                <ownedEnd xmi:id="_7y8AkBJ5EdygFI18IOWZzA" name="stereotype_0" type="_14BhUBJ5EdygFI18IOWZzA" isUnique="false" association="_7xwU0BJ5EdygFI18IOWZzA">
+                <ownedEnd xmi:type="uml:Property" xmi:id="_7y8AkBJ5EdygFI18IOWZzA" name="stereotype_0" type="_14BhUBJ5EdygFI18IOWZzA" isUnique="false" association="_7xwU0BJ5EdygFI18IOWZzA">
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_7z_JcBJ5EdygFI18IOWZzA"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7z1YcBJ5EdygFI18IOWZzA" value="*"/>
                 </ownedEnd>
@@ -2416,28 +2416,28 @@
             </packagedElement>
             <packagedElement xmi:type="uml:Profile" xmi:id="_hst0sBJwEdygQ5HMNSpiZw" name="HwStorageManager">
               <packagedElement xmi:type="uml:Stereotype" xmi:id="_h_XC4BJ7Edyix70umlP_zg" name="HwStorageManager">
-                <generalization xmi:id="_mWsPgBJ7Edyix70umlP_zg" general="_Sh-rwBGzEdyb1KzJ7GkiGA"/>
-                <generalization xmi:id="_mzcc8BJ7Edyix70umlP_zg" general="_LDER0BJxEdygQ5HMNSpiZw"/>
-                <ownedAttribute xmi:id="_rkGIgBJ7Edyix70umlP_zg" name="managedMemories" type="_A9LDEBJ1EdygQ5HMNSpiZw" isUnique="false" association="_rjzNkBJ7Edyix70umlP_zg">
+                <generalization xmi:type="uml:Generalization" xmi:id="_mWsPgBJ7Edyix70umlP_zg" general="_Sh-rwBGzEdyb1KzJ7GkiGA"/>
+                <generalization xmi:type="uml:Generalization" xmi:id="_mzcc8BJ7Edyix70umlP_zg" general="_LDER0BJxEdygQ5HMNSpiZw"/>
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_rkGIgBJ7Edyix70umlP_zg" name="managedMemories" type="_A9LDEBJ1EdygQ5HMNSpiZw" isUnique="false" association="_rjzNkBJ7Edyix70umlP_zg">
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_rkslcBJ7Edyix70umlP_zg"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rk2WcBJ7Edyix70umlP_zg" value="*"/>
                 </ownedAttribute>
-                <icon xmi:id="_p8ZPAHBXEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%4%4%4%8%8%8%12%12%12%16%16%16%20%20%20%24%24%24%28%28%28%32%32%32%36%36%36%40%40%40%44%44%44%48%48%48%52%52%52%56%56%56%60%60%60%64%64%64%68%68%68%72%72%72%76%76%76%80%80%80%85%85%85%89%89%89%97%97%97%101%101%101%105%105%105%109%109%109%113%113%113%117%117%117%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-107%-107%-107%-99%-99%-99%-91%-91%-91%-78%-78%-78%-74%-74%-74%-66%-66%-66%-58%-58%-58%-50%-50%-50%-42%-42%-42%-38%-38%-38%-34%-34%-34%-26%-26%-26%-22%-22%-22%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%97%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%33%-62%14%16%34%74%-100%72%-79%-94%69%-119%23%16%-116%48%-63%-79%-93%-57%-113%32%67%114%4%-128%96%-123%-61%-109%48%72%-102%68%-72%-126%-93%-121%-105%47%57%-78%80%-88%-46%-96%11%17%16%16%68%-124%-7%50%-94%1%8%34%92%28%-84%57%-112%-59%5%3%23%76%44%52%113%-127%-128%-123%-103%4%-119%-62%40%-95%64%-60%11%-108%35%20%-108%-120%90%82%96%9%10%66%81%10%116%65%97%-85%-64%-102%44%20%-124%21%43%-16%-123%-126%-107%53%65%108%96%91%-16%67%-121%-77%93%21%100%-96%75%80%-125%2%-68%38%19%60%-32%59%80%66%2%-64%48%18%4%72%65%120%69%-128%-61%41%-69%22%-120%120%-126%-18%-119%-120%5%16%31%40%-80%-62%65%-46%-109%40%50%56%88%-111%32%115%100%-109%19%0%-88%-128%-127%19%-63%6%19%87%13%-66%48%-79%1%1%-125%16%48%90%0%-112%-128%-8%66%2%1%-85%97%-84%0%1%65%0%-128%-97%62%1%8%-128%0%98%-91%10%1%9%46%32%-18%-16%-127%2%-128%8%107%5%-78%-24%8%-107%96%106%10%114%17%-93%-123%96%0%-125%-124%113%2%-46%21%98%32%-96%-100%4%12%9%102%-119%110%0%33%80%-123%-125%0%0%0%4%24%-128%96%1%-126%1%-8%-23%-25%64%101%48%-124%-80%23%98%2%93%112%65%119%41%112%80%65%3%7%16%112%64%3%21%112%-64%-40%88%10%114%-75%-110%64%34%32%96%-63%8%-79%37%-12%-62%8%22%24%32%66%65%82%-75%69%34%122%49%121%-12%-110%5%78%-127%104%80%-118%4%-67%32%66%79%19%-67%36%35%66%52%18%-90%-95%-113%60%66%-112%-33%-112%68%22%105%-28%-111%68%34%0%-28%-110%76%54%9%67%64%0%59%">
-                  <eAnnotations xmi:id="_qeXToHBXEd2Nss_u28cvSA" source="image_papyrus">
-                    <details xmi:id="_qehEoHBXEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+                <icon xmi:type="uml:Image" xmi:id="_p8ZPAHBXEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%4%4%4%8%8%8%12%12%12%16%16%16%20%20%20%24%24%24%28%28%28%32%32%32%36%36%36%40%40%40%44%44%44%48%48%48%52%52%52%56%56%56%60%60%60%64%64%64%68%68%68%72%72%72%76%76%76%80%80%80%85%85%85%89%89%89%97%97%97%101%101%101%105%105%105%109%109%109%113%113%113%117%117%117%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-107%-107%-107%-99%-99%-99%-91%-91%-91%-78%-78%-78%-74%-74%-74%-66%-66%-66%-58%-58%-58%-50%-50%-50%-42%-42%-42%-38%-38%-38%-34%-34%-34%-26%-26%-26%-22%-22%-22%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%97%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%33%-62%14%16%34%74%-100%72%-79%-94%69%-119%23%16%-116%48%-63%-79%-93%-57%-113%32%67%114%4%-128%96%-123%-61%-109%48%72%-102%68%-72%-126%-93%-121%-105%47%57%-78%80%-88%-46%-96%11%17%16%16%68%-124%-7%50%-94%1%8%34%92%28%-84%57%-112%-59%5%3%23%76%44%52%113%-127%-128%-123%-103%4%-119%-62%40%-95%64%-60%11%-108%35%20%-108%-120%90%82%96%9%10%66%81%10%116%65%97%-85%-64%-102%44%20%-124%21%43%-16%-123%-126%-107%53%65%108%96%91%-16%67%-121%-77%93%21%100%-96%75%80%-125%2%-68%38%19%60%-32%59%80%66%2%-64%48%18%4%72%65%120%69%-128%-61%41%-69%22%-120%120%-126%-18%-119%-120%5%16%31%40%-80%-62%65%-46%-109%40%50%56%88%-111%32%115%100%-109%19%0%-88%-128%-127%19%-63%6%19%87%13%-66%48%-79%1%1%-125%16%48%90%0%-112%-128%-8%66%2%1%-85%97%-84%0%1%65%0%-128%-97%62%1%8%-128%0%98%-91%10%1%9%46%32%-18%-16%-127%2%-128%8%107%5%-78%-24%8%-107%96%106%10%114%17%-93%-123%96%0%-125%-124%113%2%-46%21%98%32%-96%-100%4%12%9%102%-119%110%0%33%80%-123%-125%0%0%0%4%24%-128%96%1%-126%1%-8%-23%-25%64%101%48%-124%-80%23%98%2%93%112%65%119%41%112%80%65%3%7%16%112%64%3%21%112%-64%-40%88%10%114%-75%-110%64%34%32%96%-63%8%-79%37%-12%-62%8%22%24%32%66%65%82%-75%69%34%122%49%121%-12%-110%5%78%-127%104%80%-118%4%-67%32%66%79%19%-67%36%35%66%52%18%-90%-95%-113%60%66%-112%-33%-112%68%22%105%-28%-111%68%34%0%-28%-110%76%54%9%67%64%0%59%">
+                  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qeXToHBXEd2Nss_u28cvSA" source="image_papyrus">
+                    <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qehEoHBXEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
                   </eAnnotations>
                 </icon>
               </packagedElement>
               <packagedElement xmi:type="uml:Association" xmi:id="_rjzNkBJ7Edyix70umlP_zg" name="Association_HwStorageManager_HwMemory" memberEnd="_rkGIgBJ7Edyix70umlP_zg _rk2WcRJ7Edyix70umlP_zg">
-                <ownedEnd xmi:id="_rk2WcRJ7Edyix70umlP_zg" name="hwStorageManager" type="_h_XC4BJ7Edyix70umlP_zg" isUnique="false" association="_rjzNkBJ7Edyix70umlP_zg">
+                <ownedEnd xmi:type="uml:Property" xmi:id="_rk2WcRJ7Edyix70umlP_zg" name="hwStorageManager" type="_h_XC4BJ7Edyix70umlP_zg" isUnique="false" association="_rjzNkBJ7Edyix70umlP_zg">
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_rlvHQBJ7Edyix70umlP_zg"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rll9UBJ7Edyix70umlP_zg" value="*"/>
                 </ownedEnd>
               </packagedElement>
               <packagedElement xmi:type="uml:Stereotype" xmi:id="_ycxQgBJ7Edyix70umlP_zg" name="HwDMA">
-                <generalization xmi:id="_-KjtUBJ7Edyix70umlP_zg" general="_h_XC4BJ7Edyix70umlP_zg"/>
-                <generalization xmi:id="_Ljr6gBKQEdyCSNtdGzMSGg" general="_KryuYBJ-EdyT_7R0WVpWAw"/>
-                <ownedAttribute xmi:id="_0KHjIBJ7Edyix70umlP_zg" name="nbChannels" visibility="public" isUnique="false">
+                <generalization xmi:type="uml:Generalization" xmi:id="_-KjtUBJ7Edyix70umlP_zg" general="_h_XC4BJ7Edyix70umlP_zg"/>
+                <generalization xmi:type="uml:Generalization" xmi:id="_Ljr6gBKQEdyCSNtdGzMSGg" general="_KryuYBJ-EdyT_7R0WVpWAw"/>
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_0KHjIBJ7Edyix70umlP_zg" name="nbChannels" visibility="public" isUnique="false">
                   <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_227usBJ7Edyix70umlP_zg"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_23E4oBJ7Edyix70umlP_zg" value="1"/>
@@ -2445,7 +2445,7 @@
                     <value xsi:nil="true"/>
                   </defaultValue>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_0OlzcBJ7Edyix70umlP_zg" name="transferWidth" visibility="public" isUnique="false">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_0OlzcBJ7Edyix70umlP_zg" name="transferWidth" visibility="public" isUnique="false">
                   <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8M01UBJ7Edyix70umlP_zg"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8M-mUBJ7Edyix70umlP_zg" value="1"/>
@@ -2453,25 +2453,25 @@
                     <value xsi:nil="true"/>
                   </defaultValue>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_EFjsIBJ8Edyix70umlP_zg" name="drivenBy" type="_z0aH8BJyEdygQ5HMNSpiZw" isUnique="false" association="_EFZ7IBJ8Edyix70umlP_zg">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_EFjsIBJ8Edyix70umlP_zg" name="drivenBy" type="_z0aH8BJyEdygQ5HMNSpiZw" isUnique="false" association="_EFZ7IBJ8Edyix70umlP_zg">
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_EF2nEBJ8Edyix70umlP_zg"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EGAYEBJ8Edyix70umlP_zg" value="*"/>
                 </ownedAttribute>
-                <icon xmi:id="_t1zwkHBXEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%4%4%4%8%8%8%12%12%12%16%16%16%20%20%20%24%24%24%28%28%28%32%32%32%36%36%36%40%40%40%44%44%44%48%48%48%52%52%52%56%56%56%60%60%60%64%64%64%68%68%68%72%72%72%76%76%76%80%80%80%85%85%85%89%89%89%97%97%97%101%101%101%105%105%105%109%109%109%113%113%113%117%117%117%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-107%-107%-107%-99%-99%-99%-91%-91%-91%-78%-78%-78%-74%-74%-74%-66%-66%-66%-58%-58%-58%-50%-50%-50%-42%-42%-42%-38%-38%-38%-34%-34%-34%-26%-26%-26%-22%-22%-22%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%97%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%33%-62%14%16%34%74%-100%72%-79%-94%69%-119%23%16%-116%48%-63%-79%-93%-57%-113%32%67%114%4%-128%96%-123%-61%-109%48%72%-102%68%-72%-126%-93%-121%-105%47%57%-78%80%-88%-46%-96%11%17%16%16%68%-124%-7%50%-94%1%8%34%92%28%-84%57%-112%-59%5%3%23%76%44%52%113%-127%-128%-123%-103%4%-119%-62%40%-95%64%-60%11%-108%35%20%-108%-120%90%82%96%9%10%66%81%10%116%65%97%-85%-64%-102%44%20%-124%21%43%-16%-123%-126%-107%53%65%108%96%91%-16%67%-121%-77%93%21%100%-96%75%80%-125%2%-68%38%19%60%-32%59%80%66%2%-64%48%18%4%72%65%120%69%-128%-61%41%-69%22%-120%120%-126%-18%-119%-120%5%16%31%40%-80%-62%65%-46%-109%40%50%56%88%-111%32%115%100%-109%19%0%-88%-128%-127%19%-63%6%19%87%13%-66%48%-79%1%1%-125%16%48%90%0%-112%-128%-8%66%2%1%-85%97%-84%0%1%65%0%-128%-97%62%1%8%-128%0%98%-91%10%1%9%46%32%-18%-16%-127%2%-128%8%107%5%-78%-24%8%-107%96%106%10%114%17%-93%-123%96%0%-125%-124%113%2%-46%21%98%32%-96%-100%4%12%9%102%-119%110%0%33%80%-123%-125%0%0%0%4%24%-128%96%1%-126%1%-8%-23%-25%64%101%48%-124%-80%23%98%2%93%112%65%119%41%112%80%65%3%7%16%112%64%3%21%112%-64%-40%88%10%114%-75%-110%64%34%32%96%-63%8%-79%37%-12%-62%8%22%24%32%66%65%82%-75%69%34%122%49%121%-12%-110%5%78%-127%104%80%-118%4%-67%32%66%79%19%-67%36%35%66%52%18%-90%-95%-113%60%66%-112%-33%-112%68%22%105%-28%-111%68%34%0%-28%-110%76%54%9%67%64%0%59%">
-                  <eAnnotations xmi:id="_uUf3sHBXEd2Nss_u28cvSA" source="image_papyrus">
-                    <details xmi:id="_uUposHBXEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+                <icon xmi:type="uml:Image" xmi:id="_t1zwkHBXEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%4%4%4%8%8%8%12%12%12%16%16%16%20%20%20%24%24%24%28%28%28%32%32%32%36%36%36%40%40%40%44%44%44%48%48%48%52%52%52%56%56%56%60%60%60%64%64%64%68%68%68%72%72%72%76%76%76%80%80%80%85%85%85%89%89%89%97%97%97%101%101%101%105%105%105%109%109%109%113%113%113%117%117%117%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-107%-107%-107%-99%-99%-99%-91%-91%-91%-78%-78%-78%-74%-74%-74%-66%-66%-66%-58%-58%-58%-50%-50%-50%-42%-42%-42%-38%-38%-38%-34%-34%-34%-26%-26%-26%-22%-22%-22%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%97%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%33%-62%14%16%34%74%-100%72%-79%-94%69%-119%23%16%-116%48%-63%-79%-93%-57%-113%32%67%114%4%-128%96%-123%-61%-109%48%72%-102%68%-72%-126%-93%-121%-105%47%57%-78%80%-88%-46%-96%11%17%16%16%68%-124%-7%50%-94%1%8%34%92%28%-84%57%-112%-59%5%3%23%76%44%52%113%-127%-128%-123%-103%4%-119%-62%40%-95%64%-60%11%-108%35%20%-108%-120%90%82%96%9%10%66%81%10%116%65%97%-85%-64%-102%44%20%-124%21%43%-16%-123%-126%-107%53%65%108%96%91%-16%67%-121%-77%93%21%100%-96%75%80%-125%2%-68%38%19%60%-32%59%80%66%2%-64%48%18%4%72%65%120%69%-128%-61%41%-69%22%-120%120%-126%-18%-119%-120%5%16%31%40%-80%-62%65%-46%-109%40%50%56%88%-111%32%115%100%-109%19%0%-88%-128%-127%19%-63%6%19%87%13%-66%48%-79%1%1%-125%16%48%90%0%-112%-128%-8%66%2%1%-85%97%-84%0%1%65%0%-128%-97%62%1%8%-128%0%98%-91%10%1%9%46%32%-18%-16%-127%2%-128%8%107%5%-78%-24%8%-107%96%106%10%114%17%-93%-123%96%0%-125%-124%113%2%-46%21%98%32%-96%-100%4%12%9%102%-119%110%0%33%80%-123%-125%0%0%0%4%24%-128%96%1%-126%1%-8%-23%-25%64%101%48%-124%-80%23%98%2%93%112%65%119%41%112%80%65%3%7%16%112%64%3%21%112%-64%-40%88%10%114%-75%-110%64%34%32%96%-63%8%-79%37%-12%-62%8%22%24%32%66%65%82%-75%69%34%122%49%121%-12%-110%5%78%-127%104%80%-118%4%-67%32%66%79%19%-67%36%35%66%52%18%-90%-95%-113%60%66%-112%-33%-112%68%22%105%-28%-111%68%34%0%-28%-110%76%54%9%67%64%0%59%">
+                  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uUf3sHBXEd2Nss_u28cvSA" source="image_papyrus">
+                    <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uUposHBXEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
                   </eAnnotations>
                 </icon>
               </packagedElement>
               <packagedElement xmi:type="uml:Association" xmi:id="_EFZ7IBJ8Edyix70umlP_zg" name="Association_HwDMA_HwProcessor" memberEnd="_EFjsIBJ8Edyix70umlP_zg _EGAYERJ8Edyix70umlP_zg">
-                <ownedEnd xmi:id="_EGAYERJ8Edyix70umlP_zg" name="hwDMA" type="_ycxQgBJ7Edyix70umlP_zg" isUnique="false" association="_EFZ7IBJ8Edyix70umlP_zg">
+                <ownedEnd xmi:type="uml:Property" xmi:id="_EGAYERJ8Edyix70umlP_zg" name="hwDMA" type="_ycxQgBJ7Edyix70umlP_zg" isUnique="false" association="_EFZ7IBJ8Edyix70umlP_zg">
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_EGv-8BJ8Edyix70umlP_zg"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EGmN8BJ8Edyix70umlP_zg" value="*"/>
                 </ownedEnd>
               </packagedElement>
               <packagedElement xmi:type="uml:Stereotype" xmi:id="_JnXu4BJ8Edyix70umlP_zg" name="HwMMU">
-                <generalization xmi:id="_bZ_b8BJ8Edyix70umlP_zg" general="_h_XC4BJ7Edyix70umlP_zg"/>
-                <ownedAttribute xmi:id="_L_66oBJ8Edyix70umlP_zg" name="virtualAddrSpace" visibility="public" isUnique="false">
+                <generalization xmi:type="uml:Generalization" xmi:id="_bZ_b8BJ8Edyix70umlP_zg" general="_h_XC4BJ7Edyix70umlP_zg"/>
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_L_66oBJ8Edyix70umlP_zg" name="virtualAddrSpace" visibility="public" isUnique="false">
                   <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Pguu8BJ8Edyix70umlP_zg"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Pg344BJ8Edyix70umlP_zg" value="1"/>
@@ -2479,7 +2479,7 @@
                     <value xsi:nil="true"/>
                   </defaultValue>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_MDpkEBJ8Edyix70umlP_zg" name="physicalAddrSpace" visibility="public" isUnique="false">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_MDpkEBJ8Edyix70umlP_zg" name="physicalAddrSpace" visibility="public" isUnique="false">
                   <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_UaLKIBJ8Edyix70umlP_zg"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UaUUEBJ8Edyix70umlP_zg" value="1"/>
@@ -2487,7 +2487,7 @@
                     <value xsi:nil="true"/>
                   </defaultValue>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_MTcTkBJ8Edyix70umlP_zg" name="memoryProtection" visibility="public" isUnique="false">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_MTcTkBJ8Edyix70umlP_zg" name="memoryProtection" visibility="public" isUnique="false">
                   <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_55fyMBFGEdyBd9q9NMDXUQ"/>
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WxPIIBJ8Edyix70umlP_zg"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WxYSEBJ8Edyix70umlP_zg" value="1"/>
@@ -2495,7 +2495,7 @@
                     <value xsi:nil="true"/>
                   </defaultValue>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_MWH0IBJ8Edyix70umlP_zg" name="nbEntries" visibility="public" isUnique="false" isDerived="true">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_MWH0IBJ8Edyix70umlP_zg" name="nbEntries" visibility="public" isUnique="false" isDerived="true">
                   <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZCxs8BJ8Edyix70umlP_zg"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZC7d8BJ8Edyix70umlP_zg" value="1"/>
@@ -2503,19 +2503,19 @@
                     <value xsi:nil="true"/>
                   </defaultValue>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_gO9m0BJ8Edyix70umlP_zg" name="ownedTLBs" type="_z6yqgBJ3EdygFI18IOWZzA" aggregation="composite" association="_gO0c4BJ8Edyix70umlP_zg">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_gO9m0BJ8Edyix70umlP_zg" name="ownedTLBs" type="_z6yqgBJ3EdygFI18IOWZzA" aggregation="composite" association="_gO0c4BJ8Edyix70umlP_zg">
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gPtNsBJ8Edyix70umlP_zg"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gPtNsRJ8Edyix70umlP_zg" value="*"/>
                   <defaultValue xmi:type="uml:LiteralString" xmi:id="_d5fz8KknEd-P4YTdFXh-JA" value=""/>
                 </ownedAttribute>
-                <icon xmi:id="_wT48kHBXEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%4%4%4%8%8%8%12%12%12%16%16%16%20%20%20%24%24%24%28%28%28%32%32%32%36%36%36%40%40%40%44%44%44%48%48%48%52%52%52%56%56%56%60%60%60%64%64%64%68%68%68%72%72%72%76%76%76%80%80%80%85%85%85%89%89%89%97%97%97%101%101%101%105%105%105%109%109%109%113%113%113%117%117%117%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-107%-107%-107%-99%-99%-99%-91%-91%-91%-78%-78%-78%-74%-74%-74%-66%-66%-66%-58%-58%-58%-50%-50%-50%-42%-42%-42%-38%-38%-38%-34%-34%-34%-26%-26%-26%-22%-22%-22%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%97%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%33%-62%14%16%34%74%-100%72%-79%-94%69%-119%23%16%-116%48%-63%-79%-93%-57%-113%32%67%114%4%-128%96%-123%-61%-109%48%72%-102%68%-72%-126%-93%-121%-105%47%57%-78%80%-88%-46%-96%11%17%16%16%68%-124%-7%50%-94%1%8%34%92%28%-84%57%-112%-59%5%3%23%76%44%52%113%-127%-128%-123%-103%4%-119%-62%40%-95%64%-60%11%-108%35%20%-108%-120%90%82%96%9%10%66%81%10%116%65%97%-85%-64%-102%44%20%-124%21%43%-16%-123%-126%-107%53%65%108%96%91%-16%67%-121%-77%93%21%100%-96%75%80%-125%2%-68%38%19%60%-32%59%80%66%2%-64%48%18%4%72%65%120%69%-128%-61%41%-69%22%-120%120%-126%-18%-119%-120%5%16%31%40%-80%-62%65%-46%-109%40%50%56%88%-111%32%115%100%-109%19%0%-88%-128%-127%19%-63%6%19%87%13%-66%48%-79%1%1%-125%16%48%90%0%-112%-128%-8%66%2%1%-85%97%-84%0%1%65%0%-128%-97%62%1%8%-128%0%98%-91%10%1%9%46%32%-18%-16%-127%2%-128%8%107%5%-78%-24%8%-107%96%106%10%114%17%-93%-123%96%0%-125%-124%113%2%-46%21%98%32%-96%-100%4%12%9%102%-119%110%0%33%80%-123%-125%0%0%0%4%24%-128%96%1%-126%1%-8%-23%-25%64%101%48%-124%-80%23%98%2%93%112%65%119%41%112%80%65%3%7%16%112%64%3%21%112%-64%-40%88%10%114%-75%-110%64%34%32%96%-63%8%-79%37%-12%-62%8%22%24%32%66%65%82%-75%69%34%122%49%121%-12%-110%5%78%-127%104%80%-118%4%-67%32%66%79%19%-67%36%35%66%52%18%-90%-95%-113%60%66%-112%-33%-112%68%22%105%-28%-111%68%34%0%-28%-110%76%54%9%67%64%0%59%">
-                  <eAnnotations xmi:id="_wxF18HBXEd2Nss_u28cvSA" source="image_papyrus">
-                    <details xmi:id="_wxO_4HBXEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+                <icon xmi:type="uml:Image" xmi:id="_wT48kHBXEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%4%4%4%8%8%8%12%12%12%16%16%16%20%20%20%24%24%24%28%28%28%32%32%32%36%36%36%40%40%40%44%44%44%48%48%48%52%52%52%56%56%56%60%60%60%64%64%64%68%68%68%72%72%72%76%76%76%80%80%80%85%85%85%89%89%89%97%97%97%101%101%101%105%105%105%109%109%109%113%113%113%117%117%117%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-107%-107%-107%-99%-99%-99%-91%-91%-91%-78%-78%-78%-74%-74%-74%-66%-66%-66%-58%-58%-58%-50%-50%-50%-42%-42%-42%-38%-38%-38%-34%-34%-34%-26%-26%-26%-22%-22%-22%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%97%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%33%-62%14%16%34%74%-100%72%-79%-94%69%-119%23%16%-116%48%-63%-79%-93%-57%-113%32%67%114%4%-128%96%-123%-61%-109%48%72%-102%68%-72%-126%-93%-121%-105%47%57%-78%80%-88%-46%-96%11%17%16%16%68%-124%-7%50%-94%1%8%34%92%28%-84%57%-112%-59%5%3%23%76%44%52%113%-127%-128%-123%-103%4%-119%-62%40%-95%64%-60%11%-108%35%20%-108%-120%90%82%96%9%10%66%81%10%116%65%97%-85%-64%-102%44%20%-124%21%43%-16%-123%-126%-107%53%65%108%96%91%-16%67%-121%-77%93%21%100%-96%75%80%-125%2%-68%38%19%60%-32%59%80%66%2%-64%48%18%4%72%65%120%69%-128%-61%41%-69%22%-120%120%-126%-18%-119%-120%5%16%31%40%-80%-62%65%-46%-109%40%50%56%88%-111%32%115%100%-109%19%0%-88%-128%-127%19%-63%6%19%87%13%-66%48%-79%1%1%-125%16%48%90%0%-112%-128%-8%66%2%1%-85%97%-84%0%1%65%0%-128%-97%62%1%8%-128%0%98%-91%10%1%9%46%32%-18%-16%-127%2%-128%8%107%5%-78%-24%8%-107%96%106%10%114%17%-93%-123%96%0%-125%-124%113%2%-46%21%98%32%-96%-100%4%12%9%102%-119%110%0%33%80%-123%-125%0%0%0%4%24%-128%96%1%-126%1%-8%-23%-25%64%101%48%-124%-80%23%98%2%93%112%65%119%41%112%80%65%3%7%16%112%64%3%21%112%-64%-40%88%10%114%-75%-110%64%34%32%96%-63%8%-79%37%-12%-62%8%22%24%32%66%65%82%-75%69%34%122%49%121%-12%-110%5%78%-127%104%80%-118%4%-67%32%66%79%19%-67%36%35%66%52%18%-90%-95%-113%60%66%-112%-33%-112%68%22%105%-28%-111%68%34%0%-28%-110%76%54%9%67%64%0%59%">
+                  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wxF18HBXEd2Nss_u28cvSA" source="image_papyrus">
+                    <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wxO_4HBXEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
                   </eAnnotations>
                 </icon>
               </packagedElement>
               <packagedElement xmi:type="uml:Association" xmi:id="_gO0c4BJ8Edyix70umlP_zg" name="Association_HwMMU_HWCache" memberEnd="_gO9m0BJ8Edyix70umlP_zg _gP2-sBJ8Edyix70umlP_zg">
-                <ownedEnd xmi:id="_gP2-sBJ8Edyix70umlP_zg" name="hwMMU" type="_JnXu4BJ8Edyix70umlP_zg" isUnique="false" association="_gO0c4BJ8Edyix70umlP_zg">
+                <ownedEnd xmi:type="uml:Property" xmi:id="_gP2-sBJ8Edyix70umlP_zg" name="hwMMU" type="_JnXu4BJ8Edyix70umlP_zg" isUnique="false" association="_gO0c4BJ8Edyix70umlP_zg">
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gQwWkRJ8Edyix70umlP_zg"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gQwWkBJ8Edyix70umlP_zg" value="*"/>
                 </ownedEnd>
@@ -2524,18 +2524,18 @@
           </packagedElement>
         </packagedElement>
         <packagedElement xmi:type="uml:Profile" xmi:id="_R7sL8BJwEdygQ5HMNSpiZw" name="HwPhysical">
-          <packageImport xmi:id="_mmf88EIbEd6dmI2dd6jVFQ" importedPackage="_WGZ44BJwEdygQ5HMNSpiZw"/>
+          <packageImport xmi:type="uml:PackageImport" xmi:id="_mmf88EIbEd6dmI2dd6jVFQ" importedPackage="_WGZ44BJwEdygQ5HMNSpiZw"/>
           <packagedElement xmi:type="uml:Profile" xmi:id="_uAf6gBJwEdygQ5HMNSpiZw" name="HwLayout">
             <packagedElement xmi:type="uml:Stereotype" xmi:id="_ybY5ABKSEdyXTt3sy29HXg" name="HwComponent">
-              <generalization xmi:id="_IMc8IBKUEdyXTt3sy29HXg" general="_LDER0BJxEdygQ5HMNSpiZw"/>
-              <ownedAttribute xmi:id="_0lpKEBKSEdyXTt3sy29HXg" name="kind" visibility="public" type="_5j3-oBKSEdyXTt3sy29HXg" isUnique="false">
+              <generalization xmi:type="uml:Generalization" xmi:id="_IMc8IBKUEdyXTt3sy29HXg" general="_LDER0BJxEdygQ5HMNSpiZw"/>
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_0lpKEBKSEdyXTt3sy29HXg" name="kind" visibility="public" type="_5j3-oBKSEdyXTt3sy29HXg" isUnique="false">
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4_EocBKSEdyXTt3sy29HXg"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4_OZcBKSEdyXTt3sy29HXg" value="1"/>
                 <defaultValue xmi:type="uml:LiteralString" xmi:id="_4_XjYBKSEdyXTt3sy29HXg">
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_0o7HkBKSEdyXTt3sy29HXg" name="dimensions" visibility="public">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_0o7HkBKSEdyXTt3sy29HXg" name="dimensions" visibility="public">
                 <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_g4VH4BFTEdyUJeMeN__D-A"/>
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_vb4lgBKTEdyXTt3sy29HXg"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vcCWgBKTEdyXTt3sy29HXg" value="3"/>
@@ -2543,7 +2543,7 @@
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_0sNFEBKSEdyXTt3sy29HXg" name="area" visibility="public" isUnique="false" isDerived="true">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_0sNFEBKSEdyXTt3sy29HXg" name="area" visibility="public" isUnique="false" isDerived="true">
                 <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_0KmCwBFTEdyUJeMeN__D-A"/>
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xwuV8BKTEdyXTt3sy29HXg"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xw3f4BKTEdyXTt3sy29HXg" value="1"/>
@@ -2551,7 +2551,7 @@
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_0vVRkBKSEdyXTt3sy29HXg" name="position" visibility="public">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_0vVRkBKSEdyXTt3sy29HXg" name="position" visibility="public">
                 <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_rq2FsB18EdyUAqqkOL30sg"/>
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1RPPUBKTEdyXTt3sy29HXg"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1RYZQBKTEdyXTt3sy29HXg" value="2"/>
@@ -2559,7 +2559,7 @@
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_0zW18BKSEdyXTt3sy29HXg" name="grid" visibility="public">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_0zW18BKSEdyXTt3sy29HXg" name="grid" visibility="public">
                 <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_38tXEBKTEdyXTt3sy29HXg"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_383IEBKTEdyXTt3sy29HXg" value="2"/>
@@ -2567,7 +2567,7 @@
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_030fMBKSEdyXTt3sy29HXg" name="nbPins" visibility="public" isUnique="false">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_030fMBKSEdyXTt3sy29HXg" name="nbPins" visibility="public" isUnique="false">
                 <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6UhjABKTEdyXTt3sy29HXg"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6UrUABKTEdyXTt3sy29HXg" value="1"/>
@@ -2575,7 +2575,7 @@
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_07ZXoBKSEdyXTt3sy29HXg" name="weight" visibility="public" isUnique="false">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_07ZXoBKSEdyXTt3sy29HXg" name="weight" visibility="public" isUnique="false">
                 <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ACH_ABKUEdyXTt3sy29HXg"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ACRwABKUEdyXTt3sy29HXg" value="1"/>
@@ -2583,7 +2583,7 @@
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_0_RLABKSEdyXTt3sy29HXg" name="price" visibility="public" isUnique="false">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_0_RLABKSEdyXTt3sy29HXg" name="price" visibility="public" isUnique="false">
                 <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_TyXpQDJQEd211cMdxu944g"/>
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_CnWU0BKUEdyXTt3sy29HXg"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CnfewBKUEdyXTt3sy29HXg" value="1"/>
@@ -2591,18 +2591,18 @@
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_1DJlcBKSEdyXTt3sy29HXg" name="r_Conditions" visibility="public" type="_NRvQYBKTEdyXTt3sy29HXg">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_1DJlcBKSEdyXTt3sy29HXg" name="r_Conditions" visibility="public" type="_NRvQYBKTEdyXTt3sy29HXg">
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_FlcdoBKUEdyXTt3sy29HXg"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FlmOoBKUEdyXTt3sy29HXg" value="*"/>
                 <defaultValue xmi:type="uml:LiteralString" xmi:id="_FlvYkBKUEdyXTt3sy29HXg">
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_6oa58BKUEdyxaob5agZuXg" name="poweredServices" type="_LTvyIBJxEdygQ5HMNSpiZw" aggregation="composite" association="_6oH_ABKUEdyxaob5agZuXg">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_6oa58BKUEdyxaob5agZuXg" name="poweredServices" type="_LTvyIBJxEdygQ5HMNSpiZw" aggregation="composite" association="_6oH_ABKUEdyxaob5agZuXg">
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6pUR0BKUEdyxaob5agZuXg"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6peC0BKUEdyxaob5agZuXg" value="*"/>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_JLuyYBKVEdyxaob5agZuXg" name="staticConsumption" visibility="public" isUnique="false">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_JLuyYBKVEdyxaob5agZuXg" name="staticConsumption" visibility="public" isUnique="false">
                 <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_nWsu8BFSEdyUJeMeN__D-A"/>
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_MglOUBKVEdyxaob5agZuXg"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Mgu_UBKVEdyxaob5agZuXg" value="1"/>
@@ -2610,7 +2610,7 @@
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_JTb84BKVEdyxaob5agZuXg" name="staticDissipation" visibility="public" isUnique="false">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_JTb84BKVEdyxaob5agZuXg" name="staticDissipation" visibility="public" isUnique="false">
                 <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_nWsu8BFSEdyUJeMeN__D-A"/>
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_P4aFwBKVEdyxaob5agZuXg"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P4j2wBKVEdyxaob5agZuXg" value="1"/>
@@ -2618,69 +2618,69 @@
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_oxuScGqqEdyHVMM3AaZxvA" name="subComponents" type="_ybY5ABKSEdyXTt3sy29HXg" aggregation="composite" association="_oxqoEGqqEdyHVMM3AaZxvA">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_oxuScGqqEdyHVMM3AaZxvA" name="subComponents" type="_ybY5ABKSEdyXTt3sy29HXg" aggregation="composite" association="_oxqoEGqqEdyHVMM3AaZxvA">
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ox7GwGqqEdyHVMM3AaZxvA"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ox8U4GqqEdyHVMM3AaZxvA" value="*"/>
               </ownedAttribute>
-              <icon xmi:id="_Op-xQHBYEd2Nss_u28cvSA" content="71%73%70%56%57%97%-127%0%-127%0%112%0%0%44%0%0%0%0%-127%0%-127%0%-121%0%0%0%4%4%4%16%16%16%20%20%20%24%24%24%32%32%32%36%36%36%40%40%40%48%48%48%64%64%64%72%72%72%80%80%80%97%97%97%113%113%113%121%121%121%-115%-115%-115%-107%-107%-107%-99%-99%-99%-91%-91%-91%-82%-82%-82%-66%-66%-66%-58%-58%-58%-34%-34%-34%-26%-26%-26%-18%-18%-18%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%51%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%35%74%-100%72%-79%-94%-59%-117%24%51%106%-36%-56%-79%-93%-57%-113%32%67%-118%28%73%-78%-92%-55%-109%40%83%-86%92%-55%-78%-91%-53%-105%48%99%-54%-100%73%-77%-90%-51%-101%56%115%-22%-36%-55%-77%-89%-49%-97%64%-125%10%29%74%-76%-88%-47%-93%72%-109%42%93%-54%-76%-87%-45%-89%80%-93%74%-99%74%-75%-86%-43%-85%42%27%0%-40%-54%-75%-85%-41%-81%96%-61%-118%29%75%-74%-84%-39%-77%104%-63%46%72%64%1%107%73%11%5%-40%-70%37%9%87%-18%92%-111%117%-37%-34%13%-103%119%47%-33%-72%122%-3%122%-20%43%120%48%-32%-62%-122%-19%34%-34%72%120%-79%-58%-58%-114%49%66%-114%108%113%50%101%-118%-106%47%75%-52%-84%25%34%-25%-50%14%63%-125%102%40%122%-76%-62%-46%-90%17%-94%78%109%112%53%107%-126%-82%95%11%-116%45%-101%-10%107%-37%-84%113%-89%-42%109%-102%-9%104%-33%-96%-127%119%22%-82%-103%-8%101%-29%-108%-111%71%86%-18%-104%-7%98%-25%-120%-95%23%-106%46%-104%-70%95%-21%123%-79%-33%-43%62%-105%-69%91%-17%88%-63%95%-5%21%111%-107%124%85%-13%84%-47%79%85%47%-107%125%84%-9%80%-31%63%-107%-17%-108%126%83%-5%76%-15%47%-83%-5%-128%-126%-1%-1%20%76%0%-32%-128%4%22%104%-32%127%16%60%-96%-32%-126%10%30%-24%-32%-125%16%70%8%-95%-128%4%74%80%-64%3%9%100%-88%97%2%7%12%-80%-31%-121%32%-122%40%98%-122%8%4%32%-64%-119%40%10%16%0%2%35%-74%-24%-30%-117%48%-70%72%-128%1%33%58%-128%16%5%9%-128%-124%-29%65%-118%-3%-60%64%4%16%-19%-8%-111%-112%5%-11%-24%-45%-113%65%-26%56%-92%-110%69%6%-26%35%-112%15%17%-39%-111%-108%3%25%-39%19%-110%81%50%57%-91%-106%85%58%121%36%-108%14%81%-71%-111%-104%25%88%-55%19%-106%97%114%57%-90%-102%101%122%121%37%-104%13%85%32%64%-116%116%106%-120%-128%2%7%45%-64%98%-99%124%-10%25%35%1%19%68%84%-127%-124%-124%2%120%-63%65%24%20%-86%-24%-94%-123%86%32%-37%-93%-112%70%42%-23%-92%-108%86%106%-23%-91%-104%102%-86%-23%-90%-100%118%-22%-23%-89%-96%-122%42%-22%-88%-92%-106%106%-22%-87%-88%-90%-86%-22%-86%15%5%4%0%59%">
-                <eAnnotations xmi:id="_RufrIHBYEd2Nss_u28cvSA" source="image_papyrus">
-                  <details xmi:id="_RupcIHBYEd2Nss_u28cvSA" key="image_kind_key" value="shape"/>
-                  <details xmi:id="_TsGAQHBYEd2Nss_u28cvSA" key="image_expr_key" value="kind=card"/>
+              <icon xmi:type="uml:Image" xmi:id="_Op-xQHBYEd2Nss_u28cvSA" content="71%73%70%56%57%97%-127%0%-127%0%112%0%0%44%0%0%0%0%-127%0%-127%0%-121%0%0%0%4%4%4%16%16%16%20%20%20%24%24%24%32%32%32%36%36%36%40%40%40%48%48%48%64%64%64%72%72%72%80%80%80%97%97%97%113%113%113%121%121%121%-115%-115%-115%-107%-107%-107%-99%-99%-99%-91%-91%-91%-82%-82%-82%-66%-66%-66%-58%-58%-58%-34%-34%-34%-26%-26%-26%-18%-18%-18%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%51%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%35%74%-100%72%-79%-94%-59%-117%24%51%106%-36%-56%-79%-93%-57%-113%32%67%-118%28%73%-78%-92%-55%-109%40%83%-86%92%-55%-78%-91%-53%-105%48%99%-54%-100%73%-77%-90%-51%-101%56%115%-22%-36%-55%-77%-89%-49%-97%64%-125%10%29%74%-76%-88%-47%-93%72%-109%42%93%-54%-76%-87%-45%-89%80%-93%74%-99%74%-75%-86%-43%-85%42%27%0%-40%-54%-75%-85%-41%-81%96%-61%-118%29%75%-74%-84%-39%-77%104%-63%46%72%64%1%107%73%11%5%-40%-70%37%9%87%-18%92%-111%117%-37%-34%13%-103%119%47%-33%-72%122%-3%122%-20%43%120%48%-32%-62%-122%-19%34%-34%72%120%-79%-58%-58%-114%49%66%-114%108%113%50%101%-118%-106%47%75%-52%-84%25%34%-25%-50%14%63%-125%102%40%122%-76%-62%-46%-90%17%-94%78%109%112%53%107%-126%-82%95%11%-116%45%-101%-10%107%-37%-84%113%-89%-42%109%-102%-9%104%-33%-96%-127%119%22%-82%-103%-8%101%-29%-108%-111%71%86%-18%-104%-7%98%-25%-120%-95%23%-106%46%-104%-70%95%-21%123%-79%-33%-43%62%-105%-69%91%-17%88%-63%95%-5%21%111%-107%124%85%-13%84%-47%79%85%47%-107%125%84%-9%80%-31%63%-107%-17%-108%126%83%-5%76%-15%47%-83%-5%-128%-126%-1%-1%20%76%0%-32%-128%4%22%104%-32%127%16%60%-96%-32%-126%10%30%-24%-32%-125%16%70%8%-95%-128%4%74%80%-64%3%9%100%-88%97%2%7%12%-80%-31%-121%32%-122%40%98%-122%8%4%32%-64%-119%40%10%16%0%2%35%-74%-24%-30%-117%48%-70%72%-128%1%33%58%-128%16%5%9%-128%-124%-29%65%-118%-3%-60%64%4%16%-19%-8%-111%-112%5%-11%-24%-45%-113%65%-26%56%-92%-110%69%6%-26%35%-112%15%17%-39%-111%-108%3%25%-39%19%-110%81%50%57%-91%-106%85%58%121%36%-108%14%81%-71%-111%-104%25%88%-55%19%-106%97%114%57%-90%-102%101%122%121%37%-104%13%85%32%64%-116%116%106%-120%-128%2%7%45%-64%98%-99%124%-10%25%35%1%19%68%84%-127%-124%-124%2%120%-63%65%24%20%-86%-24%-94%-123%86%32%-37%-93%-112%70%42%-23%-92%-108%86%106%-23%-91%-104%102%-86%-23%-90%-100%118%-22%-23%-89%-96%-122%42%-22%-88%-92%-106%106%-22%-87%-88%-90%-86%-22%-86%15%5%4%0%59%">
+                <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RufrIHBYEd2Nss_u28cvSA" source="image_papyrus">
+                  <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RupcIHBYEd2Nss_u28cvSA" key="image_kind_key" value="shape"/>
+                  <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TsGAQHBYEd2Nss_u28cvSA" key="image_expr_key" value="kind=card"/>
                 </eAnnotations>
               </icon>
-              <icon xmi:id="_PH7RgHBYEd2Nss_u28cvSA" content="71%73%70%56%57%97%-127%0%-127%0%112%0%0%44%0%0%0%0%-127%0%-127%0%-121%0%0%0%8%8%8%16%16%16%24%24%24%32%32%32%40%40%40%48%48%48%56%56%56%64%64%64%72%72%72%80%80%80%85%85%85%89%89%89%97%97%97%101%101%101%105%105%105%113%113%113%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-107%-107%-107%-99%-99%-99%-91%-91%-91%-82%-82%-82%-78%-78%-78%-74%-74%-74%-66%-66%-66%-58%-58%-58%-50%-50%-50%-42%-42%-42%-34%-34%-34%-30%-30%-30%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%73%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%35%74%-100%72%-79%-94%-59%-117%24%51%106%-36%-56%-79%-93%-57%-113%32%67%-118%28%73%-78%-92%-55%-109%5%45%80%64%-55%-46%34%-122%8%22%25%72%104%73%83%-94%5%3%22%11%-52%-84%-55%-77%-95%5%0%35%40%-114%0%-80%-77%-89%81%-124%63%57%80%-28%64%-12%-88%83%-125%63%87%78%-92%-48%-12%-87%85%18%63%31%80%108%64%-96%-24%-43%-93%55%113%78%52%-96%-64%-21%-41%-98%22%24%8%8%26%113%-124%-128%8%102%-49%-42%-76%-48%-64%64%7%-119%29%12%72%-120%43%-73%37%-35%7%21%36%86%120%-80%-73%-81%81%-70%20%32%72%4%92%-40%48%79%-70%28%14%72%60%-64%-95%-79%99%-102%116%71%4%-112%24%96%-124%-27%-53%44%-23%-110%-80%11%49%47%-119%-49%-96%79%-118%102%112%1%-94%104%-44%-87%75%-118%78%12%17%-62%74%-40%-79%71%-118%-34%-128%0%34%-126%13%-89%-7%-26%14%41%90%-124%0%-120%2%68%4%31%-82%-70%-127%-64%2%30%28%122%40%32%-48%1%1%4%-40%-77%107%-33%-50%-67%-69%-9%-17%-32%-61%-117%-1%31%47%-66%-128%115%18%10%48%56%-68%-64%64%32%-120%12%27%-30%-53%-97%79%-65%-66%-3%-5%-8%-13%-21%-33%-49%-97%127%8%-127%19%-64%-44%80%4%19%48%-41%-109%6%9%56%-108%-128%6%6%-14%100%-100%67%-55%53%-56%-45%0%-1%45%-12%1%1%18%-14%-108%30%67%24%40%-112%97%77%-72%21%20%-30%-121%35%117%-56%-48%-122%36%-78%20%-62%0%12%81%-104%98%75%17%38%-76%-30%-117%45%45%-88%16%-126%52%-78%68%-96%66%1%-26%-120%-110%-119%9%-95%-24%99%73%-45%41%68%-64%7%67%-98%20%-93%65%15%38%105%-46%111%8%-15%-26%-92%73%-74%33%68%-37%-108%36%-79%-121%16%107%88%-110%100%-38%65%-48%117%73%82%103%6%105%38%38%73%-108%25%20%-39%-103%35%85%89%-48%-107%108%-126%52%-104%65%13%88%16%103%72%95%18%68%-38%-99%31%-71%-59%-106%64%126%-14%9%-46%-98%2%-27%41%104%71%-128%17%52%-25%-95%30%-63%73%66%-94%-116%118%-76%-26%64%105%70%-54%-111%-103%3%-111%105%41%71%123%26%-70%105%70%92%98%117%-34%-89%26%93%-23%38%-87%25%73%73%2%-108%-88%102%-44%-28%-110%-83%94%-1%4%93%-111%-79%102%-108%-98%-106%-75%98%20%-32%-114%-71%94%-124%-96%-115%-67%90%116%-31%-87%-63%78%20%-39%-94%-59%78%5%-127%-89%-55%62%84%103%-96%-51%70%68%26%-95%-47%54%20%40%-92%-43%54%-12%-91%-93%-39%42%-76%-24%-92%-35%46%4%41%-90%-31%42%84%-23%104%119%-107%-101%-112%-90%36%-124%-86%-82%65%-122%114%-5%-82%64%-94%13%-92%-22%-68%4%17%-37%36%-66%3%-79%58%80%-104%-4%10%4%43%122%-22%5%76%43%65%61%6%-116%43%65%56%6%-52%43%65%-5%-30%11%108%65%46%-14%59%-80%64%66%-66%123%33%66%35%86%11%-92%65%31%-65%27%-30%-116%-8%102%92%-48%-59%-35%86%124%-48%-60%-27%-110%-116%-48%-61%-27%54%-116%80%-56%-31%38%-116%-48%-63%-27%-102%108%16%-54%-47%30%-71%-112%-65%-35%70%-116%16%-79%-39%-34%-101%-48%-62%-35%-54%11%-81%88%-31%-70%-85%16%-69%-39%2%-68%-48%-71%-43%-110%-69%16%-47%-51%-126%-69%16%-78%-43%42%125%-48%-105%63%1%32%-10%-40%100%-105%109%-10%-39%104%-89%-83%-10%-38%108%-73%-35%-10%2%2%-43%-23%80%-96%29%91%90%47%-75%11%-111%86%119%-92%-94%65%-116%-37%80%-94%123%51%42%26%-77%10%-47%22%-8%-95%-94%113%-51%-48%-102%-121%11%42%26%-74%-42%110%-42%56%-97%-94%81%-35%-112%93%-109%-33%41%26%-44%13%-79%-106%121%-100%116%17%-66%80%98%-97%-77%73%87%-67%16%-15%86%-6%-103%116%97%-51%-112%113%-85%-117%73%23%-48%15%21%32%83%-80%116%-15%-68%-112%2%122%-31%126%0%117%19%77%80%85%-82%22%4%-48%-34%68%26%12%95%-21%79%5%78%36%-126%-14%-79%-2%-60%32%69%3%8%-9%-23%79%-54%81%84%22%-18%24%86%20%123%-105%105%89%52%66%-10%-71%-114%31%-16%-7%-24%-89%-81%126%95%1%1%0%59%">
-                <eAnnotations xmi:id="_cfbeIHBYEd2Nss_u28cvSA" source="image_papyrus">
-                  <details xmi:id="_cflPIHBYEd2Nss_u28cvSA" key="image_kind_key" value="shape"/>
-                  <details xmi:id="_dtWp0HBYEd2Nss_u28cvSA" key="image_expr_key" value="kind=channel"/>
+              <icon xmi:type="uml:Image" xmi:id="_PH7RgHBYEd2Nss_u28cvSA" content="71%73%70%56%57%97%-127%0%-127%0%112%0%0%44%0%0%0%0%-127%0%-127%0%-121%0%0%0%8%8%8%16%16%16%24%24%24%32%32%32%40%40%40%48%48%48%56%56%56%64%64%64%72%72%72%80%80%80%85%85%85%89%89%89%97%97%97%101%101%101%105%105%105%113%113%113%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-107%-107%-107%-99%-99%-99%-91%-91%-91%-82%-82%-82%-78%-78%-78%-74%-74%-74%-66%-66%-66%-58%-58%-58%-50%-50%-50%-42%-42%-42%-34%-34%-34%-30%-30%-30%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%73%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%35%74%-100%72%-79%-94%-59%-117%24%51%106%-36%-56%-79%-93%-57%-113%32%67%-118%28%73%-78%-92%-55%-109%5%45%80%64%-55%-46%34%-122%8%22%25%72%104%73%83%-94%5%3%22%11%-52%-84%-55%-77%-95%5%0%35%40%-114%0%-80%-77%-89%81%-124%63%57%80%-28%64%-12%-88%83%-125%63%87%78%-92%-48%-12%-87%85%18%63%31%80%108%64%-96%-24%-43%-93%55%113%78%52%-96%-64%-21%-41%-98%22%24%8%8%26%113%-124%-128%8%102%-49%-42%-76%-48%-64%64%7%-119%29%12%72%-120%43%-73%37%-35%7%21%36%86%120%-80%-73%-81%81%-70%20%32%72%4%92%-40%48%79%-70%28%14%72%60%-64%-95%-79%99%-102%116%71%4%-112%24%96%-124%-27%-53%44%-23%-110%-80%11%49%47%-119%-49%-96%79%-118%102%112%1%-94%104%-44%-87%75%-118%78%12%17%-62%74%-40%-79%71%-118%-34%-128%0%34%-126%13%-89%-7%-26%14%41%90%-124%0%-120%2%68%4%31%-82%-70%-127%-64%2%30%28%122%40%32%-48%1%1%4%-40%-77%107%-33%-50%-67%-69%-9%-17%-32%-61%-117%-1%31%47%-66%-128%115%18%10%48%56%-68%-64%64%32%-120%12%27%-30%-53%-97%79%-65%-66%-3%-5%-8%-13%-21%-33%-49%-97%127%8%-127%19%-64%-44%80%4%19%48%-41%-109%6%9%56%-108%-128%6%6%-14%100%-100%67%-55%53%-56%-45%0%-1%45%-12%1%1%18%-14%-108%30%67%24%40%-112%97%77%-72%21%20%-30%-121%35%117%-56%-48%-122%36%-78%20%-62%0%12%81%-104%98%75%17%38%-76%-30%-117%45%45%-88%16%-126%52%-78%68%-96%66%1%-26%-120%-110%-119%9%-95%-24%99%73%-45%41%68%-64%7%67%-98%20%-93%65%15%38%105%-46%111%8%-15%-26%-92%73%-74%33%68%-37%-108%36%-79%-121%16%107%88%-110%100%-38%65%-48%117%73%82%103%6%105%38%38%73%-108%25%20%-39%-103%35%85%89%-48%-107%108%-126%52%-104%65%13%88%16%103%72%95%18%68%-38%-99%31%-71%-59%-106%64%126%-14%9%-46%-98%2%-27%41%104%71%-128%17%52%-25%-95%30%-63%73%66%-94%-116%118%-76%-26%64%105%70%-54%-111%-103%3%-111%105%41%71%123%26%-70%105%70%92%98%117%-34%-89%26%93%-23%38%-87%25%73%73%2%-108%-88%102%-44%-28%-110%-83%94%-1%4%93%-111%-79%102%-108%-98%-106%-75%98%20%-32%-114%-71%94%-124%-96%-115%-67%90%116%-31%-87%-63%78%20%-39%-94%-59%78%5%-127%-89%-55%62%84%103%-96%-51%70%68%26%-95%-47%54%20%40%-92%-43%54%-12%-91%-93%-39%42%-76%-24%-92%-35%46%4%41%-90%-31%42%84%-23%104%119%-107%-101%-112%-90%36%-124%-86%-82%65%-122%114%-5%-82%64%-94%13%-92%-22%-68%4%17%-37%36%-66%3%-79%58%80%-104%-4%10%4%43%122%-22%5%76%43%65%61%6%-116%43%65%56%6%-52%43%65%-5%-30%11%108%65%46%-14%59%-80%64%66%-66%123%33%66%35%86%11%-92%65%31%-65%27%-30%-116%-8%102%92%-48%-59%-35%86%124%-48%-60%-27%-110%-116%-48%-61%-27%54%-116%80%-56%-31%38%-116%-48%-63%-27%-102%108%16%-54%-47%30%-71%-112%-65%-35%70%-116%16%-79%-39%-34%-101%-48%-62%-35%-54%11%-81%88%-31%-70%-85%16%-69%-39%2%-68%-48%-71%-43%-110%-69%16%-47%-51%-126%-69%16%-78%-43%42%125%-48%-105%63%1%32%-10%-40%100%-105%109%-10%-39%104%-89%-83%-10%-38%108%-73%-35%-10%2%2%-43%-23%80%-96%29%91%90%47%-75%11%-111%86%119%-92%-94%65%-116%-37%80%-94%123%51%42%26%-77%10%-47%22%-8%-95%-94%113%-51%-48%-102%-121%11%42%26%-74%-42%110%-42%56%-97%-94%81%-35%-112%93%-109%-33%41%26%-44%13%-79%-106%121%-100%116%17%-66%80%98%-97%-77%73%87%-67%16%-15%86%-6%-103%116%97%-51%-112%113%-85%-117%73%23%-48%15%21%32%83%-80%116%-15%-68%-112%2%122%-31%126%0%117%19%77%80%85%-82%22%4%-48%-34%68%26%12%95%-21%79%5%78%36%-126%-14%-79%-2%-60%32%69%3%8%-9%-23%79%-54%81%84%22%-18%24%86%20%123%-105%105%89%52%66%-10%-71%-114%31%-16%-7%-24%-89%-81%126%95%1%1%0%59%">
+                <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_cfbeIHBYEd2Nss_u28cvSA" source="image_papyrus">
+                  <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cflPIHBYEd2Nss_u28cvSA" key="image_kind_key" value="shape"/>
+                  <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dtWp0HBYEd2Nss_u28cvSA" key="image_expr_key" value="kind=channel"/>
                 </eAnnotations>
               </icon>
-              <icon xmi:id="_QKYNAHBYEd2Nss_u28cvSA" content="71%73%70%56%57%97%-127%0%-127%0%112%0%0%44%0%0%0%0%-127%0%-127%0%-121%0%0%0%8%8%8%16%16%16%24%24%24%28%28%28%32%32%32%40%40%40%48%48%48%52%52%52%56%56%56%60%60%60%64%64%64%68%68%68%72%72%72%80%80%80%89%89%89%97%97%97%113%113%113%121%121%121%-123%-123%-123%-115%-115%-115%-91%-91%-91%-66%-66%-66%-58%-58%-58%-50%-50%-50%-42%-42%-42%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%61%8%28%72%-80%-96%-63%-127%19%22%40%92%-56%-80%-95%-125%14%7%35%74%-100%72%-47%3%-124%-122%24%25%70%-88%-56%-79%-93%-60%2%21%44%-120%28%73%-110%-28%0%13%30%83%122%4%80%-78%37%73%0%42%99%114%44%-128%114%102%77%-103%56%11%-62%-20%-72%51%-89%-49%-127%52%59%6%-3%-23%-77%103%69%-93%68%113%14%-83%-72%52%105%76%-92%19%-95%58%77%-39%116%98%-43%-87%60%87%98%85%122%-109%-30%-43%-83%20%-91%70%20%11%-42%106%87%-77%101%-75%102%45%-5%64%65%-58%-116%1%-50%74%52%-112%-32%-83%-35%-69%120%-33%6%88%-103%87%-95%2%6%41%19%80%112%-23%-14%-126%71%13%-124%19%43%94%-100%56%-125%71%12%-116%69%86%24%-112%114%-127%-123%-76%-104%51%79%-44%80%-96%-14%101%-51%-96%67%115%-10%28%-70%116%-26%-47%30%45%-101%94%13%22%117%71%-43%-84%99%39%117%-51%17%-74%-20%-37%56%105%87%-76%-115%-69%-9%-31%-50%-87%63%-5%30%94%81%55%69%-34%-60%-109%27%52%62%17%-71%-14%-25%30%-104%75%116%14%61%-71%-12%-120%-44%-85%15%-65%126%48%-69%-10%-34%-36%13%122%-1%-1%126%91%58%-123%-116%2%12%-109%87%-66%33%64%70%9%11%6%-105%84%-65%94%57%-28%-110%21%10%-116%-81%-1%-99%-13%126%-2%-43%-7%39%28%-128%0%10%72%-32%-127%6%30%88%-96%126%3%42%72%94%-126%14%-82%7%97%-124%-3%49%72%-95%-124%22%94%88%-31%127%26%-106%-105%97%-121%-48%77%8%-94%117%31%-114%72%98%3%7%96%-44%-64%6%38%-126%-42%-127%3%24%37%96%-64%6%46%29%-48%96%-117%-83%13%-32%-110%92%2%113%-120%99%78%-31%21%-28%-29%-113%50%5%73%-48%-112%68%-86%100%-28%64%72%38%-7%27%105%78%110%-75%100%-113%55%70%-7%-45%-108%30%52%105%37%69%88%106%-71%-91%68%93%86%-7%101%-111%-64%-67%38%-26%-104%74%-106%89%-37%-103%104%62%25%92%-101%87%-86%-71%27%-101%112%22%39%-25%113%116%-42%-71%-39%-99%-51%-27%-87%103%68%97%-2%73%38%-108%-126%-90%20%104%-95%-122%-14%57%-99%-97%-120%14%116%104%-93%28%61%10%41%-105%-118%98%-57%40%-92%-110%78%10%102%-91%-35%93%-38%104%-90%-102%30%4%106%-88%5%-115%74%-86%-93%-100%-118%-25%41%-94%-90%-98%26%93%-86%66%-82%-1%90%104%-85%-89%-46%74%-86%-83%-95%-30%-86%-87%-82%-109%-14%-118%41%-84%71%-54%42%-88%-81%-97%2%-53%-92%-80%127%18%-53%-86%-79%84%-70%10%40%-77%89%34%-85%-89%-78%-77%66%-21%101%-78%-42%74%91%39%-75%-61%42%10%1%0%-32%-122%11%64%0%-114%57%107%16%7%2%-120%27%-82%66%-38%-102%43%-94%-71%105%94%11%-17%-85%-14%-62%-5%-18%-68%29%-35%-117%-81%-99%-11%-70%91%-30%-66%-7%-2%11%48%-65%-19%58%-85%-17%-64%-49%-10%107%-80%-64%8%111%-86%-80%-85%7%55%92%106%1%14%-88%11%-82%0%60%58%-53%65%1%22%3%112%-128%-91%3%115%-117%45%-95%-8%-118%60%109%-74%33%-93%12%-80%-55%-37%-86%-68%47%-53%112%-62%-36%-90%-52%104%-46%60%-90%-51%95%-30%-68%-91%-50%86%98%-119%64%-57%64%11%-64%-63%107%64%23%109%-12%-47%69%51%-53%49%-46%-32%18%-112%-42%87%7%65%93%26%89%6%81%93%-102%-44%5%97%13%-102%-43%4%113%13%-102%-42%64%101%60%-75%90%-67%-127%45%-112%-39%-104%121%45%-112%-38%-103%-95%-115%118%90%108%-77%-115%-103%-37%98%-121%22%-9%112%116%-9%118%-73%111%11%48%11%125%-15%-48%-72%45%-51%52%-76%17%5%4%0%59%">
-                <eAnnotations xmi:id="_e2zlMHBYEd2Nss_u28cvSA" source="image_papyrus">
-                  <details xmi:id="_e29WMHBYEd2Nss_u28cvSA" key="image_kind_key" value="shape"/>
-                  <details xmi:id="_gCpGMHBYEd2Nss_u28cvSA" key="image_expr_key" value="kind=chip"/>
+              <icon xmi:type="uml:Image" xmi:id="_QKYNAHBYEd2Nss_u28cvSA" content="71%73%70%56%57%97%-127%0%-127%0%112%0%0%44%0%0%0%0%-127%0%-127%0%-121%0%0%0%8%8%8%16%16%16%24%24%24%28%28%28%32%32%32%40%40%40%48%48%48%52%52%52%56%56%56%60%60%60%64%64%64%68%68%68%72%72%72%80%80%80%89%89%89%97%97%97%113%113%113%121%121%121%-123%-123%-123%-115%-115%-115%-91%-91%-91%-66%-66%-66%-58%-58%-58%-50%-50%-50%-42%-42%-42%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%61%8%28%72%-80%-96%-63%-127%19%22%40%92%-56%-80%-95%-125%14%7%35%74%-100%72%-47%3%-124%-122%24%25%70%-88%-56%-79%-93%-60%2%21%44%-120%28%73%-110%-28%0%13%30%83%122%4%80%-78%37%73%0%42%99%114%44%-128%114%102%77%-103%56%11%-62%-20%-72%51%-89%-49%-127%52%59%6%-3%-23%-77%103%69%-93%68%113%14%-83%-72%52%105%76%-92%19%-95%58%77%-39%116%98%-43%-87%60%87%98%85%122%-109%-30%-43%-83%20%-91%70%20%11%-42%106%87%-77%101%-75%102%45%-5%64%65%-58%-116%1%-50%74%52%-112%-32%-83%-35%-69%120%-33%6%88%-103%87%-95%2%6%41%19%80%112%-23%-14%-126%71%13%-124%19%43%94%-100%56%-125%71%12%-116%69%86%24%-112%114%-127%-123%-76%-104%51%79%-44%80%-96%-14%101%-51%-96%67%115%-10%28%-70%116%-26%-47%30%45%-101%94%13%22%117%71%-43%-84%99%39%117%-51%17%-74%-20%-37%56%105%87%-76%-115%-69%-9%-31%-50%-87%63%-5%30%94%81%55%69%-34%-60%-109%27%52%62%17%-71%-14%-25%30%-104%75%116%14%61%-71%-12%-120%-44%-85%15%-65%126%48%-69%-10%-34%-36%13%122%-1%-1%126%91%58%-123%-116%2%12%-109%87%-66%33%64%70%9%11%6%-105%84%-65%94%57%-28%-110%21%10%-116%-81%-1%-99%-13%126%-2%-43%-7%39%28%-128%0%10%72%-32%-127%6%30%88%-96%126%3%42%72%94%-126%14%-82%7%97%-124%-3%49%72%-95%-124%22%94%88%-31%127%26%-106%-105%97%-121%-48%77%8%-94%117%31%-114%72%98%3%7%96%-44%-64%6%38%-126%-42%-127%3%24%37%96%-64%6%46%29%-48%96%-117%-83%13%-32%-110%92%2%113%-120%99%78%-31%21%-28%-29%-113%50%5%73%-48%-112%68%-86%100%-28%64%72%38%-7%27%105%78%110%-75%100%-113%55%70%-7%-45%-108%30%52%105%37%69%88%106%-71%-91%68%93%86%-7%101%-111%-64%-67%38%-26%-104%74%-106%89%-37%-103%104%62%25%92%-101%87%-86%-71%27%-101%112%22%39%-25%113%116%-42%-71%-39%-99%-51%-27%-87%103%68%97%-2%73%38%-108%-126%-90%20%104%-95%-122%-14%57%-99%-97%-120%14%116%104%-93%28%61%10%41%-105%-118%98%-57%40%-92%-110%78%10%102%-91%-35%93%-38%104%-90%-102%30%4%106%-88%5%-115%74%-86%-93%-100%-118%-25%41%-94%-90%-98%26%93%-86%66%-82%-1%90%104%-85%-89%-46%74%-86%-83%-95%-30%-86%-87%-82%-109%-14%-118%41%-84%71%-54%42%-88%-81%-97%2%-53%-92%-80%127%18%-53%-86%-79%84%-70%10%40%-77%89%34%-85%-89%-78%-77%66%-21%101%-78%-42%74%91%39%-75%-61%42%10%1%0%-32%-122%11%64%0%-114%57%107%16%7%2%-120%27%-82%66%-38%-102%43%-94%-71%105%94%11%-17%-85%-14%-62%-5%-18%-68%29%-35%-117%-81%-99%-11%-70%91%-30%-66%-7%-2%11%48%-65%-19%58%-85%-17%-64%-49%-10%107%-80%-64%8%111%-86%-80%-85%7%55%92%106%1%14%-88%11%-82%0%60%58%-53%65%1%22%3%112%-128%-91%3%115%-117%45%-95%-8%-118%60%109%-74%33%-93%12%-80%-55%-37%-86%-68%47%-53%112%-62%-36%-90%-52%104%-46%60%-90%-51%95%-30%-68%-91%-50%86%98%-119%64%-57%64%11%-64%-63%107%64%23%109%-12%-47%69%51%-53%49%-46%-32%18%-112%-42%87%7%65%93%26%89%6%81%93%-102%-44%5%97%13%-102%-43%4%113%13%-102%-42%64%101%60%-75%90%-67%-127%45%-112%-39%-104%121%45%-112%-38%-103%-95%-115%118%90%108%-77%-115%-103%-37%98%-121%22%-9%112%116%-9%118%-73%111%11%48%11%125%-15%-48%-72%45%-51%52%-76%17%5%4%0%59%">
+                <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_e2zlMHBYEd2Nss_u28cvSA" source="image_papyrus">
+                  <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_e29WMHBYEd2Nss_u28cvSA" key="image_kind_key" value="shape"/>
+                  <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_gCpGMHBYEd2Nss_u28cvSA" key="image_expr_key" value="kind=chip"/>
                 </eAnnotations>
               </icon>
-              <icon xmi:id="_Q9x_4HBYEd2Nss_u28cvSA">
-                <eAnnotations xmi:id="_hTitYHBYEd2Nss_u28cvSA" source="image_papyrus">
-                  <details xmi:id="_hTitYXBYEd2Nss_u28cvSA" key="image_kind_key" value="shape"/>
-                  <details xmi:id="_iYOdgHBYEd2Nss_u28cvSA" key="image_expr_key" value="kind=port"/>
+              <icon xmi:type="uml:Image" xmi:id="_Q9x_4HBYEd2Nss_u28cvSA">
+                <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hTitYHBYEd2Nss_u28cvSA" source="image_papyrus">
+                  <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hTitYXBYEd2Nss_u28cvSA" key="image_kind_key" value="shape"/>
+                  <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iYOdgHBYEd2Nss_u28cvSA" key="image_expr_key" value="kind=port"/>
                 </eAnnotations>
               </icon>
             </packagedElement>
             <packagedElement xmi:type="uml:Enumeration" xmi:id="_5j3-oBKSEdyXTt3sy29HXg" name="ComponentKind">
-              <ownedLiteral xmi:id="_7iDikBKSEdyXTt3sy29HXg" name="card"/>
-              <ownedLiteral xmi:id="_7sVf8BKSEdyXTt3sy29HXg" name="channel"/>
-              <ownedLiteral xmi:id="_7wXEUBKSEdyXTt3sy29HXg" name="chip"/>
-              <ownedLiteral xmi:id="_71bKgBKSEdyXTt3sy29HXg" name="port"/>
-              <ownedLiteral xmi:id="_77-ecBKSEdyXTt3sy29HXg" name="unit"/>
-              <ownedLiteral xmi:id="_8BDLsBKSEdyXTt3sy29HXg" name="other"/>
-              <ownedLiteral xmi:id="_8Gj90BKSEdyXTt3sy29HXg" name="undef"/>
+              <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_7iDikBKSEdyXTt3sy29HXg" name="card"/>
+              <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_7sVf8BKSEdyXTt3sy29HXg" name="channel"/>
+              <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_7wXEUBKSEdyXTt3sy29HXg" name="chip"/>
+              <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_71bKgBKSEdyXTt3sy29HXg" name="port"/>
+              <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_77-ecBKSEdyXTt3sy29HXg" name="unit"/>
+              <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_8BDLsBKSEdyXTt3sy29HXg" name="other"/>
+              <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_8Gj90BKSEdyXTt3sy29HXg" name="undef"/>
             </packagedElement>
             <packagedElement xmi:type="uml:Enumeration" xmi:id="_Bgyx4BKTEdyXTt3sy29HXg" name="ConditionType">
-              <ownedLiteral xmi:id="_CwMkQBKTEdyXTt3sy29HXg" name="temperature"/>
-              <ownedLiteral xmi:id="_C1jlYBKTEdyXTt3sy29HXg" name="humidity"/>
-              <ownedLiteral xmi:id="_EksnwBKTEdyXTt3sy29HXg" name="altitude"/>
-              <ownedLiteral xmi:id="_EpK4EBKTEdyXTt3sy29HXg" name="vibration"/>
-              <ownedLiteral xmi:id="_Eu1bMBKTEdyXTt3sy29HXg" name="shock"/>
-              <ownedLiteral xmi:id="_Ezl_YBKTEdyXTt3sy29HXg" name="other"/>
-              <ownedLiteral xmi:id="_E5aTgBKTEdyXTt3sy29HXg" name="undef"/>
+              <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_CwMkQBKTEdyXTt3sy29HXg" name="temperature"/>
+              <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_C1jlYBKTEdyXTt3sy29HXg" name="humidity"/>
+              <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_EksnwBKTEdyXTt3sy29HXg" name="altitude"/>
+              <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_EpK4EBKTEdyXTt3sy29HXg" name="vibration"/>
+              <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Eu1bMBKTEdyXTt3sy29HXg" name="shock"/>
+              <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Ezl_YBKTEdyXTt3sy29HXg" name="other"/>
+              <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_E5aTgBKTEdyXTt3sy29HXg" name="undef"/>
             </packagedElement>
             <packagedElement xmi:type="uml:DataType" xmi:id="_NRvQYBKTEdyXTt3sy29HXg" name="Env_Condition">
-              <ownedAttribute xmi:id="_Ou2uoBKTEdyXTt3sy29HXg" name="type" visibility="public" type="_Bgyx4BKTEdyXTt3sy29HXg" isUnique="false">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_Ou2uoBKTEdyXTt3sy29HXg" name="type" visibility="public" type="_Bgyx4BKTEdyXTt3sy29HXg" isUnique="false">
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Sn8gEBKTEdyXTt3sy29HXg"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SoGREBKTEdyXTt3sy29HXg" value="1"/>
                 <defaultValue xmi:type="uml:LiteralString" xmi:id="_SoGRERKTEdyXTt3sy29HXg">
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_O799kBKTEdyXTt3sy29HXg" name="status" visibility="public" type="_gvhewBKTEdyXTt3sy29HXg" isUnique="false">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_O799kBKTEdyXTt3sy29HXg" name="status" visibility="public" type="_gvhewBKTEdyXTt3sy29HXg" isUnique="false">
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Uk8YQBKTEdyXTt3sy29HXg"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UlGJQBKTEdyXTt3sy29HXg" value="1"/>
                 <defaultValue xmi:type="uml:LiteralString" xmi:id="_UlPTMBKTEdyXTt3sy29HXg">
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_PBLNsBKTEdyXTt3sy29HXg" name="description" visibility="public" isUnique="false">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_PBLNsBKTEdyXTt3sy29HXg" name="description" visibility="public" isUnique="false">
                 <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_B5VngBFQEdyUJeMeN__D-A"/>
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WTyfsBKTEdyXTt3sy29HXg"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WT7poBKTEdyXTt3sy29HXg" value="1"/>
@@ -2688,7 +2688,7 @@
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_PIL0oBKTEdyXTt3sy29HXg" name="range" visibility="public" isUnique="false">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_PIL0oBKTEdyXTt3sy29HXg" name="range" visibility="public" isUnique="false">
                 <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_6ekucBXWEdyC88-N-gXBsQ"/>
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZAmrQBKTEdyXTt3sy29HXg"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZA5mMBKTEdyXTt3sy29HXg" value="1"/>
@@ -2698,13 +2698,13 @@
               </ownedAttribute>
             </packagedElement>
             <packagedElement xmi:type="uml:Enumeration" xmi:id="_gvhewBKTEdyXTt3sy29HXg" name="ComponentState">
-              <ownedLiteral xmi:id="_iE4vMBKTEdyXTt3sy29HXg" name="operating"/>
-              <ownedLiteral xmi:id="_iJ81YBKTEdyXTt3sy29HXg" name="storage"/>
-              <ownedLiteral xmi:id="_iO3xoBKTEdyXTt3sy29HXg" name="other"/>
-              <ownedLiteral xmi:id="_iTVa4BKTEdyXTt3sy29HXg" name="undef"/>
+              <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_iE4vMBKTEdyXTt3sy29HXg" name="operating"/>
+              <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_iJ81YBKTEdyXTt3sy29HXg" name="storage"/>
+              <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_iO3xoBKTEdyXTt3sy29HXg" name="other"/>
+              <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_iTVa4BKTEdyXTt3sy29HXg" name="undef"/>
             </packagedElement>
             <packagedElement xmi:type="uml:Association" xmi:id="_oxqoEGqqEdyHVMM3AaZxvA" name="Association_HwComponent_HwComponent" memberEnd="_oxuScGqqEdyHVMM3AaZxvA _ox-KEGqqEdyHVMM3AaZxvA">
-              <ownedEnd xmi:id="_ox-KEGqqEdyHVMM3AaZxvA" name="hwComponent" type="_ybY5ABKSEdyXTt3sy29HXg" isUnique="false" association="_oxqoEGqqEdyHVMM3AaZxvA">
+              <ownedEnd xmi:type="uml:Property" xmi:id="_ox-KEGqqEdyHVMM3AaZxvA" name="hwComponent" type="_ybY5ABKSEdyXTt3sy29HXg" isUnique="false" association="_oxqoEGqqEdyHVMM3AaZxvA">
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_oyQd8GqqEdyHVMM3AaZxvA"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oyOowGqqEdyHVMM3AaZxvA" value="1"/>
               </ownedEnd>
@@ -2712,14 +2712,14 @@
           </packagedElement>
           <packagedElement xmi:type="uml:Profile" xmi:id="_vrbyUBJwEdygQ5HMNSpiZw" name="HwPower">
             <packagedElement xmi:type="uml:Association" xmi:id="_6oH_ABKUEdyxaob5agZuXg" name="Association_HwComponent_HwResourceService" memberEnd="_6oa58BKUEdyxaob5agZuXg _6peC0RKUEdyxaob5agZuXg">
-              <ownedEnd xmi:id="_6peC0RKUEdyxaob5agZuXg" name="hwComponent" type="_ybY5ABKSEdyXTt3sy29HXg" isUnique="false" association="_6oH_ABKUEdyxaob5agZuXg">
+              <ownedEnd xmi:type="uml:Property" xmi:id="_6peC0RKUEdyxaob5agZuXg" name="hwComponent" type="_ybY5ABKSEdyXTt3sy29HXg" isUnique="false" association="_6oH_ABKUEdyxaob5agZuXg">
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6qXasBKUEdyxaob5agZuXg"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6qNpsBKUEdyxaob5agZuXg" value="*"/>
               </ownedEnd>
             </packagedElement>
             <packagedElement xmi:type="uml:Stereotype" xmi:id="_WKaPUBKVEdyxaob5agZuXg" name="HwPowerSupply">
-              <generalization xmi:id="_l4vJYBKVEdyxaob5agZuXg" general="_ybY5ABKSEdyXTt3sy29HXg"/>
-              <ownedAttribute xmi:id="_dovpIBKVEdyxaob5agZuXg" name="suppliedPower" visibility="public" isUnique="false">
+              <generalization xmi:type="uml:Generalization" xmi:id="_l4vJYBKVEdyxaob5agZuXg" general="_ybY5ABKSEdyXTt3sy29HXg"/>
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_dovpIBKVEdyxaob5agZuXg" name="suppliedPower" visibility="public" isUnique="false">
                 <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_nWsu8BFSEdyUJeMeN__D-A"/>
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_fnCh0BKVEdyxaob5agZuXg"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fnLrwBKVEdyxaob5agZuXg" value="1"/>
@@ -2727,7 +2727,7 @@
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <ownedAttribute xmi:id="_d0TY4BKVEdyxaob5agZuXg" name="capacity" visibility="public" isUnique="false">
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_d0TY4BKVEdyxaob5agZuXg" name="capacity" visibility="public" isUnique="false">
                 <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_QmcNwBFTEdyUJeMeN__D-A"/>
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_iZy9UBKVEdyxaob5agZuXg"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iZ8uUBKVEdyxaob5agZuXg" value="1"/>
@@ -2735,15 +2735,15 @@
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <icon xmi:id="_k-WyQHBYEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%8%8%8%24%24%24%32%32%32%36%36%36%40%40%40%48%48%48%56%56%56%60%60%60%64%64%64%72%72%72%76%76%76%80%80%80%89%89%89%97%97%97%105%105%105%113%113%113%117%117%117%125%125%125%-115%-115%-115%-107%-107%-107%-103%-103%-103%-99%-99%-99%-91%-91%-91%-86%-86%-86%-82%-82%-82%-74%-74%-74%-70%-70%-70%-66%-66%-66%-62%-62%-62%-58%-58%-58%-50%-50%-50%-42%-42%-42%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%75%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-31%-62%11%16%18%72%-100%72%-79%-94%69%-119%15%40%16%28%-95%-96%-63%4%14%32%67%-118%28%73%18%36%-123%7%7%66%8%84%112%-63%97%67%15%6%72%92%104%-32%-46%-95%4%9%14%44%-44%-20%64%96%34%-126%2%6%63%24%48%-16%-63%37%9%3%24%64%110%64%80%-63%32%-119%0%3%84%58%-52%41%-112%4%3%13%8%1%68%117%104%-63%65%-43%-85%9%-75%74%93%8%34%102%9%-85%88%-61%110%93%120%20%-60%89%-80%10%-59%50%-92%-118%-106%-95%92%-123%93%-33%74%56%-103%-64%109%-42%-75%8%-53%-110%40%-47%0%-64%-127%7%3%36%-60%5%-20%-44%-128%95%17%34%74%-36%92%120%-9%-96%-125%6%18%24%24%48%60%-103%50%99%-126%34%18%48%-112%-112%-63%66%-126%8%-118%-19%126%62%-8%-31%116%106%-43%99%17%-74%70%-19%-78%50%107%-41%53%109%23%-100%-3%-38%-95%-18%-127%-68%107%10%4%80%-64%47%65%9%18%23%12%-16%32%-68%4%0%6%25%12%106%24%112%-127%0%-124%-63%53%65%20%-104%0%-63%50%-126%-40%46%-69%-74%38%109%-98%-112%-60%-128%-56%31%10%80%0%-33%92%68%6%3%105%75%-116%64%12%-96%-66%-3%-5%-8%-13%-41%23%-64%-64%56%-7%-1%0%6%88%83%64%0%59%">
-                <eAnnotations xmi:id="_lv91YHBYEd2Nss_u28cvSA" source="image_papyrus">
-                  <details xmi:id="_lwHmYHBYEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+              <icon xmi:type="uml:Image" xmi:id="_k-WyQHBYEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%8%8%8%24%24%24%32%32%32%36%36%36%40%40%40%48%48%48%56%56%56%60%60%60%64%64%64%72%72%72%76%76%76%80%80%80%89%89%89%97%97%97%105%105%105%113%113%113%117%117%117%125%125%125%-115%-115%-115%-107%-107%-107%-103%-103%-103%-99%-99%-99%-91%-91%-91%-86%-86%-86%-82%-82%-82%-74%-74%-74%-70%-70%-70%-66%-66%-66%-62%-62%-62%-58%-58%-58%-50%-50%-50%-42%-42%-42%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%75%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-31%-62%11%16%18%72%-100%72%-79%-94%69%-119%15%40%16%28%-95%-96%-63%4%14%32%67%-118%28%73%18%36%-123%7%7%66%8%84%112%-63%97%67%15%6%72%92%104%-32%-46%-95%4%9%14%44%-44%-20%64%96%34%-126%2%6%63%24%48%-16%-63%37%9%3%24%64%110%64%80%-63%32%-119%0%3%84%58%-52%41%-112%4%3%13%8%1%68%117%104%-63%65%-43%-85%9%-75%74%93%8%34%102%9%-85%88%-61%110%93%120%20%-60%89%-80%10%-59%50%-92%-118%-106%-95%92%-123%93%-33%74%56%-103%-64%109%-42%-75%8%-53%-110%40%-47%0%-64%-127%7%3%36%-60%5%-20%-44%-128%95%17%34%74%-36%92%120%-9%-96%-125%6%18%24%24%48%60%-103%50%99%-126%34%18%48%-112%-112%-63%66%-126%8%-118%-19%126%62%-8%-31%116%106%-43%99%17%-74%70%-19%-78%50%107%-41%53%109%23%-100%-3%-38%-95%-18%-127%-68%107%10%4%80%-64%47%65%9%18%23%12%-16%32%-68%4%0%6%25%12%106%24%112%-127%0%-124%-63%53%65%20%-104%0%-63%50%-126%-40%46%-69%-74%38%109%-98%-112%-60%-128%-56%31%10%80%0%-33%92%68%6%3%105%75%-116%64%12%-96%-66%-3%-5%-8%-13%-41%23%-64%-64%56%-7%-1%0%6%88%83%64%0%59%">
+                <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lv91YHBYEd2Nss_u28cvSA" source="image_papyrus">
+                  <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lwHmYHBYEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
                 </eAnnotations>
               </icon>
             </packagedElement>
             <packagedElement xmi:type="uml:Stereotype" xmi:id="_Wmtw0BKVEdyxaob5agZuXg" name="HwCoolingSupply">
-              <generalization xmi:id="_lMH7ABKVEdyxaob5agZuXg" general="_ybY5ABKSEdyXTt3sy29HXg"/>
-              <ownedAttribute xmi:id="_ZeX6cBKVEdyxaob5agZuXg" name="coolingPower" visibility="public" isUnique="false">
+              <generalization xmi:type="uml:Generalization" xmi:id="_lMH7ABKVEdyxaob5agZuXg" general="_ybY5ABKSEdyXTt3sy29HXg"/>
+              <ownedAttribute xmi:type="uml:Property" xmi:id="_ZeX6cBKVEdyxaob5agZuXg" name="coolingPower" visibility="public" isUnique="false">
                 <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_nWsu8BFSEdyUJeMeN__D-A"/>
                 <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_btkV4BKVEdyxaob5agZuXg"/>
                 <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bttf0BKVEdyxaob5agZuXg" value="1"/>
@@ -2751,9 +2751,9 @@
                   <value xsi:nil="true"/>
                 </defaultValue>
               </ownedAttribute>
-              <icon xmi:id="_qVoY8HBYEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%8%8%8%16%16%16%24%24%24%32%32%32%40%40%40%48%48%48%56%56%56%60%60%60%64%64%64%72%72%72%80%80%80%89%89%89%97%97%97%101%101%101%105%105%105%113%113%113%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-107%-107%-107%-99%-99%-99%-91%-91%-91%-82%-82%-82%-74%-74%-74%-66%-66%-66%-62%-62%-62%-58%-58%-58%-50%-50%-50%-42%-42%-42%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%71%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-31%-62%11%16%18%72%-100%72%-79%-94%69%-119%15%42%16%12%-95%-128%1%5%13%32%67%-118%28%73%18%100%-123%7%7%62%8%84%112%-63%97%67%14%6%68%92%96%-32%-46%-95%4%9%13%44%48%-20%-96%-63%65%6%14%59%13%24%-24%-96%-48%-62%0%3%9%0%24%56%32%96%-126%66%17%1%8%-88%60%8%66%65%3%16%2%-107%-114%8%17%-31%-128%-121%-124%0%-92%30%-20%80%32%3%65%0%11%48%8%-124%105%-10%96%-40%-87%4%69%24%-8%122%-74%-125%-127%-127%34%10%-64%61%43%-74%96%4%-89%5%1%-116%72%-96%97%-96%-122%4%110%-5%14%-28%112%-64%45%8%2%34%8%102%52%-8%-74%96%78%-127%24%-44%102%-123%64%-95%32%99%-54%-118%5%74%-43%112%96%-63%-126%3%-123%-61%70%46%56%0%43%-33%-67%35%0%36%104%10%114%-126%-128%-92%15%68%94%-72%57%-128%-24%-21%-64%23%15%0%0%112%91%34%-125%5%-60%55%4%14%61%66%64%8%-125%12%0%28%38%12%-30%-127%1%13%-52%43%19%36%92%-48%-82%-32%17%-121%7%104%-115%4%49%0%52%-20%-109%5%-45%126%47%72%1%-126%-7%-126%34%14%-8%30%97%55%-74%65%16%6%92%-1%-18%126%96%53%-120%2%33%-84%55%16%3%45%-67%103%-112%4%15%-84%-42%-98%-128%35%72%64%-109%91%5%-48%101%-48%4%6%0%37%2%1%-21%121%112%64%4%-85%81%-106%86%66%26%46%96%-63%3%-46%-51%84%33%-120%5%-76%-73%16%6%13%32%48%64%2%4%118%120%-112%5%13%-56%37%97%77%8%93%-120%21%89%21%-64%-122%-29%8%32%96%96%64%91%91%61%-128%-31%112%72%38%-87%-28%-110%-61%13%-80%-64%-115%63%70%41%-27%-108%81%6%4%0%59%">
-                <eAnnotations xmi:id="_qwvnoHBYEd2Nss_u28cvSA" source="image_papyrus">
-                  <details xmi:id="_qw5YoHBYEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+              <icon xmi:type="uml:Image" xmi:id="_qVoY8HBYEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%8%8%8%16%16%16%24%24%24%32%32%32%40%40%40%48%48%48%56%56%56%60%60%60%64%64%64%72%72%72%80%80%80%89%89%89%97%97%97%101%101%101%105%105%105%113%113%113%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-107%-107%-107%-99%-99%-99%-91%-91%-91%-82%-82%-82%-74%-74%-74%-66%-66%-66%-62%-62%-62%-58%-58%-58%-50%-50%-50%-42%-42%-42%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%71%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-31%-62%11%16%18%72%-100%72%-79%-94%69%-119%15%42%16%12%-95%-128%1%5%13%32%67%-118%28%73%18%100%-123%7%7%62%8%84%112%-63%97%67%14%6%68%92%96%-32%-46%-95%4%9%13%44%48%-20%-96%-63%65%6%14%59%13%24%-24%-96%-48%-62%0%3%9%0%24%56%32%96%-126%66%17%1%8%-88%60%8%66%65%3%16%2%-107%-114%8%17%-31%-128%-121%-124%0%-92%30%-20%80%32%3%65%0%11%48%8%-124%105%-10%96%-40%-87%4%69%24%-8%122%-74%-125%-127%-127%34%10%-64%61%43%-74%96%4%-89%5%1%-116%72%-96%97%-96%-122%4%110%-5%14%-28%112%-64%45%8%2%34%8%102%52%-8%-74%96%78%-127%24%-44%102%-123%64%-95%32%99%-54%-118%5%74%-43%112%96%-63%-126%3%-123%-61%70%46%56%0%43%-33%-67%35%0%36%104%10%114%-126%-128%-92%15%68%94%-72%57%-128%-24%-21%-64%23%15%0%0%112%91%34%-125%5%-60%55%4%14%61%66%64%8%-125%12%0%28%38%12%-30%-127%1%13%-52%43%19%36%92%-48%-82%-32%17%-121%7%104%-115%4%49%0%52%-20%-109%5%-45%126%47%72%1%-126%-7%-126%34%14%-8%30%97%55%-74%65%16%6%92%-1%-18%126%96%53%-120%2%33%-84%55%16%3%45%-67%103%-112%4%15%-84%-42%-98%-128%35%72%64%-109%91%5%-48%101%-48%4%6%0%37%2%1%-21%121%112%64%4%-85%81%-106%86%66%26%46%96%-63%3%-46%-51%84%33%-120%5%-76%-73%16%6%13%32%48%64%2%4%118%120%-112%5%13%-56%37%97%77%8%93%-120%21%89%21%-64%-122%-29%8%32%96%96%64%91%91%61%-128%-31%112%72%38%-87%-28%-110%-61%13%-80%-64%-115%63%70%41%-27%-108%81%6%4%0%59%">
+                <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qwvnoHBYEd2Nss_u28cvSA" source="image_papyrus">
+                  <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qw5YoHBYEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
                 </eAnnotations>
               </icon>
             </packagedElement>
@@ -2761,8 +2761,8 @@
         </packagedElement>
         <packagedElement xmi:type="uml:Profile" xmi:id="_WGZ44BJwEdygQ5HMNSpiZw" name="HwGeneral">
           <packagedElement xmi:type="uml:Stereotype" xmi:id="_LDER0BJxEdygQ5HMNSpiZw" name="HwResource">
-            <generalization xmi:id="_SzrucBJxEdygQ5HMNSpiZw" general="_BthQEBGzEdyb1KzJ7GkiGA"/>
-            <ownedAttribute xmi:id="_OCw9IBJxEdygQ5HMNSpiZw" name="description" visibility="public" isUnique="false">
+            <generalization xmi:type="uml:Generalization" xmi:id="_SzrucBJxEdygQ5HMNSpiZw" general="_BthQEBGzEdyb1KzJ7GkiGA"/>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_OCw9IBJxEdygQ5HMNSpiZw" name="description" visibility="public" isUnique="false">
               <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_B5VngBFQEdyUJeMeN__D-A"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Q2QYcBJxEdygQ5HMNSpiZw"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Q2aJcBJxEdygQ5HMNSpiZw" value="1"/>
@@ -2770,31 +2770,31 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_p5sO4CCiEdyQTZkkq_UPhw" name="frequency" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_p5sO4CCiEdyQTZkkq_UPhw" name="frequency" isUnique="false">
               <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_UDZSQBFSEdyUJeMeN__D-A"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_tZ93sCCiEdyQTZkkq_UPhw"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_taJd4CCiEdyQTZkkq_UPhw" value="1"/>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_WQzTcGuYEeKh2rhLHsYgWg" name="endPoints" type="_-ZhPABJ-EdyT_7R0WVpWAw" aggregation="composite" association="_WQzTc2uYEeKh2rhLHsYgWg">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_WQzTcGuYEeKh2rhLHsYgWg" name="endPoints" type="_-ZhPABJ-EdyT_7R0WVpWAw" aggregation="composite" association="_WQzTc2uYEeKh2rhLHsYgWg">
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WQzTcWuYEeKh2rhLHsYgWg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WQzTcmuYEeKh2rhLHsYgWg" value="*"/>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_U_Nd0GuaEeKh2rhLHsYgWg" name="p_HW_Services" type="_LTvyIBJxEdygQ5HMNSpiZw" aggregation="composite" association="_U_Nd02uaEeKh2rhLHsYgWg">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_U_Nd0GuaEeKh2rhLHsYgWg" name="p_HW_Services" type="_LTvyIBJxEdygQ5HMNSpiZw" aggregation="composite" association="_U_Nd02uaEeKh2rhLHsYgWg">
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_U_Nd0WuaEeKh2rhLHsYgWg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_U_Nd0muaEeKh2rhLHsYgWg" value="*"/>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_olkHcGucEeKh2rhLHsYgWg" name="r_HW_Services" type="_LTvyIBJxEdygQ5HMNSpiZw" association="_olkHc2ucEeKh2rhLHsYgWg">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_olkHcGucEeKh2rhLHsYgWg" name="r_HW_Services" type="_LTvyIBJxEdygQ5HMNSpiZw" association="_olkHc2ucEeKh2rhLHsYgWg">
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_olkHcWucEeKh2rhLHsYgWg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_olkHcmucEeKh2rhLHsYgWg" value="*"/>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_WnHIYGudEeKh2rhLHsYgWg" name="ownedHW" type="_LDER0BJxEdygQ5HMNSpiZw" association="_WnHIY2udEeKh2rhLHsYgWg">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_WnHIYGudEeKh2rhLHsYgWg" name="ownedHW" type="_LDER0BJxEdygQ5HMNSpiZw" association="_WnHIY2udEeKh2rhLHsYgWg">
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WnHIYWudEeKh2rhLHsYgWg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WnHIYmudEeKh2rhLHsYgWg" value="*"/>
             </ownedAttribute>
           </packagedElement>
           <packagedElement xmi:type="uml:Stereotype" xmi:id="_LTvyIBJxEdygQ5HMNSpiZw" name="HwResourceService">
-            <generalization xmi:id="_VkozIBJxEdygQ5HMNSpiZw" general="_dDjlYBG5Edyb1KzJ7GkiGA"/>
-            <ownedAttribute xmi:id="_Mq-1wGqgEdyHVMM3AaZxvA" name="consumption" visibility="public" isUnique="false">
+            <generalization xmi:type="uml:Generalization" xmi:id="_VkozIBJxEdygQ5HMNSpiZw" general="_dDjlYBG5Edyb1KzJ7GkiGA"/>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_Mq-1wGqgEdyHVMM3AaZxvA" name="consumption" visibility="public" isUnique="false">
               <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_nWsu8BFSEdyUJeMeN__D-A"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WcQikGqgEdyHVMM3AaZxvA"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WcS-0GqgEdyHVMM3AaZxvA" value="1"/>
@@ -2802,7 +2802,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_M-LekGqgEdyHVMM3AaZxvA" name="dissipation" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_M-LekGqgEdyHVMM3AaZxvA" name="dissipation" visibility="public" isUnique="false">
               <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_nWsu8BFSEdyUJeMeN__D-A"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_V2j0gGqgEdyHVMM3AaZxvA"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_V2m30GqgEdyHVMM3AaZxvA" value="1"/>
@@ -2812,25 +2812,25 @@
             </ownedAttribute>
           </packagedElement>
           <packagedElement xmi:type="uml:Association" xmi:id="_WQzTc2uYEeKh2rhLHsYgWg" name="hwResource_hwEndPoint_1" memberEnd="_WQzTdGuYEeKh2rhLHsYgWg _WQzTcGuYEeKh2rhLHsYgWg">
-            <ownedEnd xmi:id="_WQzTdGuYEeKh2rhLHsYgWg" name="hwResource" type="_LDER0BJxEdygQ5HMNSpiZw" association="_WQzTc2uYEeKh2rhLHsYgWg">
+            <ownedEnd xmi:type="uml:Property" xmi:id="_WQzTdGuYEeKh2rhLHsYgWg" name="hwResource" type="_LDER0BJxEdygQ5HMNSpiZw" association="_WQzTc2uYEeKh2rhLHsYgWg">
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WQzTdWuYEeKh2rhLHsYgWg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WQzTdmuYEeKh2rhLHsYgWg" value="1"/>
             </ownedEnd>
           </packagedElement>
           <packagedElement xmi:type="uml:Association" xmi:id="_U_Nd02uaEeKh2rhLHsYgWg" name="hwResource_hwResourceService_1" memberEnd="_U_Nd1GuaEeKh2rhLHsYgWg _U_Nd0GuaEeKh2rhLHsYgWg">
-            <ownedEnd xmi:id="_U_Nd1GuaEeKh2rhLHsYgWg" name="hwResource" type="_LDER0BJxEdygQ5HMNSpiZw" association="_U_Nd02uaEeKh2rhLHsYgWg">
+            <ownedEnd xmi:type="uml:Property" xmi:id="_U_Nd1GuaEeKh2rhLHsYgWg" name="hwResource" type="_LDER0BJxEdygQ5HMNSpiZw" association="_U_Nd02uaEeKh2rhLHsYgWg">
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_U_Nd1WuaEeKh2rhLHsYgWg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_U_Nd1muaEeKh2rhLHsYgWg" value="1"/>
             </ownedEnd>
           </packagedElement>
           <packagedElement xmi:type="uml:Association" xmi:id="_olkHc2ucEeKh2rhLHsYgWg" name="hwResource_hwResourceService_2" memberEnd="_olkHdGucEeKh2rhLHsYgWg _olkHcGucEeKh2rhLHsYgWg">
-            <ownedEnd xmi:id="_olkHdGucEeKh2rhLHsYgWg" name="hwResource" type="_LDER0BJxEdygQ5HMNSpiZw" association="_olkHc2ucEeKh2rhLHsYgWg">
+            <ownedEnd xmi:type="uml:Property" xmi:id="_olkHdGucEeKh2rhLHsYgWg" name="hwResource" type="_LDER0BJxEdygQ5HMNSpiZw" association="_olkHc2ucEeKh2rhLHsYgWg">
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_olkHdWucEeKh2rhLHsYgWg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_olkHdmucEeKh2rhLHsYgWg" value="1"/>
             </ownedEnd>
           </packagedElement>
           <packagedElement xmi:type="uml:Association" xmi:id="_WnHIY2udEeKh2rhLHsYgWg" name="hwResource_hwResource_1" memberEnd="_WnHIZGudEeKh2rhLHsYgWg _WnHIYGudEeKh2rhLHsYgWg">
-            <ownedEnd xmi:id="_WnHIZGudEeKh2rhLHsYgWg" name="hwResource" type="_LDER0BJxEdygQ5HMNSpiZw" association="_WnHIY2udEeKh2rhLHsYgWg">
+            <ownedEnd xmi:type="uml:Property" xmi:id="_WnHIZGudEeKh2rhLHsYgWg" name="hwResource" type="_LDER0BJxEdygQ5HMNSpiZw" association="_WnHIY2udEeKh2rhLHsYgWg">
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WnHIZWudEeKh2rhLHsYgWg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WnHIZmudEeKh2rhLHsYgWg" value="1"/>
             </ownedEnd>
@@ -2840,8 +2840,8 @@
       <packagedElement xmi:type="uml:Profile" xmi:id="_3VS0wAPMEdyuUt-4qHuVvQ" name="SRM">
         <packagedElement xmi:type="uml:Profile" xmi:id="_-1fcUBJdEdy3Td9UhuLFPg" name="SW_ResourceCore">
           <packagedElement xmi:type="uml:Stereotype" xmi:id="_b5kPgBJeEdy3Td9UhuLFPg" name="SwResource" isAbstract="true">
-            <generalization xmi:id="_iSh8sBJeEdy3Td9UhuLFPg" general="_BthQEBGzEdyb1KzJ7GkiGA"/>
-            <ownedAttribute xmi:id="_j5CAcBJeEdy3Td9UhuLFPg" name="identifierElements" visibility="public" isUnique="false">
+            <generalization xmi:type="uml:Generalization" xmi:id="_iSh8sBJeEdy3Td9UhuLFPg" general="_BthQEBGzEdyb1KzJ7GkiGA"/>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_j5CAcBJeEdy3Td9UhuLFPg" name="identifierElements" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6lfKQBJeEdy3Td9UhuLFPg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6loUMBJeEdy3Td9UhuLFPg" value="*"/>
@@ -2849,7 +2849,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_j98VoBJeEdy3Td9UhuLFPg" name="stateElements" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_j98VoBJeEdy3Td9UhuLFPg" name="stateElements" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_7PphkBJeEdy3Td9UhuLFPg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7PyrgBJeEdy3Td9UhuLFPg" value="*"/>
@@ -2857,7 +2857,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_kBq_EBJeEdy3Td9UhuLFPg" name="memorySizeFootprint" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_kBq_EBJeEdy3Td9UhuLFPg" name="memorySizeFootprint" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_w94W0BJeEdy3Td9UhuLFPg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_w-BgwBJeEdy3Td9UhuLFPg" value="1"/>
@@ -2865,7 +2865,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_kFZogBJeEdy3Td9UhuLFPg" name="createServices" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_kFZogBJeEdy3Td9UhuLFPg" name="createServices" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_z1IQwBJeEdy3Td9UhuLFPg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_z1SBwBJeEdy3Td9UhuLFPg" value="*"/>
@@ -2873,7 +2873,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_kJRb4BJeEdy3Td9UhuLFPg" name="deleteServices" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_kJRb4BJeEdy3Td9UhuLFPg" name="deleteServices" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2QrGIBJeEdy3Td9UhuLFPg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2Q0QEBJeEdy3Td9UhuLFPg" value="*"/>
@@ -2881,7 +2881,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_kM2UUBJeEdy3Td9UhuLFPg" name="initializeServices" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_kM2UUBJeEdy3Td9UhuLFPg" name="initializeServices" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_45eUYBJeEdy3Td9UhuLFPg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_45neUBJeEdy3Td9UhuLFPg" value="*"/>
@@ -2891,8 +2891,8 @@
             </ownedAttribute>
           </packagedElement>
           <packagedElement xmi:type="uml:Stereotype" xmi:id="_cMo8gBJeEdy3Td9UhuLFPg" name="SwAccessService">
-            <generalization xmi:id="_i1PoMBJeEdy3Td9UhuLFPg" general="_dDjlYBG5Edyb1KzJ7GkiGA"/>
-            <ownedAttribute xmi:id="_B-PggBJfEdy3Td9UhuLFPg" name="isModifier" visibility="public" isUnique="false">
+            <generalization xmi:type="uml:Generalization" xmi:id="_i1PoMBJeEdy3Td9UhuLFPg" general="_dDjlYBG5Edyb1KzJ7GkiGA"/>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_B-PggBJfEdy3Td9UhuLFPg" name="isModifier" visibility="public" isUnique="false">
               <type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ETjyEBJfEdy3Td9UhuLFPg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ETs8ABJfEdy3Td9UhuLFPg" value="1"/>
@@ -2900,7 +2900,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_CCaO0BJfEdy3Td9UhuLFPg" name="accessedElement" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_CCaO0BJfEdy3Td9UhuLFPg" name="accessedElement" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HfQ5EBJfEdy3Td9UhuLFPg" value="1"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HfaqEBJfEdy3Td9UhuLFPg" value="1"/>
@@ -2911,18 +2911,18 @@
           </packagedElement>
         </packagedElement>
         <packagedElement xmi:type="uml:Profile" xmi:id="_A_vtYBJeEdy3Td9UhuLFPg" name="SW_Concurrency">
-          <elementImport xmi:id="_56WyUEFiEd6UW4qJC-Vahw" alias="" importedElement="_1zYucBG0Edyb1KzJ7GkiGA"/>
-          <packageImport xmi:id="_KqgigBJeEdy3Td9UhuLFPg" importedPackage="_-1fcUBJdEdy3Td9UhuLFPg"/>
+          <elementImport xmi:type="uml:ElementImport" xmi:id="_56WyUEFiEd6UW4qJC-Vahw" alias="" importedElement="_1zYucBG0Edyb1KzJ7GkiGA"/>
+          <packageImport xmi:type="uml:PackageImport" xmi:id="_KqgigBJeEdy3Td9UhuLFPg" importedPackage="_-1fcUBJdEdy3Td9UhuLFPg"/>
           <packagedElement xmi:type="uml:Enumeration" xmi:id="_62OfgBJfEdy3Td9UhuLFPg" name="InterruptKind">
-            <ownedLiteral xmi:id="_8YvbIBJfEdy3Td9UhuLFPg" name="HardwareInterruption"/>
-            <ownedLiteral xmi:id="_8ikskBJfEdy3Td9UhuLFPg" name="ProcessorDetectedException"/>
-            <ownedLiteral xmi:id="_8or7oBJfEdy3Td9UhuLFPg" name="ProgrammedException"/>
-            <ownedLiteral xmi:id="_8u8UoBJfEdy3Td9UhuLFPg" name="Undef"/>
-            <ownedLiteral xmi:id="_80Aa0BJfEdy3Td9UhuLFPg" name="Other"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_8YvbIBJfEdy3Td9UhuLFPg" name="HardwareInterruption"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_8ikskBJfEdy3Td9UhuLFPg" name="ProcessorDetectedException"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_8or7oBJfEdy3Td9UhuLFPg" name="ProgrammedException"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_8u8UoBJfEdy3Td9UhuLFPg" name="Undef"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_80Aa0BJfEdy3Td9UhuLFPg" name="Other"/>
           </packagedElement>
           <packagedElement xmi:type="uml:Stereotype" xmi:id="_FWpxUBJgEdy3Td9UhuLFPg" name="EntryPoint">
-            <generalization xmi:id="_WMfpcDLsEd2HYNz2hI9A2g" general="_kzoXABHbEdyWC5IKDhzksw"/>
-            <ownedAttribute xmi:id="_GaTmsBJgEdy3Td9UhuLFPg" name="isReentrant" visibility="public" isUnique="false">
+            <generalization xmi:type="uml:Generalization" xmi:id="_WMfpcDLsEd2HYNz2hI9A2g" general="_kzoXABHbEdyWC5IKDhzksw"/>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_GaTmsBJgEdy3Td9UhuLFPg" name="isReentrant" visibility="public" isUnique="false">
               <type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IsXI4BJgEdy3Td9UhuLFPg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IsgS0BJgEdy3Td9UhuLFPg" value="1"/>
@@ -2930,7 +2930,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_Gl7n4BJgEdy3Td9UhuLFPg" name="routine" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_Gl7n4BJgEdy3Td9UhuLFPg" name="routine" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LVqGYBJgEdy3Td9UhuLFPg" value="1"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LVz3YBJgEdy3Td9UhuLFPg" value="1"/>
@@ -2940,8 +2940,8 @@
             </ownedAttribute>
           </packagedElement>
           <packagedElement xmi:type="uml:Stereotype" xmi:id="_UwoMABJgEdy3Td9UhuLFPg" name="SwConcurrentResource" isAbstract="true">
-            <generalization xmi:id="_UkKn4BJhEdy3Td9UhuLFPg" general="_b5kPgBJeEdy3Td9UhuLFPg"/>
-            <ownedAttribute xmi:id="_Y7GBUBJgEdy3Td9UhuLFPg" name="type" visibility="public" isUnique="false">
+            <generalization xmi:type="uml:Generalization" xmi:id="_UkKn4BJhEdy3Td9UhuLFPg" general="_b5kPgBJeEdy3Td9UhuLFPg"/>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_Y7GBUBJgEdy3Td9UhuLFPg" name="type" visibility="public" isUnique="false">
               <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_VDec8BFXEdyUJeMeN__D-A"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_cNFWgBJgEdy3Td9UhuLFPg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cNPHgBJgEdy3Td9UhuLFPg" value="1"/>
@@ -2949,7 +2949,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_Y-hv0BJgEdy3Td9UhuLFPg" name="activationCapacity" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_Y-hv0BJgEdy3Td9UhuLFPg" name="activationCapacity" visibility="public" isUnique="false">
               <type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_HJ1zcAnfEdy9WM11hWri2g"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_fGfMkBJgEdy3Td9UhuLFPg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fGoWgBJgEdy3Td9UhuLFPg" value="1"/>
@@ -2957,7 +2957,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_ZB83QBJgEdy3Td9UhuLFPg" name="entryPoints" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_ZB83QBJgEdy3Td9UhuLFPg" name="entryPoints" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_h569gBJgEdy3Td9UhuLFPg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_h569gRJgEdy3Td9UhuLFPg" value="*"/>
@@ -2965,7 +2965,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_ZFhvsBJgEdy3Td9UhuLFPg" name="adressSpace" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_ZFhvsBJgEdy3Td9UhuLFPg" name="adressSpace" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_q_5qkBJgEdy3Td9UhuLFPg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rADbkBJgEdy3Td9UhuLFPg" value="*"/>
@@ -2973,7 +2973,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_ZJZjEBJgEdy3Td9UhuLFPg" name="periodElements" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_ZJZjEBJgEdy3Td9UhuLFPg" name="periodElements" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_tigKMBJgEdy3Td9UhuLFPg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tipUIBJgEdy3Td9UhuLFPg" value="*"/>
@@ -2981,7 +2981,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_ZM1RkBJgEdy3Td9UhuLFPg" name="priorityElements" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_ZM1RkBJgEdy3Td9UhuLFPg" name="priorityElements" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_vx3kwBJgEdy3Td9UhuLFPg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vyBVwBJgEdy3Td9UhuLFPg" value="*"/>
@@ -2989,7 +2989,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_ZQQZABJgEdy3Td9UhuLFPg" name="stackSizeElements" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_ZQQZABJgEdy3Td9UhuLFPg" name="stackSizeElements" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yffooBJgEdy3Td9UhuLFPg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yfpZoBJgEdy3Td9UhuLFPg" value="*"/>
@@ -2997,7 +2997,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_ZTPbkBJgEdy3Td9UhuLFPg" name="activateServices" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_ZTPbkBJgEdy3Td9UhuLFPg" name="activateServices" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_19G_ABJgEdy3Td9UhuLFPg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_19QwABJgEdy3Td9UhuLFPg" value="*"/>
@@ -3005,7 +3005,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_ZXHO8BJgEdy3Td9UhuLFPg" name="enableConcurrencyServices" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_ZXHO8BJgEdy3Td9UhuLFPg" name="enableConcurrencyServices" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_58jQEBJgEdy3Td9UhuLFPg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_58tBEBJgEdy3Td9UhuLFPg" value="*"/>
@@ -3013,7 +3013,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_ZaPbcBJgEdy3Td9UhuLFPg" name="resumeServices" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_ZaPbcBJgEdy3Td9UhuLFPg" name="resumeServices" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8PWZIBJgEdy3Td9UhuLFPg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8PgKIBJgEdy3Td9UhuLFPg" value="*"/>
@@ -3021,7 +3021,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_ZdOeABJgEdy3Td9UhuLFPg" name="suspendServices" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_ZdOeABJgEdy3Td9UhuLFPg" name="suspendServices" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-0eoUBJgEdy3Td9UhuLFPg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-0eoURJgEdy3Td9UhuLFPg" value="*"/>
@@ -3029,7 +3029,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_Zfw0oBJgEdy3Td9UhuLFPg" name="terminateServices" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_Zfw0oBJgEdy3Td9UhuLFPg" name="terminateServices" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_CJKFIBJhEdy3Td9UhuLFPg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CJTPEBJhEdy3Td9UhuLFPg" value="*"/>
@@ -3037,7 +3037,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_Zh_pQBJgEdy3Td9UhuLFPg" name="disableConcurrencyServices" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_Zh_pQBJgEdy3Td9UhuLFPg" name="disableConcurrencyServices" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_FDvm8BJhEdy3Td9UhuLFPg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FD5X8BJhEdy3Td9UhuLFPg" value="*"/>
@@ -3045,7 +3045,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_ZkFT8BJgEdy3Td9UhuLFPg" name="shareDataResources" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_ZkFT8BJgEdy3Td9UhuLFPg" name="shareDataResources" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HqXq8BJhEdy3Td9UhuLFPg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Hqg04BJhEdy3Td9UhuLFPg" value="*"/>
@@ -3053,7 +3053,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_Zo2fMBJgEdy3Td9UhuLFPg" name="messageResources" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_Zo2fMBJgEdy3Td9UhuLFPg" name="messageResources" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_KL7BsBJhEdy3Td9UhuLFPg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KMELoBJhEdy3Td9UhuLFPg" value="*"/>
@@ -3061,7 +3061,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_ZtK-gBJgEdy3Td9UhuLFPg" name="mutualExclusionResources" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_ZtK-gBJgEdy3Td9UhuLFPg" name="mutualExclusionResources" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NN0FYBJhEdy3Td9UhuLFPg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NN0FYRJhEdy3Td9UhuLFPg" value="*"/>
@@ -3069,7 +3069,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_Z0xbUBJgEdy3Td9UhuLFPg" name="notificationResources" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_Z0xbUBJgEdy3Td9UhuLFPg" name="notificationResources" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_PypZoBJhEdy3Td9UhuLFPg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PyzKoBJhEdy3Td9UhuLFPg" value="*"/>
@@ -3077,7 +3077,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_R3qMoDLrEd2HYNz2hI9A2g" name="heapSizeElements" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_R3qMoDLrEd2HYNz2hI9A2g" name="heapSizeElements" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZOFAkDLrEd2HYNz2hI9A2g"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZOYikDLrEd2HYNz2hI9A2g" value="*"/>
@@ -3087,15 +3087,15 @@
             </ownedAttribute>
           </packagedElement>
           <packagedElement xmi:type="uml:Stereotype" xmi:id="_fO5sQBJhEdypOJGS7WfJjQ" name="InterruptResource">
-            <generalization xmi:id="_5zPtoBJhEdypOJGS7WfJjQ" general="_UwoMABJgEdy3Td9UhuLFPg"/>
-            <ownedAttribute xmi:id="_kziZgBJhEdypOJGS7WfJjQ" name="kind" visibility="public" type="_62OfgBJfEdy3Td9UhuLFPg" isUnique="false">
+            <generalization xmi:type="uml:Generalization" xmi:id="_5zPtoBJhEdypOJGS7WfJjQ" general="_UwoMABJgEdy3Td9UhuLFPg"/>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_kziZgBJhEdypOJGS7WfJjQ" name="kind" visibility="public" type="_62OfgBJfEdy3Td9UhuLFPg" isUnique="false">
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_oZWpoBJhEdypOJGS7WfJjQ"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oZfzkBJhEdypOJGS7WfJjQ" value="1"/>
               <defaultValue xmi:type="uml:LiteralString" xmi:id="_oZpkkBJhEdypOJGS7WfJjQ">
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_k46BsBJhEdypOJGS7WfJjQ" name="isMaskable" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_k46BsBJhEdypOJGS7WfJjQ" name="isMaskable" visibility="public" isUnique="false">
               <type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_rNPGgBJhEdypOJGS7WfJjQ"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rNY3gBJhEdypOJGS7WfJjQ" value="1"/>
@@ -3103,7 +3103,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_k6sKYBJhEdypOJGS7WfJjQ" name="vectorElements" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_k6sKYBJhEdypOJGS7WfJjQ" name="vectorElements" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_uJ66EBJhEdypOJGS7WfJjQ"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uKEEABJhEdypOJGS7WfJjQ" value="*"/>
@@ -3111,7 +3111,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_lApocBJhEdypOJGS7WfJjQ" name="maskElements" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_lApocBJhEdypOJGS7WfJjQ" name="maskElements" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wgvngBJhEdypOJGS7WfJjQ"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wg4xcBJhEdypOJGS7WfJjQ" value="*"/>
@@ -3119,7 +3119,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_lErM0BJhEdypOJGS7WfJjQ" name="routineConnectServices" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_lErM0BJhEdypOJGS7WfJjQ" name="routineConnectServices" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_z0hFYBJhEdypOJGS7WfJjQ"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_z0q2YBJhEdypOJGS7WfJjQ" value="*"/>
@@ -3127,7 +3127,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_lI2iMBJhEdypOJGS7WfJjQ" name="routineDisconnectServices" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_lI2iMBJhEdypOJGS7WfJjQ" name="routineDisconnectServices" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_26cUgBJhEdypOJGS7WfJjQ"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_26lecBJhEdypOJGS7WfJjQ" value="*"/>
@@ -3135,21 +3135,21 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <icon xmi:id="_SWVRwHBZEd2Nss_u28cvSA" content="71%73%70%56%57%97%60%0%26%0%112%0%0%44%0%0%0%0%60%0%26%0%-121%0%0%0%8%8%8%16%16%16%24%24%24%32%32%32%40%40%40%48%48%48%56%56%56%60%60%60%64%64%64%80%80%80%89%89%89%97%97%97%105%105%105%113%113%113%117%117%117%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-107%-107%-107%-99%-99%-99%-91%-91%-91%-82%-82%-82%-78%-78%-78%-66%-66%-66%-50%-50%-50%-42%-42%-42%-38%-38%-38%-26%-26%-26%-18%-18%-18%-14%-14%-14%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%67%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%28%6%70%124%72%-79%-94%65%13%10%66%100%120%96%-79%99%71%9%18%50%122%28%73%-15%64%0%0%40%83%-86%68%25%-63%-95%-122%8%48%99%-54%-100%73%-109%-26%-124%16%32%69%30%4%-79%-96%1%-120%16%30%60%44%60%-32%-96%-90%-47%-93%17%22%24%-56%-64%32%4%6%-114%6%55%24%-80%64%-48%-64%2%11%63%47%26%32%73%80%-63%5%10%3%41%124%40%88%-63%-64%-122%-126%18%80%10%96%-112%-95%-96%87%-82%2%59%12%88%-120%96%-91%-35%-69%120%83%94%-96%-24%-32%102%-57%9%41%19%84%16%42%-80%47%-36%16%29%8%100%-75%104%-96%-64%-124%14%5%19%47%38%9%-45%99%-121%-77%7%13%-61%5%65%0%-14%-31%-127%-100%61%115%-99%-32%-32%51%65%-46%-97%7%-120%-2%28%-6%-16%5%-99%-90%45%44%-8%108%64%-125%-23%-127%-75%93%-61%-2%-4%-6%-13%-37%-37%33%18%-76%-123%-85%97%43%-16%-30%-66%-9%2%-1%-51%85%50%-16%13%5%62%107%-66%61%-99%-92%-13%-37%-41%-71%74%-128%0%60%-124%-125%1%9%-62%-117%9%31%79%-66%60%121%-43%8%3%2%0%59%">
-              <eAnnotations xmi:id="_TGAbMHBZEd2Nss_u28cvSA" source="image_papyrus">
-                <details xmi:id="_TGKMMHBZEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+            <icon xmi:type="uml:Image" xmi:id="_SWVRwHBZEd2Nss_u28cvSA" content="71%73%70%56%57%97%60%0%26%0%112%0%0%44%0%0%0%0%60%0%26%0%-121%0%0%0%8%8%8%16%16%16%24%24%24%32%32%32%40%40%40%48%48%48%56%56%56%60%60%60%64%64%64%80%80%80%89%89%89%97%97%97%105%105%105%113%113%113%117%117%117%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-107%-107%-107%-99%-99%-99%-91%-91%-91%-82%-82%-82%-78%-78%-78%-66%-66%-66%-50%-50%-50%-42%-42%-42%-38%-38%-38%-26%-26%-26%-18%-18%-18%-14%-14%-14%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%67%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%28%6%70%124%72%-79%-94%65%13%10%66%100%120%96%-79%99%71%9%18%50%122%28%73%-15%64%0%0%40%83%-86%68%25%-63%-95%-122%8%48%99%-54%-100%73%-109%-26%-124%16%32%69%30%4%-79%-96%1%-120%16%30%60%44%60%-32%-96%-90%-47%-93%17%22%24%-56%-64%32%4%6%-114%6%55%24%-80%64%-48%-64%2%11%63%47%26%32%73%80%-63%5%10%3%41%124%40%88%-63%-64%-122%-126%18%80%10%96%-112%-95%-96%87%-82%2%59%12%88%-120%96%-91%-35%-69%120%83%94%-96%-24%-32%102%-57%9%41%19%84%16%42%-80%47%-36%16%29%8%100%-75%104%-96%-64%-124%14%5%19%47%38%9%-45%99%-121%-77%7%13%-61%5%65%0%-14%-31%-127%-100%61%115%-99%-32%-32%51%65%-46%-97%7%-120%-2%28%-6%-16%5%-99%-90%45%44%-8%108%64%-125%-23%-127%-75%93%-61%-2%-4%-6%-13%-37%-37%33%18%-76%-123%-85%97%43%-16%-30%-66%-9%2%-1%-51%85%50%-16%13%5%62%107%-66%61%-99%-92%-13%-37%-41%-71%74%-128%0%60%-124%-125%1%9%-62%-117%9%31%79%-66%60%121%-43%8%3%2%0%59%">
+              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TGAbMHBZEd2Nss_u28cvSA" source="image_papyrus">
+                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TGKMMHBZEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
               </eAnnotations>
             </icon>
-            <icon xmi:id="_V1hVcHBZEd2Nss_u28cvSA" content="71%73%70%56%57%97%-19%0%102%0%112%0%0%44%0%0%0%0%-19%0%102%0%-121%0%0%0%4%4%4%8%8%8%12%12%12%16%16%16%24%24%24%28%28%28%32%32%32%36%36%36%40%40%40%48%48%48%56%56%56%60%60%60%64%64%64%68%68%68%72%72%72%80%80%80%89%89%89%97%97%97%105%105%105%109%109%109%113%113%113%117%117%117%121%121%121%125%125%125%-127%-127%-127%-123%-123%-123%-115%-115%-115%-111%-111%-111%-107%-107%-107%-99%-99%-99%-95%-95%-95%-91%-91%-91%-82%-82%-82%-78%-78%-78%-74%-74%-74%-66%-66%-66%-58%-58%-58%-50%-50%-50%-42%-42%-42%-38%-38%-38%-34%-34%-34%-26%-26%-26%-18%-18%-18%-14%-14%-14%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%93%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%35%74%-100%72%-79%-94%-59%-117%24%51%106%-36%-56%-79%-93%-57%-113%32%67%-118%28%73%-78%-92%-55%-109%40%83%-86%92%-55%-78%-91%-53%-105%48%99%-54%-100%73%-77%-90%-51%-101%56%115%-22%-36%-55%-77%-89%-49%-97%64%-125%10%29%74%52%-93%8%13%26%58%48%-20%-128%20%69%-47%-89%80%15%-94%64%0%0%-128%-46%-124%29%-86%50%-120%-54%-75%107%86%0%8%-100%30%36%81%21%-127%-118%-82%104%-95%66%-48%122%-112%5%85%0%31%-46%-54%37%-22%-74%-86%5%-125%107%1%72%-104%-53%87%-88%-120%-86%0%72%16%-44%-64%-74%-81%-31%-97%22%-54%-78%16%72%22%-84%-40%-61%-112%119%50%-88%-70%-73%46%-36%-56%-104%117%-102%120%43%66%2%-27%-52%-96%113%18%6%91%56%-76%105%-102%121%1%16%-96%-128%-95%-75%-21%-41%-80%99%-53%-98%77%-37%-11%-122%22%-89%115%79%-83%-102%-96%-74%-17%-33%-64%91%59%80%-80%-62%39%-119%-29%-56%-109%43%95%-50%-68%-71%-13%-25%-48%-93%75%-97%-82%-36%4%66%-49%-128%5%-77%92%1%-95%2%-18%-98%27%18%52%-1%24%79%-66%-68%-7%-13%-24%-45%-85%95%-49%-66%-67%-5%-9%-28%21%20%56%-8%-11%45%-126%-59%42%75%40%8%-15%-77%-59%-127%-77%-71%65%84%-63%6%6%109%6%-106%9%-109%-23%-91%82%7%13%-92%0%-108%7%123%5%-8%80%11%4%124%71%80%-126%119%53%102%-43%73%43%68%48%-127%-123%10%-99%48%-127%118%47%41%96%-99%-124%14%109%80%-127%65%-40%109%37%80%98%-114%-107%100%-62%2%32%64%-76%1%0%5%84%112%66%75%33%64%-128%-94%67%-2%1%56%80%125%66%-70%-112%-96%-117%34%117%-80%-64%-114%17%61%0%88%2%26%56%-104%82%3%36%-2%-88%80%7%19%20%-76%-37%101%4%109%121%23%72%45%72%-16%-31%68%38%0%6%88%3%29%20%39%-93%2%86%54%100%98%65%9%70%88%-48%87%-127%125%116%-126%2%30%88%-108%-102%-103%0%68%0%2%-120%31%65%-64%95%-101%10%-11%88%80%-117%9%-27%117%95%71%30%40%-64%100%69%35%-16%-55%39%1%18%84%-55%81%10%7%16%-70%-48%-101%3%125%-112%93%66%-106%-55%-119%81%11%19%72%0%-24%68%20%74%42%105%-114%-113%106%52%-96%-90%9%-103%-1%-64%-26%64%91%106%-80%-48%95%85%93%117%-47%9%11%-24%-118%17%118%-86%74%10%-91%-108%23%-87%112%-64%-87%-80%10%36%40%65%71%37%-43%16%83%72%97%4%-62%2%39%106%-28%65%-80%-40%2%-128%-90%-102%20%-75%-106%-20%65%-78%-62%68%106%4%-36%106%-92%97%-74%-63%-6%-119%-20%66%65%126%107%-48%-85%46%-91%-128%-90%-99%-24%-42%75%-87%-91%11%-87%-24%110%65%-58%-82%91%18%9%10%4%48%0%1%4%23%108%-16%-63%8%39%108%-16%0%-11%54%12%64%0%6%44%-32%94%0%18%-61%103%-79%121%15%20%25%20%-68%-37%-119%-64%-63%6%32%-121%44%-14%-56%36%-105%60%50%6%14%-93%91%64%4%31%72%-105%1%3%-44%-59%-36%92%81%45%20%80%-18%92%37%-92%-84%42%1%35%66%-60%-23%-66%2%-23%123%-40%-71%41%11%-32%-89%68%35%60%0%-12%64%-19%30%118%-93%-50%13%120%112%-13%67%-53%46%-19%2%8%17%68%-42%-128%-61%9%108%-96%113%68%-31%90%-19%-62%-49%125%-83%32%0%-70%7%92%-48%106%69%71%91%109%40%100%32%96%-53%51%-66%21%-11%43%54%-107%-111%41%32%-87%-47%53%118%-1%-60%49%-48%97%31%22%2%-97%81%79%-99%-47%10%5%-8%-85%105%-43%-122%-83%112%0%111%94%-117%36%-12%-46%39%36%16%25%4%105%-81%-3%81%-45%75%-1%-51%87%10%116%-125%-124%-91%-40%118%-117%-3%16%-39%-5%94%96%-85%-23%14%-67%-67%52%-25%-84%47%-76%64%9%98%79%30%-69%66%-127%3%13%-5%-19%8%49%14%-76%-21%-68%35%84%-71%-23%-88%7%95%-112%-25%-18%2%111%60%-65%-57%-118%-3%-64%8%-53%35%-124%-4%-73%-71%71%-49%-12%127%98%-5%110%125%-48%43%90%-83%-62%124%-37%19%-76%-69%-69%-45%71%-81%-68%-69%-91%-121%47%80%-15%-33%122%-85%-66%64%-25%127%59%-66%-11%-38%-69%107%123%-8%-43%-17%91%-64%-41%-12%15%-70%116%-4%-47%75%31%-48%-40%23%-67%-14%-63%42%105%-17%19%-120%0%-9%85%63%-21%-35%-49%93%-7%-77%-34%-4%-110%-43%-64%-24%61%-16%91%11%-36%30%1%97%101%64%-29%1%16%86%25%-76%-34%6%53%-91%-127%11%36%-48%5%37%88%-128%-40%38%-72%-68%10%-62%-22%-126%-47%-117%-32%-73%18%-96%57%-21%77%-64%87%-5%-6%-96%-15%66%-104%-84%17%6%-81%-125%-124%34%65%3%-126%78%88%51%-61%81%-48%127%-22%-125%33%-84%100%-72%60%22%106%74%2%121%74%32%-42%72%-41%-68%4%-6%-80%77%64%-28%-99%14%9%-123%56%-59%5%-17%121%-75%-21%-34%-5%-104%-88%41%39%6%-49%-123%-102%82%-30%14%-63%103%-75%43%-34%46%-117%86%-38%34%-17%120%8%43%55%-58%-50%125%75%35%99%-16%-52%-40%38%52%6%79%-115%-124%-46%99%-16%14%64%44%-96%-35%-16%-124%114%-76%18%29%-115%103%71%20%-63%49%118%66%92%97%-123%78%8%-127%7%4%-25%-110%-104%-52%-92%38%55%73%-101%8%-120%49%36%1%1%0%59%">
-              <eAnnotations xmi:id="_WcG0UHBZEd2Nss_u28cvSA" source="image_papyrus">
-                <details xmi:id="_WcQlUHBZEd2Nss_u28cvSA" key="image_kind_key" value="shape"/>
+            <icon xmi:type="uml:Image" xmi:id="_V1hVcHBZEd2Nss_u28cvSA" content="71%73%70%56%57%97%-19%0%102%0%112%0%0%44%0%0%0%0%-19%0%102%0%-121%0%0%0%4%4%4%8%8%8%12%12%12%16%16%16%24%24%24%28%28%28%32%32%32%36%36%36%40%40%40%48%48%48%56%56%56%60%60%60%64%64%64%68%68%68%72%72%72%80%80%80%89%89%89%97%97%97%105%105%105%109%109%109%113%113%113%117%117%117%121%121%121%125%125%125%-127%-127%-127%-123%-123%-123%-115%-115%-115%-111%-111%-111%-107%-107%-107%-99%-99%-99%-95%-95%-95%-91%-91%-91%-82%-82%-82%-78%-78%-78%-74%-74%-74%-66%-66%-66%-58%-58%-58%-50%-50%-50%-42%-42%-42%-38%-38%-38%-34%-34%-34%-26%-26%-26%-18%-18%-18%-14%-14%-14%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%93%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%35%74%-100%72%-79%-94%-59%-117%24%51%106%-36%-56%-79%-93%-57%-113%32%67%-118%28%73%-78%-92%-55%-109%40%83%-86%92%-55%-78%-91%-53%-105%48%99%-54%-100%73%-77%-90%-51%-101%56%115%-22%-36%-55%-77%-89%-49%-97%64%-125%10%29%74%52%-93%8%13%26%58%48%-20%-128%20%69%-47%-89%80%15%-94%64%0%0%-128%-46%-124%29%-86%50%-120%-54%-75%107%86%0%8%-100%30%36%81%21%-127%-118%-82%104%-95%66%-48%122%-112%5%85%0%31%-46%-54%37%-22%-74%-86%5%-125%107%1%72%-104%-53%87%-88%-120%-86%0%72%16%-44%-64%-74%-81%-31%-97%22%-54%-78%16%72%22%-84%-40%-61%-112%119%50%-88%-70%-73%46%-36%-56%-104%117%-102%120%43%66%2%-27%-52%-96%113%18%6%91%56%-76%105%-102%121%1%16%-96%-128%-95%-75%-21%-41%-80%99%-53%-98%77%-37%-11%-122%22%-89%115%79%-83%-102%-96%-74%-17%-33%-64%91%59%80%-80%-62%39%-119%-29%-56%-109%43%95%-50%-68%-71%-13%-25%-48%-93%75%-97%-82%-36%4%66%-49%-128%5%-77%92%1%-95%2%-18%-98%27%18%52%-1%24%79%-66%-68%-7%-13%-24%-45%-85%95%-49%-66%-67%-5%-9%-28%21%20%56%-8%-11%45%-126%-59%42%75%40%8%-15%-77%-59%-127%-77%-71%65%84%-63%6%6%109%6%-106%9%-109%-23%-91%82%7%13%-92%0%-108%7%123%5%-8%80%11%4%124%71%80%-126%119%53%102%-43%73%43%68%48%-127%-123%10%-99%48%-127%118%47%41%96%-99%-124%14%109%80%-127%65%-40%109%37%80%98%-114%-107%100%-62%2%32%64%-76%1%0%5%84%112%66%75%33%64%-128%-94%67%-2%1%56%80%125%66%-70%-112%-96%-117%34%117%-80%-64%-114%17%61%0%88%2%26%56%-104%82%3%36%-2%-88%80%7%19%20%-76%-37%101%4%109%121%23%72%45%72%-16%-31%68%38%0%6%88%3%29%20%39%-93%2%86%54%100%98%65%9%70%88%-48%87%-127%125%116%-126%2%30%88%-108%-102%-103%0%68%0%2%-120%31%65%-64%95%-101%10%-11%88%80%-117%9%-27%117%95%71%30%40%-64%100%69%35%-16%-55%39%1%18%84%-55%81%10%7%16%-70%-48%-101%3%125%-112%93%66%-106%-55%-119%81%11%19%72%0%-24%68%20%74%42%105%-114%-113%106%52%-96%-90%9%-103%-1%-64%-26%64%91%106%-80%-48%95%85%93%117%-47%9%11%-24%-118%17%118%-86%74%10%-91%-108%23%-87%112%-64%-87%-80%10%36%40%65%71%37%-43%16%83%72%97%4%-62%2%39%106%-28%65%-80%-40%2%-128%-90%-102%20%-75%-106%-20%65%-78%-62%68%106%4%-36%106%-92%97%-74%-63%-6%-119%-20%66%65%126%107%-48%-85%46%-91%-128%-90%-99%-24%-42%75%-87%-91%11%-87%-24%110%65%-58%-82%91%18%9%10%4%48%0%1%4%23%108%-16%-63%8%39%108%-16%0%-11%54%12%64%0%6%44%-32%94%0%18%-61%103%-79%121%15%20%25%20%-68%-37%-119%-64%-63%6%32%-121%44%-14%-56%36%-105%60%50%6%14%-93%91%64%4%31%72%-105%1%3%-44%-59%-36%92%81%45%20%80%-18%92%37%-92%-84%42%1%35%66%-60%-23%-66%2%-23%123%-40%-71%41%11%-32%-89%68%35%60%0%-12%64%-19%30%118%-93%-50%13%120%112%-13%67%-53%46%-19%2%8%17%68%-42%-128%-61%9%108%-96%113%68%-31%90%-19%-62%-49%125%-83%32%0%-70%7%92%-48%106%69%71%91%109%40%100%32%96%-53%51%-66%21%-11%43%54%-107%-111%41%32%-87%-47%53%118%-1%-60%49%-48%97%31%22%2%-97%81%79%-99%-47%10%5%-8%-85%105%-43%-122%-83%112%0%111%94%-117%36%-12%-46%39%36%16%25%4%105%-81%-3%81%-45%75%-1%-51%87%10%116%-125%-124%-91%-40%118%-117%-3%16%-39%-5%94%96%-85%-23%14%-67%-67%52%-25%-84%47%-76%64%9%98%79%30%-69%66%-127%3%13%-5%-19%8%49%14%-76%-21%-68%35%84%-71%-23%-88%7%95%-112%-25%-18%2%111%60%-65%-57%-118%-3%-64%8%-53%35%-124%-4%-73%-71%71%-49%-12%127%98%-5%110%125%-48%43%90%-83%-62%124%-37%19%-76%-69%-69%-45%71%-81%-68%-69%-91%-121%47%80%-15%-33%122%-85%-66%64%-25%127%59%-66%-11%-38%-69%107%123%-8%-43%-17%91%-64%-41%-12%15%-70%116%-4%-47%75%31%-48%-40%23%-67%-14%-63%42%105%-17%19%-120%0%-9%85%63%-21%-35%-49%93%-7%-77%-34%-4%-110%-43%-64%-24%61%-16%91%11%-36%30%1%97%101%64%-29%1%16%86%25%-76%-34%6%53%-91%-127%11%36%-48%5%37%88%-128%-40%38%-72%-68%10%-62%-22%-126%-47%-117%-32%-73%18%-96%57%-21%77%-64%87%-5%-6%-96%-15%66%-104%-84%17%6%-81%-125%-124%34%65%3%-126%78%88%51%-61%81%-48%127%-22%-125%33%-84%100%-72%60%22%106%74%2%121%74%32%-42%72%-41%-68%4%-6%-80%77%64%-28%-99%14%9%-123%56%-59%5%-17%121%-75%-21%-34%-5%-104%-88%41%39%6%-49%-123%-102%82%-30%14%-63%103%-75%43%-34%46%-117%86%-38%34%-17%120%8%43%55%-58%-50%125%75%35%99%-16%-52%-40%38%52%6%79%-115%-124%-46%99%-16%14%64%44%-96%-35%-16%-124%114%-76%18%29%-115%103%71%20%-63%49%118%66%92%97%-123%78%8%-127%7%4%-25%-110%-104%-52%-92%38%55%73%-101%8%-120%49%36%1%1%0%59%">
+              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WcG0UHBZEd2Nss_u28cvSA" source="image_papyrus">
+                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WcQlUHBZEd2Nss_u28cvSA" key="image_kind_key" value="shape"/>
               </eAnnotations>
             </icon>
           </packagedElement>
           <packagedElement xmi:type="uml:Stereotype" xmi:id="_hQja8BJhEdypOJGS7WfJjQ" name="SwSchedulableResource">
-            <generalization xmi:id="_ZjWCMBJiEdypOJGS7WfJjQ" general="_UwoMABJgEdy3Td9UhuLFPg"/>
-            <generalization xmi:id="_lPtSwEFjEd6UW4qJC-Vahw" general="_1zYucBG0Edyb1KzJ7GkiGA"/>
-            <ownedAttribute xmi:id="_7kzx4BJhEdypOJGS7WfJjQ" name="isStaticSchedulingFeature" visibility="public" isUnique="false">
+            <generalization xmi:type="uml:Generalization" xmi:id="_ZjWCMBJiEdypOJGS7WfJjQ" general="_UwoMABJgEdy3Td9UhuLFPg"/>
+            <generalization xmi:type="uml:Generalization" xmi:id="_lPtSwEFjEd6UW4qJC-Vahw" general="_1zYucBG0Edyb1KzJ7GkiGA"/>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_7kzx4BJhEdypOJGS7WfJjQ" name="isStaticSchedulingFeature" visibility="public" isUnique="false">
               <type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-7uDUBJhEdypOJGS7WfJjQ"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-73NQBJhEdypOJGS7WfJjQ" value="1"/>
@@ -3157,7 +3157,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_7npDcBJhEdypOJGS7WfJjQ" name="isPreemptable" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_7npDcBJhEdypOJGS7WfJjQ" name="isPreemptable" visibility="public" isUnique="false">
               <type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_BmEJsBJiEdypOJGS7WfJjQ"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BmN6sBJiEdypOJGS7WfJjQ" value="1"/>
@@ -3165,7 +3165,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_7qBpEBJhEdypOJGS7WfJjQ" name="schedulers" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_7qBpEBJhEdypOJGS7WfJjQ" name="schedulers" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#NamedElement"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_EDJQIBJiEdypOJGS7WfJjQ" value="1"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EDTBIBJiEdypOJGS7WfJjQ" value="1"/>
@@ -3173,7 +3173,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_7z26gBJhEdypOJGS7WfJjQ" name="deadlineElements" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_7z26gBJhEdypOJGS7WfJjQ" name="deadlineElements" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_G4Om4BJiEdypOJGS7WfJjQ"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_G4Xw0BJiEdypOJGS7WfJjQ" value="*"/>
@@ -3181,7 +3181,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_72jCIBJhEdypOJGS7WfJjQ" name="deadlineTypeElements" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_72jCIBJhEdypOJGS7WfJjQ" name="deadlineTypeElements" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_KlMn4BJiEdypOJGS7WfJjQ"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KlVx0BJiEdypOJGS7WfJjQ" value="*"/>
@@ -3189,7 +3189,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_75ExsBJhEdypOJGS7WfJjQ" name="timeSliceElements" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_75ExsBJhEdypOJGS7WfJjQ" name="timeSliceElements" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NUdqgBJiEdypOJGS7WfJjQ"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NUm0cBJiEdypOJGS7WfJjQ" value="*"/>
@@ -3197,7 +3197,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_79QHEBJhEdypOJGS7WfJjQ" name="delayServices" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_79QHEBJhEdypOJGS7WfJjQ" name="delayServices" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_QgyckBJiEdypOJGS7WfJjQ"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Qg8NkBJiEdypOJGS7WfJjQ" value="*"/>
@@ -3205,7 +3205,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_7_ossBJhEdypOJGS7WfJjQ" name="joinServices" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_7_ossBJhEdypOJGS7WfJjQ" name="joinServices" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_TGq5sBJiEdypOJGS7WfJjQ"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TG0DoBJiEdypOJGS7WfJjQ" value="*"/>
@@ -3213,7 +3213,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_8CKcQBJhEdypOJGS7WfJjQ" name="yieldServices" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_8CKcQBJhEdypOJGS7WfJjQ" name="yieldServices" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VqT7IBJiEdypOJGS7WfJjQ"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VqdFEBJiEdypOJGS7WfJjQ" value="*"/>
@@ -3221,20 +3221,20 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <icon xmi:id="_ZtlzMHBZEd2Nss_u28cvSA" content="71%73%70%56%57%97%36%0%20%0%112%0%0%44%0%0%0%0%36%0%20%0%-121%0%0%0%8%8%8%16%16%16%24%24%24%32%32%32%48%48%48%56%56%56%64%64%64%72%72%72%76%76%76%80%80%80%97%97%97%101%101%101%113%113%113%117%117%117%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-99%-99%-99%-82%-82%-82%-78%-78%-78%-74%-74%-74%-66%-66%-66%-62%-62%-62%-54%-54%-54%-50%-50%-50%-46%-46%-46%-30%-30%-30%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-28%0%65%8%28%40%-80%3%-126%3%8%19%42%92%-56%80%-95%2%-126%4%27%60%96%80%-96%-94%-59%-117%24%51%22%112%-16%-32%33%68%16%29%8%112%32%112%-95%-92%-55%-109%40%83%34%-112%80%64%-61%71%16%18%26%52%-112%-16%-78%38%68%15%3%48%24%120%-7%-127%-64%6%1%15%32%8%29%-22%-63%38%-63%-104%10%40%-68%-116%-7%32%-63%-48%-89%69%-115%-126%-24%121%-95%64%-51%2%25%8%116%-112%106%51%-26%-126%9%47%41%40%-120%-55%-43%38%-127%-84%31%94%98%-43%90%54%-84%-126%-103%47%53%20%-104%-80%-96%-83%90%12%3%-46%126%76%-38%-46%46%68%-79%100%63%-54%21%-21%23%34%-126%10%108%63%-50%-20%91%88%-96%-36%-64%16%67%-22%108%60%-112%-81%75%-59%18%-110%82%6%49%-40%35%68%-86%86%55%47%-66%12%17%-87%82%-54%-110%119%126%-20%-71%33%64%-48%-89%-80%99%63%93%-87%-7%-93%-40%15%17%100%-21%-114%45%65%110%77%4%0%-126%11%31%78%-68%56%113%11%53%3%2%0%59%">
-              <eAnnotations xmi:id="_aMk1QHBZEd2Nss_u28cvSA" source="image_papyrus">
-                <details xmi:id="_aMumQHBZEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+            <icon xmi:type="uml:Image" xmi:id="_ZtlzMHBZEd2Nss_u28cvSA" content="71%73%70%56%57%97%36%0%20%0%112%0%0%44%0%0%0%0%36%0%20%0%-121%0%0%0%8%8%8%16%16%16%24%24%24%32%32%32%48%48%48%56%56%56%64%64%64%72%72%72%76%76%76%80%80%80%97%97%97%101%101%101%113%113%113%117%117%117%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-99%-99%-99%-82%-82%-82%-78%-78%-78%-74%-74%-74%-66%-66%-66%-62%-62%-62%-54%-54%-54%-50%-50%-50%-46%-46%-46%-30%-30%-30%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-28%0%65%8%28%40%-80%3%-126%3%8%19%42%92%-56%80%-95%2%-126%4%27%60%96%80%-96%-94%-59%-117%24%51%22%112%-16%-32%33%68%16%29%8%112%32%112%-95%-92%-55%-109%40%83%34%-112%80%64%-61%71%16%18%26%52%-112%-16%-78%38%68%15%3%48%24%120%-7%-127%-64%6%1%15%32%8%29%-22%-63%38%-63%-104%10%40%-68%-116%-7%32%-63%-48%-89%69%-115%-126%-24%121%-95%64%-51%2%25%8%116%-112%106%51%-26%-126%9%47%41%40%-120%-55%-43%38%-127%-84%31%94%98%-43%90%54%-84%-126%-103%47%53%20%-104%-80%-96%-83%90%12%3%-46%126%76%-38%-46%46%68%-79%100%63%-54%21%-21%23%34%-126%10%108%63%-50%-20%91%88%-96%-36%-64%16%67%-22%108%60%-112%-81%75%-59%18%-110%82%6%49%-40%35%68%-86%86%55%47%-66%12%17%-87%82%-54%-110%119%126%-20%-71%33%64%-48%-89%-80%99%63%93%-87%-7%-93%-40%15%17%100%-21%-114%45%65%110%77%4%0%-126%11%31%78%-68%56%113%11%53%3%2%0%59%">
+              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aMk1QHBZEd2Nss_u28cvSA" source="image_papyrus">
+                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aMumQHBZEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
               </eAnnotations>
             </icon>
-            <icon xmi:id="_3elWwHBZEd2Nss_u28cvSA" content="71%73%70%56%57%97%-116%0%77%0%112%0%0%44%0%0%0%0%-116%0%77%0%-121%0%0%0%16%16%16%24%24%24%32%32%32%40%40%40%48%48%48%56%56%56%64%64%64%72%72%72%80%80%80%89%89%89%97%97%97%105%105%105%113%113%113%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-107%-107%-107%-99%-99%-99%-91%-91%-91%-82%-82%-82%-74%-74%-74%-66%-66%-66%-58%-58%-58%-50%-50%-50%-42%-42%-42%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%63%8%28%72%-80%-96%-63%-125%6%59%60%88%-56%-80%-95%-61%-121%16%35%74%-100%72%-79%-94%69%-117%17%16%106%-36%120%-48%65%-126%-117%32%67%-118%28%73%-110%-95%-126%2%28%83%110%-12%48%-128%-125%-54%-105%48%99%-54%-100%-87%49%65%5%-102%47%35%52%-64%-55%-77%-89%-49%-104%28%4%-4%-36%40%-64%-27%-48%-93%72%125%54%-56%-104%-108%96%-123%4%6%29%28%-104%74%-75%-86%-43%-85%88%-77%106%-35%-54%-75%43%87%-90%3%57%12%-16%-48%-108%96%-127%12%5%51%20%-72%-64%-74%-83%-37%-73%112%-29%-54%-99%75%-73%-82%93%-70%8%-64%10%92%88%118%-96%5%4%6%23%76%-24%75%-8%103%7%1%100%7%-78%52%-38%-41%102%65%-79%-119%11%75%-98%-87%-77%96%101%-62%106%13%46%-99%-52%57%-26%-30%-126%3%54%20%86%64%-31%-15%-40%-50%-88%83%94%30%-8%-76%48%-28%-126%16%28%-92%-98%-83%49%116%-63%-77%-123%55%19%-4%76%-69%55%107%-88%4%47%28%112%125%-102%-32%106%-33%-67%113%19%116%76%-8%-72%-64%-94%-56%125%-73%38%-104%-103%48%-17%-33%-47%125%35%-80%80%-112%116%97%-25%31%-108%103%-1%79%93%61%108%-15%-66%-30%5%86%56%112%23%-18%4%-119%55%-57%111%100%62%80%119%-33%-23%4%17%32%-16%122%117%-127%-60%-63%-14%33%84%-98%64%-121%69%86%86%122%31%12%24%-32%100%-10%9%4%30%82%10%126%64%-33%-126%-110%-67%-90%88%75%-123%77%-104%32%74%20%114%-42%-32%7%15%30%21%-31%-121%29%-106%101%-31%64%8%38%-11%-31%-119%37%-10%-27%28%126%38%-98%39%16%-119%45%34%117%-99%64%41%34%-11%-95%7%1%24%88%99%82%-50%69%104%35%-122%-58%-19%-12%99%95%-48%45%23%-97%-117%70%94%-56%-40%-111%72%-63%-72%97%97%55%-126%-40%36%-108%72%33%-56%-128%4%-123%81%-96%-128%65%57%98%-55%-109%-108%44%54%-123%-96%-108%98%-6%-60%94%65%52%30%-123%102%-104%105%-50%-92%-96%7%2%116%80%-40%118%5%-3%21%-25%81%26%-122%56%84%-124%26%-18%73%-45%-100%68%54%-74%-92%64%66%10%42%-45%-106%5%77%-80%-128%107%66%21%20%-88%-94%64%-55%24%30%90%-124%-83%24%41%-91%56%125%-120%38%82%101%-74%-55%105%74%101%-82%73%88%108%-90%-7%56%-22%75%-88%82%-57%97%95%85%-118%-1%-70%-86%70%85%78%122%-108%115%85%-50%-86%-38%-107%31%108%48%-128%100%4%104%96%25%-81%-70%114%20%-85%94%77%73%-103%107%-79%26%-111%105%105%82%8%58%-54%44%76%8%58%0%65%97%24%24%0%38%-90%-45%114%-92%108%-95%101%105%-8%105%-73%6%25%-128%-63%-80%-123%69%8%39%-71%-120%-66%58%80%-110%125%9%-106%-106%-69%-20%30%36%46%112%125%-107%105%107%-67%83%-34%-58%109%89%31%38%-54%-17%7%-14%58%-123%111%89%60%-6%-24%-35%-64%6%-23%123%104%83%-50%-107%-55%-16%7%1%-45%-101%-44%-79%19%-89%42%-23%-61%73%73%75%-112%-60%12%-73%106%-98%-86%89%-2%-5%-127%-56%25%127%-128%49%97%-33%62%-103%113%-60%-49%34%101%-22%64%126%-42%91%37%-54%77%17%-22%-14%-60%94%22%-76%44%-97%15%-113%59%48%-126%53%-5%-28%-21%-74%41%99%87%80%-80%-71%33%43%52%-65%103%30%-36%84%-87%23%36%-35%46%-46%-124%89%59%-81%-43%2%105%40%28%-107%-32%74%-56%49%-61%-128%-114%125%43%-81%2%-13%-69%-16%64%105%-1%4%-17%-116%-56%78%92%102%-63%-9%73%13%-14%-64%43%-58%124%20%-126%-78%-78%95%27%106%-36%72%-23%73%80%-127%92%-13%-75%91%-113%25%62%76%1%0%-116%55%-18%-8%-29%-112%71%46%-7%-28%-108%87%110%121%-27%97%23%-35%83%-37%92%-17%22%118%82%107%119%-50%-111%4%12%16%71%-78%-24%88%-9%-43%55%-22%31%60%-19%19%-31%-84%111%100%-18%119%8%-76%103%-5%-19%-72%-25%-82%123%91%20%88%-84%34%127%-64%7%47%-4%-16%-60%91%85%117%97%1%1%0%59%">
-              <eAnnotations xmi:id="_44tycHBZEd2Nss_u28cvSA" source="image_papyrus">
-                <details xmi:id="_443jcHBZEd2Nss_u28cvSA" key="image_kind_key" value="shape"/>
+            <icon xmi:type="uml:Image" xmi:id="_3elWwHBZEd2Nss_u28cvSA" content="71%73%70%56%57%97%-116%0%77%0%112%0%0%44%0%0%0%0%-116%0%77%0%-121%0%0%0%16%16%16%24%24%24%32%32%32%40%40%40%48%48%48%56%56%56%64%64%64%72%72%72%80%80%80%89%89%89%97%97%97%105%105%105%113%113%113%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-107%-107%-107%-99%-99%-99%-91%-91%-91%-82%-82%-82%-74%-74%-74%-66%-66%-66%-58%-58%-58%-50%-50%-50%-42%-42%-42%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%63%8%28%72%-80%-96%-63%-125%6%59%60%88%-56%-80%-95%-61%-121%16%35%74%-100%72%-79%-94%69%-117%17%16%106%-36%120%-48%65%-126%-117%32%67%-118%28%73%-110%-95%-126%2%28%83%110%-12%48%-128%-125%-54%-105%48%99%-54%-100%-87%49%65%5%-102%47%35%52%-64%-55%-77%-89%-49%-104%28%4%-4%-36%40%-64%-27%-48%-93%72%125%54%-56%-104%-108%96%-123%4%6%29%28%-104%74%-75%-86%-43%-85%88%-77%106%-35%-54%-75%43%87%-90%3%57%12%-16%-48%-108%96%-127%12%5%51%20%-72%-64%-74%-83%-37%-73%112%-29%-54%-99%75%-73%-82%93%-70%8%-64%10%92%88%118%-96%5%4%6%23%76%-24%75%-8%103%7%1%100%7%-78%52%-38%-41%102%65%-79%-119%11%75%-98%-87%-77%96%101%-62%106%13%46%-99%-52%57%-26%-30%-126%3%54%20%86%64%-31%-15%-40%-50%-88%83%94%30%-8%-76%48%-28%-126%16%28%-92%-98%-83%49%116%-63%-77%-123%55%19%-4%76%-69%55%107%-88%4%47%28%112%125%-102%-32%106%-33%-67%113%19%116%76%-8%-72%-64%-94%-56%125%-73%38%-104%-103%48%-17%-33%-47%125%35%-80%80%-112%116%97%-25%31%-108%103%-1%79%93%61%108%-15%-66%-30%5%86%56%112%23%-18%4%-119%55%-57%111%100%62%80%119%-33%-23%4%17%32%-16%122%117%-127%-60%-63%-14%33%84%-98%64%-121%69%86%86%122%31%12%24%-32%100%-10%9%4%30%82%10%126%64%-33%-126%-110%-67%-90%88%75%-123%77%-104%32%74%20%114%-42%-32%7%15%30%21%-31%-121%29%-106%101%-31%64%8%38%-11%-31%-119%37%-10%-27%28%126%38%-98%39%16%-119%45%34%117%-99%64%41%34%-11%-95%7%1%24%88%99%82%-50%69%104%35%-122%-58%-19%-12%99%95%-48%45%23%-97%-117%70%94%-56%-40%-111%72%-63%-72%97%97%55%-126%-40%36%-108%72%33%-56%-128%4%-123%81%-96%-128%65%57%98%-55%-109%-108%44%54%-123%-96%-108%98%-6%-60%94%65%52%30%-123%102%-104%105%-50%-92%-96%7%2%116%80%-40%118%5%-3%21%-25%81%26%-122%56%84%-124%26%-18%73%-45%-100%68%54%-74%-92%64%66%10%42%-45%-106%5%77%-80%-128%107%66%21%20%-88%-94%64%-55%24%30%90%-124%-83%24%41%-91%56%125%-120%38%82%101%-74%-55%105%74%101%-82%73%88%108%-90%-7%56%-22%75%-88%82%-57%97%95%85%-118%-1%-70%-86%70%85%78%122%-108%115%85%-50%-86%-38%-107%31%108%48%-128%100%4%104%96%25%-81%-70%114%20%-85%94%77%73%-103%107%-79%26%-111%105%105%82%8%58%-54%44%76%8%58%0%65%97%24%24%0%38%-90%-45%114%-92%108%-95%101%105%-8%105%-73%6%25%-128%-63%-80%-123%69%8%39%-71%-120%-66%58%80%-110%125%9%-106%-106%-69%-20%30%36%46%112%125%-107%105%107%-67%83%-34%-58%109%89%31%38%-54%-17%7%-14%58%-123%111%89%60%-6%-24%-35%-64%6%-23%123%104%83%-50%-107%-55%-16%7%1%-45%-101%-44%-79%19%-89%42%-23%-61%73%73%75%-112%-60%12%-73%106%-98%-86%89%-2%-5%-127%-56%25%127%-128%49%97%-33%62%-103%113%-60%-49%34%101%-22%64%126%-42%91%37%-54%77%17%-22%-14%-60%94%22%-76%44%-97%15%-113%59%48%-126%53%-5%-28%-21%-74%41%99%87%80%-80%-71%33%43%52%-65%103%30%-36%84%-87%23%36%-35%46%-46%-124%89%59%-81%-43%2%105%40%28%-107%-32%74%-56%49%-61%-128%-114%125%43%-81%2%-13%-69%-16%64%105%-1%4%-17%-116%-56%78%92%102%-63%-9%73%13%-14%-64%43%-58%124%20%-126%-78%-78%95%27%106%-36%72%-23%73%80%-127%92%-13%-75%91%-113%25%62%76%1%0%-116%55%-18%-8%-29%-112%71%46%-7%-28%-108%87%110%121%-27%97%23%-35%83%-37%92%-17%22%118%82%107%119%-50%-111%4%12%16%71%-78%-24%88%-9%-43%55%-22%31%60%-19%19%-31%-84%111%100%-18%119%8%-76%103%-5%-19%-72%-25%-82%123%91%20%88%-84%34%127%-64%7%47%-4%-16%-60%91%85%117%97%1%1%0%59%">
+              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_44tycHBZEd2Nss_u28cvSA" source="image_papyrus">
+                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_443jcHBZEd2Nss_u28cvSA" key="image_kind_key" value="shape"/>
               </eAnnotations>
             </icon>
           </packagedElement>
           <packagedElement xmi:type="uml:Stereotype" xmi:id="_hI6FYBJiEdypOJGS7WfJjQ" name="SwTimerResource">
-            <generalization xmi:id="_xm5h0BJiEdypOJGS7WfJjQ" general="_7IF3YBG2Edyb1KzJ7GkiGA"/>
-            <ownedAttribute xmi:id="_i3DCMBJiEdypOJGS7WfJjQ" name="durationElements" visibility="public" isUnique="false" redefinedProperty="_9OzFMBG2Edyb1KzJ7GkiGA">
+            <generalization xmi:type="uml:Generalization" xmi:id="_xm5h0BJiEdypOJGS7WfJjQ" general="_7IF3YBG2Edyb1KzJ7GkiGA"/>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_i3DCMBJiEdypOJGS7WfJjQ" name="durationElements" visibility="public" isUnique="false" redefinedProperty="_9OzFMBG2Edyb1KzJ7GkiGA">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_sjVhUBJiEdypOJGS7WfJjQ"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sjfSUBJiEdypOJGS7WfJjQ" value="1"/>
@@ -3244,8 +3244,8 @@
             </ownedAttribute>
           </packagedElement>
           <packagedElement xmi:type="uml:Stereotype" xmi:id="_M2YK4BJjEdypOJGS7WfJjQ" name="MemoryPartition">
-            <generalization xmi:id="_bnRzYBJjEdypOJGS7WfJjQ" general="_b5kPgBJeEdy3Td9UhuLFPg"/>
-            <ownedAttribute xmi:id="_OUlOQBJjEdypOJGS7WfJjQ" name="concurrentResources" visibility="public" isUnique="false">
+            <generalization xmi:type="uml:Generalization" xmi:id="_bnRzYBJjEdypOJGS7WfJjQ" general="_b5kPgBJeEdy3Td9UhuLFPg"/>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_OUlOQBJjEdypOJGS7WfJjQ" name="concurrentResources" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Q7hbUBJjEdypOJGS7WfJjQ"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Q7rMUBJjEdypOJGS7WfJjQ" value="*"/>
@@ -3253,7 +3253,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_OYk9cBJjEdypOJGS7WfJjQ" name="memorySpaces" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_OYk9cBJjEdypOJGS7WfJjQ" name="memorySpaces" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_T3gEQBJjEdypOJGS7WfJjQ"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_T3pOMBJjEdypOJGS7WfJjQ" value="*"/>
@@ -3261,7 +3261,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_OcInwBJjEdypOJGS7WfJjQ" name="fork" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_OcInwBJjEdypOJGS7WfJjQ" name="fork" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WFtBMBJjEdypOJGS7WfJjQ"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WF2LIBJjEdypOJGS7WfJjQ" value="*"/>
@@ -3269,7 +3269,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_Of2DEBJjEdypOJGS7WfJjQ" name="exit" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_Of2DEBJjEdypOJGS7WfJjQ" name="exit" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Y3J1IBJjEdypOJGS7WfJjQ"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Y3TmIBJjEdypOJGS7WfJjQ" value="*"/>
@@ -3277,17 +3277,17 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_de0j0BJjEdypOJGS7WfJjQ" name="base_Namespace" isUnique="false" association="_deho4BJjEdypOJGS7WfJjQ">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_de0j0BJjEdypOJGS7WfJjQ" name="base_Namespace" isUnique="false" association="_deho4BJjEdypOJGS7WfJjQ">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Namespace"/>
             </ownedAttribute>
-            <icon xmi:id="_cw6aQHBZEd2Nss_u28cvSA" content="71%73%70%56%57%97%37%0%24%0%112%0%0%44%0%0%0%0%37%0%24%0%-121%0%0%0%12%12%12%20%20%20%32%32%32%36%36%36%44%44%44%64%64%64%89%89%89%93%93%93%101%101%101%109%109%109%117%117%117%121%121%121%125%125%125%-127%-127%-127%-66%-66%-66%-34%-34%-34%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-73%0%29%52%24%-40%-32%64%-124%9%8%19%42%92%-56%48%-31%2%-126%5%11%32%32%72%-32%65%-61%-117%24%5%40%32%8%-64%-128%69%-124%30%49%-118%92%56%0%66%-62%-114%31%39%-124%28%-55%-78%-28%-55%-107%42%83%-78%-60%-24%18%33%-54%-124%48%103%94%-84%57%-31%38%72%-103%58%25%-14%-12%25%51%40%77%-109%54%97%-26%52%-86%112%-88%82%-96%76%17%58%77%-71%52%-22%-124%-87%9%121%90%-75%-87%-112%-88%-42%-83%0%-70%-62%-4%106%53%-20%-53%-108%100%-93%-102%77%-118%22%-23%86%-82%103%-77%-70%125%-69%-74%-25%-40%-71%96%-59%-74%125%123%82%-81%92%-66%112%-39%38%-44%8%-79%-80%-31%-61%3%1%72%-120%-117%-112%1%-30%-57%-120%19%44%22%12%88%36%-128%1%0%50%107%-34%-52%-71%-77%103%-49%1%2%2%0%59%">
-              <eAnnotations xmi:id="_dOtwkHBZEd2Nss_u28cvSA" source="image_papyrus">
-                <details xmi:id="_dO26gHBZEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+            <icon xmi:type="uml:Image" xmi:id="_cw6aQHBZEd2Nss_u28cvSA" content="71%73%70%56%57%97%37%0%24%0%112%0%0%44%0%0%0%0%37%0%24%0%-121%0%0%0%12%12%12%20%20%20%32%32%32%36%36%36%44%44%44%64%64%64%89%89%89%93%93%93%101%101%101%109%109%109%117%117%117%121%121%121%125%125%125%-127%-127%-127%-66%-66%-66%-34%-34%-34%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-73%0%29%52%24%-40%-32%64%-124%9%8%19%42%92%-56%48%-31%2%-126%5%11%32%32%72%-32%65%-61%-117%24%5%40%32%8%-64%-128%69%-124%30%49%-118%92%56%0%66%-62%-114%31%39%-124%28%-55%-78%-28%-55%-107%42%83%-78%-60%-24%18%33%-54%-124%48%103%94%-84%57%-31%38%72%-103%58%25%-14%-12%25%51%40%77%-109%54%97%-26%52%-86%112%-88%82%-96%76%17%58%77%-71%52%-22%-124%-87%9%121%90%-75%-87%-112%-88%-42%-83%0%-70%-62%-4%106%53%-20%-53%-108%100%-93%-102%77%-118%22%-23%86%-82%103%-77%-70%125%-69%-74%-25%-40%-71%96%-59%-74%125%123%82%-81%92%-66%112%-39%38%-44%8%-79%-80%-31%-61%3%1%72%-120%-117%-112%1%-30%-57%-120%19%44%22%12%88%36%-128%1%0%50%107%-34%-52%-71%-77%103%-49%1%2%2%0%59%">
+              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dOtwkHBZEd2Nss_u28cvSA" source="image_papyrus">
+                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dO26gHBZEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
               </eAnnotations>
             </icon>
-            <icon xmi:id="_7v1JgHBZEd2Nss_u28cvSA" content="71%73%70%56%57%97%-110%0%93%0%112%0%0%44%0%0%0%0%-110%0%93%0%-121%0%0%0%8%8%8%16%16%16%24%24%24%28%28%28%32%32%32%40%40%40%48%48%48%56%56%56%60%60%60%64%64%64%72%72%72%76%76%76%89%89%89%93%93%93%97%97%97%101%101%101%113%113%113%117%117%117%121%121%121%125%125%125%-115%-115%-115%-99%-99%-99%-91%-91%-91%-66%-66%-66%-50%-50%-50%-42%-42%-42%-34%-34%-34%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%61%8%28%72%-80%96%-63%14%26%12%42%92%-56%-80%-95%-61%-121%16%35%74%-100%40%48%3%3%0%24%51%102%12%-96%-96%-93%71%-113%7%12%80%28%73%-78%-92%73%-123%17%52%-86%4%-16%-79%37%2%1%27%10%44%-20%-128%-95%-90%77%-101%21%18%-100%-36%-55%-77%39%67%0%12%111%10%-67%64%32%-26%72%12%10%124%42%93%122%18%40%-59%-104%70%41%34%101%74%-75%42%68%-89%19%-95%-54%-108%-102%-44%-86%-41%-81%3%-79%74%-44%122%-76%43%-40%-77%84%-59%70%36%-53%21%-83%-37%-91%106%33%-78%-99%56%-11%-83%-35%-99%113%31%-50%-107%88%-9%-82%-33%-111%121%29%-18%-115%-40%-9%-81%-31%-85%35%7%67%44%124%-72%-15%-62%-64%13%21%63%100%-20%-72%114%-40%-60%5%-94%-46%53%107%-71%51%7%1%-104%53%-13%-27%-36%-71%-78%-24%-75%-103%-73%110%46%93%-6%-76%-36%-44%101%89%119%118%-83%23%54%-59%11%13%100%91%-90%45%-40%-10%68%11%15%116%-101%86%61%-42%-73%68%-32%-62%29%-13%-114%108%60%34%-14%-28%-121%-105%51%-108%-20%-16%57%-12%-65%-46%23%82%111%104%-3%-6%-35%-20%10%-73%51%-1%-20%-18%-3%45%120%-125%-30%23%-110%47%-113%-10%124%-63%-12%10%-41%-77%7%-21%-98%32%124%-125%-14%-25%123%-83%63%-16%126%-63%-4%-6%85%-59%-97%64%-2%17%4%96%-128%76%13%-24%65%-127%3%29%-120%-96%82%10%50%40%-112%-125%15%-10%20%97%115%16%81%88%-31%78%10%126%-90%-96%-122%27%-102%-92%-96%7%0%124%24%92%-120%86%-115%88%34%113%-50%-99%-120%34%85%42%-102%-8%-94%-128%44%70%-76%-30%72%32%-50%56%81%6%7%-112%116%35%69%57%-22%72%24%105%54%-54%40%-92%82%-108%93%101%-28%-111%61%37%-7%-48%-113%-65%-71%-56%-28%78%78%58%4%-27%113%82%78%105%82%-107%13%93%-39%-94%-106%60%113%-7%-45%-110%96%-106%36%-26%99%100%-106%25%27%96%105%-86%-71%26%-101%53%62%20%-92%-101%4%-99%-87%-112%-105%25%102%73%-25%-112%62%-74%-71%-25%100%68%42%25%103%117%122%-2%-23%-112%-99%6%-31%-7%16%5%20%24%-6%38%69%-118%58%-60%-88%-93%-93%-11%57%104%67%-109%82%-70%88%-96%79%42%-104%-87%-90%-121%114%106%-91%-89%-115%-126%26%-86%-91%35%125%106%-22%66%-120%22%20%41%-90%-91%-82%-3%-54%-86%-88%93%-110%42%107%80%-76%-114%121%41%67%-86%-34%90%103%-82%104%-18%-70%80%-81%-66%10%-124%27%-86%20%17%91%-20%-100%2%-67%-54%107%-84%-59%54%88%104%-89%-62%42%-92%-84%-81%-52%-110%104%107%-76%6%78%59%106%-75%6%93%123%107%-74%-50%14%11%45%-73%-28%110%-53%-19%-124%-34%-42%10%110%65%-30%-54%-102%-18%-69%4%-59%-69%-22%-68%-87%-98%27%45%-66%-55%-22%-69%108%-69%-70%-26%-69%-82%-76%-56%78%100%-81%-87%-4%26%-20%47%-74%0%7%43%-16%-64%30%36%44%-47%-63%-96%74%28%17%-59%-102%90%12%17%-58%-108%106%-68%-24%-62%-29%54%124%-89%-70%-21%122%44%41%-56%-14%-118%-100%-88%-126%19%56%32%-44%-53%48%-57%44%-13%-52%52%-41%108%-13%-51%48%75%-80%64%-63%18%65%96%64%75%64%7%45%-12%-48%68%23%109%-12%-47%72%7%29%82%6%112%66%-20%87%-71%78%-89%53%98%-44%38%65%77%-75%82%86%95%-35%83%-42%90%-29%53%117%-41%19%113%13%118%73%0%96%48%0%-50%104%-89%-83%-10%-38%108%-73%-99%54%0%19%28%-112%-12%-36%116%-41%109%-9%-35%120%-45%-115%64%64%0%59%">
-              <eAnnotations xmi:id="_8YWiEHBZEd2Nss_u28cvSA" source="image_papyrus">
-                <details xmi:id="_8YgTEHBZEd2Nss_u28cvSA" key="image_kind_key" value="shape"/>
+            <icon xmi:type="uml:Image" xmi:id="_7v1JgHBZEd2Nss_u28cvSA" content="71%73%70%56%57%97%-110%0%93%0%112%0%0%44%0%0%0%0%-110%0%93%0%-121%0%0%0%8%8%8%16%16%16%24%24%24%28%28%28%32%32%32%40%40%40%48%48%48%56%56%56%60%60%60%64%64%64%72%72%72%76%76%76%89%89%89%93%93%93%97%97%97%101%101%101%113%113%113%117%117%117%121%121%121%125%125%125%-115%-115%-115%-99%-99%-99%-91%-91%-91%-66%-66%-66%-50%-50%-50%-42%-42%-42%-34%-34%-34%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%61%8%28%72%-80%96%-63%14%26%12%42%92%-56%-80%-95%-61%-121%16%35%74%-100%40%48%3%3%0%24%51%102%12%-96%-96%-93%71%-113%7%12%80%28%73%-78%-92%73%-123%17%52%-86%4%-16%-79%37%2%1%27%10%44%-20%-128%-95%-90%77%-101%21%18%-100%-36%-55%-77%39%67%0%12%111%10%-67%64%32%-26%72%12%10%124%42%93%122%18%40%-59%-104%70%41%34%101%74%-75%42%68%-89%19%-95%-54%-108%-102%-44%-86%-41%-81%3%-79%74%-44%122%-76%43%-40%-77%84%-59%70%36%-53%21%-83%-37%-91%106%33%-78%-99%56%-11%-83%-35%-99%113%31%-50%-107%88%-9%-82%-33%-111%121%29%-18%-115%-40%-9%-81%-31%-85%35%7%67%44%124%-72%-15%-62%-64%13%21%63%100%-20%-72%114%-40%-60%5%-94%-46%53%107%-71%51%7%1%-104%53%-13%-27%-36%-71%-78%-24%-75%-103%-73%110%46%93%-6%-76%-36%-44%101%89%119%118%-83%23%54%-59%11%13%100%91%-90%45%-40%-10%68%11%15%116%-101%86%61%-42%-73%68%-32%-62%29%-13%-114%108%60%34%-14%-28%-121%-105%51%-108%-20%-16%57%-12%-65%-46%23%82%111%104%-3%-6%-35%-20%10%-73%51%-1%-20%-18%-3%45%120%-125%-30%23%-110%47%-113%-10%124%-63%-12%10%-41%-77%7%-21%-98%32%124%-125%-14%-25%123%-83%63%-16%126%-63%-4%-6%85%-59%-97%64%-2%17%4%96%-128%76%13%-24%65%-127%3%29%-120%-96%82%10%50%40%-112%-125%15%-10%20%97%115%16%81%88%-31%78%10%126%-90%-96%-122%27%-102%-92%-96%7%0%124%24%92%-120%86%-115%88%34%113%-50%-99%-120%34%85%42%-102%-8%-94%-128%44%70%-76%-30%72%32%-50%56%81%6%7%-112%116%35%69%57%-22%72%24%105%54%-54%40%-92%82%-108%93%101%-28%-111%61%37%-7%-48%-113%-65%-71%-56%-28%78%78%58%4%-27%113%82%78%105%82%-107%13%93%-39%-94%-106%60%113%-7%-45%-110%96%-106%36%-26%99%100%-106%25%27%96%105%-86%-71%26%-101%53%62%20%-92%-101%4%-99%-87%-112%-105%25%102%73%-25%-112%62%-74%-71%-25%100%68%42%25%103%117%122%-2%-23%-112%-99%6%-31%-7%16%5%20%24%-6%38%69%-118%58%-60%-88%-93%-93%-11%57%104%67%-109%82%-70%88%-96%79%42%-104%-87%-90%-121%114%106%-91%-89%-115%-126%26%-86%-91%35%125%106%-22%66%-120%22%20%41%-90%-91%-82%-3%-54%-86%-88%93%-110%42%107%80%-76%-114%121%41%67%-86%-34%90%103%-82%104%-18%-70%80%-81%-66%10%-124%27%-86%20%17%91%-20%-100%2%-67%-54%107%-84%-59%54%88%104%-89%-62%42%-92%-84%-81%-52%-110%104%107%-76%6%78%59%106%-75%6%93%123%107%-74%-50%14%11%45%-73%-28%110%-53%-19%-124%-34%-42%10%110%65%-30%-54%-102%-18%-69%4%-59%-69%-22%-68%-87%-98%27%45%-66%-55%-22%-69%108%-69%-70%-26%-69%-82%-76%-56%78%100%-81%-87%-4%26%-20%47%-74%0%7%43%-16%-64%30%36%44%-47%-63%-96%74%28%17%-59%-102%90%12%17%-58%-108%106%-68%-24%-62%-29%54%124%-89%-70%-21%122%44%41%-56%-14%-118%-100%-88%-126%19%56%32%-44%-53%48%-57%44%-13%-52%52%-41%108%-13%-51%48%75%-80%64%-63%18%65%96%64%75%64%7%45%-12%-48%68%23%109%-12%-47%72%7%29%82%6%112%66%-20%87%-71%78%-89%53%98%-44%38%65%77%-75%82%86%95%-35%83%-42%90%-29%53%117%-41%19%113%13%118%73%0%96%48%0%-50%104%-89%-83%-10%-38%108%-73%-99%54%0%19%28%-112%-12%-36%116%-41%109%-9%-35%120%-45%-115%64%64%0%59%">
+              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8YWiEHBZEd2Nss_u28cvSA" source="image_papyrus">
+                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8YgTEHBZEd2Nss_u28cvSA" key="image_kind_key" value="shape"/>
               </eAnnotations>
             </icon>
           </packagedElement>
@@ -3295,8 +3295,8 @@
             <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_deho4RJjEdypOJGS7WfJjQ" name="extension_MemoryPartition" type="_M2YK4BJjEdypOJGS7WfJjQ" aggregation="composite" association="_deho4BJjEdypOJGS7WfJjQ"/>
           </packagedElement>
           <packagedElement xmi:type="uml:Stereotype" xmi:id="_QpmPoB2tEdym5pjrMPD5aQ" name="Alarm">
-            <generalization xmi:id="_YhsNQB2tEdym5pjrMPD5aQ" general="_fO5sQBJhEdypOJGS7WfJjQ"/>
-            <ownedAttribute xmi:id="_Rb9gsB2tEdym5pjrMPD5aQ" name="isWatchdog" visibility="public" isUnique="false">
+            <generalization xmi:type="uml:Generalization" xmi:id="_YhsNQB2tEdym5pjrMPD5aQ" general="_fO5sQBJhEdypOJGS7WfJjQ"/>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_Rb9gsB2tEdym5pjrMPD5aQ" name="isWatchdog" visibility="public" isUnique="false">
               <type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_TKYKUB2tEdym5pjrMPD5aQ"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TKhUQB2tEdym5pjrMPD5aQ" value="1"/>
@@ -3304,7 +3304,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_UnDjsB2tEdym5pjrMPD5aQ" name="timers" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_UnDjsB2tEdym5pjrMPD5aQ" name="timers" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XNWQgB2tEdym5pjrMPD5aQ"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XNgBgB2tEdym5pjrMPD5aQ" value="*"/>
@@ -3312,37 +3312,37 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <icon xmi:id="_ezbroHBZEd2Nss_u28cvSA" content="71%73%70%56%57%97%58%0%26%0%112%0%0%44%0%0%0%0%58%0%26%0%-121%0%0%0%4%4%4%8%8%8%12%12%12%16%16%16%24%24%24%28%28%28%32%32%32%36%36%36%40%40%40%48%48%48%56%56%56%60%60%60%64%64%64%72%72%72%80%80%80%89%89%89%93%93%93%97%97%97%101%101%101%105%105%105%109%109%109%113%113%113%121%121%121%125%125%125%-127%-127%-127%-123%-123%-123%-115%-115%-115%-107%-107%-107%-99%-99%-99%-95%-95%-95%-91%-91%-91%-86%-86%-86%-82%-82%-82%-74%-74%-74%-66%-66%-66%-62%-62%-62%-58%-58%-58%-50%-50%-50%-42%-42%-42%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%89%8%60%17%0%0%1%-127%8%19%42%92%-56%-80%-95%-61%-121%36%4%40%48%112%-30%-95%-59%-117%24%21%-82%-96%-96%-96%-62%5%11%9%40%-84%-56%72%-78%100%66%8%26%4%2%16%-88%1%-126%-55%-105%24%63%-72%84%-119%16%-62%7%-104%56%27%62%8%-127%112%-91%64%-103%57%-125%38%84%96%2%33%-127%18%2%77%20%4%-64%20%-128%1%-116%41%28%52%-104%74%-75%-86%-43%-85%85%37%-20%68%-104%98%65%-54%16%15%16%-122%88%80%-108%-123%-120%-121%22%46%-116%88%-53%-74%-83%-37%-73%108%49%56%-24%32%65%-31%77%9%29%88%-84%-80%-16%64%5%-62%13%5%40%32%85%-104%-30%-64%72%-95%91%29%112%80%-56%33%44%8%4%15%54%72%-106%-100%-95%105%-127%8%30%-40%78%-128%0%119%4%10%-110%38%20%8%84%1%-63%-127%-122%17%26%28%72%24%89%96%0%-127%-41%-80%9%52%101%58%64%65%3%6%2%22%96%109%96%-127%-28%86%-124%34%46%52%-72%112%-10%97%9%-90%9%48%124%22%-72%-95%-73%-48%20%5%114%98%-96%80%54%97%-126%-118%66%45%108%16%-70%16%44%-9%-62%-121%-71%35%78%36%-54%29%3%6%-15%9%71%52%-32%-66%-30%64%10%-12%8%127%7%109%14%63%-87%104%-95%-19%-33%-41%-73%-55%-35%123%125%-16%-36%-111%87%-97%118%-3%-123%85%-97%10%5%-124%-105%83%3%35%-44%-57%2%125%66%-123%-26%96%126%-36%-55%-121%30%-124%65%73%-24%-96%2%9%-20%-26%33%86%9%44%-58%80%64%0%59%">
-              <eAnnotations xmi:id="_fTnAgHBZEd2Nss_u28cvSA" source="image_papyrus">
-                <details xmi:id="_fTwxgHBZEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+            <icon xmi:type="uml:Image" xmi:id="_ezbroHBZEd2Nss_u28cvSA" content="71%73%70%56%57%97%58%0%26%0%112%0%0%44%0%0%0%0%58%0%26%0%-121%0%0%0%4%4%4%8%8%8%12%12%12%16%16%16%24%24%24%28%28%28%32%32%32%36%36%36%40%40%40%48%48%48%56%56%56%60%60%60%64%64%64%72%72%72%80%80%80%89%89%89%93%93%93%97%97%97%101%101%101%105%105%105%109%109%109%113%113%113%121%121%121%125%125%125%-127%-127%-127%-123%-123%-123%-115%-115%-115%-107%-107%-107%-99%-99%-99%-95%-95%-95%-91%-91%-91%-86%-86%-86%-82%-82%-82%-74%-74%-74%-66%-66%-66%-62%-62%-62%-58%-58%-58%-50%-50%-50%-42%-42%-42%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%89%8%60%17%0%0%1%-127%8%19%42%92%-56%-80%-95%-61%-121%36%4%40%48%112%-30%-95%-59%-117%24%21%-82%-96%-96%-96%-62%5%11%9%40%-84%-56%72%-78%100%66%8%26%4%2%16%-88%1%-126%-55%-105%24%63%-72%84%-119%16%-62%7%-104%56%27%62%8%-127%112%-91%64%-103%57%-125%38%84%96%2%33%-127%18%2%77%20%4%-64%20%-128%1%-116%41%28%52%-104%74%-75%-86%-43%-85%85%37%-20%68%-104%98%65%-54%16%15%16%-122%88%80%-108%-123%-120%-121%22%46%-116%88%-53%-74%-83%-37%-73%108%49%56%-24%32%65%-31%77%9%29%88%-84%-80%-16%64%5%-62%13%5%40%32%85%-104%-30%-64%72%-95%91%29%112%80%-56%33%44%8%4%15%54%72%-106%-100%-95%105%-127%8%30%-40%78%-128%0%119%4%10%-110%38%20%8%84%1%-63%-127%-122%17%26%28%72%24%89%96%0%-127%-41%-80%9%52%101%58%64%65%3%6%2%22%96%109%96%-127%-28%86%-124%34%46%52%-72%112%-10%97%9%-90%9%48%124%22%-72%-95%-73%-48%20%5%114%98%-96%80%54%97%-126%-118%66%45%108%16%-70%16%44%-9%-62%-121%-71%35%78%36%-54%29%3%6%-15%9%71%52%-32%-66%-30%64%10%-12%8%127%7%109%14%63%-87%104%-95%-19%-33%-41%-73%-55%-35%123%125%-16%-36%-111%87%-97%118%-3%-123%85%-97%10%5%-124%-105%83%3%35%-44%-57%2%125%66%-123%-26%96%126%-36%-55%-121%30%-124%65%73%-24%-96%2%9%-20%-26%33%86%9%44%-58%80%64%0%59%">
+              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fTnAgHBZEd2Nss_u28cvSA" source="image_papyrus">
+                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fTwxgHBZEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
               </eAnnotations>
             </icon>
-            <icon xmi:id="__C8gEHBZEd2Nss_u28cvSA" content="71%73%70%56%57%97%-28%0%102%0%112%0%0%44%0%0%0%0%-28%0%102%0%-121%0%0%0%4%4%4%8%8%8%12%12%12%16%16%16%24%24%24%28%28%28%32%32%32%40%40%40%44%44%44%48%48%48%52%52%52%56%56%56%60%60%60%64%64%64%72%72%72%80%80%80%89%89%89%97%97%97%105%105%105%113%113%113%117%117%117%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-107%-107%-107%-103%-103%-103%-99%-99%-99%-91%-91%-91%-82%-82%-82%-78%-78%-78%-74%-74%-74%-66%-66%-66%-58%-58%-58%-54%-54%-54%-50%-50%-50%-42%-42%-42%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%85%8%28%72%-112%32%-118%3%0%18%42%76%72%-95%-96%-61%-121%16%35%74%-100%72%-79%-94%-59%-117%24%51%106%-36%-56%49%-93%-119%3%15%67%56%-24%72%-78%-92%-55%-109%40%83%-86%-20%-8%49%-28%-56%-107%48%99%-54%-100%73%51%37%10%2%2%70%16%-108%0%64%66%-51%-97%64%-125%10%-91%-23%32%4%-63%-94%67%-109%42%93%-54%84%-94%-126%12%25%46%72%77%-112%1%69%-45%-85%88%-77%-82%76%-47%65%2%1%3%12%40%72%-67%-128%-128%1%1%7%25%76%104%93%-53%-74%45%-60%20%24%10%68%-32%96%21%98%8%10%7%34%-88%117%-53%-73%47%-45%14%7%44%-44%-83%8%-104%-62%96%-65%-120%19%111%-107%16%-31%-60%-58%12%12%72%40%-98%76%-103%37%3%14%18%53%-108%-112%88%-126%65%-121%-54%-96%67%75%52%-95%64%-78%68%9%-104%37%-90%-104%43%-70%117%107%20%12%54%79%68%93%-15%1%8%-41%-72%41%-37%-82%72%33%67%69%-40%-78%115%11%119%107%1%-125%69%-87%22%77%32%72%49%-68%-71%-42%19%7%-104%87%68%110%-79%-73%-13%-21%77%33%120%-72%72%-67%98%-118%3%-114%-79%-117%-1%15%74%66%1%-58%-18%21%51%52%28%-49%-98%102%-15%-13%23%48%-74%108%79%31%38%-126%-32%21%53%76%-56%-56%64%68%-3%-1%39%-107%-128%64%70%28%-8%-124%17%6%22%0%-88%96%71%5%18%104%-32%69%34%45%40%97%70%8%58%-104%-111%-128%19%102%-56%-101%111%24%53%-120%-47%77%26%-122%24%17%109%24%117%-16%-128%70%0%56%-96%-30%-118%44%-74%-24%-94%-118%13%112%40%-94%112%36%98%100%-63%3%-121%81%4%64%8%60%-10%-24%-29%-113%64%-122%-80%1%2%31%32%-58%-63%88%72%38%-87%-28%-110%76%54%-23%-28%-109%80%70%41%-91%84%30%-96%119%17%8%8%24%85%-47%124%27%105%16%27%98%36%32%48%-27%-104%100%-106%105%102%-103%14%76%-96%31%71%39%56%16%31%69%34%48%-80%-47%106%19%72%-25%-105%118%51%78%84%90%7%17%-112%116%-127%3%-31%69%-28%1%4%26%-107%-96%-64%103%19%-95%-112%-29%80%39%20%-112%-89%68%-125%-86%-128%66%1%118%110%20%2%2%-73%69%-92%38%-127%10%-32%23%81%10%12%68%-128%104%82%-42%61%10%81%105%2%-19%70%18%10%15%24%7%81%1%-127%82%-1%-108%-126%4%18%84%58%-111%9%2%0%64%-128%4%90%2%5%-99%-83%-90%10%84%-34%64%30%-106%-108%-87%67%17%90%-44%89%106%24%101%-80%80%96%-98%-58%84%97%-80%14%-31%41%16%10%8%-60%-70%-110%-75%20%117%16%-39%-100%5%44%-108%16%2%25%104%-101%-46%119%-26%6%59%44%65%-22%-55%-76%-18%68%41%76%16%-63%-94%23%97%32%-18%66%15%-48%-75%82%-69%-44%22%84%42%65%-88%-62%20%-16%104%12%104%80%-110%9%-9%-118%43%64%4%-37%-95%116%-64%94%-3%10%-12%43%-78%15%0%91%-46%-102%19%121%48%48%73%8%36%124%47%1%19%-8%71%82%-92%17%15%-12%111%65%-59%-98%4%2%4%22%15%-108%2%5%16%-48%-69%-111%5%30%123%124%-64%5%-47%90%-76%113%-65%41%20%32%-77%10%-17%5%-56%-64%-49%42%-104%-128%-106%74%26%-44%-84%-76%2%26%-92%27%81%-78%37%-85%-64%-17%-120%-21%-111%20%-126%2%16%63%4%-126%2%34%-89%-28%-127%-46%96%3%0%1%7%45%23%-60%109%-60%-24%82%-108%-127%3%68%79%-76%-10%-49%24%24%16%-64%0%4%-44%109%-9%-35%120%-25%-83%119%-35%3%-124%-1%-19%119%1%9%-68%-72%-30%2%3%8%110%-8%-31%-120%87%77%25%-97%22%-123%112%115%-39%16%109%-83%-8%67%37%104%0%-43%-27%-104%103%-82%-7%-26%-103%79%-32%55%-40%10%84%-16%65%-112%61%62%80%1%-23%-88%-89%-82%-70%105%-107%-19%44%17%10%23%28%-112%-106%-84%30%56%-16%0%-21%75%117%-16%121%-62%-28%58%77%-48%-60%81%-109%-116%-47%9%120%41%112%65%8%-8%-95%16%2%7%16%16%0%65%-81%77%113%-80%-69%66%-48%94%116%114%-60%72%113%68%-62%-97%29%43%116%-106%4%30%64%62%20%79%-97%-125%12%-3%111%-108%70%-83%-62%-69%-1%33%4%-10%-62%-93%102%52%117%-55%103%-45%71%2%-40%-7%-74%-83%26%120%-22%99%-88%32%5%30%123%-118%-17%46%-126%-79%-88%93%-81%61%39%-56%-43%-77%44%-112%51%-114%-72%46%88%-64%-5%15%0%19%2%-78%-82%-95%68%120%37%11%-38%127%68%32%-128%-123%53%76%96%-72%-29%25%-1%-2%115%2%-44%-24%-81%35%-20%-117%-40%-4%-44%119%-111%-6%81%43%109%44%-60%72%10%-5%-123%-63%24%110%-120%-123%15%-76%33%68%34%24%-79%26%-22%80%34%7%-92%-106%-86%-1%126%8%-81%17%-106%108%-122%68%124%-56%10%-5%-27%-62%36%22%4%-122%37%107%-108%19%39%-62%56%-11%5%113%-118%3%-55%-31%-93%120%-120%69%-126%-8%-112%90%86%-22%-30%64%-122%-120%54%35%-118%113%32%72%12%-42%18%-49%-40%-60%96%61%-20%-116%5%-111%-94%-6%-66%40%-58%43%-102%74%-117%83%-28%34%-75%64%112%34%56%18%36%-116%-44%106%35%22%-95%24%-79%52%118%113%-115%-63%18%36%22%-33%24%53%61%-118%-111%-114%-90%-78%35%22%-15%56%35%71%118%-111%-113%44%68%100%23%21%57%35%66%-62%-47%-112%-113%-46%36%22%69%-59%-62%-5%-8%113%32%-106%124%20%36%-79%40%-55%60%81%50%-119%-109%18%-97%-120%-96%118%74%81%-26%-119%-109%73%-12%36%-75%64%57%69%91%-50%-88%70%-89%124%101%-120%82%57%-59%85%-26%-87%-107%78%20%-90%-122%98%121%74%97%-103%71%125%-66%76%34%46%67%-92%75%49%-14%114%70%5%60%37%50%69%-92%76%29%18%115%70%-58%116%-30%54%67%-44%77%27%-10%-20%-124%26%-70%102%18%-93%25%-94%105%-2%-80%-102%-90%82%39%17%-85%24%-75%77%53%83%5%-27%-108%-48%55%-109%24%34%78%17%-115%-13%-121%100%-28%-103%-49%-18%41%79%13%-79%-13%-121%18%56%0%-30%22%-54%-48%-122%58%-12%-95%16%109%-111%25%97%18%16%0%59%">
-              <eAnnotations xmi:id="__6qyQHBZEd2Nss_u28cvSA" source="image_papyrus">
-                <details xmi:id="__6qyQXBZEd2Nss_u28cvSA" key="image_kind_key" value="shape"/>
+            <icon xmi:type="uml:Image" xmi:id="__C8gEHBZEd2Nss_u28cvSA" content="71%73%70%56%57%97%-28%0%102%0%112%0%0%44%0%0%0%0%-28%0%102%0%-121%0%0%0%4%4%4%8%8%8%12%12%12%16%16%16%24%24%24%28%28%28%32%32%32%40%40%40%44%44%44%48%48%48%52%52%52%56%56%56%60%60%60%64%64%64%72%72%72%80%80%80%89%89%89%97%97%97%105%105%105%113%113%113%117%117%117%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-107%-107%-107%-103%-103%-103%-99%-99%-99%-91%-91%-91%-82%-82%-82%-78%-78%-78%-74%-74%-74%-66%-66%-66%-58%-58%-58%-54%-54%-54%-50%-50%-50%-42%-42%-42%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%85%8%28%72%-112%32%-118%3%0%18%42%76%72%-95%-96%-61%-121%16%35%74%-100%72%-79%-94%-59%-117%24%51%106%-36%-56%49%-93%-119%3%15%67%56%-24%72%-78%-92%-55%-109%40%83%-86%-20%-8%49%-28%-56%-107%48%99%-54%-100%73%51%37%10%2%2%70%16%-108%0%64%66%-51%-97%64%-125%10%-91%-23%32%4%-63%-94%67%-109%42%93%-54%84%-94%-126%12%25%46%72%77%-112%1%69%-45%-85%88%-77%-82%76%-47%65%2%1%3%12%40%72%-67%-128%-128%1%1%7%25%76%104%93%-53%-74%45%-60%20%24%10%68%-32%96%21%98%8%10%7%34%-88%117%-53%-73%47%-45%14%7%44%-44%-83%8%-104%-62%96%-65%-120%19%111%-107%16%-31%-60%-58%12%12%72%40%-98%76%-103%37%3%14%18%53%-108%-112%88%-126%65%-121%-54%-96%67%75%52%-95%64%-78%68%9%-104%37%-90%-104%43%-70%117%107%20%12%54%79%68%93%-15%1%8%-41%-72%41%-37%-82%72%33%67%69%-40%-78%115%11%119%107%1%-125%69%-87%22%77%32%72%49%-68%-71%-42%19%7%-104%87%68%110%-79%-73%-13%-21%77%33%120%-72%72%-67%98%-118%3%-114%-79%-117%-1%15%74%66%1%-58%-18%21%51%52%28%-49%-98%102%-15%-13%23%48%-74%108%79%31%38%-126%-32%21%53%76%-56%-56%64%68%-3%-1%39%-107%-128%64%70%28%-8%-124%17%6%22%0%-88%96%71%5%18%104%-32%69%34%45%40%97%70%8%58%-104%-111%-128%19%102%-56%-101%111%24%53%-120%-47%77%26%-122%24%17%109%24%117%-16%-128%70%0%56%-96%-30%-118%44%-74%-24%-94%-118%13%112%40%-94%112%36%98%100%-63%3%-121%81%4%64%8%60%-10%-24%-29%-113%64%-122%-80%1%2%31%32%-58%-63%88%72%38%-87%-28%-110%76%54%-23%-28%-109%80%70%41%-91%84%30%-96%119%17%8%8%24%85%-47%124%27%105%16%27%98%36%32%48%-27%-104%100%-106%105%102%-103%14%76%-96%31%71%39%56%16%31%69%34%48%-80%-47%106%19%72%-25%-105%118%51%78%84%90%7%17%-112%116%-127%3%-31%69%-28%1%4%26%-107%-96%-64%103%19%-95%-112%-29%80%39%20%-112%-89%68%-125%-86%-128%66%1%118%110%20%2%2%-73%69%-92%38%-127%10%-32%23%81%10%12%68%-128%104%82%-42%61%10%81%105%2%-19%70%18%10%15%24%7%81%1%-127%82%-1%-108%-126%4%18%84%58%-111%9%2%0%64%-128%4%90%2%5%-99%-83%-90%10%84%-34%64%30%-106%-108%-87%67%17%90%-44%89%106%24%101%-80%80%96%-98%-58%84%97%-80%14%-31%41%16%10%8%-60%-70%-110%-75%20%117%16%-39%-100%5%44%-108%16%2%25%104%-101%-46%119%-26%6%59%44%65%-22%-55%-76%-18%68%41%76%16%-63%-94%23%97%32%-18%66%15%-48%-75%82%-69%-44%22%84%42%65%-88%-62%20%-16%104%12%104%80%-110%9%-9%-118%43%64%4%-37%-95%116%-64%94%-3%10%-12%43%-78%15%0%91%-46%-102%19%121%48%48%73%8%36%124%47%1%19%-8%71%82%-92%17%15%-12%111%65%-59%-98%4%2%4%22%15%-108%2%5%16%-48%-69%-111%5%30%123%124%-64%5%-47%90%-76%113%-65%41%20%32%-77%10%-17%5%-56%-64%-49%42%-104%-128%-106%74%26%-44%-84%-76%2%26%-92%27%81%-78%37%-85%-64%-17%-120%-21%-111%20%-126%2%16%63%4%-126%2%34%-89%-28%-127%-46%96%3%0%1%7%45%23%-60%109%-60%-24%82%-108%-127%3%68%79%-76%-10%-49%24%24%16%-64%0%4%-44%109%-9%-35%120%-25%-83%119%-35%3%-124%-1%-19%119%1%9%-68%-72%-30%2%3%8%110%-8%-31%-120%87%77%25%-97%22%-123%112%115%-39%16%109%-83%-8%67%37%104%0%-43%-27%-104%103%-82%-7%-26%-103%79%-32%55%-40%10%84%-16%65%-112%61%62%80%1%-23%-88%-89%-82%-70%105%-107%-19%44%17%10%23%28%-112%-106%-84%30%56%-16%0%-21%75%117%-16%121%-62%-28%58%77%-48%-60%81%-109%-116%-47%9%120%41%112%65%8%-8%-95%16%2%7%16%16%0%65%-81%77%113%-80%-69%66%-48%94%116%114%-60%72%113%68%-62%-97%29%43%116%-106%4%30%64%62%20%79%-97%-125%12%-3%111%-108%70%-83%-62%-69%-1%33%4%-10%-62%-93%102%52%117%-55%103%-45%71%2%-40%-7%-74%-83%26%120%-22%99%-88%32%5%30%123%-118%-17%46%-126%-79%-88%93%-81%61%39%-56%-43%-77%44%-112%51%-114%-72%46%88%-64%-5%15%0%19%2%-78%-82%-95%68%120%37%11%-38%127%68%32%-128%-123%53%76%96%-72%-29%25%-1%-2%115%2%-44%-24%-81%35%-20%-117%-40%-4%-44%119%-111%-6%81%43%109%44%-60%72%10%-5%-123%-63%24%110%-120%-123%15%-76%33%68%34%24%-79%26%-22%80%34%7%-92%-106%-86%-1%126%8%-81%17%-106%108%-122%68%124%-56%10%-5%-27%-62%36%22%4%-122%37%107%-108%19%39%-62%56%-11%5%113%-118%3%-55%-31%-93%120%-120%69%-126%-8%-112%90%86%-22%-30%64%-122%-120%54%35%-118%113%32%72%12%-42%18%-49%-40%-60%96%61%-20%-116%5%-111%-94%-6%-66%40%-58%43%-102%74%-117%83%-28%34%-75%64%112%34%56%18%36%-116%-44%106%35%22%-95%24%-79%52%118%113%-115%-63%18%36%22%-33%24%53%61%-118%-111%-114%-90%-78%35%22%-15%56%35%71%118%-111%-113%44%68%100%23%21%57%35%66%-62%-47%-112%-113%-46%36%22%69%-59%-62%-5%-8%113%32%-106%124%20%36%-79%40%-55%60%81%50%-119%-109%18%-97%-120%-96%118%74%81%-26%-119%-109%73%-12%36%-75%64%57%69%91%-50%-88%70%-89%124%101%-120%82%57%-59%85%-26%-87%-107%78%20%-90%-122%98%121%74%97%-103%71%125%-66%76%34%46%67%-92%75%49%-14%114%70%5%60%37%50%69%-92%76%29%18%115%70%-58%116%-30%54%67%-44%77%27%-10%-20%-124%26%-70%102%18%-93%25%-94%105%-2%-80%-102%-90%82%39%17%-85%24%-75%77%53%83%5%-27%-108%-48%55%-109%24%34%78%17%-115%-13%-121%100%-28%-103%-49%-18%41%79%13%-79%-13%-121%18%56%0%-30%22%-54%-48%-122%58%-12%-95%16%109%-111%25%97%18%16%0%59%">
+              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__6qyQHBZEd2Nss_u28cvSA" source="image_papyrus">
+                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__6qyQXBZEd2Nss_u28cvSA" key="image_kind_key" value="shape"/>
               </eAnnotations>
             </icon>
           </packagedElement>
         </packagedElement>
         <packagedElement xmi:type="uml:Profile" xmi:id="_Cf874BJeEdy3Td9UhuLFPg" name="SW_Brokering">
-          <packageImport xmi:id="_L2KdUBJeEdy3Td9UhuLFPg" importedPackage="_-1fcUBJdEdy3Td9UhuLFPg"/>
+          <packageImport xmi:type="uml:PackageImport" xmi:id="_L2KdUBJeEdy3Td9UhuLFPg" importedPackage="_-1fcUBJdEdy3Td9UhuLFPg"/>
           <packagedElement xmi:type="uml:Enumeration" xmi:id="_iJA2gBJtEdyNBsnA2HLmgg" name="AccessPolicyKind">
-            <ownedLiteral xmi:id="_j8KPIBJtEdyNBsnA2HLmgg" name="Read"/>
-            <ownedLiteral xmi:id="_kHofUBJtEdyNBsnA2HLmgg" name="Write"/>
-            <ownedLiteral xmi:id="_kOxpIBJtEdyNBsnA2HLmgg" name="ReadWrite"/>
-            <ownedLiteral xmi:id="_kU44MBJtEdyNBsnA2HLmgg" name="Undef"/>
-            <ownedLiteral xmi:id="_kaZqUBJtEdyNBsnA2HLmgg" name="Other"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_j8KPIBJtEdyNBsnA2HLmgg" name="Read"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_kHofUBJtEdyNBsnA2HLmgg" name="Write"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_kOxpIBJtEdyNBsnA2HLmgg" name="ReadWrite"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_kU44MBJtEdyNBsnA2HLmgg" name="Undef"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_kaZqUBJtEdyNBsnA2HLmgg" name="Other"/>
           </packagedElement>
           <packagedElement xmi:type="uml:Stereotype" xmi:id="_IXI-cBJuEdyNBsnA2HLmgg" name="DeviceBroker">
-            <generalization xmi:id="_mXGLEBJuEdyNBsnA2HLmgg" general="_b5kPgBJeEdy3Td9UhuLFPg"/>
-            <ownedAttribute xmi:id="_LCTkMBJuEdyNBsnA2HLmgg" name="accessPolicy" visibility="public" type="_iJA2gBJtEdyNBsnA2HLmgg" isUnique="false">
+            <generalization xmi:type="uml:Generalization" xmi:id="_mXGLEBJuEdyNBsnA2HLmgg" general="_b5kPgBJeEdy3Td9UhuLFPg"/>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_LCTkMBJuEdyNBsnA2HLmgg" name="accessPolicy" visibility="public" type="_iJA2gBJtEdyNBsnA2HLmgg" isUnique="false">
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_N-54MBJuEdyNBsnA2HLmgg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_N_DpMBJuEdyNBsnA2HLmgg" value="1"/>
               <defaultValue xmi:type="uml:LiteralString" xmi:id="_N_MzIBJuEdyNBsnA2HLmgg">
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_LFuroBJuEdyNBsnA2HLmgg" name="isBuffered" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_LFuroBJuEdyNBsnA2HLmgg" name="isBuffered" visibility="public" isUnique="false">
               <type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Q7NRQBJuEdyNBsnA2HLmgg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Q7XCQBJuEdyNBsnA2HLmgg" value="1"/>
@@ -3350,7 +3350,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_LI24IBJuEdyNBsnA2HLmgg" name="devices" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_LI24IBJuEdyNBsnA2HLmgg" name="devices" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_V94g8BJuEdyNBsnA2HLmgg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_V-CR8BJuEdyNBsnA2HLmgg" value="*"/>
@@ -3358,7 +3358,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_LMbwkBJuEdyNBsnA2HLmgg" name="closeServices" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_LMbwkBJuEdyNBsnA2HLmgg" name="closeServices" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Y-zUQBJuEdyNBsnA2HLmgg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Y-9FQBJuEdyNBsnA2HLmgg" value="*"/>
@@ -3366,7 +3366,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_LSZOoBJuEdyNBsnA2HLmgg" name="controlServices" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_LSZOoBJuEdyNBsnA2HLmgg" name="controlServices" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_cUk9QBJuEdyNBsnA2HLmgg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cUuuQBJuEdyNBsnA2HLmgg" value="*"/>
@@ -3374,7 +3374,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_LV-HEBJuEdyNBsnA2HLmgg" name="openServices" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_LV-HEBJuEdyNBsnA2HLmgg" name="openServices" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_fHMO0BJuEdyNBsnA2HLmgg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fHV_0BJuEdyNBsnA2HLmgg" value="*"/>
@@ -3382,7 +3382,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_LZ_rcBJuEdyNBsnA2HLmgg" name="readServices" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_LZ_rcBJuEdyNBsnA2HLmgg" name="readServices" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_huMGQBJuEdyNBsnA2HLmgg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_huV3QBJuEdyNBsnA2HLmgg" value="*"/>
@@ -3390,7 +3390,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_Ld3e0BJuEdyNBsnA2HLmgg" name="writeServices" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_Ld3e0BJuEdyNBsnA2HLmgg" name="writeServices" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kU5CwBJuEdyNBsnA2HLmgg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kVCzwBJuEdyNBsnA2HLmgg" value="*"/>
@@ -3398,27 +3398,27 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <icon xmi:id="_iSnvUHBZEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%20%0%112%0%0%44%0%0%0%0%33%0%20%0%-121%0%0%0%8%8%8%24%24%24%32%32%32%40%40%40%48%48%48%56%56%56%64%64%64%72%72%72%80%80%80%85%85%85%89%89%89%97%97%97%105%105%105%113%113%113%-123%-123%-123%-115%-115%-115%-107%-107%-107%-103%-103%-103%-99%-99%-99%-91%-91%-91%-66%-66%-66%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-92%0%19%0%24%72%-80%-96%-63%-125%8%9%22%24%96%33%-125%3%1%9%35%30%12%-80%-64%-126%6%0%12%17%64%-72%-96%-95%-93%-57%-113%32%67%118%-52%64%-31%-128%5%-116%15%26%-120%92%-55%-46%35%-123%5%24%23%68%104%73%51%-92%-123%1%24%21%76%-88%-55%-77%-29%-51%-100%59%123%-42%-4%57%64%-89%-48%-95%56%-117%6%61%-54%-110%-88%81%-90%77%-109%62%-123%42%-46%-23%82%-86%32%-83%98%-83%42%-11%-22%86%-97%93%-65%102%77%42%83%-20%71%-94%18%18%-104%-11%8%-63%1%70%11%12%28%84%-104%75%-73%-82%-35%-69%117%35%28%-64%-16%86%3%-124%3%-128%3%11%30%76%88%112%3%12%23%9%24%40%-52%-72%49%-31%0%1%1%0%59%">
-              <eAnnotations xmi:id="_jSPZQHBZEd2Nss_u28cvSA" source="image_papyrus">
-                <details xmi:id="_jSYjMHBZEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+            <icon xmi:type="uml:Image" xmi:id="_iSnvUHBZEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%20%0%112%0%0%44%0%0%0%0%33%0%20%0%-121%0%0%0%8%8%8%24%24%24%32%32%32%40%40%40%48%48%48%56%56%56%64%64%64%72%72%72%80%80%80%85%85%85%89%89%89%97%97%97%105%105%105%113%113%113%-123%-123%-123%-115%-115%-115%-107%-107%-107%-103%-103%-103%-99%-99%-99%-91%-91%-91%-66%-66%-66%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-92%0%19%0%24%72%-80%-96%-63%-125%8%9%22%24%96%33%-125%3%1%9%35%30%12%-80%-64%-126%6%0%12%17%64%-72%-96%-95%-93%-57%-113%32%67%118%-52%64%-31%-128%5%-116%15%26%-120%92%-55%-46%35%-123%5%24%23%68%104%73%51%-92%-123%1%24%21%76%-88%-55%-77%-29%-51%-100%59%123%-42%-4%57%64%-89%-48%-95%56%-117%6%61%-54%-110%-88%81%-90%77%-109%62%-123%42%-46%-23%82%-86%32%-83%98%-83%42%-11%-22%86%-97%93%-65%102%77%42%83%-20%71%-94%18%18%-104%-11%8%-63%1%70%11%12%28%84%-104%75%-73%-82%-35%-69%117%35%28%-64%-16%86%3%-124%3%-128%3%11%30%76%88%112%3%12%23%9%24%40%-52%-72%49%-31%0%1%1%0%59%">
+              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jSPZQHBZEd2Nss_u28cvSA" source="image_papyrus">
+                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jSYjMHBZEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
               </eAnnotations>
             </icon>
-            <icon xmi:id="_CRJhcHBaEd2Nss_u28cvSA" content="71%73%70%56%57%97%-128%0%77%0%112%0%0%44%0%0%0%0%-128%0%77%0%-121%0%0%0%8%8%8%16%16%16%24%24%24%32%32%32%40%40%40%48%48%48%56%56%56%64%64%64%72%72%72%80%80%80%89%89%89%97%97%97%105%105%105%113%113%113%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-107%-107%-107%-99%-99%-99%-91%-91%-91%-82%-82%-82%-74%-74%-74%-66%-66%-66%-58%-58%-58%-50%-50%-50%-42%-42%-42%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%31%32%24%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%15%50%32%80%1%-125%-59%-117%24%51%106%-36%-56%-79%-93%-57%-113%32%67%-118%28%-103%17%0%1%14%32%82%-86%92%-55%-78%-91%-53%-105%48%99%-54%-100%73%-77%-90%77%-106%38%81%-34%-36%-55%-77%-89%-49%-97%52%115%-50%-76%0%65%96%-60%-93%72%-109%42%37%-88%0%-126%-124%13%51%-123%-66%-12%0%65%64%-45%8%36%-77%106%-35%-54%21%35%81%7%5%12%88%-120%41%-75%-91%-123%2%16%60%0%93%-53%-74%-83%75%13%10%18%116%120%89%118%37%5%5%115%-35%-22%-35%-69%-10%-62%1%-99%56%79%-74%-92%-64%-128%-81%-31%-61%60%57%32%0%-84%-78%46%8%12%8%16%75%-98%44%-109%-125%1%-75%43%-21%122%40%-112%-105%-78%-25%-49%32%36%56%8%-52%88%52%-24%-45%-98%13%104%-56%44%56%-27%7%2%-99%81%-53%-26%59%-95%1%107%-64%23%18%-52%-34%-51%-41%-61%-128%15%-115%91%-125%-128%0%-127%-73%113%-73%-86%-125%3%102%64%-31%-72%115%-96%8%48%40%87%-55%-4%-71%117%-98%-47%-89%-89%-84%126%-67%59%-51%-20%41%-53%114%-1%-9%78%-2%37%120%16%-30%-101%-105%95%-49%-14%124%122%-10%-16%83%-70%23%62%62%126%-7%-7%-53%-43%-37%-65%47%61%60%125%-3%-5%121%-121%31%117%0%6%120%-35%-128%-37%21%104%-32%115%8%-126%80%-33%-126%12%-10%-121%-34%127%16%118%-41%-32%-125%21%26%119%-95%-126%25%-18%-74%97%-121%17%106%-25%32%-121%32%-94%-10%97%-119%26%74%-8%30%-118%-68%-99%-56%-30%108%46%-66%104%-94%-118%20%-54%40%91%-116%54%126%-122%99%-114%-108%-19%-56%-93%100%62%-2%120%88%-112%66%-14%69%100%-111%122%29%-119%100%91%74%46%-71%86%-109%78%-2%4%101%-108%61%77%73%-27%78%86%94%105%83%-106%90%126%71%99%126%93%-18%-59%101%-104%49%-115%73%-90%121%95%18%120%38%-109%105%38%-72%38%91%102%-66%-71%82%-100%114%-54%-41%-26%-120%117%74%121%39%-122%121%-42%68%103%-99%127%-54%-39%-96%105%125%-14%84%0%84%-2%1%-106%-63%1%-123%-18%-60%1%1%-73%-83%-108%92%-93%53%17%23%-87%74%21%44%64%41%77%-101%-59%-26%-40%1%25%108%42%-109%3%18%-112%-58%-110%101%-104%-119%-38%82%110%45%57%6%-126%6%8%-92%120%-86%106%74%23%40%0%-100%-87%45%97%96%-64%5%-77%-126%-16%-63%3%9%-36%-118%107%75%28%36%112%94%-95%31%72%64%64%4%48%-71%-70%18%100%3%36%64%-36%-76%-44%86%107%-19%-75%-40%102%-85%-19%-74%-36%118%107%-83%3%8%4%-32%64%108%-83%10%7%83%7%23%120%-85%-18%-70%-20%-74%-69%-82%4%18%-110%101%110%-81%59%57%75%111%80%-13%-34%91%-109%-67%-6%-110%101%0%0%0%7%44%-16%-64%4%23%108%-16%-63%8%39%-84%-16%-62%12%55%76%-80%0%1%1%0%59%">
-              <eAnnotations xmi:id="_DEGoYHBaEd2Nss_u28cvSA" source="image_papyrus">
-                <details xmi:id="_DEQZYHBaEd2Nss_u28cvSA" key="image_kind_key" value="shape"/>
+            <icon xmi:type="uml:Image" xmi:id="_CRJhcHBaEd2Nss_u28cvSA" content="71%73%70%56%57%97%-128%0%77%0%112%0%0%44%0%0%0%0%-128%0%77%0%-121%0%0%0%8%8%8%16%16%16%24%24%24%32%32%32%40%40%40%48%48%48%56%56%56%64%64%64%72%72%72%80%80%80%89%89%89%97%97%97%105%105%105%113%113%113%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-107%-107%-107%-99%-99%-99%-91%-91%-91%-82%-82%-82%-74%-74%-74%-66%-66%-66%-58%-58%-58%-50%-50%-50%-42%-42%-42%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%31%32%24%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%15%50%32%80%1%-125%-59%-117%24%51%106%-36%-56%-79%-93%-57%-113%32%67%-118%28%-103%17%0%1%14%32%82%-86%92%-55%-78%-91%-53%-105%48%99%-54%-100%73%-77%-90%77%-106%38%81%-34%-36%-55%-77%-89%-49%-97%52%115%-50%-76%0%65%96%-60%-93%72%-109%42%37%-88%0%-126%-124%13%51%-123%-66%-12%0%65%64%-45%8%36%-77%106%-35%-54%21%35%81%7%5%12%88%-120%41%-75%-91%-123%2%16%60%0%93%-53%-74%-83%75%13%10%18%116%120%89%118%37%5%5%115%-35%-22%-35%-69%-10%-62%1%-99%56%79%-74%-92%-64%-128%-81%-31%-61%60%57%32%0%-84%-78%46%8%12%8%16%75%-98%44%-109%-125%1%-75%43%-21%122%40%-112%-105%-78%-25%-49%32%36%56%8%-52%88%52%-24%-45%-98%13%104%-56%44%56%-27%7%2%-99%81%-53%-26%59%-95%1%107%-64%23%18%-52%-34%-51%-41%-61%-128%15%-115%91%-125%-128%0%-127%-73%113%-73%-86%-125%3%102%64%-31%-72%115%-96%8%48%40%87%-55%-4%-71%117%-98%-47%-89%-89%-84%126%-67%59%-51%-20%41%-53%114%-1%-9%78%-2%37%120%16%-30%-101%-105%95%-49%-14%124%122%-10%-16%83%-70%23%62%62%126%-7%-7%-53%-43%-37%-65%47%61%60%125%-3%-5%121%-121%31%117%0%6%120%-35%-128%-37%21%104%-32%115%8%-126%80%-33%-126%12%-10%-121%-34%127%16%118%-41%-32%-125%21%26%119%-95%-126%25%-18%-74%97%-121%17%106%-25%32%-121%32%-94%-10%97%-119%26%74%-8%30%-118%-68%-99%-56%-30%108%46%-66%104%-94%-118%20%-54%40%91%-116%54%126%-122%99%-114%-108%-19%-56%-93%100%62%-2%120%88%-112%66%-14%69%100%-111%122%29%-119%100%91%74%46%-71%86%-109%78%-2%4%101%-108%61%77%73%-27%78%86%94%105%83%-106%90%126%71%99%126%93%-18%-59%101%-104%49%-115%73%-90%121%95%18%120%38%-109%105%38%-72%38%91%102%-66%-71%82%-100%114%-54%-41%-26%-120%117%74%121%39%-122%121%-42%68%103%-99%127%-54%-39%-96%105%125%-14%84%0%84%-2%1%-106%-63%1%-123%-18%-60%1%1%-73%-83%-108%92%-93%53%17%23%-87%74%21%44%64%41%77%-101%-59%-26%-40%1%25%108%42%-109%3%18%-112%-58%-110%101%-104%-119%-38%82%110%45%57%6%-126%6%8%-92%120%-86%106%74%23%40%0%-100%-87%45%97%96%-64%5%-77%-126%-16%-63%3%9%-36%-118%107%75%28%36%112%94%-95%31%72%64%64%4%48%-71%-70%18%100%3%36%64%-36%-76%-44%86%107%-19%-75%-40%102%-85%-19%-74%-36%118%107%-83%3%8%4%-32%64%108%-83%10%7%83%7%23%120%-85%-18%-70%-20%-74%-69%-82%4%18%-110%101%110%-81%59%57%75%111%80%-13%-34%91%-109%-67%-6%-110%101%0%0%0%7%44%-16%-64%4%23%108%-16%-63%8%39%-84%-16%-62%12%55%76%-80%0%1%1%0%59%">
+              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_DEGoYHBaEd2Nss_u28cvSA" source="image_papyrus">
+                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DEQZYHBaEd2Nss_u28cvSA" key="image_kind_key" value="shape"/>
               </eAnnotations>
             </icon>
           </packagedElement>
           <packagedElement xmi:type="uml:Stereotype" xmi:id="_ovMq4BJuEdyNBsnA2HLmgg" name="MemoryBroker">
-            <generalization xmi:id="_QDqIwBJvEdyNBsnA2HLmgg" general="_b5kPgBJeEdy3Td9UhuLFPg"/>
-            <ownedAttribute xmi:id="_qC68kBJuEdyNBsnA2HLmgg" name="accessPolicy" visibility="public" type="_iJA2gBJtEdyNBsnA2HLmgg" isUnique="false">
+            <generalization xmi:type="uml:Generalization" xmi:id="_QDqIwBJvEdyNBsnA2HLmgg" general="_b5kPgBJeEdy3Td9UhuLFPg"/>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_qC68kBJuEdyNBsnA2HLmgg" name="accessPolicy" visibility="public" type="_iJA2gBJtEdyNBsnA2HLmgg" isUnique="false">
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t8AG8BJuEdyNBsnA2HLmgg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t8J38BJuEdyNBsnA2HLmgg" value="1"/>
               <defaultValue xmi:type="uml:LiteralString" xmi:id="_t8To8BJuEdyNBsnA2HLmgg">
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_qGyv8BJuEdyNBsnA2HLmgg" name="memories" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_qGyv8BJuEdyNBsnA2HLmgg" name="memories" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wWWCcBJuEdyNBsnA2HLmgg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wWfzcBJuEdyNBsnA2HLmgg" value="*"/>
@@ -3426,7 +3426,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_q-DvIBJuEdyNBsnA2HLmgg" name="memoryBlockAdressElements" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_q-DvIBJuEdyNBsnA2HLmgg" name="memoryBlockAdressElements" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2zwx0BJuEdyNBsnA2HLmgg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2z57wBJuEdyNBsnA2HLmgg" value="*"/>
@@ -3434,7 +3434,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_rCYOcBJuEdyNBsnA2HLmgg" name="memoryBlockSizeElements" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_rCYOcBJuEdyNBsnA2HLmgg" name="memoryBlockSizeElements" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ERKyIBJvEdyNBsnA2HLmgg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ERUjIBJvEdyNBsnA2HLmgg" value="*"/>
@@ -3442,7 +3442,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_rHTKsBJuEdyNBsnA2HLmgg" name="lockServices" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_rHTKsBJuEdyNBsnA2HLmgg" name="lockServices" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_GyOZoBJvEdyNBsnA2HLmgg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GyXjkBJvEdyNBsnA2HLmgg" value="*"/>
@@ -3450,7 +3450,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_rLd5ABJuEdyNBsnA2HLmgg" name="unlockServices" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_rLd5ABJuEdyNBsnA2HLmgg" name="unlockServices" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_JUm20BJvEdyNBsnA2HLmgg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JUwn0BJvEdyNBsnA2HLmgg" value="*"/>
@@ -3458,7 +3458,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_rPfdYBJuEdyNBsnA2HLmgg" name="mapServices" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_rPfdYBJuEdyNBsnA2HLmgg" name="mapServices" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LgrFwBJvEdyNBsnA2HLmgg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Lg0PsBJvEdyNBsnA2HLmgg" value="*"/>
@@ -3466,7 +3466,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_rTNfwBJuEdyNBsnA2HLmgg" name="unMapServices" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_rTNfwBJuEdyNBsnA2HLmgg" name="unMapServices" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NgYTsBJvEdyNBsnA2HLmgg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NgiEsBJvEdyNBsnA2HLmgg" value="*"/>
@@ -3474,64 +3474,64 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <icon xmi:id="_kopykHBZEd2Nss_u28cvSA" content="71%73%70%56%57%97%24%0%20%0%112%0%0%44%0%0%0%0%24%0%20%0%-121%0%0%0%4%4%4%8%8%8%12%12%12%16%16%16%20%20%20%24%24%24%32%32%32%36%36%36%40%40%40%44%44%44%48%48%48%56%56%56%60%60%60%64%64%64%68%68%68%72%72%72%80%80%80%89%89%89%97%97%97%101%101%101%105%105%105%113%113%113%121%121%121%125%125%125%-123%-123%-123%-119%-119%-119%-115%-115%-115%-99%-99%-99%-91%-91%-91%-82%-82%-82%-78%-78%-78%-74%-74%-74%-66%-66%-66%-62%-62%-62%-58%-58%-58%-50%-50%-50%-42%-42%-42%-38%-38%-38%-34%-34%-34%-30%-30%-30%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%51%56%24%72%-80%-96%-63%-125%14%44%28%-24%16%-94%-95%-61%-121%16%35%2%56%112%-126%-123%-59%-117%44%82%60%76%-127%17%-29%-60%-118%23%61%72%16%96%-96%-96%1%1%18%58%-84%-16%72%-47%34%-119%4%17%84%118%100%-79%-94%-125%-124%3%35%46%126%100%-63%-127%65%-119%-103%51%83%48%-32%96%-15%35%-119%5%43%-127%2%93%64%-126%-59%71%9%20%-108%42%-67%16%-63%41%69%4%14%-92%2%-123%-128%-64%-22%-119%3%1%66%104%-59%56%98%-64%1%-81%6%74%94%0%-87%52%-123%-64%3%5%-68%62%0%96%34%-61%-127%5%24%64%-124%56%-95%49%4%6%7%6%46%-96%0%-48%-64%-85%5%3%0%48%-80%32%-127%1%-126%-125%3%37%29%96%16%-53%1%-128%-127%10%94%61%-60%4%0%64%-63%-121%-103%32%22%112%-34%48%-127%-24%-50%8%23%88%104%40%-64%25%64%-128%0%-83%9%88%96%-79%1%66%-47%-106%44%50%12%85%97%81%68%-123%10%32%44%-42%-124%48%-5%54%-37%17%19%8%56%-72%-128%-127%67%7%12%127%9%72%8%-82%19%55%-58%16%25%48%76%-112%0%61%68%82%-106%108%-57%2%11%5%-32%-96%-75%-7%-13%-24%-51%31%8%8%0%59%">
-              <eAnnotations xmi:id="_lOpbkHBZEd2Nss_u28cvSA" source="image_papyrus">
-                <details xmi:id="_lOylgHBZEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+            <icon xmi:type="uml:Image" xmi:id="_kopykHBZEd2Nss_u28cvSA" content="71%73%70%56%57%97%24%0%20%0%112%0%0%44%0%0%0%0%24%0%20%0%-121%0%0%0%4%4%4%8%8%8%12%12%12%16%16%16%20%20%20%24%24%24%32%32%32%36%36%36%40%40%40%44%44%44%48%48%48%56%56%56%60%60%60%64%64%64%68%68%68%72%72%72%80%80%80%89%89%89%97%97%97%101%101%101%105%105%105%113%113%113%121%121%121%125%125%125%-123%-123%-123%-119%-119%-119%-115%-115%-115%-99%-99%-99%-91%-91%-91%-82%-82%-82%-78%-78%-78%-74%-74%-74%-66%-66%-66%-62%-62%-62%-58%-58%-58%-50%-50%-50%-42%-42%-42%-38%-38%-38%-34%-34%-34%-30%-30%-30%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%51%56%24%72%-80%-96%-63%-125%14%44%28%-24%16%-94%-95%-61%-121%16%35%2%56%112%-126%-123%-59%-117%44%82%60%76%-127%17%-29%-60%-118%23%61%72%16%96%-96%-96%1%1%18%58%-84%-16%72%-47%34%-119%4%17%84%118%100%-79%-94%-125%-124%3%35%46%126%100%-63%-127%65%-119%-103%51%83%48%-32%96%-15%35%-119%5%43%-127%2%93%64%-126%-59%71%9%20%-108%42%-67%16%-63%41%69%4%14%-92%2%-123%-128%-64%-22%-119%3%1%66%104%-59%56%98%-64%1%-81%6%74%94%0%-87%52%-123%-64%3%5%-68%62%0%96%34%-61%-127%5%24%64%-124%56%-95%49%4%6%7%6%46%-96%0%-48%-64%-85%5%3%0%48%-80%32%-127%1%-126%-125%3%37%29%96%16%-53%1%-128%-127%10%94%61%-60%4%0%64%-63%-121%-103%32%22%112%-34%48%-127%-24%-50%8%23%88%104%40%-64%25%64%-128%0%-83%9%88%96%-79%1%66%-47%-106%44%50%12%85%97%81%68%-123%10%32%44%-42%-124%48%-5%54%-37%17%19%8%56%-72%-128%-127%67%7%12%127%9%72%8%-82%19%55%-58%16%25%48%76%-112%0%61%68%82%-106%108%-57%2%11%5%-32%-96%-75%-7%-13%-24%-51%31%8%8%0%59%">
+              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lOpbkHBZEd2Nss_u28cvSA" source="image_papyrus">
+                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lOylgHBZEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
               </eAnnotations>
             </icon>
-            <icon xmi:id="_FtqEkHBaEd2Nss_u28cvSA" content="71%73%70%56%57%97%94%0%77%0%112%0%0%44%0%0%0%0%94%0%77%0%-121%0%0%0%4%4%4%8%8%8%12%12%12%16%16%16%20%20%20%24%24%24%28%28%28%32%32%32%36%36%36%40%40%40%44%44%44%48%48%48%52%52%52%56%56%56%60%60%60%64%64%64%68%68%68%72%72%72%76%76%76%80%80%80%85%85%85%89%89%89%97%97%97%105%105%105%109%109%109%113%113%113%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-107%-107%-107%-103%-103%-103%-99%-99%-99%-95%-95%-95%-91%-91%-91%-86%-86%-86%-82%-82%-82%-74%-74%-74%-66%-66%-66%-62%-62%-62%-58%-58%-58%-54%-54%-54%-50%-50%-50%-46%-46%-46%-42%-42%-42%-38%-38%-38%-34%-34%-34%-30%-30%-30%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%99%-100%24%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%19%47%36%48%-128%64%-79%-94%-59%-117%24%51%106%-36%-56%-79%-93%71%-113%14%20%64%56%65%-93%-92%-55%-109%40%83%-86%92%-55%-78%-91%-53%-105%47%95%32%24%9%-77%-90%-51%-101%56%109%-54%-92%-103%-77%-89%-49%-97%46%119%-110%4%74%-76%-88%79%-95%70%-109%42%-115%57%115%-24%-46%-89%80%105%32%-115%74%53%-23%-44%-86%43%5%-98%-104%-127%-107%-27%85%-88%43%74%112%-96%0%65%1%-128%-77%0%12%80%20%-128%22%-128%3%8%23%56%64%-84%-6%-75%-24%-117%15%22%24%0%96%64%-127%67%-119%19%45%94%-90%56%17%-126%3%4%4%0%32%96%24%33%99%105%-35%-98%50%74%96%64%-128%96%-15%-118%-92%39%-16%18%96%-80%-63%41%-48%-57%55%83%88%32%64%-31%-61%11%-84%43%58%64%32%-96%-31%-12%79%-48%47%103%-124%96%-32%96%68%-41%-108%50%60%32%-96%96%-30%104%-45%-100%29%16%92%-72%124%-101%101%9%9%10%122%-29%-124%-67%50%-123%-126%13%49%-118%-61%108%33%65%66%116%-99%-65%97%-58%-72%-32%32%-80%116%-101%38%16%116%-1%-32%10%-109%-7%-55%21%10%66%124%-49%57%99%-125%-125%-58%76%121%-74%92%1%1%-2%-6%-100%-12%-19%123%-51%-50%-46%68%-3%-5%63%-27%23%20%127%42%-103%64%-127%126%0%-30%-9%-33%126%-14%-31%-90%-64%117%9%-2%84%2%5%45%49%-121%-63%7%17%22%37%-127%114%42%-63%-74%2%3%25%22%-43%2%3%-28%-91%4%91%-125%33%-6%116%-31%74%-96%-55%96%64%-119%41%-6%116%2%4%44%18%104%-110%9%18%-60%72%-44%12%2%-44%-120%98%73%120%-23%72%-44%0%8%-106%4%-38%3%13%8%9%20%0%40%116%104%99%73%15%40%-96%-28%79%76%58%-7%35%13%15%16%48%101%79%43%84%105%-30%-109%88%2%64%-36%-106%54%113%-32%37%74%71%26%96%1%-103%54%-55%96%86%-109%95%94%-7%-64%3%87%-78%-103%-110%6%30%4%0%39%-102%96%-50%57%34%-116%118%-90%-12%33%13%122%90%-23%-103%73%115%-46%-48%-127%6%-127%-82%36%3%4%-105%21%26%-25%-95%80%62%80%82%7%23%52%-118%-46%-93%-60%73%-54%-89%-100%8%-104%20%2%5%-128%-78%-7%2%3%99%2%64%-87%84%96%54%-48%-93%73%37%64%-1%-112%66%-93%35%56%-32%90%73%0%-80%96%-88%74%19%0%-128%82%10%14%104%80%100%-116%-44%89%0%33%13%42%0%112%-21%73%-96%-103%-23%66%74%30%40%96%-101%-112%51%112%-64%0%-121%38%69%-96%-20%-82%41%-103%-103%100%74%49%88%-128%-64%7%-61%126%-9%-62%6%6%112%80%42%-95%-37%78%-86%18%7%-67%-86%-64%34%6%6%96%-32%-35%122%6%-118%87%-82%5%1%32%-80%-84%73%-51%114%-48%-64%0%45%-51%-16%-127%2%14%116%48%43%86%51%-104%-96%-127%2%18%-108%-48%-110%12%0%-112%-32%47%-73%40%113%-96%46%0%28%8%-26%30%105%-90%45%-107%-126%106%2%72%-32%-63%-67%44%25%-112%0%13%23%-69%-37%109%-57%38%0%-64%40%76%-111%77%-26%-106%5%28%-104%-128%-78%96%35%112%-128%-100%91%-99%-39%-76%64%1%92%-75%-4%-23%-86%26%-105%-92%66%0%24%-28%-108%66%-49%63%3%32%-64%70%14%-96%-27%0%-50%58%-25%-124%0%-47%37%25%-51%44%-104%31%52%93%18%11%1%124%11%-44%12%10%45%12%20%12%4%-68%104%-110%1%-57%2%12%-26%-124%39%-55%48%64%0%34%-40%-103%1%0%11%-96%-1%-28%43%-58%95%-89%68%1%0%10%-108%27%33%11%108%97%120%30%-120%-128%-97%-92%-64%-50%52%-60%80%0%0%18%-64%16%35%10%102%61%80%106%-46%-115%-117%-102%-87%74%121%2%112%-64%-98%-9%117%64%0%0%5%-112%110%-46%12%8%-60%45%119%-99%52%56%-96%118%74%36%28%32%-75%6%-106%23%-121%-126%4%103%45%-16%-17%73%27%116%-64%-32%-86%37%13%90%-31%3%103%5%-96%-128%7%81%-63%-96%-127%-19%0%48%109%56%13%43%56%-80%-82%-111%96%-102%-76%-63%6%48%-83%64%-63%-28%82%47%80%1%-13%62%-63%-32%-63%97%1%-100%117%0%6%-65%-89%52%-125%4%-60%99%15%123%73%28%-52%92%83%9%17%16%-112%-2%89%2%44%-32%-1%2%28%-16%-128%0%7%120%-127%-1%33%-128%45%-4%51%0%5%-58%-12%18%25%56%0%91%-99%-125%-42%-25%114%114%-126%13%-28%-113%0%24%108%75%91%48%-40%-74%8%-128%-128%-127%109%-126%84%124%-30%119%-110%16%72%0%114%83%50%-127%3%64%-24%35%18%-98%-60%4%12%24%15%-103%-74%115%-62%-102%-104%7%37%-19%97%-64%-20%98%20%-126%-12%-36%-28%-122%41%105%-127%3%-67%34%-106%34%-125%41%-32%2%-45%-117%-32%75%-14%-43%-127%36%70%-27%5%-12%-78%87%79%-128%-24%21%116%93%32%4%-82%-125%74%11%60%32%-127%113%57%113%120%59%10%-63%5%12%-96%0%13%-104%-32%122%62%-119%-63%8%-58%88%70%8%78%49%123%61%-39%-94%4%4%0%49%14%-116%96%-121%-79%-55%-52%6%32%96%0%53%97%81%41%84%-52%73%11%76%-64%1%11%84%77%36%21%-63%-128%-58%52%102%1%-117%16%96%106%24%-24%-64%9%-78%104%23%56%46%-91%5%5%-7%-64%34%-19%88%-112%47%86%114%126%-102%122%-115%37%67%-23%27%80%-110%50%39%-127%60%-91%13%71%-87%-54%31%-78%-78%-107%-85%52%37%44%-53%51%-109%-72%108%-14%-106%-72%-52%-91%46%119%-55%-53%94%-6%-14%-105%-101%-44%0%2%-60%2%-52%98%26%-13%-104%-56%-20%101%8%2%2%0%59%">
-              <eAnnotations xmi:id="_GS6GsHBaEd2Nss_u28cvSA" source="image_papyrus">
-                <details xmi:id="_GTDQoHBaEd2Nss_u28cvSA" key="image_kind_key" value="shape"/>
+            <icon xmi:type="uml:Image" xmi:id="_FtqEkHBaEd2Nss_u28cvSA" content="71%73%70%56%57%97%94%0%77%0%112%0%0%44%0%0%0%0%94%0%77%0%-121%0%0%0%4%4%4%8%8%8%12%12%12%16%16%16%20%20%20%24%24%24%28%28%28%32%32%32%36%36%36%40%40%40%44%44%44%48%48%48%52%52%52%56%56%56%60%60%60%64%64%64%68%68%68%72%72%72%76%76%76%80%80%80%85%85%85%89%89%89%97%97%97%105%105%105%109%109%109%113%113%113%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-107%-107%-107%-103%-103%-103%-99%-99%-99%-95%-95%-95%-91%-91%-91%-86%-86%-86%-82%-82%-82%-74%-74%-74%-66%-66%-66%-62%-62%-62%-58%-58%-58%-54%-54%-54%-50%-50%-50%-46%-46%-46%-42%-42%-42%-38%-38%-38%-34%-34%-34%-30%-30%-30%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%99%-100%24%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%19%47%36%48%-128%64%-79%-94%-59%-117%24%51%106%-36%-56%-79%-93%71%-113%14%20%64%56%65%-93%-92%-55%-109%40%83%-86%92%-55%-78%-91%-53%-105%47%95%32%24%9%-77%-90%-51%-101%56%109%-54%-92%-103%-77%-89%-49%-97%46%119%-110%4%74%-76%-88%79%-95%70%-109%42%-115%57%115%-24%-46%-89%80%105%32%-115%74%53%-23%-44%-86%43%5%-98%-104%-127%-107%-27%85%-88%43%74%112%-96%0%65%1%-128%-77%0%12%80%20%-128%22%-128%3%8%23%56%64%-84%-6%-75%-24%-117%15%22%24%0%96%64%-127%67%-119%19%45%94%-90%56%17%-126%3%4%4%0%32%96%24%33%99%105%-35%-98%50%74%96%64%-128%96%-15%-118%-92%39%-16%18%96%-80%-63%41%-48%-57%55%83%88%32%64%-31%-61%11%-84%43%58%64%32%-96%-31%-12%79%-48%47%103%-124%96%-32%96%68%-41%-108%50%60%32%-96%96%-30%104%-45%-100%29%16%92%-72%124%-101%101%9%9%10%122%-29%-124%-67%50%-123%-126%13%49%-118%-61%108%33%65%66%116%-99%-65%97%-58%-72%-32%32%-80%116%-101%38%16%116%-1%-32%10%-109%-7%-55%21%10%66%124%-49%57%99%-125%-125%-58%76%121%-74%92%1%1%-2%-6%-100%-12%-19%123%-51%-50%-46%68%-3%-5%63%-27%23%20%127%42%-103%64%-127%126%0%-30%-9%-33%126%-14%-31%-90%-64%117%9%-2%84%2%5%45%49%-121%-63%7%17%22%37%-127%114%42%-63%-74%2%3%25%22%-43%2%3%-28%-91%4%91%-125%33%-6%116%-31%74%-96%-55%96%64%-119%41%-6%116%2%4%44%18%104%-110%9%18%-60%72%-44%12%2%-44%-120%98%73%120%-23%72%-44%0%8%-106%4%-38%3%13%8%9%20%0%40%116%104%99%73%15%40%-96%-28%79%76%58%-7%35%13%15%16%48%101%79%43%84%105%-30%-109%88%2%64%-36%-106%54%113%-32%37%74%71%26%96%1%-103%54%-55%96%86%-109%95%94%-7%-64%3%87%-78%-103%-110%6%30%4%0%39%-102%96%-50%57%34%-116%118%-90%-12%33%13%122%90%-23%-103%73%115%-46%-48%-127%6%-127%-82%36%3%4%-105%21%26%-25%-95%80%62%80%82%7%23%52%-118%-46%-93%-60%73%-54%-89%-100%8%-104%20%2%5%-128%-78%-7%2%3%99%2%64%-87%84%96%54%-48%-93%73%37%64%-1%-112%66%-93%35%56%-32%90%73%0%-80%96%-88%74%19%0%-128%82%10%14%104%80%100%-116%-44%89%0%33%13%42%0%112%-21%73%-96%-103%-23%66%74%30%40%96%-101%-112%51%112%-64%0%-121%38%69%-96%-20%-82%41%-103%-103%100%74%49%88%-128%-64%7%-61%126%-9%-62%6%6%112%80%42%-95%-37%78%-86%18%7%-67%-86%-64%34%6%6%96%-32%-35%122%6%-118%87%-82%5%1%32%-80%-84%73%-51%114%-48%-64%0%45%-51%-16%-127%2%14%116%48%43%86%51%-104%-96%-127%2%18%-108%-48%-110%12%0%-112%-32%47%-73%40%113%-96%46%0%28%8%-26%30%105%-90%45%-107%-126%106%2%72%-32%-63%-67%44%25%-112%0%13%23%-69%-37%109%-57%38%0%-64%40%76%-111%77%-26%-106%5%28%-104%-128%-78%96%35%112%-128%-100%91%-99%-39%-76%64%1%92%-75%-4%-23%-86%26%-105%-92%66%0%24%-28%-108%66%-49%63%3%32%-64%70%14%-96%-27%0%-50%58%-25%-124%0%-47%37%25%-51%44%-104%31%52%93%18%11%1%124%11%-44%12%10%45%12%20%12%4%-68%104%-110%1%-57%2%12%-26%-124%39%-55%48%64%0%34%-40%-103%1%0%11%-96%-1%-28%43%-58%95%-89%68%1%0%10%-108%27%33%11%108%97%120%30%-120%-128%-97%-92%-64%-50%52%-60%80%0%0%18%-64%16%35%10%102%61%80%106%-46%-115%-117%-102%-87%74%121%2%112%-64%-98%-9%117%64%0%0%5%-112%110%-46%12%8%-60%45%119%-99%52%56%-96%118%74%36%28%32%-75%6%-106%23%-121%-126%4%103%45%-16%-17%73%27%116%-64%-32%-86%37%13%90%-31%3%103%5%-96%-128%7%81%-63%-96%-127%-19%0%48%109%56%13%43%56%-80%-82%-111%96%-102%-76%-63%6%48%-83%64%-63%-28%82%47%80%1%-13%62%-63%-32%-63%97%1%-100%117%0%6%-65%-89%52%-125%4%-60%99%15%123%73%28%-52%92%83%9%17%16%-112%-2%89%2%44%-32%-1%2%28%-16%-128%0%7%120%-127%-1%33%-128%45%-4%51%0%5%-58%-12%18%25%56%0%91%-99%-125%-42%-25%114%114%-126%13%-28%-113%0%24%108%75%91%48%-40%-74%8%-128%-128%-127%109%-126%84%124%-30%119%-110%16%72%0%114%83%50%-127%3%64%-24%35%18%-98%-60%4%12%24%15%-103%-74%115%-62%-102%-104%7%37%-19%97%-64%-20%98%20%-126%-12%-36%-28%-122%41%105%-127%3%-67%34%-106%34%-125%41%-32%2%-45%-117%-32%75%-14%-43%-127%36%70%-27%5%-12%-78%87%79%-128%-24%21%116%93%32%4%-82%-125%74%11%60%32%-127%113%57%113%120%59%10%-63%5%12%-96%0%13%-104%-32%122%62%-119%-63%8%-58%88%70%8%78%49%123%61%-39%-94%4%4%0%49%14%-116%96%-121%-79%-55%-52%6%32%96%0%53%97%81%41%84%-52%73%11%76%-64%1%11%84%77%36%21%-63%-128%-58%52%102%1%-117%16%96%106%24%-24%-64%9%-78%104%23%56%46%-91%5%5%-7%-64%34%-19%88%-112%47%86%114%126%-102%122%-115%37%67%-23%27%80%-110%50%39%-127%60%-91%13%71%-87%-54%31%-78%-78%-107%-85%52%37%44%-53%51%-109%-72%108%-14%-106%-72%-52%-91%46%119%-55%-53%94%-6%-14%-105%-101%-44%0%2%-60%2%-52%98%26%-13%-104%-56%-20%101%8%2%2%0%59%">
+              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GS6GsHBaEd2Nss_u28cvSA" source="image_papyrus">
+                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GTDQoHBaEd2Nss_u28cvSA" key="image_kind_key" value="shape"/>
               </eAnnotations>
             </icon>
           </packagedElement>
         </packagedElement>
         <packagedElement xmi:type="uml:Profile" xmi:id="_EIfnABJeEdy3Td9UhuLFPg" name="SW_Interaction">
-          <packageImport xmi:id="_LLa3MBJeEdy3Td9UhuLFPg" importedPackage="_-1fcUBJdEdy3Td9UhuLFPg"/>
+          <packageImport xmi:type="uml:PackageImport" xmi:id="_LLa3MBJeEdy3Td9UhuLFPg" importedPackage="_-1fcUBJdEdy3Td9UhuLFPg"/>
           <packagedElement xmi:type="uml:Enumeration" xmi:id="_qdRlABJoEdy4mPo_dcOmkg" name="QueuePolicyKind">
-            <ownedLiteral xmi:id="_smHg0BJoEdy4mPo_dcOmkg" name="FIFO"/>
-            <ownedLiteral xmi:id="_ssG0EBJoEdy4mPo_dcOmkg" name="LIFO"/>
-            <ownedLiteral xmi:id="_sxylUBJoEdy4mPo_dcOmkg" name="Priority"/>
-            <ownedLiteral xmi:id="_s3UlkBJoEdy4mPo_dcOmkg" name="Undef"/>
-            <ownedLiteral xmi:id="_v-PTMBJoEdy4mPo_dcOmkg" name="Other"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_smHg0BJoEdy4mPo_dcOmkg" name="FIFO"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ssG0EBJoEdy4mPo_dcOmkg" name="LIFO"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_sxylUBJoEdy4mPo_dcOmkg" name="Priority"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_s3UlkBJoEdy4mPo_dcOmkg" name="Undef"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_v-PTMBJoEdy4mPo_dcOmkg" name="Other"/>
           </packagedElement>
           <packagedElement xmi:type="uml:Enumeration" xmi:id="_xPJhcBJoEdy4mPo_dcOmkg" name="MessageResourceKind">
-            <ownedLiteral xmi:id="_y7bdEBJoEdy4mPo_dcOmkg" name="MessageQueue"/>
-            <ownedLiteral xmi:id="_zJypMBJoEdy4mPo_dcOmkg" name="Pipe"/>
-            <ownedLiteral xmi:id="_zPLfgBJoEdy4mPo_dcOmkg" name="Blackboard"/>
-            <ownedLiteral xmi:id="_zVwooBJoEdy4mPo_dcOmkg" name="Undef"/>
-            <ownedLiteral xmi:id="_zcCPwBJoEdy4mPo_dcOmkg" name="Other"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_y7bdEBJoEdy4mPo_dcOmkg" name="MessageQueue"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_zJypMBJoEdy4mPo_dcOmkg" name="Pipe"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_zPLfgBJoEdy4mPo_dcOmkg" name="Blackboard"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_zVwooBJoEdy4mPo_dcOmkg" name="Undef"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_zcCPwBJoEdy4mPo_dcOmkg" name="Other"/>
           </packagedElement>
           <packagedElement xmi:type="uml:Enumeration" xmi:id="_5CilQBJoEdy4mPo_dcOmkg" name="NotificationKind">
-            <ownedLiteral xmi:id="_6hXTsBJoEdy4mPo_dcOmkg" name="Memorized"/>
-            <ownedLiteral xmi:id="_6mcoABJoEdy4mPo_dcOmkg" name="Bounded"/>
-            <ownedLiteral xmi:id="_6rPBYBJoEdy4mPo_dcOmkg" name="Memoryless"/>
-            <ownedLiteral xmi:id="_6v3pwBJoEdy4mPo_dcOmkg" name="Undef"/>
-            <ownedLiteral xmi:id="_-vKw4BJoEdy4mPo_dcOmkg" name="Other"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_6hXTsBJoEdy4mPo_dcOmkg" name="Memorized"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_6mcoABJoEdy4mPo_dcOmkg" name="Bounded"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_6rPBYBJoEdy4mPo_dcOmkg" name="Memoryless"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_6v3pwBJoEdy4mPo_dcOmkg" name="Undef"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_-vKw4BJoEdy4mPo_dcOmkg" name="Other"/>
           </packagedElement>
           <packagedElement xmi:type="uml:Enumeration" xmi:id="_AJDU8BJpEdy4mPo_dcOmkg" name="NotificationResourceKind">
-            <ownedLiteral xmi:id="_BudMgBJpEdy4mPo_dcOmkg" name="Event"/>
-            <ownedLiteral xmi:id="_B4ocMBJpEdy4mPo_dcOmkg" name="Barrier"/>
-            <ownedLiteral xmi:id="_B-6DUBJpEdy4mPo_dcOmkg" name="Undef"/>
-            <ownedLiteral xmi:id="_CQaDABJpEdy4mPo_dcOmkg" name="Other"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_BudMgBJpEdy4mPo_dcOmkg" name="Event"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_B4ocMBJpEdy4mPo_dcOmkg" name="Barrier"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_B-6DUBJpEdy4mPo_dcOmkg" name="Undef"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_CQaDABJpEdy4mPo_dcOmkg" name="Other"/>
           </packagedElement>
           <packagedElement xmi:type="uml:Enumeration" xmi:id="_H1teoBJpEdy4mPo_dcOmkg" name="MutualExclusionResourceKind">
-            <ownedLiteral xmi:id="_JksI8BJpEdy4mPo_dcOmkg" name="BooleanSemaphore"/>
-            <ownedLiteral xmi:id="_JrHhEBJpEdy4mPo_dcOmkg" name="CountSemaphore"/>
-            <ownedLiteral xmi:id="_JwphUBJpEdy4mPo_dcOmkg" name="Mutex"/>
-            <ownedLiteral xmi:id="_J1SwwBJpEdy4mPo_dcOmkg" name="Undef"/>
-            <ownedLiteral xmi:id="_J6EjEBJpEdy4mPo_dcOmkg" name="Other"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_JksI8BJpEdy4mPo_dcOmkg" name="BooleanSemaphore"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_JrHhEBJpEdy4mPo_dcOmkg" name="CountSemaphore"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_JwphUBJpEdy4mPo_dcOmkg" name="Mutex"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_J1SwwBJpEdy4mPo_dcOmkg" name="Undef"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_J6EjEBJpEdy4mPo_dcOmkg" name="Other"/>
           </packagedElement>
           <packagedElement xmi:type="uml:Enumeration" xmi:id="_PhoBcBJpEdy4mPo_dcOmkg" name="ConcurrentAccessProtocolKind">
-            <ownedLiteral xmi:id="_ScB9EBJpEdy4mPo_dcOmkg" name="PIP"/>
-            <ownedLiteral xmi:id="_SgWcYBJpEdy4mPo_dcOmkg" name="PCP"/>
-            <ownedLiteral xmi:id="_SluEkBJpEdy4mPo_dcOmkg" name="NoPreemption"/>
-            <ownedLiteral xmi:id="_SrGT0BJpEdy4mPo_dcOmkg" name="Undef"/>
-            <ownedLiteral xmi:id="_SvuVIBJpEdy4mPo_dcOmkg" name="Other"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ScB9EBJpEdy4mPo_dcOmkg" name="PIP"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_SgWcYBJpEdy4mPo_dcOmkg" name="PCP"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_SluEkBJpEdy4mPo_dcOmkg" name="NoPreemption"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_SrGT0BJpEdy4mPo_dcOmkg" name="Undef"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_SvuVIBJpEdy4mPo_dcOmkg" name="Other"/>
           </packagedElement>
           <packagedElement xmi:type="uml:Stereotype" xmi:id="_c1edIBJpEdy4mPo_dcOmkg" name="SwInteractionResource" isAbstract="true">
-            <generalization xmi:id="_1QPi4BJpEdy4mPo_dcOmkg" general="_b5kPgBJeEdy3Td9UhuLFPg"/>
-            <ownedAttribute xmi:id="_lk2BABJpEdy4mPo_dcOmkg" name="isIntraMemoryPartitionInteraction" visibility="public" isUnique="false">
+            <generalization xmi:type="uml:Generalization" xmi:id="_1QPi4BJpEdy4mPo_dcOmkg" general="_b5kPgBJeEdy3Td9UhuLFPg"/>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_lk2BABJpEdy4mPo_dcOmkg" name="isIntraMemoryPartitionInteraction" visibility="public" isUnique="false">
               <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_peUM8BJpEdy4mPo_dcOmkg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_pedW4BJpEdy4mPo_dcOmkg" value="1"/>
@@ -3539,14 +3539,14 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_lq9QEBJpEdy4mPo_dcOmkg" name="waitingQueuePolicy" visibility="public" type="_qdRlABJoEdy4mPo_dcOmkg" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_lq9QEBJpEdy4mPo_dcOmkg" name="waitingQueuePolicy" visibility="public" type="_qdRlABJoEdy4mPo_dcOmkg" isUnique="false">
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_sawv8BJpEdy4mPo_dcOmkg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sa554BJpEdy4mPo_dcOmkg" value="1"/>
               <defaultValue xmi:type="uml:LiteralString" xmi:id="_sa554RJpEdy4mPo_dcOmkg">
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_lvcHcBJpEdy4mPo_dcOmkg" name="waitingQueueCapacity" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_lvcHcBJpEdy4mPo_dcOmkg" name="waitingQueueCapacity" visibility="public" isUnique="false">
               <type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_HJ1zcAnfEdy9WM11hWri2g"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_vztBsBJpEdy4mPo_dcOmkg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vz2LoBJpEdy4mPo_dcOmkg" value="1"/>
@@ -3554,7 +3554,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_l0EIwBJpEdy4mPo_dcOmkg" name="waitingPolicyElements" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_l0EIwBJpEdy4mPo_dcOmkg" name="waitingPolicyElements" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_y0eEABJpEdy4mPo_dcOmkg"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_y0n1ABJpEdy4mPo_dcOmkg" value="*"/>
@@ -3564,16 +3564,16 @@
             </ownedAttribute>
           </packagedElement>
           <packagedElement xmi:type="uml:Stereotype" xmi:id="_34ZQ4BJpEdy4mPo_dcOmkg" name="SwCommunicationResource" isAbstract="true">
-            <generalization xmi:id="_OeZNYBJqEdy4mPo_dcOmkg" general="_c1edIBJpEdy4mPo_dcOmkg"/>
-            <generalization xmi:id="_Pg06wBJqEdy4mPo_dcOmkg" general="_XpH50BG1Edyb1KzJ7GkiGA"/>
+            <generalization xmi:type="uml:Generalization" xmi:id="_OeZNYBJqEdy4mPo_dcOmkg" general="_c1edIBJpEdy4mPo_dcOmkg"/>
+            <generalization xmi:type="uml:Generalization" xmi:id="_Pg06wBJqEdy4mPo_dcOmkg" general="_XpH50BG1Edyb1KzJ7GkiGA"/>
           </packagedElement>
           <packagedElement xmi:type="uml:Stereotype" xmi:id="_82VxkBJpEdy4mPo_dcOmkg" name="SwSynchronizationResource" isAbstract="true">
-            <generalization xmi:id="_NzUQEBJqEdy4mPo_dcOmkg" general="_c1edIBJpEdy4mPo_dcOmkg"/>
-            <generalization xmi:id="_QS4p0BJqEdy4mPo_dcOmkg" general="_p4uIsBGzEdyb1KzJ7GkiGA"/>
+            <generalization xmi:type="uml:Generalization" xmi:id="_NzUQEBJqEdy4mPo_dcOmkg" general="_c1edIBJpEdy4mPo_dcOmkg"/>
+            <generalization xmi:type="uml:Generalization" xmi:id="_QS4p0BJqEdy4mPo_dcOmkg" general="_p4uIsBGzEdyb1KzJ7GkiGA"/>
           </packagedElement>
           <packagedElement xmi:type="uml:Stereotype" xmi:id="_kwKJ0BJrEdyJdskagPjJSA" name="SharedDataComResource">
-            <generalization xmi:id="_JpclwBJsEdyJdskagPjJSA" general="_34ZQ4BJpEdy4mPo_dcOmkg"/>
-            <ownedAttribute xmi:id="_opaTUBJrEdyJdskagPjJSA" name="readServices" visibility="public" isUnique="false">
+            <generalization xmi:type="uml:Generalization" xmi:id="_JpclwBJsEdyJdskagPjJSA" general="_34ZQ4BJpEdy4mPo_dcOmkg"/>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_opaTUBJrEdyJdskagPjJSA" name="readServices" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_q-i-sBJrEdyJdskagPjJSA"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_q-sIoBJrEdyJdskagPjJSA" value="*"/>
@@ -3581,7 +3581,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_otuyoBJrEdyJdskagPjJSA" name="writeServices" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_otuyoBJrEdyJdskagPjJSA" name="writeServices" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_uKpuUBJrEdyJdskagPjJSA"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uKzfUBJrEdyJdskagPjJSA" value="*"/>
@@ -3589,20 +3589,20 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <icon xmi:id="_oYOboHBZEd2Nss_u28cvSA" content="71%73%70%56%57%97%46%0%20%0%112%0%0%44%0%0%0%0%46%0%20%0%-121%0%0%0%32%32%32%48%48%48%56%56%56%64%64%64%72%72%72%80%80%80%89%89%89%97%97%97%105%105%105%113%113%113%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-107%-107%-107%-99%-99%-99%-91%-91%-91%-82%-82%-82%-74%-74%-74%-66%-66%-66%-58%-58%-58%-50%-50%-50%-42%-42%-42%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-49%0%57%8%28%72%-112%-61%2%2%8%19%42%92%-56%-112%64%-126%13%5%35%74%-28%-96%-63%64%3%10%24%51%106%-36%-56%-111%-62%3%2%25%38%-118%-60%64%64%-126%-56%-109%5%43%12%-80%-128%-110%-96%-123%-107%45%99%114%-64%48%-64%100%-53%8%3%66%-54%-116%-71%-63%-128%3%-108%13%14%64%-36%-71%83%1%-126%-95%5%55%28%88%64%-76%41%7%8%4%52%20%-44%64%32%-126%83%-89%21%4%92%24%104%65%64%-123%-85%87%105%78%-32%48%-127%0%6%-80%96%53%20%-128%-64%-32%40%90%-80%13%16%60%45%32%-11%-19%-50%13%8%-104%10%-92%-96%-43%110%76%-86%16%10%-46%-92%-32%-9%-28%5%-81%18%-43%6%46%28%113%-62%-128%-77%19%-15%42%96%76%-16%1%-35%-106%14%12%32%-11%-85%32%-63%78%9%57%-3%-86%-3%73%-12%37%75%-76%36%-57%58%-59%32%0%-128%-21%-41%-80%99%-53%6%16%-32%-12%-60%-128%0%59%">
-              <eAnnotations xmi:id="_o0F4QHBZEd2Nss_u28cvSA" source="image_papyrus">
-                <details xmi:id="_o0PCMHBZEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+            <icon xmi:type="uml:Image" xmi:id="_oYOboHBZEd2Nss_u28cvSA" content="71%73%70%56%57%97%46%0%20%0%112%0%0%44%0%0%0%0%46%0%20%0%-121%0%0%0%32%32%32%48%48%48%56%56%56%64%64%64%72%72%72%80%80%80%89%89%89%97%97%97%105%105%105%113%113%113%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-107%-107%-107%-99%-99%-99%-91%-91%-91%-82%-82%-82%-74%-74%-74%-66%-66%-66%-58%-58%-58%-50%-50%-50%-42%-42%-42%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-49%0%57%8%28%72%-112%-61%2%2%8%19%42%92%-56%-112%64%-126%13%5%35%74%-28%-96%-63%64%3%10%24%51%106%-36%-56%-111%-62%3%2%25%38%-118%-60%64%64%-126%-56%-109%5%43%12%-80%-128%-110%-96%-123%-107%45%99%114%-64%48%-64%100%-53%8%3%66%-54%-116%-71%-63%-128%3%-108%13%14%64%-36%-71%83%1%-126%-95%5%55%28%88%64%-76%41%7%8%4%52%20%-44%64%32%-126%83%-89%21%4%92%24%104%65%64%-123%-85%87%105%78%-32%48%-127%0%6%-80%96%53%20%-128%-64%-32%40%90%-80%13%16%60%45%32%-11%-19%-50%13%8%-104%10%-92%-96%-43%110%76%-86%16%10%-46%-92%-32%-9%-28%5%-81%18%-43%6%46%28%113%-62%-128%-77%19%-15%42%96%76%-16%1%-35%-106%14%12%32%-11%-85%32%-63%78%9%57%-3%-86%-3%73%-12%37%75%-76%36%-57%58%-59%32%0%-128%-21%-41%-80%99%-53%6%16%-32%-12%-60%-128%0%59%">
+              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_o0F4QHBZEd2Nss_u28cvSA" source="image_papyrus">
+                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_o0PCMHBZEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
               </eAnnotations>
             </icon>
-            <icon xmi:id="_LPqUkHBaEd2Nss_u28cvSA" content="71%73%70%56%57%97%-75%0%77%0%112%0%0%44%0%0%0%0%-75%0%77%0%-121%0%0%0%16%16%16%48%48%48%56%56%56%64%64%64%72%72%72%80%80%80%89%89%89%97%97%97%105%105%105%113%113%113%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-107%-107%-107%-99%-99%-99%-91%-91%-91%-82%-82%-82%-74%-74%-74%-66%-66%-66%-58%-58%-58%-50%-50%-50%-42%-42%-42%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%57%8%28%72%-80%-96%-63%-125%8%17%106%56%64%-96%-95%-61%-121%16%35%74%-100%72%-79%-94%-59%-117%22%13%104%72%-56%-79%-93%-57%-113%32%67%14%-60%48%32%2%-123%-109%40%83%-86%92%-55%-78%-91%-53%-105%48%99%-62%-108%32%-64%-126%-56%-101%56%115%-122%-92%32%-32%-126%-50%-97%64%-125%22%-60%64%96%-126%-48%-93%72%17%66%40%-80%49%-87%-45%-89%10%11%56%-128%74%85%-25%2%4%27%-86%106%-91%-86%32%-63%-42%-81%9%55%24%104%0%-74%44%-46%7%4%-102%-102%-3%-102%97%-128%-124%-75%112%-127%82%24%-128%33%110%85%11%53%-19%-22%-59%121%65%0%-123%-67%73%37%12%-56%0%-72%48%72%13%5%32%24%6%-22%-64%64%-42%-59%-112%-61%34%80%16%89%-28%-122%-55%-107%51%35%108%-4%88%115%84%-59%-98%67%15%20%92%87%52%-63%-66%127%77%-101%-74%48%-64%-90%-22%-71%-91%85%-101%110%27%-63%52%90%-75%-78%77%111%56%-64%32%116%-41%-36%-64%5%50%56%-48%121%-79%6%3%83%-125%7%-113%64%-128%-16%98%-94%111%-107%43%-81%-48%-38%48%117%-41%-46%-107%67%7%-52%-36%121%118%-23%-57%-109%-57%-1%109%64%-4%-69%121%14%93%-117%127%-35%-67%-32%-68%-5%7%76%-53%106%32%80%-37%-67%-5%-71%62%-73%-30%-83%96%-65%-1%-123%1%-87%81%53%1%1%-79%-11%-25%30%98%15%80%-27%64%124%6%26%-72%65%2%-108%57%5%97%-125%20%10%-44%24%110%63%33%88%-31%-122%18%16%24%20%73%70%109%-72%33%107%-4%-23%84%65%79%34%-90%-104%1%125%57%65%-112%86%-118%48%-18%-42%-101%72%87%-87%7%-29%-122%-61%-39%120%-48%110%100%-35%-24%35%7%-35%117%68%-37%-113%68%94%-105%16%107%-40%17%-23%-29%118%6%-111%-90%-28%-109%-31%21%-60%-39%-109%84%-94%-105%64%86%-105%69%88%37%-107%-16%105%-128%-64%-116%91%86%-55%28%-109%97%42%-119%36%7%81%-106%-7%99%-121%5%-2%-90%38%-116%23%26%116%-37%-101%21%62%-88%-91%65%-80%-47%105%-96%-122%28%-95%-90%-89%123%-1%5%-56%17%98%-96%-3%41%29%126%33%93%-42%-98%-95%-63%117%-119%83%3%-114%49%42%91%122%58%9%-26%-99%-92%-103%-91%-7%-45%-103%-104%86%70%38%80%36%69%-41%-87%97%-100%30%37%-106%120%-93%-22%21%-63%96%80%81%-102%-22%120%-27%81%-80%-27%-24%-85%101%-79%-9%21%-94%-76%110%53%95%125%95%5%-102%-21%93%2%-108%40%95%98%-65%62%53%96%-127%-75%98%86%-20%81%11%98%-72%-42%-108%-53%-2%52%97%97%-106%70%-117%-45%124%9%46%-122%87%-110%-42%118%68%-110%-96%-122%-75%37%106%-73%9%-99%-104%95%101%-89%-110%-101%-112%-117%-50%70%-90%0%86%-22%22%84%-93%106%75%-75%-69%-84%88%61%-54%-122%107%-73%-30%42%-25%-85%-75%-37%102%-57%103%-79%-43%126%103%103%-79%-112%-22%-88%28%-76%-93%42%-38%-96%-109%-99%-50%87%-88%-127%-91%26%-38%-105%-80%20%-10%107%-24%4%116%-59%56%-42%-97%-77%-34%56%-81%-102%110%18%89%111%-104%-120%-95%74%36%5%1%0%-32%-14%-53%48%-57%44%-13%-52%52%-41%108%-13%-51%56%-33%28%64%-120%118%5%4%0%59%">
-              <eAnnotations xmi:id="_L1DgoHBaEd2Nss_u28cvSA" source="image_papyrus">
-                <details xmi:id="_L1NRoHBaEd2Nss_u28cvSA" key="image_kind_key" value="shape"/>
+            <icon xmi:type="uml:Image" xmi:id="_LPqUkHBaEd2Nss_u28cvSA" content="71%73%70%56%57%97%-75%0%77%0%112%0%0%44%0%0%0%0%-75%0%77%0%-121%0%0%0%16%16%16%48%48%48%56%56%56%64%64%64%72%72%72%80%80%80%89%89%89%97%97%97%105%105%105%113%113%113%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-107%-107%-107%-99%-99%-99%-91%-91%-91%-82%-82%-82%-74%-74%-74%-66%-66%-66%-58%-58%-58%-50%-50%-50%-42%-42%-42%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%57%8%28%72%-80%-96%-63%-125%8%17%106%56%64%-96%-95%-61%-121%16%35%74%-100%72%-79%-94%-59%-117%22%13%104%72%-56%-79%-93%-57%-113%32%67%14%-60%48%32%2%-123%-109%40%83%-86%92%-55%-78%-91%-53%-105%48%99%-62%-108%32%-64%-126%-56%-101%56%115%-122%-92%32%-32%-126%-50%-97%64%-125%22%-60%64%96%-126%-48%-93%72%17%66%40%-80%49%-87%-45%-89%10%11%56%-128%74%85%-25%2%4%27%-86%106%-91%-86%32%-63%-42%-81%9%55%24%104%0%-74%44%-46%7%4%-102%-102%-3%-102%97%-128%-124%-75%112%-127%82%24%-128%33%110%85%11%53%-19%-22%-59%121%65%0%-123%-67%73%37%12%-56%0%-72%48%72%13%5%32%24%6%-22%-64%64%-42%-59%-112%-61%34%80%16%89%-28%-122%-55%-107%51%35%108%-4%88%115%84%-59%-98%67%15%20%92%87%52%-63%-66%127%77%-101%-74%48%-64%-90%-22%-71%-91%85%-101%110%27%-63%52%90%-75%-78%77%111%56%-64%32%116%-41%-36%-64%5%50%56%-48%121%-79%6%3%83%-125%7%-113%64%-128%-16%98%-94%111%-107%43%-81%-48%-38%48%117%-41%-46%-107%67%7%-52%-36%121%118%-23%-57%-109%-57%-1%109%64%-4%-69%121%14%93%-117%127%-35%-67%-32%-68%-5%7%76%-53%106%32%80%-37%-67%-5%-71%62%-73%-30%-83%96%-65%-1%-123%1%-87%81%53%1%1%-79%-11%-25%30%98%15%80%-27%64%124%6%26%-72%65%2%-108%57%5%97%-125%20%10%-44%24%110%63%33%88%-31%-122%18%16%24%20%73%70%109%-72%33%107%-4%-23%84%65%79%34%-90%-104%1%125%57%65%-112%86%-118%48%-18%-42%-101%72%87%-87%7%-29%-122%-61%-39%120%-48%110%100%-35%-24%35%7%-35%117%68%-37%-113%68%94%-105%16%107%-40%17%-23%-29%118%6%-111%-90%-28%-109%-31%21%-60%-39%-109%84%-94%-105%64%86%-105%69%88%37%-107%-16%105%-128%-64%-116%91%86%-55%28%-109%97%42%-119%36%7%81%-106%-7%99%-121%5%-2%-90%38%-116%23%26%116%-37%-101%21%62%-88%-91%65%-80%-47%105%-96%-122%28%-95%-90%-89%123%-1%5%-56%17%98%-96%-3%41%29%126%33%93%-42%-98%-95%-63%117%-119%83%3%-114%49%42%91%122%58%9%-26%-99%-92%-103%-91%-7%-45%-103%-104%86%70%38%80%36%69%-41%-87%97%-100%30%37%-106%120%-93%-22%21%-63%96%80%81%-102%-22%120%-27%81%-80%-27%-24%-85%101%-79%-9%21%-94%-76%110%53%95%125%95%5%-102%-21%93%2%-108%40%95%98%-65%62%53%96%-127%-75%98%86%-20%81%11%98%-72%-42%-108%-53%-2%52%97%97%-106%70%-117%-45%124%9%46%-122%87%-110%-42%118%68%-110%-96%-122%-75%37%106%-73%9%-99%-104%95%101%-89%-110%-101%-112%-117%-50%70%-90%0%86%-22%22%84%-93%106%75%-75%-69%-84%88%61%-54%-122%107%-73%-30%42%-25%-85%-75%-37%102%-57%103%-79%-43%126%103%103%-79%-112%-22%-88%28%-76%-93%42%-38%-96%-109%-99%-50%87%-88%-127%-91%26%-38%-105%-80%20%-10%107%-24%4%116%-59%56%-42%-97%-77%-34%56%-81%-102%110%18%89%111%-104%-120%-95%74%36%5%1%0%-32%-14%-53%48%-57%44%-13%-52%52%-41%108%-13%-51%56%-33%28%64%-120%118%5%4%0%59%">
+              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_L1DgoHBaEd2Nss_u28cvSA" source="image_papyrus">
+                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_L1NRoHBaEd2Nss_u28cvSA" key="image_kind_key" value="shape"/>
               </eAnnotations>
             </icon>
           </packagedElement>
           <packagedElement xmi:type="uml:Stereotype" xmi:id="_lQCjwBJrEdyJdskagPjJSA" name="MessageComResource">
-            <generalization xmi:id="_KXxrYBJsEdyJdskagPjJSA" general="_34ZQ4BJpEdy4mPo_dcOmkg"/>
-            <ownedAttribute xmi:id="_wsA30BJrEdyJdskagPjJSA" name="isFixedMessageSize" visibility="public" isUnique="false">
+            <generalization xmi:type="uml:Generalization" xmi:id="_KXxrYBJsEdyJdskagPjJSA" general="_34ZQ4BJpEdy4mPo_dcOmkg"/>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_wsA30BJrEdyJdskagPjJSA" name="isFixedMessageSize" visibility="public" isUnique="false">
               <type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_zUgkEBJrEdyJdskagPjJSA"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zUqVEBJrEdyJdskagPjJSA" value="1"/>
@@ -3610,14 +3610,14 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_wwehEBJrEdyJdskagPjJSA" name="mechanism" visibility="public" type="_xPJhcBJoEdy4mPo_dcOmkg" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_wwehEBJrEdyJdskagPjJSA" name="mechanism" visibility="public" type="_xPJhcBJoEdy4mPo_dcOmkg" isUnique="false">
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1_ZdABJrEdyJdskagPjJSA"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1_jOABJrEdyJdskagPjJSA" value="1"/>
               <defaultValue xmi:type="uml:LiteralString" xmi:id="_1_s_ABJrEdyJdskagPjJSA">
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_w0gFcBJrEdyJdskagPjJSA" name="messageSizeElements" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_w0gFcBJrEdyJdskagPjJSA" name="messageSizeElements" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5llgkBJrEdyJdskagPjJSA"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5lvRkBJrEdyJdskagPjJSA" value="*"/>
@@ -3625,7 +3625,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_w4Ou4BJrEdyJdskagPjJSA" name="messageQueueCapacityElements" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_w4Ou4BJrEdyJdskagPjJSA" name="messageQueueCapacityElements" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_826HYBJrEdyJdskagPjJSA"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_83D4YBJrEdyJdskagPjJSA" value="*"/>
@@ -3633,14 +3633,14 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_w8PsMBJrEdyJdskagPjJSA" name="messageQueuePolicy" visibility="public" type="_qdRlABJoEdy4mPo_dcOmkg" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_w8PsMBJrEdyJdskagPjJSA" name="messageQueuePolicy" visibility="public" type="_qdRlABJoEdy4mPo_dcOmkg" isUnique="false">
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A5ZscBJsEdyJdskagPjJSA"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A5jdcBJsEdyJdskagPjJSA" value="1"/>
               <defaultValue xmi:type="uml:LiteralString" xmi:id="_A5tOcBJsEdyJdskagPjJSA">
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_xBnUYBJrEdyJdskagPjJSA" name="sendServices" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_xBnUYBJrEdyJdskagPjJSA" name="sendServices" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DX7kYBJsEdyJdskagPjJSA"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DYEuUBJsEdyJdskagPjJSA" value="*"/>
@@ -3648,7 +3648,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_xFyCsBJrEdyJdskagPjJSA" name="receiveServices" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_xFyCsBJrEdyJdskagPjJSA" name="receiveServices" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_GJE2UBJsEdyJdskagPjJSA"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GJOAQBJsEdyJdskagPjJSA" value="*"/>
@@ -3656,34 +3656,34 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <icon xmi:id="_qutK0HBZEd2Nss_u28cvSA" content="71%73%70%56%57%97%39%0%21%0%112%0%0%44%0%0%0%0%39%0%21%0%-121%0%0%0%16%16%16%24%24%24%28%28%28%32%32%32%40%40%40%52%52%52%56%56%56%64%64%64%72%72%72%80%80%80%97%97%97%105%105%105%113%113%113%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-111%-111%-111%-107%-107%-107%-103%-103%-103%-99%-99%-99%-95%-95%-95%-91%-91%-91%-86%-86%-86%-82%-82%-82%-74%-74%-74%-66%-66%-66%-58%-58%-58%-50%-50%-50%-42%-42%-42%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%33%32%24%72%-80%-96%-63%-125%8%19%34%104%64%-32%-62%-122%-121%16%35%74%-100%72%-79%34%0%2%31%70%104%-36%-56%-79%-93%-57%-113%32%47%102%-36%8%2%-92%73%-112%33%58%-118%-36%-56%1%-63%70%13%0%98%-54%-100%73%83%-90%6%-115%12%46%112%92%-87%113%-125%75%-115%21%20%56%32%-112%-96%-126%-120%-113%28%22%8%96%80%84%-29%-126%10%59%49%110%-12%-71%-79%-62%2%-115%26%22%4%88%-80%65%35%-120%9%5%14%24%29%-15%-44%41%-44%-115%60%71%80%5%122%117%-93%-120%10%8%6%24%88%-22%-127%99%89%-78%103%53%-90%93%59%-94%66%2%-118%22%24%80%108%-118%55%-22%72%-75%63%71%120%80%-88%-80%110%97%-76%82%123%38%62%73%-7%-79%-34%-56%-120%43%107%-66%123%-7%48%-33%16%15%66%-117%30%77%58%116%-122%-115%-100%71%-20%77%-36%-95%-76%-21%-47%17%80%-25%85%-115%-103%-17%-121%-41%-72%-13%-90%94%-67%-15%54%110%-41%-70%103%-17%29%-64%-72%120%65%1%18%12%-69%-59%80%-79%121%69%10%41%33%31%-42%76%-35%99%-38%-22%-40%-11%34%-88%-55%-67%-69%119%-18%4%2%2%0%59%">
-              <eAnnotations xmi:id="_rhXW0HBZEd2Nss_u28cvSA" source="image_papyrus">
-                <details xmi:id="_rhhH0HBZEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+            <icon xmi:type="uml:Image" xmi:id="_qutK0HBZEd2Nss_u28cvSA" content="71%73%70%56%57%97%39%0%21%0%112%0%0%44%0%0%0%0%39%0%21%0%-121%0%0%0%16%16%16%24%24%24%28%28%28%32%32%32%40%40%40%52%52%52%56%56%56%64%64%64%72%72%72%80%80%80%97%97%97%105%105%105%113%113%113%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-111%-111%-111%-107%-107%-107%-103%-103%-103%-99%-99%-99%-95%-95%-95%-91%-91%-91%-86%-86%-86%-82%-82%-82%-74%-74%-74%-66%-66%-66%-58%-58%-58%-50%-50%-50%-42%-42%-42%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%33%32%24%72%-80%-96%-63%-125%8%19%34%104%64%-32%-62%-122%-121%16%35%74%-100%72%-79%34%0%2%31%70%104%-36%-56%-79%-93%-57%-113%32%47%102%-36%8%2%-92%73%-112%33%58%-118%-36%-56%1%-63%70%13%0%98%-54%-100%73%83%-90%6%-115%12%46%112%92%-87%113%-125%75%-115%21%20%56%32%-112%-96%-126%-120%-113%28%22%8%96%80%84%-29%-126%10%59%49%110%-12%-71%-79%-62%2%-115%26%22%4%88%-80%65%35%-120%9%5%14%24%29%-15%-44%41%-44%-115%60%71%80%5%122%117%-93%-120%10%8%6%24%88%-22%-127%99%89%-78%103%53%-90%93%59%-94%66%2%-118%22%24%80%108%-118%55%-22%72%-75%63%71%120%80%-88%-80%110%97%-76%82%123%38%62%73%-7%-79%-34%-56%-120%43%107%-66%123%-7%48%-33%16%15%66%-117%30%77%58%116%-122%-115%-100%71%-20%77%-36%-95%-76%-21%-47%17%80%-25%85%-115%-103%-17%-121%-41%-72%-13%-90%94%-67%-15%54%110%-41%-70%103%-17%29%-64%-72%120%65%1%18%12%-69%-59%80%-79%121%69%10%41%33%31%-42%76%-35%99%-38%-22%-40%-11%34%-88%-55%-67%-69%119%-18%4%2%2%0%59%">
+              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rhXW0HBZEd2Nss_u28cvSA" source="image_papyrus">
+                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rhhH0HBZEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
               </eAnnotations>
             </icon>
-            <icon xmi:id="_Nt4qgHBaEd2Nss_u28cvSA" content="71%73%70%56%57%97%-104%0%80%0%112%0%0%44%0%0%0%0%-104%0%80%0%-121%0%0%0%12%12%12%16%16%16%24%24%24%28%28%28%32%32%32%36%36%36%40%40%40%48%48%48%52%52%52%56%56%56%60%60%60%64%64%64%72%72%72%80%80%80%89%89%89%97%97%97%105%105%105%109%109%109%113%113%113%117%117%117%121%121%121%125%125%125%-123%-123%-123%-119%-119%-119%-115%-115%-115%-107%-107%-107%-103%-103%-103%-99%-99%-99%-91%-91%-91%-82%-82%-82%-74%-74%-74%-66%-66%-66%-58%-58%-58%-50%-50%-50%-42%-42%-42%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%71%-128%24%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%35%62%20%81%64%1%-125%-117%24%51%106%-36%-56%-79%-93%-57%-113%32%67%-118%28%73%-78%-92%72%0%5%72%-96%88%-55%-78%-91%-53%-105%48%99%-54%-100%73%-77%-90%-51%-101%56%115%-38%68%-87%82%-89%-49%-97%64%-125%10%29%26%-109%39%-47%-93%72%-109%42%-3%105%116%-87%-45%-89%80%-111%54%-115%74%-75%-86%85%-103%83%-81%106%-35%10%53%43%-41%-81%96%-123%122%13%75%-74%108%-51%-79%102%-45%-86%93%-119%118%-83%-37%-80%109%-33%-54%-43%26%119%-82%-35%-88%117%103%-110%-104%112%119%-83%-122%18%65%-13%-54%4%-63%-64%-89%-124%3%11%76%42%94%28%114%-127%-127%13%55%25%-128%8%-100%18%40%97%-97%4%22%8%104%-112%65%-94%-25%-49%9%49%48%8%96%-128%66%-28%-55%64%5%-57%-68%-84%51%-91%9%14%12%10%88%-24%105%-73%-60%-123%2%13%58%-96%-80%96%-31%52%101%-38%58%89%-25%-84%-68%-110%-124%-123%-118%28%76%-68%-11%-16%96%64%5%-38%-68%125%-89%38%-18%83%56%78%-22%44%67%64%24%-16%-32%-125%89%18%21%6%56%-1%-48%-19%50%-70%77%-55%-65%45%23%110%13%-68%-27%-119%14%13%6%76%24%-15%21%126%-127%11%-128%97%-102%-81%-119%126%122%123%-100%-42%-35%-124%29%76%37%100%112%0%2%127%85%53%-62%4%-36%121%55%-45%126%52%-11%-57%-44%-128%0%-82%55%-36%127%49%-119%16%1%119%-28%41%117%2%7%10%28%-112%65%126%52%65%56%-109%-124%62%-87%6%83%-128%54%81%72%83%7%15%8%16%65%8%71%-115%-80%33%4%52%-30%100%-94%76%40%-22%-92%-30%75%44%-42%-28%98%77%38%104%16%-30%5%24%18%-87%-63%1%7%104%-96%-100%78%59%-58%-44%99%78%63%-70%20%36%77%67%-34%52%66%5%-72%113%112%-62%77%-38%13%16%1%125%64%69%9%-45%-108%56%85%-39%-46%-107%51%101%-103%-45%7%16%8%0%1%106%4%46%-87%-128%-105%67%-103%-7%18%-102%55%-87%-55%18%-101%50%-71%-87%-45%-121%-79%61%-41%-46%7%-51%-115%-119%-108%-98%46%-15%-71%-109%-96%-125%89%120%93%-110%66%-111%112%-101%2%24%28%-105%-37%82%-116%-74%-28%-24%89%-112%-82%38%-87%-128%-108%18%21%66%2%12%-108%26%84%-89%44%125%74%-109%-97%43%1%-1%26%83%-88%119%-79%-70%-110%-85%51%-63%-118%-126%-84%48%-47%106%-105%-83%40%-32%-118%-107%-81%86%-114%-38%-94%-86%125%-19%-42%-37%121%116%-90%72%-20%-102%-58%10%-119%108%95%-64%10%91%-44%-77%127%70%75%19%2%0%116%-21%-19%-73%-32%-122%43%-18%-72%-28%-106%107%-18%-73%25%72%55%-31%-76%43%106%-101%-20%86%-42%-62%-92%43%-81%-17%82%21%-17%75%-13%-70%91%-81%85%-9%-70%-108%-17%-66%100%-11%-37%-46%-65%0%-125%37%48%75%4%23%-52%-43%-63%108%97%27%-85%-66%10%63%-59%48%10%9%71%124%-43%-60%21%91%92%21%-58%14%-17%10%-79%-58%73%113%-52%46%-112%31%-125%124%-108%-56%-22%-103%-52%111%-77%62%118%76%-81%-54%66%-95%-4%-45%-53%48%3%37%115%117%37%-73%36%2%99%60%-9%-68%81%3%35%-33%28%92%-50%44%-103%0%-38%-47%72%35%-12%-91%-70%-50%-114%92%108%-51%81%9%-99%19%-51%80%-21%36%117%-123%85%75%-52%50%-107%46%19%-99%53%78%87%-33%68%-11%-41%-52%-90%55%-77%-41%-79%38%-83%-10%-47%57%50%-35%-78%-45%-48%-22%-76%-77%-49%116%-9%76%34%127%91%-89%-39%53%-39%74%-123%-116%109%-45%-40%124%-97%-104%119%-97%123%7%126%-14%-32%-113%-62%-99%-83%-31%-121%-101%-115%51%-29%68%-7%93%19%-32%-112%55%-118%56%-88%-118%-57%-118%106%-35%-100%119%94%-73%0%30%56%-82%-109%109%33%-84%109%-6%-23%107%83%112%-9%-37%-107%-125%-84%107%-21%102%-67%14%59%89%-78%-49%14%86%-19%-74%115%-123%123%-18%116%117%-52%-5%87%-69%-1%94%85%-16%-62%-29%-27%123%-15%87%17%-113%-68%83%-54%47%-81%20%74%19%-16%38%-3%-12%-44%87%111%-3%-11%-40%103%-81%-3%-10%-36%119%-17%-3%-9%-35%3%-64%1%-8%-28%-105%111%-2%-7%-24%-89%-97%125%6%1%1%0%59%">
-              <eAnnotations xmi:id="_Oewt0HBaEd2Nss_u28cvSA" source="image_papyrus">
-                <details xmi:id="_Oe53wHBaEd2Nss_u28cvSA" key="image_kind_key" value="shape"/>
+            <icon xmi:type="uml:Image" xmi:id="_Nt4qgHBaEd2Nss_u28cvSA" content="71%73%70%56%57%97%-104%0%80%0%112%0%0%44%0%0%0%0%-104%0%80%0%-121%0%0%0%12%12%12%16%16%16%24%24%24%28%28%28%32%32%32%36%36%36%40%40%40%48%48%48%52%52%52%56%56%56%60%60%60%64%64%64%72%72%72%80%80%80%89%89%89%97%97%97%105%105%105%109%109%109%113%113%113%117%117%117%121%121%121%125%125%125%-123%-123%-123%-119%-119%-119%-115%-115%-115%-107%-107%-107%-103%-103%-103%-99%-99%-99%-91%-91%-91%-82%-82%-82%-74%-74%-74%-66%-66%-66%-58%-58%-58%-50%-50%-50%-42%-42%-42%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%71%-128%24%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%35%62%20%81%64%1%-125%-117%24%51%106%-36%-56%-79%-93%-57%-113%32%67%-118%28%73%-78%-92%72%0%5%72%-96%88%-55%-78%-91%-53%-105%48%99%-54%-100%73%-77%-90%-51%-101%56%115%-38%68%-87%82%-89%-49%-97%64%-125%10%29%26%-109%39%-47%-93%72%-109%42%-3%105%116%-87%-45%-89%80%-111%54%-115%74%-75%-86%85%-103%83%-81%106%-35%10%53%43%-41%-81%96%-123%122%13%75%-74%108%-51%-79%102%-45%-86%93%-119%118%-83%-37%-80%109%-33%-54%-43%26%119%-82%-35%-88%117%103%-110%-104%112%119%-83%-122%18%65%-13%-54%4%-63%-64%-89%-124%3%11%76%42%94%28%114%-127%-127%13%55%25%-128%8%-100%18%40%97%-97%4%22%8%104%-112%65%-94%-25%-49%9%49%48%8%96%-128%66%-28%-55%64%5%-57%-68%-84%51%-91%9%14%12%10%88%-24%105%-73%-60%-123%2%13%58%-96%-80%96%-31%52%101%-38%58%89%-25%-84%-68%-110%-124%-123%-118%28%76%-68%-11%-16%96%64%5%-38%-68%125%-89%38%-18%83%56%78%-22%44%67%64%24%-16%-32%-125%89%18%21%6%56%-1%-48%-19%50%-70%77%-55%-65%45%23%110%13%-68%-27%-119%14%13%6%76%24%-15%21%126%-127%11%-128%97%-102%-81%-119%126%122%123%-100%-42%-35%-124%29%76%37%100%112%0%2%127%85%53%-62%4%-36%121%55%-45%126%52%-11%-57%-44%-128%0%-82%55%-36%127%49%-119%16%1%119%-28%41%117%2%7%10%28%-112%65%126%52%65%56%-109%-124%62%-87%6%83%-128%54%81%72%83%7%15%8%16%65%8%71%-115%-80%33%4%52%-30%100%-94%76%40%-22%-92%-30%75%44%-42%-28%98%77%38%104%16%-30%5%24%18%-87%-63%1%7%104%-96%-100%78%59%-58%-44%99%78%63%-70%20%36%77%67%-34%52%66%5%-72%113%112%-62%77%-38%13%16%1%125%64%69%9%-45%-108%56%85%-39%-46%-107%51%101%-103%-45%7%16%8%0%1%106%4%46%-87%-128%-105%67%-103%-7%18%-102%55%-87%-55%18%-101%50%-71%-87%-45%-121%-79%61%-41%-46%7%-51%-115%-119%-108%-98%46%-15%-71%-109%-96%-125%89%120%93%-110%66%-111%112%-101%2%24%28%-105%-37%82%-116%-74%-28%-24%89%-112%-82%38%-87%-128%-108%18%21%66%2%12%-108%26%84%-89%44%125%74%-109%-97%43%1%-1%26%83%-88%119%-79%-70%-110%-85%51%-63%-118%-126%-84%48%-47%106%-105%-83%40%-32%-118%-107%-81%86%-114%-38%-94%-86%125%-19%-42%-37%121%116%-90%72%-20%-102%-58%10%-119%108%95%-64%10%91%-44%-77%127%70%75%19%2%0%116%-21%-19%-73%-32%-122%43%-18%-72%-28%-106%107%-18%-73%25%72%55%-31%-76%43%106%-101%-20%86%-42%-62%-92%43%-81%-17%82%21%-17%75%-13%-70%91%-81%85%-9%-70%-108%-17%-66%100%-11%-37%-46%-65%0%-125%37%48%75%4%23%-52%-43%-63%108%97%27%-85%-66%10%63%-59%48%10%9%71%124%-43%-60%21%91%92%21%-58%14%-17%10%-79%-58%73%113%-52%46%-112%31%-125%124%-108%-56%-22%-103%-52%111%-77%62%118%76%-81%-54%66%-95%-4%-45%-53%48%3%37%115%117%37%-73%36%2%99%60%-9%-68%81%3%35%-33%28%92%-50%44%-103%0%-38%-47%72%35%-12%-91%-70%-50%-114%92%108%-51%81%9%-99%19%-51%80%-21%36%117%-123%85%75%-52%50%-107%46%19%-99%53%78%87%-33%68%-11%-41%-52%-90%55%-77%-41%-79%38%-83%-10%-47%57%50%-35%-78%-45%-48%-22%-76%-77%-49%116%-9%76%34%127%91%-89%-39%53%-39%74%-123%-116%109%-45%-40%124%-97%-104%119%-97%123%7%126%-14%-32%-113%-62%-99%-83%-31%-121%-101%-115%51%-29%68%-7%93%19%-32%-112%55%-118%56%-88%-118%-57%-118%106%-35%-100%119%94%-73%0%30%56%-82%-109%109%33%-84%109%-6%-23%107%83%112%-9%-37%-107%-125%-84%107%-21%102%-67%14%59%89%-78%-49%14%86%-19%-74%115%-123%123%-18%116%117%-52%-5%87%-69%-1%94%85%-16%-62%-29%-27%123%-15%87%17%-113%-68%83%-54%47%-81%20%74%19%-16%38%-3%-12%-44%87%111%-3%-11%-40%103%-81%-3%-10%-36%119%-17%-3%-9%-35%3%-64%1%-8%-28%-105%111%-2%-7%-24%-89%-97%125%6%1%1%0%59%">
+              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Oewt0HBaEd2Nss_u28cvSA" source="image_papyrus">
+                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Oe53wHBaEd2Nss_u28cvSA" key="image_kind_key" value="shape"/>
               </eAnnotations>
             </icon>
           </packagedElement>
           <packagedElement xmi:type="uml:Stereotype" xmi:id="_Z1NCsBJsEdyz67WHCXYdRQ" name="NotificationResource">
-            <generalization xmi:id="_050fkBJsEdyz67WHCXYdRQ" general="_82VxkBJpEdy4mPo_dcOmkg"/>
-            <ownedAttribute xmi:id="_bjnFQBJsEdyz67WHCXYdRQ" name="occurence" visibility="public" type="_5CilQBJoEdy4mPo_dcOmkg" isUnique="false">
+            <generalization xmi:type="uml:Generalization" xmi:id="_050fkBJsEdyz67WHCXYdRQ" general="_82VxkBJpEdy4mPo_dcOmkg"/>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_bjnFQBJsEdyz67WHCXYdRQ" name="occurence" visibility="public" type="_5CilQBJoEdy4mPo_dcOmkg" isUnique="false">
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_d3Qi4BJsEdyz67WHCXYdRQ"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_d3Zs0BJsEdyz67WHCXYdRQ" value="1"/>
               <defaultValue xmi:type="uml:LiteralString" xmi:id="_d3jd0BJsEdyz67WHCXYdRQ">
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_boOfgBJsEdyz67WHCXYdRQ" name="mechanism" visibility="public" type="_AJDU8BJpEdy4mPo_dcOmkg" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_boOfgBJsEdyz67WHCXYdRQ" name="mechanism" visibility="public" type="_AJDU8BJpEdy4mPo_dcOmkg" isUnique="false">
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hadj4BJsEdyz67WHCXYdRQ"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hanU4BJsEdyz67WHCXYdRQ" value="1"/>
               <defaultValue xmi:type="uml:LiteralString" xmi:id="_hanU4RJsEdyz67WHCXYdRQ">
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_bsZN0BJsEdyz67WHCXYdRQ" name="occurenceCountElements" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_bsZN0BJsEdyz67WHCXYdRQ" name="occurenceCountElements" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kaEIkBJsEdyz67WHCXYdRQ"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kaNSgBJsEdyz67WHCXYdRQ" value="*"/>
@@ -3691,7 +3691,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_bwayMBJsEdyz67WHCXYdRQ" name="maskElements" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_bwayMBJsEdyz67WHCXYdRQ" name="maskElements" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mm-sEBJsEdyz67WHCXYdRQ"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mm-sERJsEdyz67WHCXYdRQ" value="*"/>
@@ -3699,7 +3699,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_b0vRgBJsEdyz67WHCXYdRQ" name="flushServices" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_b0vRgBJsEdyz67WHCXYdRQ" name="flushServices" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_o_VDgBJsEdyz67WHCXYdRQ"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_o_e0gBJsEdyz67WHCXYdRQ" value="*"/>
@@ -3707,7 +3707,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_b46m4BJsEdyz67WHCXYdRQ" name="signalServices" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_b46m4BJsEdyz67WHCXYdRQ" name="signalServices" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_rMEA0BJsEdyz67WHCXYdRQ"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rMNx0BJsEdyz67WHCXYdRQ" value="*"/>
@@ -3715,7 +3715,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_b9FVMBJsEdyz67WHCXYdRQ" name="waitServices" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_b9FVMBJsEdyz67WHCXYdRQ" name="waitServices" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t11fcBJsEdyz67WHCXYdRQ"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t1_QcBJsEdyz67WHCXYdRQ" value="*"/>
@@ -3723,7 +3723,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_cBG5kBJsEdyz67WHCXYdRQ" name="clearServices" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_cBG5kBJsEdyz67WHCXYdRQ" name="clearServices" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_v3jfkBJsEdyz67WHCXYdRQ"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_v3spgBJsEdyz67WHCXYdRQ" value="*"/>
@@ -3731,35 +3731,35 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <icon xmi:id="_tPd3YHBZEd2Nss_u28cvSA" content="71%73%70%56%57%97%39%0%20%0%112%0%0%44%0%0%0%0%39%0%20%0%-121%0%0%0%4%4%4%8%8%8%16%16%16%24%24%24%28%28%28%32%32%32%40%40%40%48%48%48%52%52%52%56%56%56%64%64%64%72%72%72%80%80%80%89%89%89%97%97%97%101%101%101%113%113%113%117%117%117%121%121%121%-127%-127%-127%-123%-123%-123%-115%-115%-115%-107%-107%-107%-99%-99%-99%-95%-95%-95%-91%-91%-91%-82%-82%-82%-74%-74%-74%-66%-66%-66%-62%-62%-62%-58%-58%-58%-50%-50%-50%-46%-46%-46%-42%-42%-42%-38%-38%-38%-34%-34%-34%-30%-30%-30%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%17%0%24%72%-80%-96%-63%-125%8%19%2%24%96%-128%68%-118%-121%16%35%74%-100%72%-79%34%-128%-122%20%41%100%-88%-56%49%5%10%5%40%38%94%116%24%-15%-60%-125%5%2%74%116%-92%-104%-96%0%3%19%18%71%70%-4%-128%0%67%10%8%6%86%74%-68%48%0%5%-121%3%27%34%-54%-12%56%65%1%-55%20%4%36%-24%124%88%66%-128%-121%-121%39%26%60%56%-15%80%-90%8%5%21%36%-114%8%48%98%-87%-127%7%18%49%32%-8%-112%66%-26%-124%9%19%63%20%80%-96%115%-125%0%14%19%59%28%40%-117%-15%35%-120%-120%21%22%-120%120%96%-109%-29%-119%3%33%24%68%8%9%113%65%7%-70%36%69%32%8%121%117%66%-56%-65%48%43%58%-48%-16%-48%-62%-40%-121%21%-48%34%-122%104%33%2%6%5%100%33%114%96%80%17%3%88%-120%34%22%84%0%1%-78%42%70%-120%12%-90%78%-28%59%-111%4%2%-86%17%81%76%24%32%2%-30%-48%-107%-112%37%26%-82%72%-40%-11%-47%-107%-93%-15%106%-42%-7%91%39%-19%20%-84%-117%-81%108%14%-4%-128%9%20%8%122%47%-35%-68%61%-59%-24%8%22%-70%115%24%-17%-50%0%-127%-8%-15%-37%79%-32%-18%126%81%-63%-126%-9%-16%-29%-53%-97%79%-65%62%-128%-128%0%59%">
-              <eAnnotations xmi:id="_ttt5oHBZEd2Nss_u28cvSA" source="image_papyrus">
-                <details xmi:id="_tt3DkHBZEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+            <icon xmi:type="uml:Image" xmi:id="_tPd3YHBZEd2Nss_u28cvSA" content="71%73%70%56%57%97%39%0%20%0%112%0%0%44%0%0%0%0%39%0%20%0%-121%0%0%0%4%4%4%8%8%8%16%16%16%24%24%24%28%28%28%32%32%32%40%40%40%48%48%48%52%52%52%56%56%56%64%64%64%72%72%72%80%80%80%89%89%89%97%97%97%101%101%101%113%113%113%117%117%117%121%121%121%-127%-127%-127%-123%-123%-123%-115%-115%-115%-107%-107%-107%-99%-99%-99%-95%-95%-95%-91%-91%-91%-82%-82%-82%-74%-74%-74%-66%-66%-66%-62%-62%-62%-58%-58%-58%-50%-50%-50%-46%-46%-46%-42%-42%-42%-38%-38%-38%-34%-34%-34%-30%-30%-30%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%17%0%24%72%-80%-96%-63%-125%8%19%2%24%96%-128%68%-118%-121%16%35%74%-100%72%-79%34%-128%-122%20%41%100%-88%-56%49%5%10%5%40%38%94%116%24%-15%-60%-125%5%2%74%116%-92%-104%-96%0%3%19%18%71%70%-4%-128%0%67%10%8%6%86%74%-68%48%0%5%-121%3%27%34%-54%-12%56%65%1%-55%20%4%36%-24%124%88%66%-128%-121%-121%39%26%60%56%-15%80%-90%8%5%21%36%-114%8%48%98%-87%-127%7%18%49%32%-8%-112%66%-26%-124%9%19%63%20%80%-96%115%-125%0%14%19%59%28%40%-117%-15%35%-120%-120%21%22%-120%120%96%-109%-29%-119%3%33%24%68%8%9%113%65%7%-70%36%69%32%8%121%117%66%-56%-65%48%43%58%-48%-16%-48%-62%-40%-121%21%-48%34%-122%104%33%2%6%5%100%33%114%96%80%17%3%88%-120%34%22%84%0%1%-78%42%70%-120%12%-90%78%-28%59%-111%4%2%-86%17%81%76%24%32%2%-30%-48%-107%-112%37%26%-82%72%-40%-11%-47%-107%-93%-15%106%-42%-7%91%39%-19%20%-84%-117%-81%108%14%-4%-128%9%20%8%122%47%-35%-68%61%-59%-24%8%22%-70%115%24%-17%-50%0%-127%-8%-15%-37%79%-32%-18%126%81%-63%-126%-9%-16%-29%-53%-97%79%-65%62%-128%-128%0%59%">
+              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ttt5oHBZEd2Nss_u28cvSA" source="image_papyrus">
+                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tt3DkHBZEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
               </eAnnotations>
             </icon>
-            <icon xmi:id="_RMoCQHBaEd2Nss_u28cvSA" content="71%73%70%56%57%97%-104%0%78%0%112%0%0%44%0%0%0%0%-104%0%78%0%-121%0%0%0%8%8%8%12%12%12%16%16%16%20%20%20%24%24%24%28%28%28%32%32%32%36%36%36%40%40%40%48%48%48%52%52%52%56%56%56%60%60%60%64%64%64%68%68%68%72%72%72%76%76%76%80%80%80%85%85%85%89%89%89%93%93%93%97%97%97%105%105%105%109%109%109%113%113%113%117%117%117%121%121%121%125%125%125%-123%-123%-123%-119%-119%-119%-115%-115%-115%-111%-111%-111%-107%-107%-107%-103%-103%-103%-99%-99%-99%-91%-91%-91%-82%-82%-82%-78%-78%-78%-74%-74%-74%-70%-70%-70%-66%-66%-66%-62%-62%-62%-58%-58%-58%-50%-50%-50%-46%-46%-46%-42%-42%-42%-38%-38%-38%-34%-34%-34%-30%-30%-30%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%21%0%24%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%35%62%28%112%0%70%-115%-117%24%51%106%-36%-56%-79%-93%-57%-113%32%67%-118%28%73%-78%-92%72%0%21%77%-86%92%-55%-78%-91%-53%-105%30%81%90%-124%73%-77%-90%-51%-101%42%101%-30%-36%-55%-77%-89%77%-99%62%-125%10%29%-6%17%40%-47%-93%72%125%26%77%-54%-76%-23%-53%-91%78%-93%-42%-100%-111%98%39%-44%-99%34%46%72%21%10%-31%-124%-43%-108%62%57%20%64%-32%117%43%-49%7%14%120%94%-83%-23%-126%1%-121%26%10%12%-52%48%-117%51%-124%-128%10%16%-26%-34%92%11%115%-124%-126%21%23%97%20%-88%64%-41%102%12%1%94%79%36%40%91%-109%111%-53%25%16%44%-48%-56%56%-94%0%-29%-62%46%17%80%-64%40%3%-62%-123%-55%52%29%-81%84%124%25%35%-124%2%122%49%-77%-44%64%96%99%-120%-65%-95%-63%-62%-92%113%1%-126%-116%-114%50%12%76%80%-51%-78%69%-128%23%28%-37%118%-128%41%-102%-28%10%5%33%64%-98%32%80%-102%119%72%26%4%54%124%-36%-64%-64%-123%-53%-30%34%59%84%23%89%1%-75%115%-110%19%16%-124%-1%92%-63%96%68%75%-20%31%-37%74%31%73%-61%-128%-124%-17%34%75%8%-72%29%114%-122%5%9%-87%75%-94%-17%56%-126%1%-32%-110%44%12%96%2%124%31%-51%32%-128%8%37%-107%-80%88%78%-78%-107%52%-125%4%22%-28%71%-46%6%3%72%72%32%70%13%52%-96%82%103%25%-128%54%-46%126%25%41%86%-126%75%9%64%112%-31%70%30%8%-32%-95%73%31%-64%-10%97%-125%-49%101%96%-37%75%48%8%48%-30%-119%-127%5%-128%-126%75%46%56%48%-36%73%48%126%116%-36%7%53%-127%32%-128%-123%-33%29%64%-40%75%52%80%55%83%81%65%118%-44%-127%3%-42%-39%-76%-128%-122%39%94%96%-64%-118%46%29%103%30%-108%79%122%4%3%3%27%112%9%-45%12%1%-112%112%-95%10%2%-76%112%-109%125%20%32%121%81%113%126%-3%-73%83%9%1%-56%105%22%116%111%-19%68%-62%-126%28%-119%-74%-62%1%122%-98%73%64%4%-16%65%-112%-128%79%-99%-3%-88%81%113%18%-36%-72%19%105%93%57%39%67%1%9%84%-55%-45%8%22%4%26%101%70%50%40%64%-97%77%52%-56%120%-101%12%9%20%-38%84%-92%46%40%-32%-24%77%48%36%-1%96%102%13%-40%-99%96%-94%77%44%40%64%36%70%-100%-86%-42%107%13%77%58%48%106%77%-2%117%-124%-34%5%-55%-47%-92%-99%-90%-90%53%-25%84%-84%43%-90%-112%-64%-105%52%113%-48%-89%-89%97%122%68%-125%2%-52%-82%36%-125%3%101%114%-124%-86%-86%68%21%-85%-111%125%17%-62%-76%-126%3%-77%-50%-7%-23%70%-21%-74%43%-46%-97%85%121%-12%-85%84%-42%-38%11%40%75%52%36%-112%-19%-93%-17%110%-108%-81%74%112%-110%91%105%84%-15%126%-44%89%-72%43%89%64%-83%-79%1%111%100%-82%113%10%60%-84%112%-86%78%109%-37%-83%-108%10%-80%-96%82%9%-17%-127%4%98%13%-48%-78%-25%100%73%-9%38%-123%44%73%-62%-107%20%-22%-80%16%-1%11%82%-54%30%-75%-84%-46%-63%72%-39%106%82%-109%12%-64%-20%17%-50%96%-86%20%41%72%29%116%-52%-46%-72%72%-67%-68%-46%10%-45%-122%20%-126%86%64%-54%12%-110%-46%-30%66%-64%48%75%79%35%53%52%75%5%-41%-84%-128%-68%0%75%13%82%10%105%109%52%-62%-66%46%57%80%-81%80%52%-81%-12%-89%-77%52%56%96%103%72%35%103%-108%-63%-82%23%-95%75%-18%72%37%7%-1%-43%-9%75%11%115%57%-16%-117%98%-125%-92%-15%69%-118%89%12%83%-42%65%77%-84%-84%-47%23%-111%103%82%-35%25%-79%-64%-64%12%27%-52%-72%-109%-38%62%117%-80%-34%77%45%-9%91%56%-74%46%117%80%-64%-85%56%-3%125%-109%-27%96%-73%-60%51%5%-118%-45%29%113%72%-93%47%14%-11%77%-121%-5%-76%66%6%43%81%-34%20%-25%55%-35%77%-96%-17%76%-87%-2%18%-39%23%18%-49%20%-29%103%38%-32%-77%106%-54%51%5%-4%75%20%-88%-103%-4%-20%-104%25%-81%82%-37%-50%69%-65%-4%-19%43%-63%-96%-64%-34%91%121%47%-3%-38%42%77%127%125%-19%-68%105%-97%-35%-25%39%-102%-1%-67%74%-84%-29%-24%46%-5%-50%-87%-1%28%-73%-10%-33%-33%-65%70%-18%-21%-120%-16%-2%39%-65%-90%48%111%108%101%35%32%-10%-32%-93%63%-114%-52%-64%121%-1%-13%95%4%51%18%64%-116%84%111%-126%-76%90%32%124%14%104%-74%78%97%-80%-128%81%105%96%96%-58%-121%-63%12%-30%-113%64%-18%19%-95%-3%64%24%21%14%-42%-64%115%37%-108%96%12%49%-94%-66%-6%-59%-112%-123%81%-23%91%-18%110%-88%-63%19%49%110%-128%51%-60%-95%84%79%-44%-122%-68%25%-54%-48%-120%-127%65%0%2%-98%55%65%33%74%5%3%120%51%-94%19%-111%72%-105%41%82%-79%124%61%-68%98%-1%-84%-88%69%-89%112%-79%-117%76%-7%34%24%-111%34%-58%49%18%5%37%12%112%-128%26%-41%-56%-58%54%-70%-15%-115%112%-116%-93%28%-25%72%-57%58%-38%-15%-114%120%-84%35%0%2%2%0%59%">
-              <eAnnotations xmi:id="_R2zAoHBaEd2Nss_u28cvSA" source="image_papyrus">
-                <details xmi:id="_R28KkHBaEd2Nss_u28cvSA" key="image_kind_key" value="shape"/>
+            <icon xmi:type="uml:Image" xmi:id="_RMoCQHBaEd2Nss_u28cvSA" content="71%73%70%56%57%97%-104%0%78%0%112%0%0%44%0%0%0%0%-104%0%78%0%-121%0%0%0%8%8%8%12%12%12%16%16%16%20%20%20%24%24%24%28%28%28%32%32%32%36%36%36%40%40%40%48%48%48%52%52%52%56%56%56%60%60%60%64%64%64%68%68%68%72%72%72%76%76%76%80%80%80%85%85%85%89%89%89%93%93%93%97%97%97%105%105%105%109%109%109%113%113%113%117%117%117%121%121%121%125%125%125%-123%-123%-123%-119%-119%-119%-115%-115%-115%-111%-111%-111%-107%-107%-107%-103%-103%-103%-99%-99%-99%-91%-91%-91%-82%-82%-82%-78%-78%-78%-74%-74%-74%-70%-70%-70%-66%-66%-66%-62%-62%-62%-58%-58%-58%-50%-50%-50%-46%-46%-46%-42%-42%-42%-38%-38%-38%-34%-34%-34%-30%-30%-30%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%21%0%24%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%35%62%28%112%0%70%-115%-117%24%51%106%-36%-56%-79%-93%-57%-113%32%67%-118%28%73%-78%-92%72%0%21%77%-86%92%-55%-78%-91%-53%-105%30%81%90%-124%73%-77%-90%-51%-101%42%101%-30%-36%-55%-77%-89%77%-99%62%-125%10%29%-6%17%40%-47%-93%72%125%26%77%-54%-76%-23%-53%-91%78%-93%-42%-100%-111%98%39%-44%-99%34%46%72%21%10%-31%-124%-43%-108%62%57%20%64%-32%117%43%-49%7%14%120%94%-83%-23%-126%1%-121%26%10%12%-52%48%-117%51%-124%-128%10%16%-26%-34%92%11%115%-124%-126%21%23%97%20%-88%64%-41%102%12%1%94%79%36%40%91%-109%111%-53%25%16%44%-48%-56%56%-94%0%-29%-62%46%17%80%-64%40%3%-62%-123%-55%52%29%-81%84%124%25%35%-124%2%122%49%-77%-44%64%96%99%-120%-65%-95%-63%-62%-92%113%1%-126%-116%-114%50%12%76%80%-51%-78%69%-128%23%28%-37%118%-128%41%-102%-28%10%5%33%64%-98%32%80%-102%119%72%26%4%54%124%-36%-64%-64%-123%-53%-30%34%59%84%23%89%1%-75%115%-110%19%16%-124%-1%92%-63%96%68%75%-20%31%-37%74%31%73%-61%-128%-124%-17%34%75%8%-72%29%114%-122%5%9%-87%75%-94%-17%56%-126%1%-32%-110%44%12%96%2%124%31%-51%32%-128%8%37%-107%-80%88%78%-78%-107%52%-125%4%22%-28%71%-46%6%3%72%72%32%70%13%52%-96%82%103%25%-128%54%-46%126%25%41%86%-126%75%9%64%112%-31%70%30%8%-32%-95%73%31%-64%-10%97%-125%-49%101%96%-37%75%48%8%48%-30%-119%-127%5%-128%-126%75%46%56%48%-36%73%48%126%116%-36%7%53%-127%32%-128%-123%-33%29%64%-40%75%52%80%55%83%81%65%118%-44%-127%3%-42%-39%-76%-128%-122%39%94%96%-64%-118%46%29%103%30%-108%79%122%4%3%3%27%112%9%-45%12%1%-112%112%-95%10%2%-76%112%-109%125%20%32%121%81%113%126%-3%-73%83%9%1%-56%105%22%116%111%-19%68%-62%-126%28%-119%-74%-62%1%122%-98%73%64%4%-16%65%-112%-128%79%-99%-3%-88%81%113%18%-36%-72%19%105%93%57%39%67%1%9%84%-55%-45%8%22%4%26%101%70%50%40%64%-97%77%52%-56%120%-101%12%9%20%-38%84%-92%46%40%-32%-24%77%48%36%-1%96%102%13%-40%-99%96%-94%77%44%40%64%36%70%-100%-86%-42%107%13%77%58%48%106%77%-2%117%-124%-34%5%-55%-47%-92%-99%-90%-90%53%-25%84%-84%43%-90%-112%-64%-105%52%113%-48%-89%-89%97%122%68%-125%2%-52%-82%36%-125%3%101%114%-124%-86%-86%68%21%-85%-111%125%17%-62%-76%-126%3%-77%-50%-7%-23%70%-21%-74%43%-46%-97%85%121%-12%-85%84%-42%-38%11%40%75%52%36%-112%-19%-93%-17%110%-108%-81%74%112%-110%91%105%84%-15%126%-44%89%-72%43%89%64%-83%-79%1%111%100%-82%113%10%60%-84%112%-86%78%109%-37%-83%-108%10%-80%-96%82%9%-17%-127%4%98%13%-48%-78%-25%100%73%-9%38%-123%44%73%-62%-107%20%-22%-80%16%-1%11%82%-54%30%-75%-84%-46%-63%72%-39%106%82%-109%12%-64%-20%17%-50%96%-86%20%41%72%29%116%-52%-46%-72%72%-67%-68%-46%10%-45%-122%20%-126%86%64%-54%12%-110%-46%-30%66%-64%48%75%79%35%53%52%75%5%-41%-84%-128%-68%0%75%13%82%10%105%109%52%-62%-66%46%57%80%-81%80%52%-81%-12%-89%-77%52%56%96%103%72%35%103%-108%-63%-82%23%-95%75%-18%72%37%7%-1%-43%-9%75%11%115%57%-16%-117%98%-125%-92%-15%69%-118%89%12%83%-42%65%77%-84%-84%-47%23%-111%103%82%-35%25%-79%-64%-64%12%27%-52%-72%-109%-38%62%117%-80%-34%77%45%-9%91%56%-74%46%117%80%-64%-85%56%-3%125%-109%-27%96%-73%-60%51%5%-118%-45%29%113%72%-93%47%14%-11%77%-121%-5%-76%66%6%43%81%-34%20%-25%55%-35%77%-96%-17%76%-87%-2%18%-39%23%18%-49%20%-29%103%38%-32%-77%106%-54%51%5%-4%75%20%-88%-103%-4%-20%-104%25%-81%82%-37%-50%69%-65%-4%-19%43%-63%-96%-64%-34%91%121%47%-3%-38%42%77%127%125%-19%-68%105%-97%-35%-25%39%-102%-1%-67%74%-84%-29%-24%46%-5%-50%-87%-1%28%-73%-10%-33%-33%-65%70%-18%-21%-120%-16%-2%39%-65%-90%48%111%108%101%35%32%-10%-32%-93%63%-114%-52%-64%121%-1%-13%95%4%51%18%64%-116%84%111%-126%-76%90%32%124%14%104%-74%78%97%-80%-128%81%105%96%96%-58%-121%-63%12%-30%-113%64%-18%19%-95%-3%64%24%21%14%-42%-64%115%37%-108%96%12%49%-94%-66%-6%-59%-112%-123%81%-23%91%-18%110%-88%-63%19%49%110%-128%51%-60%-95%84%79%-44%-122%-68%25%-54%-48%-120%-127%65%0%2%-98%55%65%33%74%5%3%120%51%-94%19%-111%72%-105%41%82%-79%124%61%-68%98%-1%-84%-88%69%-89%112%-79%-117%76%-7%34%24%-111%34%-58%49%18%5%37%12%112%-128%26%-41%-56%-58%54%-70%-15%-115%112%-116%-93%28%-25%72%-57%58%-38%-15%-114%120%-84%35%0%2%2%0%59%">
+              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R2zAoHBaEd2Nss_u28cvSA" source="image_papyrus">
+                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R28KkHBaEd2Nss_u28cvSA" key="image_kind_key" value="shape"/>
               </eAnnotations>
             </icon>
           </packagedElement>
           <packagedElement xmi:type="uml:Stereotype" xmi:id="_3u6dYBJsEdyz67WHCXYdRQ" name="SwMutualExclusionResource">
-            <generalization xmi:id="_7Exl8BJsEdyz67WHCXYdRQ" general="_82VxkBJpEdy4mPo_dcOmkg"/>
-            <generalization xmi:id="_uDRicEIZEd6dmI2dd6jVFQ" general="_y3mvQBGzEdyb1KzJ7GkiGA"/>
-            <ownedAttribute xmi:id="_7rV2sBJsEdyz67WHCXYdRQ" name="mechanism" visibility="public" type="_H1teoBJpEdy4mPo_dcOmkg" isUnique="false">
+            <generalization xmi:type="uml:Generalization" xmi:id="_7Exl8BJsEdyz67WHCXYdRQ" general="_82VxkBJpEdy4mPo_dcOmkg"/>
+            <generalization xmi:type="uml:Generalization" xmi:id="_uDRicEIZEd6dmI2dd6jVFQ" general="_y3mvQBGzEdyb1KzJ7GkiGA"/>
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_7rV2sBJsEdyz67WHCXYdRQ" name="mechanism" visibility="public" type="_H1teoBJpEdy4mPo_dcOmkg" isUnique="false">
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-vx4EBJsEdyz67WHCXYdRQ"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-v7CABJsEdyz67WHCXYdRQ" value="1"/>
               <defaultValue xmi:type="uml:LiteralString" xmi:id="_-v7CARJsEdyz67WHCXYdRQ">
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_7u6vIBJsEdyz67WHCXYdRQ" name="concurrentAccessProtocol" visibility="public" type="_PhoBcBJpEdy4mPo_dcOmkg" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_7u6vIBJsEdyz67WHCXYdRQ" name="concurrentAccessProtocol" visibility="public" type="_PhoBcBJpEdy4mPo_dcOmkg" isUnique="false">
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_CaB8QBJtEdyz67WHCXYdRQ"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CaLtQBJtEdyz67WHCXYdRQ" value="1"/>
               <defaultValue xmi:type="uml:LiteralString" xmi:id="_CaVeQBJtEdyz67WHCXYdRQ">
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_79Np0BJsEdyz67WHCXYdRQ" name="accessTokenElements" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_79Np0BJsEdyz67WHCXYdRQ" name="accessTokenElements" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Fc-v4BJtEdyz67WHCXYdRQ"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FdH50BJtEdyz67WHCXYdRQ" value="*"/>
@@ -3767,7 +3767,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_8EXasBJsEdyz67WHCXYdRQ" name="releaseServices" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_8EXasBJsEdyz67WHCXYdRQ" name="releaseServices" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_II1SIBJtEdyz67WHCXYdRQ"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_II_DIBJtEdyz67WHCXYdRQ" value="*"/>
@@ -3775,7 +3775,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_8HfnMBJsEdyz67WHCXYdRQ" name="acquireServices" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_8HfnMBJsEdyz67WHCXYdRQ" name="acquireServices" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LECfABJtEdyz67WHCXYdRQ"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LELo8BJtEdyz67WHCXYdRQ" value="*"/>
@@ -3783,145 +3783,145 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <icon xmi:id="_wABTcHBZEd2Nss_u28cvSA" content="71%73%70%56%57%97%20%0%19%0%112%0%0%44%0%0%0%0%20%0%19%0%-121%0%0%0%8%8%8%16%16%16%20%20%20%28%28%28%44%44%44%48%48%48%52%52%52%56%56%56%64%64%64%68%68%68%72%72%72%80%80%80%85%85%85%89%89%89%93%93%93%97%97%97%101%101%101%105%105%105%113%113%113%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-107%-107%-107%-103%-103%-103%-91%-91%-91%-74%-74%-74%-50%-50%-50%-42%-42%-42%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-109%0%9%4%24%72%-80%-96%-63%-126%2%26%76%88%-56%-80%-95%-61%7%2%0%8%-104%-112%-95%-94%-59%-117%23%45%24%-24%32%-111%34%-58%-113%25%42%20%-16%32%-94%35%72%-116%21%14%124%16%81%114%-30%73%-117%19%14%-128%96%-39%-46%-29%-55%9%10%102%-46%52%121%50%-126%-126%16%52%89%-14%-4%8%-127%1%-48%-96%53%65%58%112%-128%116%-89%75%-116%12%36%52%117%106%-77%-30%2%10%83%-87%94%76%112%33%-85%-42%12%24%16%100%-16%-86%53%-84%6%-78%84%47%32%-40%-128%-42%-87%4%3%108%-37%10%21%48%-128%-125%-36%-99%3%10%36%-40%-53%-73%-81%-33%-67%0%2%2%0%59%">
-              <eAnnotations xmi:id="_w6k3MHBZEd2Nss_u28cvSA" source="image_papyrus">
-                <details xmi:id="_w6k3MXBZEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+            <icon xmi:type="uml:Image" xmi:id="_wABTcHBZEd2Nss_u28cvSA" content="71%73%70%56%57%97%20%0%19%0%112%0%0%44%0%0%0%0%20%0%19%0%-121%0%0%0%8%8%8%16%16%16%20%20%20%28%28%28%44%44%44%48%48%48%52%52%52%56%56%56%64%64%64%68%68%68%72%72%72%80%80%80%85%85%85%89%89%89%93%93%93%97%97%97%101%101%101%105%105%105%113%113%113%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-107%-107%-107%-103%-103%-103%-91%-91%-91%-74%-74%-74%-50%-50%-50%-42%-42%-42%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-109%0%9%4%24%72%-80%-96%-63%-126%2%26%76%88%-56%-80%-95%-61%7%2%0%8%-104%-112%-95%-94%-59%-117%23%45%24%-24%32%-111%34%-58%-113%25%42%20%-16%32%-94%35%72%-116%21%14%124%16%81%114%-30%73%-117%19%14%-128%96%-39%-46%-29%-55%9%10%102%-46%52%121%50%-126%-126%16%52%89%-14%-4%8%-127%1%-48%-96%53%65%58%112%-128%116%-89%75%-116%12%36%52%117%106%-77%-30%2%10%83%-87%94%76%112%33%-85%-42%12%24%16%100%-16%-86%53%-84%6%-78%84%47%32%-40%-128%-42%-87%4%3%108%-37%10%21%48%-128%-125%-36%-99%3%10%36%-40%-53%-73%-81%-33%-67%0%2%2%0%59%">
+              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_w6k3MHBZEd2Nss_u28cvSA" source="image_papyrus">
+                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_w6k3MXBZEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
               </eAnnotations>
             </icon>
-            <icon xmi:id="_TuosAHBaEd2Nss_u28cvSA" content="71%73%70%56%57%97%77%0%74%0%112%0%0%44%0%0%0%0%77%0%74%0%-121%0%0%0%12%12%12%24%24%24%28%28%28%32%32%32%36%36%36%40%40%40%44%44%44%48%48%48%52%52%52%56%56%56%64%64%64%68%68%68%72%72%72%76%76%76%80%80%80%85%85%85%89%89%89%93%93%93%97%97%97%101%101%101%105%105%105%113%113%113%117%117%117%121%121%121%125%125%125%-127%-127%-127%-123%-123%-123%-115%-115%-115%-107%-107%-107%-103%-103%-103%-91%-91%-91%-82%-82%-82%-74%-74%-74%-66%-66%-66%-58%-58%-58%-50%-50%-50%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%17%28%64%64%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-62%0%4%0%28%-104%72%-79%-94%-59%-117%24%51%106%-36%-56%-15%-30%-128%0%0%34%122%24%73%-78%-92%-55%-109%40%83%-86%92%-55%-46%-28%-122%3%36%66%2%104%73%-77%-90%-51%-101%27%16%-108%72%33%-13%-90%-49%-97%63%51%24%-40%-55%83%36%-48%-93%72%81%102%72%112%34%-123%-45%-98%73%-93%34%-75%-64%-44%-23%83%-93%82%-77%-38%-76%-64%-96%-87%-43%-94%51%-75%-118%101%73%-127%1%-118%-81%87%-61%-114%93%107%114%-62%-125%-77%104%-63%-78%-99%59%50%66%-124%-72%86%-95%-46%29%-5%-96%2%-34%-68%88%-9%102%117%-128%-31%47%96%-75%-126%-93%46%-48%96%-8%112%98%-87%11%60%52%118%-4%-8%104%7%4%-110%39%-89%-83%12%-76%-125%-126%16%-102%41%115%-74%-55%-31%0%-24%-48%-101%71%-41%-28%-128%96%4%106%-47%-86%87%-26%36%-15%26%118%108%-108%-77%107%-37%-66%93%50%-125%78%-35%-69%121%123%88%74%20%-72%92%-31%37%47%84%53%-98%26%-71%7%11%10%-68%50%63%-114%-100%43%-36%-23%-44%121%79%88%112%29%-69%-34%-37%19%-18%98%-1%-1%-6%93%53%4%-15%-29%-125%63%126%96%33%61%-38%-14%-107%27%20%118%79%62%112%-27%5%28%-24%-65%-73%47%-40%115%102%-3%-22%-79%-27%-39%7%0%-18%-121%-40%94%28%124%86%-96%-127%-113%-79%118%-38%-126%1%106%-59%26%109%16%-42%119%-32%90%27%20%64%97%-123%17%70%-107%83%113%28%54%-73%86%6%7%-128%24%98%118%98%45%101%-62%-119%12%-82%69%-107%116%44%-118%-104%-107%5%11%-64%24%35%-118%81%-107%-43%-35%-115%56%34%-27%-42%-114%60%-62%119%-108%4%-24%-15%104%97%86%15%76%96%36%94%66%-6%-12%-64%124%75%-74%-120%-44%2%80%70%121%-28%-108%-1%89%121%-27%79%29%36%-112%-91%-106%29%-90%-28%25%8%96%50%-55%95%75%14%-106%105%-26%-123%44%-79%38%-126%-102%107%-30%-124%-64%-122%112%110%-39%82%110%117%-58%-43%-28%73%26%-4%-106%-89%-98%103%-98%68%-94%-119%127%-54%-88%-44%114%-123%74%-103%-110%5%8%-40%-104%-88%-95%37%89%-9%104%-100%41%77%96%-42%-92%-108%-98%20%30%-112%-104%-10%104%87%-89%127%-63%-41%23%-88%-95%-38%39%31%-87%-91%34%-122%31%-86%-87%-114%-44%65%100%-84%-74%42%-22%95%-84%-87%122%-10%32%-83%6%26%112%43%-82%-11%9%64%39%-81%-11%17%10%-20%85%22%100%96%-20%-79%-56%38%-85%-20%-78%-52%54%-21%-20%-77%-52%2%16%16%0%59%">
-              <eAnnotations xmi:id="_UZdKoHBaEd2Nss_u28cvSA" source="image_papyrus">
-                <details xmi:id="_UZmUkHBaEd2Nss_u28cvSA" key="image_kind_key" value="shape"/>
+            <icon xmi:type="uml:Image" xmi:id="_TuosAHBaEd2Nss_u28cvSA" content="71%73%70%56%57%97%77%0%74%0%112%0%0%44%0%0%0%0%77%0%74%0%-121%0%0%0%12%12%12%24%24%24%28%28%28%32%32%32%36%36%36%40%40%40%44%44%44%48%48%48%52%52%52%56%56%56%64%64%64%68%68%68%72%72%72%76%76%76%80%80%80%85%85%85%89%89%89%93%93%93%97%97%97%101%101%101%105%105%105%113%113%113%117%117%117%121%121%121%125%125%125%-127%-127%-127%-123%-123%-123%-115%-115%-115%-107%-107%-107%-103%-103%-103%-91%-91%-91%-82%-82%-82%-74%-74%-74%-66%-66%-66%-58%-58%-58%-50%-50%-50%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%17%28%64%64%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-62%0%4%0%28%-104%72%-79%-94%-59%-117%24%51%106%-36%-56%-15%-30%-128%0%0%34%122%24%73%-78%-92%-55%-109%40%83%-86%92%-55%-46%-28%-122%3%36%66%2%104%73%-77%-90%-51%-101%27%16%-108%72%33%-13%-90%-49%-97%63%51%24%-40%-55%83%36%-48%-93%72%81%102%72%112%34%-123%-45%-98%73%-93%34%-75%-64%-44%-23%83%-93%82%-77%-38%-76%-64%-96%-87%-43%-94%51%-75%-118%101%73%-127%1%-118%-81%87%-61%-114%93%107%114%-62%-125%-77%104%-63%-78%-99%59%50%66%-124%-72%86%-95%-46%29%-5%-96%2%-34%-68%88%-9%102%117%-128%-31%47%96%-75%-126%-93%46%-48%96%-8%112%98%-87%11%60%52%118%-4%-8%104%7%4%-110%39%-89%-83%12%-76%-125%-126%16%-102%41%115%-74%-55%-31%0%-24%-48%-101%71%-41%-28%-128%96%4%106%-47%-86%87%-26%36%-15%26%118%108%-108%-77%107%-37%-66%93%50%-125%78%-35%-69%121%123%88%74%20%-72%92%-31%37%47%84%53%-98%26%-71%7%11%10%-68%50%63%-114%-100%43%-36%-23%-44%121%79%88%112%29%-69%-34%-37%19%-18%98%-1%-1%-6%93%53%4%-15%-29%-125%63%126%96%33%61%-38%-14%-107%27%20%118%79%62%112%-27%5%28%-24%-65%-73%47%-40%115%102%-3%-22%-79%-27%-39%7%0%-18%-121%-40%94%28%124%86%-96%-127%-113%-79%118%-38%-126%1%106%-59%26%109%16%-42%119%-32%90%27%20%64%97%-123%17%70%-107%83%113%28%54%-73%86%6%7%-128%24%98%118%98%45%101%-62%-119%12%-82%69%-107%116%44%-118%-104%-107%5%11%-64%24%35%-118%81%-107%-43%-35%-115%56%34%-27%-42%-114%60%-62%119%-108%4%-24%-15%104%97%86%15%76%96%36%94%66%-6%-12%-64%124%75%-74%-120%-44%2%80%70%121%-28%-108%-1%89%121%-27%79%29%36%-112%-91%-106%29%-90%-28%25%8%96%50%-55%95%75%14%-106%105%-26%-123%44%-79%38%-126%-102%107%-30%-124%-64%-122%112%110%-39%82%110%117%-58%-43%-28%73%26%-4%-106%-89%-98%103%-98%68%-94%-119%127%-54%-88%-44%114%-123%74%-103%-110%5%8%-40%-104%-88%-95%37%89%-9%104%-100%41%77%96%-42%-92%-108%-98%20%30%-112%-104%-10%104%87%-89%127%-63%-41%23%-88%-95%-38%39%31%-87%-91%34%-122%31%-86%-87%-114%-44%65%100%-84%-74%42%-22%95%-84%-87%122%-10%32%-83%6%26%112%43%-82%-11%9%64%39%-81%-11%17%10%-20%85%22%100%96%-20%-79%-56%38%-85%-20%-78%-52%54%-21%-20%-77%-52%2%16%16%0%59%">
+              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UZdKoHBaEd2Nss_u28cvSA" source="image_papyrus">
+                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UZmUkHBaEd2Nss_u28cvSA" key="image_kind_key" value="shape"/>
               </eAnnotations>
             </icon>
           </packagedElement>
         </packagedElement>
       </packagedElement>
       <packagedElement xmi:type="uml:Profile" xmi:id="_YgAioAPMEdyuUt-4qHuVvQ" name="GCM" metaclassReference="_j5XBUEFXEd6UW4qJC-Vahw _rAh4UEFXEd6UW4qJC-Vahw _rHSnoEFXEd6UW4qJC-Vahw _rQYSMEFXEd6UW4qJC-Vahw">
-        <elementImport xmi:id="_j5XBUEFXEd6UW4qJC-Vahw" alias="Trigger">
+        <elementImport xmi:type="uml:ElementImport" xmi:id="_j5XBUEFXEd6UW4qJC-Vahw" alias="Trigger">
           <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Trigger"/>
         </elementImport>
-        <elementImport xmi:id="_rAh4UEFXEd6UW4qJC-Vahw" alias="Feature">
+        <elementImport xmi:type="uml:ElementImport" xmi:id="_rAh4UEFXEd6UW4qJC-Vahw" alias="Feature">
           <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Feature"/>
         </elementImport>
-        <elementImport xmi:id="_rHSnoEFXEd6UW4qJC-Vahw" alias="InvocationAction">
+        <elementImport xmi:type="uml:ElementImport" xmi:id="_rHSnoEFXEd6UW4qJC-Vahw" alias="InvocationAction">
           <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#InvocationAction"/>
         </elementImport>
-        <elementImport xmi:id="_rQYSMEFXEd6UW4qJC-Vahw" alias="AnyReceiveEvent">
+        <elementImport xmi:type="uml:ElementImport" xmi:id="_rQYSMEFXEd6UW4qJC-Vahw" alias="AnyReceiveEvent">
           <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#AnyReceiveEvent"/>
         </elementImport>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_lMax0BHYEdyWC5IKDhzksw" name="FlowProperty">
-          <ownedAttribute xmi:id="_rG6aUBHYEdyWC5IKDhzksw" name="direction" visibility="public" type="_mmbRsBHYEdyWC5IKDhzksw" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_rG6aUBHYEdyWC5IKDhzksw" name="direction" visibility="public" type="_mmbRsBHYEdyWC5IKDhzksw" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hV118BRWEdyCa-N9ek5e_w" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hV_m8BRWEdyCa-N9ek5e_w" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_uKQ2kBHYEdyWC5IKDhzksw" value="inout"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_wccUkBHYEdyWC5IKDhzksw" name="base_Property" isUnique="false" association="_wb_ooBHYEdyWC5IKDhzksw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_wccUkBHYEdyWC5IKDhzksw" name="base_Property" isUnique="false" association="_wb_ooBHYEdyWC5IKDhzksw">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
           </ownedAttribute>
-          <icon xmi:id="_N2QyIHBUEd2Nss_u28cvSA" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%10%0%0%0%10%8%2%0%0%0%2%80%88%-22%0%0%0%1%115%82%71%66%0%-82%-50%28%-23%0%0%0%4%103%65%77%65%0%0%-79%-113%11%-4%97%5%0%0%0%32%99%72%82%77%0%0%122%38%0%0%-128%-124%0%0%-6%0%0%0%-128%-24%0%0%117%48%0%0%-22%96%0%0%58%-104%0%0%23%112%-100%-70%81%60%0%0%0%104%73%68%65%84%40%83%99%-4%-2%-3%-5%-124%9%19%126%-4%-8%-63%-128%1%10%10%10%24%-18%-33%-65%47%32%32%-128%41%7%20%-87%-81%-81%103%-8%-1%-1%63%80%-123%-126%-126%2%-90%10%-88%52%46%21%8%105%-84%42%80%-92%-127%110%-76%-76%-76%100%99%99%-125%-37%-126%-112%-58%-108%67%56%13%-85%28%84%26%40%103%98%98%-62%-62%-62%-126%-35%-27%-41%-81%95%55%50%50%50%-64%6%-10%-17%-33%15%0%-17%10%92%18%-113%107%-7%16%0%0%0%0%73%69%78%68%-82%66%96%-126%">
-            <eAnnotations xmi:id="_g1RZ0HBUEd2Nss_u28cvSA" source="image_papyrus">
-              <details xmi:id="_g1bK0HBUEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
-              <details xmi:id="_hP8joHBUEd2Nss_u28cvSA" key="image_expr_key" value="direction=in"/>
+          <icon xmi:type="uml:Image" xmi:id="_N2QyIHBUEd2Nss_u28cvSA" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%10%0%0%0%10%8%2%0%0%0%2%80%88%-22%0%0%0%1%115%82%71%66%0%-82%-50%28%-23%0%0%0%4%103%65%77%65%0%0%-79%-113%11%-4%97%5%0%0%0%32%99%72%82%77%0%0%122%38%0%0%-128%-124%0%0%-6%0%0%0%-128%-24%0%0%117%48%0%0%-22%96%0%0%58%-104%0%0%23%112%-100%-70%81%60%0%0%0%104%73%68%65%84%40%83%99%-4%-2%-3%-5%-124%9%19%126%-4%-8%-63%-128%1%10%10%10%24%-18%-33%-65%47%32%32%-128%41%7%20%-87%-81%-81%103%-8%-1%-1%63%80%-123%-126%-126%2%-90%10%-88%52%46%21%8%105%-84%42%80%-92%-127%110%-76%-76%-76%100%99%99%-125%-37%-126%-112%-58%-108%67%56%13%-85%28%84%26%40%103%98%98%-62%-62%-62%-126%-35%-27%-41%-81%95%55%50%50%50%-64%6%-10%-17%-33%15%0%-17%10%92%18%-113%107%-7%16%0%0%0%0%73%69%78%68%-82%66%96%-126%">
+            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_g1RZ0HBUEd2Nss_u28cvSA" source="image_papyrus">
+              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_g1bK0HBUEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hP8joHBUEd2Nss_u28cvSA" key="image_expr_key" value="direction=in"/>
             </eAnnotations>
           </icon>
-          <icon xmi:id="_yRgnMHBUEd2Nss_u28cvSA" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%10%0%0%0%9%8%2%0%0%0%-124%-60%42%68%0%0%0%1%115%82%71%66%0%-82%-50%28%-23%0%0%0%4%103%65%77%65%0%0%-79%-113%11%-4%97%5%0%0%0%32%99%72%82%77%0%0%122%38%0%0%-128%-124%0%0%-6%0%0%0%-128%-24%0%0%117%48%0%0%-22%96%0%0%58%-104%0%0%23%112%-100%-70%81%60%0%0%0%120%73%68%65%84%40%83%117%-113%49%14%0%17%16%0%-23%36%10%23%95%-48%-8%-117%-65%-8%-126%68%-29%5%-34%-31%27%58%-33%-48%-87%68%121%-73%71%-72%102%111%-86%-107%-103%108%44%29%99%-28%-100%-55%-90%-9%110%-116%57%79%18%66%96%-116%93%19%-50%57%8%-17%-3%-67%33%-50%-71%-81%-99%19%116%49%-58%21%32%26%10%41%-27%42%112%13%-123%16%34%-91%-12%-85%-75%-42%-83%53%92%47%-121%44%-89%-108%42%-91%-106%123%117%41%5%62%127%-80%-42%-42%90%-49%97%15%-51%-117%85%-63%-104%-4%-71%-32%0%0%0%0%73%69%78%68%-82%66%96%-126%">
-            <eAnnotations xmi:id="_zAInwHBUEd2Nss_u28cvSA" source="image_papyrus">
-              <details xmi:id="_zASYwHBUEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
-              <details xmi:id="_zz18oHBUEd2Nss_u28cvSA" key="image_expr_key" value="direction=out"/>
+          <icon xmi:type="uml:Image" xmi:id="_yRgnMHBUEd2Nss_u28cvSA" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%10%0%0%0%9%8%2%0%0%0%-124%-60%42%68%0%0%0%1%115%82%71%66%0%-82%-50%28%-23%0%0%0%4%103%65%77%65%0%0%-79%-113%11%-4%97%5%0%0%0%32%99%72%82%77%0%0%122%38%0%0%-128%-124%0%0%-6%0%0%0%-128%-24%0%0%117%48%0%0%-22%96%0%0%58%-104%0%0%23%112%-100%-70%81%60%0%0%0%120%73%68%65%84%40%83%117%-113%49%14%0%17%16%0%-23%36%10%23%95%-48%-8%-117%-65%-8%-126%68%-29%5%-34%-31%27%58%-33%-48%-87%68%121%-73%71%-72%102%111%-86%-107%-103%108%44%29%99%-28%-100%-55%-90%-9%110%-116%57%79%18%66%96%-116%93%19%-50%57%8%-17%-3%-67%33%-50%-71%-81%-99%19%116%49%-58%21%32%26%10%41%-27%42%112%13%-123%16%34%-91%-12%-85%-75%-42%-83%53%92%47%-121%44%-89%-108%42%-91%-106%123%117%41%5%62%127%-80%-42%-42%90%-49%97%15%-51%-117%85%-63%-104%-4%-71%-32%0%0%0%0%73%69%78%68%-82%66%96%-126%">
+            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zAInwHBUEd2Nss_u28cvSA" source="image_papyrus">
+              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zASYwHBUEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zz18oHBUEd2Nss_u28cvSA" key="image_expr_key" value="direction=out"/>
             </eAnnotations>
           </icon>
-          <icon xmi:id="_1s0QcHBUEd2Nss_u28cvSA" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%11%0%0%0%10%8%2%0%0%0%-19%-110%51%-44%0%0%0%1%115%82%71%66%0%-82%-50%28%-23%0%0%0%4%103%65%77%65%0%0%-79%-113%11%-4%97%5%0%0%0%32%99%72%82%77%0%0%122%38%0%0%-128%-124%0%0%-6%0%0%0%-128%-24%0%0%117%48%0%0%-22%96%0%0%58%-104%0%0%23%112%-100%-70%81%60%0%0%0%111%73%68%65%84%40%83%125%-113%-69%13%-64%32%12%5%-99%-51%24%-127%17%-40%-110%49%24%-63%37%-91%75%-105%-28%33%75%15%2%82%40%-112%-51%-99%63%60%99%12%-7%63%48%-30%-104%89%-50%25%65%41%69%85%-7%46%-60%41%-91%-42%26%82%96%-60%-108%-90%-127%106%-30%40%-40%37%-71%-15%33%9%58%-93%1%60%14%-114%-64%-35%-79%86%-83%117%78%-71%37%-30%-7%-45%-88%-40%-91%29%47%-125%-46%-127%63%6%-110%-34%59%111%-82%-11%2%-58%-53%-4%38%51%15%-12%-97%0%0%0%0%73%69%78%68%-82%66%96%-126%">
-            <eAnnotations xmi:id="_2YK6kHBUEd2Nss_u28cvSA" source="image_papyrus">
-              <details xmi:id="_2YUrkHBUEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
-              <details xmi:id="_3FeFcHBUEd2Nss_u28cvSA" key="image_expr_key" value="direction=inout"/>
+          <icon xmi:type="uml:Image" xmi:id="_1s0QcHBUEd2Nss_u28cvSA" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%11%0%0%0%10%8%2%0%0%0%-19%-110%51%-44%0%0%0%1%115%82%71%66%0%-82%-50%28%-23%0%0%0%4%103%65%77%65%0%0%-79%-113%11%-4%97%5%0%0%0%32%99%72%82%77%0%0%122%38%0%0%-128%-124%0%0%-6%0%0%0%-128%-24%0%0%117%48%0%0%-22%96%0%0%58%-104%0%0%23%112%-100%-70%81%60%0%0%0%111%73%68%65%84%40%83%125%-113%-69%13%-64%32%12%5%-99%-51%24%-127%17%-40%-110%49%24%-63%37%-91%75%-105%-28%33%75%15%2%82%40%-112%-51%-99%63%60%99%12%-7%63%48%-30%-104%89%-50%25%65%41%69%85%-7%46%-60%41%-91%-42%26%82%96%-60%-108%-90%-127%106%-30%40%-40%37%-71%-15%33%9%58%-93%1%60%14%-114%-64%-35%-79%86%-83%117%78%-71%37%-30%-7%-45%-88%-40%-91%29%47%-125%-46%-127%63%6%-110%-34%59%111%-82%-11%2%-58%-53%-4%38%51%15%-12%-97%0%0%0%0%73%69%78%68%-82%66%96%-126%">
+            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2YK6kHBUEd2Nss_u28cvSA" source="image_papyrus">
+              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2YUrkHBUEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3FeFcHBUEd2Nss_u28cvSA" key="image_expr_key" value="direction=inout"/>
             </eAnnotations>
           </icon>
         </packagedElement>
         <packagedElement xmi:type="uml:Enumeration" xmi:id="_mmbRsBHYEdyWC5IKDhzksw" name="FlowDirectionKind">
-          <ownedLiteral xmi:id="_nq934BHYEdyWC5IKDhzksw" name="in"/>
-          <ownedLiteral xmi:id="_nu_cQBHYEdyWC5IKDhzksw" name="out"/>
-          <ownedLiteral xmi:id="_n0NTcBHYEdyWC5IKDhzksw" name="inout"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_nq934BHYEdyWC5IKDhzksw" name="in"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_nu_cQBHYEdyWC5IKDhzksw" name="out"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_n0NTcBHYEdyWC5IKDhzksw" name="inout"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Extension" xmi:id="_wb_ooBHYEdyWC5IKDhzksw" name="Extension_FlowProperty" memberEnd="_wcJZoBHYEdyWC5IKDhzksw _wccUkBHYEdyWC5IKDhzksw">
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_wcJZoBHYEdyWC5IKDhzksw" name="extension_FlowProperty" type="_lMax0BHYEdyWC5IKDhzksw" aggregation="composite" association="_wb_ooBHYEdyWC5IKDhzksw"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_xKMLYBHYEdyWC5IKDhzksw" name="FlowPort">
-          <ownedAttribute xmi:id="_y8LtcBHYEdyWC5IKDhzksw" name="isAtomic" visibility="public" isUnique="false" isDerived="true">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_y8LtcBHYEdyWC5IKDhzksw" name="isAtomic" visibility="public" isUnique="false" isDerived="true">
             <type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-oOd0BHYEdyWC5IKDhzksw" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-oOd0RHYEdyWC5IKDhzksw" value="1"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_zCvocBHYEdyWC5IKDhzksw" name="direction" visibility="public" type="_mmbRsBHYEdyWC5IKDhzksw" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_zCvocBHYEdyWC5IKDhzksw" name="direction" visibility="public" type="_mmbRsBHYEdyWC5IKDhzksw" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_eNLpAEFUEd6UW4qJC-Vahw" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_eNej8EFUEd6UW4qJC-Vahw" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_C170YRHZEdyWC5IKDhzksw" value="inout"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_I_xgcBHZEdyWC5IKDhzksw" name="base_Port" isUnique="false" association="_I_LDgBHZEdyWC5IKDhzksw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_I_xgcBHZEdyWC5IKDhzksw" name="base_Port" isUnique="false" association="_I_LDgBHZEdyWC5IKDhzksw">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Port"/>
           </ownedAttribute>
-          <icon xmi:id="_Chv7gHBVEd2Nss_u28cvSA" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%10%0%0%0%10%8%2%0%0%0%2%80%88%-22%0%0%0%1%115%82%71%66%0%-82%-50%28%-23%0%0%0%4%103%65%77%65%0%0%-79%-113%11%-4%97%5%0%0%0%32%99%72%82%77%0%0%122%38%0%0%-128%-124%0%0%-6%0%0%0%-128%-24%0%0%117%48%0%0%-22%96%0%0%58%-104%0%0%23%112%-100%-70%81%60%0%0%0%104%73%68%65%84%40%83%99%-4%-2%-3%-5%-124%9%19%126%-4%-8%-63%-128%1%10%10%10%24%-18%-33%-65%47%32%32%-128%41%7%20%-87%-81%-81%103%-8%-1%-1%63%80%-123%-126%-126%2%-90%10%-88%52%46%21%8%105%-84%42%80%-92%-127%110%-76%-76%-76%100%99%99%-125%-37%-126%-112%-58%-108%67%56%13%-85%28%84%26%40%103%98%98%-62%-62%-62%-126%-35%-27%-41%-81%95%55%50%50%50%-64%6%-10%-17%-33%15%0%-17%10%92%18%-113%107%-7%16%0%0%0%0%73%69%78%68%-82%66%96%-126%">
-            <eAnnotations xmi:id="_DKIKIHBVEd2Nss_u28cvSA" source="image_papyrus">
-              <details xmi:id="_DKR7IHBVEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
-              <details xmi:id="_Dl11wHBVEd2Nss_u28cvSA" key="image_expr_key" value="direction=in"/>
+          <icon xmi:type="uml:Image" xmi:id="_Chv7gHBVEd2Nss_u28cvSA" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%10%0%0%0%10%8%2%0%0%0%2%80%88%-22%0%0%0%1%115%82%71%66%0%-82%-50%28%-23%0%0%0%4%103%65%77%65%0%0%-79%-113%11%-4%97%5%0%0%0%32%99%72%82%77%0%0%122%38%0%0%-128%-124%0%0%-6%0%0%0%-128%-24%0%0%117%48%0%0%-22%96%0%0%58%-104%0%0%23%112%-100%-70%81%60%0%0%0%104%73%68%65%84%40%83%99%-4%-2%-3%-5%-124%9%19%126%-4%-8%-63%-128%1%10%10%10%24%-18%-33%-65%47%32%32%-128%41%7%20%-87%-81%-81%103%-8%-1%-1%63%80%-123%-126%-126%2%-90%10%-88%52%46%21%8%105%-84%42%80%-92%-127%110%-76%-76%-76%100%99%99%-125%-37%-126%-112%-58%-108%67%56%13%-85%28%84%26%40%103%98%98%-62%-62%-62%-126%-35%-27%-41%-81%95%55%50%50%50%-64%6%-10%-17%-33%15%0%-17%10%92%18%-113%107%-7%16%0%0%0%0%73%69%78%68%-82%66%96%-126%">
+            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_DKIKIHBVEd2Nss_u28cvSA" source="image_papyrus">
+              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DKR7IHBVEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Dl11wHBVEd2Nss_u28cvSA" key="image_expr_key" value="direction=in"/>
             </eAnnotations>
           </icon>
-          <icon xmi:id="_E6nQUHBVEd2Nss_u28cvSA" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%10%0%0%0%9%8%2%0%0%0%-124%-60%42%68%0%0%0%1%115%82%71%66%0%-82%-50%28%-23%0%0%0%4%103%65%77%65%0%0%-79%-113%11%-4%97%5%0%0%0%32%99%72%82%77%0%0%122%38%0%0%-128%-124%0%0%-6%0%0%0%-128%-24%0%0%117%48%0%0%-22%96%0%0%58%-104%0%0%23%112%-100%-70%81%60%0%0%0%120%73%68%65%84%40%83%117%-113%49%14%0%17%16%0%-23%36%10%23%95%-48%-8%-117%-65%-8%-126%68%-29%5%-34%-31%27%58%-33%-48%-87%68%121%-73%71%-72%102%111%-86%-107%-103%108%44%29%99%-28%-100%-55%-90%-9%110%-116%57%79%18%66%96%-116%93%19%-50%57%8%-17%-3%-67%33%-50%-71%-81%-99%19%116%49%-58%21%32%26%10%41%-27%42%112%13%-123%16%34%-91%-12%-85%-75%-42%-83%53%92%47%-121%44%-89%-108%42%-91%-106%123%117%41%5%62%127%-80%-42%-42%90%-49%97%15%-51%-117%85%-63%-104%-4%-71%-32%0%0%0%0%73%69%78%68%-82%66%96%-126%">
-            <eAnnotations xmi:id="_FjcK4HBVEd2Nss_u28cvSA" source="image_papyrus">
-              <details xmi:id="_FjlU0HBVEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
-              <details xmi:id="_Gj8loHBVEd2Nss_u28cvSA" key="image_expr_key" value="direction=out"/>
+          <icon xmi:type="uml:Image" xmi:id="_E6nQUHBVEd2Nss_u28cvSA" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%10%0%0%0%9%8%2%0%0%0%-124%-60%42%68%0%0%0%1%115%82%71%66%0%-82%-50%28%-23%0%0%0%4%103%65%77%65%0%0%-79%-113%11%-4%97%5%0%0%0%32%99%72%82%77%0%0%122%38%0%0%-128%-124%0%0%-6%0%0%0%-128%-24%0%0%117%48%0%0%-22%96%0%0%58%-104%0%0%23%112%-100%-70%81%60%0%0%0%120%73%68%65%84%40%83%117%-113%49%14%0%17%16%0%-23%36%10%23%95%-48%-8%-117%-65%-8%-126%68%-29%5%-34%-31%27%58%-33%-48%-87%68%121%-73%71%-72%102%111%-86%-107%-103%108%44%29%99%-28%-100%-55%-90%-9%110%-116%57%79%18%66%96%-116%93%19%-50%57%8%-17%-3%-67%33%-50%-71%-81%-99%19%116%49%-58%21%32%26%10%41%-27%42%112%13%-123%16%34%-91%-12%-85%-75%-42%-83%53%92%47%-121%44%-89%-108%42%-91%-106%123%117%41%5%62%127%-80%-42%-42%90%-49%97%15%-51%-117%85%-63%-104%-4%-71%-32%0%0%0%0%73%69%78%68%-82%66%96%-126%">
+            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FjcK4HBVEd2Nss_u28cvSA" source="image_papyrus">
+              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FjlU0HBVEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Gj8loHBVEd2Nss_u28cvSA" key="image_expr_key" value="direction=out"/>
             </eAnnotations>
           </icon>
-          <icon xmi:id="_H6EEAHBVEd2Nss_u28cvSA" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%11%0%0%0%10%8%2%0%0%0%-19%-110%51%-44%0%0%0%1%115%82%71%66%0%-82%-50%28%-23%0%0%0%4%103%65%77%65%0%0%-79%-113%11%-4%97%5%0%0%0%32%99%72%82%77%0%0%122%38%0%0%-128%-124%0%0%-6%0%0%0%-128%-24%0%0%117%48%0%0%-22%96%0%0%58%-104%0%0%23%112%-100%-70%81%60%0%0%0%111%73%68%65%84%40%83%125%-113%-69%13%-64%32%12%5%-99%-51%24%-127%17%-40%-110%49%24%-63%37%-91%75%-105%-28%33%75%15%2%82%40%-112%-51%-99%63%60%99%12%-7%63%48%-30%-104%89%-50%25%65%41%69%85%-7%46%-60%41%-91%-42%26%82%96%-60%-108%-90%-127%106%-30%40%-40%37%-71%-15%33%9%58%-93%1%60%14%-114%-64%-35%-79%86%-83%117%78%-71%37%-30%-7%-45%-88%-40%-91%29%47%-125%-46%-127%63%6%-110%-34%59%111%-82%-11%2%-58%-53%-4%38%51%15%-12%-97%0%0%0%0%73%69%78%68%-82%66%96%-126%">
-            <eAnnotations xmi:id="_IjCvkHBVEd2Nss_u28cvSA" source="image_papyrus">
-              <details xmi:id="_IjL5gHBVEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
-              <details xmi:id="_JWlsYHBVEd2Nss_u28cvSA" key="image_expr_key" value="direction=inout"/>
+          <icon xmi:type="uml:Image" xmi:id="_H6EEAHBVEd2Nss_u28cvSA" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%11%0%0%0%10%8%2%0%0%0%-19%-110%51%-44%0%0%0%1%115%82%71%66%0%-82%-50%28%-23%0%0%0%4%103%65%77%65%0%0%-79%-113%11%-4%97%5%0%0%0%32%99%72%82%77%0%0%122%38%0%0%-128%-124%0%0%-6%0%0%0%-128%-24%0%0%117%48%0%0%-22%96%0%0%58%-104%0%0%23%112%-100%-70%81%60%0%0%0%111%73%68%65%84%40%83%125%-113%-69%13%-64%32%12%5%-99%-51%24%-127%17%-40%-110%49%24%-63%37%-91%75%-105%-28%33%75%15%2%82%40%-112%-51%-99%63%60%99%12%-7%63%48%-30%-104%89%-50%25%65%41%69%85%-7%46%-60%41%-91%-42%26%82%96%-60%-108%-90%-127%106%-30%40%-40%37%-71%-15%33%9%58%-93%1%60%14%-114%-64%-35%-79%86%-83%117%78%-71%37%-30%-7%-45%-88%-40%-91%29%47%-125%-46%-127%63%6%-110%-34%59%111%-82%-11%2%-58%-53%-4%38%51%15%-12%-97%0%0%0%0%73%69%78%68%-82%66%96%-126%">
+            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IjCvkHBVEd2Nss_u28cvSA" source="image_papyrus">
+              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IjL5gHBVEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_JWlsYHBVEd2Nss_u28cvSA" key="image_expr_key" value="direction=inout"/>
             </eAnnotations>
           </icon>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_xgP68BHYEdyWC5IKDhzksw" name="ClientServerPort">
-          <ownedAttribute xmi:id="_JZ_-UBHZEdyWC5IKDhzksw" name="base_Port" isUnique="false" association="_JZZhYBHZEdyWC5IKDhzksw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_JZ_-UBHZEdyWC5IKDhzksw" name="base_Port" isUnique="false" association="_JZZhYBHZEdyWC5IKDhzksw">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Port"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_N_QSMBHZEdyWC5IKDhzksw" name="specificationKind" visibility="public" type="_LptasEE8Ed6UW4qJC-Vahw" isUnique="false" isDerived="true">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_N_QSMBHZEdyWC5IKDhzksw" name="specificationKind" visibility="public" type="_LptasEE8Ed6UW4qJC-Vahw" isUnique="false" isDerived="true">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_N_QSMhHZEdyWC5IKDhzksw" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_N_QSMRHZEdyWC5IKDhzksw" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_tO9UMEFWEd6UW4qJC-Vahw" value="interfaceBased"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_N_QSOBHZEdyWC5IKDhzksw" name="kind" visibility="public" type="_DdY_gBRWEdyCa-N9ek5e_w" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_N_QSOBHZEdyWC5IKDhzksw" name="kind" visibility="public" type="_DdY_gBRWEdyCa-N9ek5e_w" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_N_QSOhHZEdyWC5IKDhzksw" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_N_QSORHZEdyWC5IKDhzksw" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_N_QSOxHZEdyWC5IKDhzksw" value="proreq"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_IEghsEFUEd6UW4qJC-Vahw" name="provInterface" isUnique="false" association="_IAK0QEFUEd6UW4qJC-Vahw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_IEghsEFUEd6UW4qJC-Vahw" name="provInterface" isUnique="false" association="_IAK0QEFUEd6UW4qJC-Vahw">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Interface"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IFdj8EFUEd6UW4qJC-Vahw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IFgAMEFUEd6UW4qJC-Vahw" value="*"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_MEBrQEFUEd6UW4qJC-Vahw" name="reqInterface" isUnique="false" association="_MBIIQEFUEd6UW4qJC-Vahw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_MEBrQEFUEd6UW4qJC-Vahw" name="reqInterface" isUnique="false" association="_MBIIQEFUEd6UW4qJC-Vahw">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Interface"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ME-GcEFUEd6UW4qJC-Vahw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MFBJwEFUEd6UW4qJC-Vahw" value="*"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_QfslUEFUEd6UW4qJC-Vahw" name="featuresSpec" type="_lOsNQBHZEdyWC5IKDhzksw" isUnique="false" association="_Qbzj0EFUEd6UW4qJC-Vahw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_QfslUEFUEd6UW4qJC-Vahw" name="featuresSpec" type="_lOsNQBHZEdyWC5IKDhzksw" isUnique="false" association="_Qbzj0EFUEd6UW4qJC-Vahw">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ws0O4EFUEd6UW4qJC-Vahw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WtC4YEFUEd6UW4qJC-Vahw" value="1"/>
           </ownedAttribute>
-          <icon xmi:id="_VYRVkHBVEd2Nss_u28cvSA" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%5%0%0%0%10%8%2%0%0%0%-13%91%3%103%0%0%0%1%115%82%71%66%0%-82%-50%28%-23%0%0%0%4%103%65%77%65%0%0%-79%-113%11%-4%97%5%0%0%0%32%99%72%82%77%0%0%122%38%0%0%-128%-124%0%0%-6%0%0%0%-128%-24%0%0%117%48%0%0%-22%96%0%0%58%-104%0%0%23%112%-100%-70%81%60%0%0%0%113%73%68%65%84%24%87%69%-51%-79%17%64%17%12%6%96%-74%48%-122%17%-116%96%4%58%59%40%-108%74%-107%83%26%65%105%12%-91%21%116%74%58%47%30%119%-46%36%-33%37%-71%31%-81%-75%-48%95%-83%-75%57%39%2%67%57%-25%8%33%49%-58%109%107%-83%82%-22%44%80%41%-123%82%122%-80%-83%-75%54%-58%60%75%41%-67%-9%-49%41%37%-50%-7%51%76%-116%-79%-100%-13%-3%-121%-42%123%-121%19%33%68%-83%-11%-26%-113%49%32%60%-124%-16%1%-49%-8%112%-111%72%93%-123%-80%0%0%0%0%73%69%78%68%-82%66%96%-126%">
-            <eAnnotations xmi:id="_bR9FwHBVEd2Nss_u28cvSA" source="image_papyrus">
-              <details xmi:id="_bSG2wHBVEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
-              <details xmi:id="_cOveIHBVEd2Nss_u28cvSA" key="image_expr_key" value="kind=required"/>
+          <icon xmi:type="uml:Image" xmi:id="_VYRVkHBVEd2Nss_u28cvSA" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%5%0%0%0%10%8%2%0%0%0%-13%91%3%103%0%0%0%1%115%82%71%66%0%-82%-50%28%-23%0%0%0%4%103%65%77%65%0%0%-79%-113%11%-4%97%5%0%0%0%32%99%72%82%77%0%0%122%38%0%0%-128%-124%0%0%-6%0%0%0%-128%-24%0%0%117%48%0%0%-22%96%0%0%58%-104%0%0%23%112%-100%-70%81%60%0%0%0%113%73%68%65%84%24%87%69%-51%-79%17%64%17%12%6%96%-74%48%-122%17%-116%96%4%58%59%40%-108%74%-107%83%26%65%105%12%-91%21%116%74%58%47%30%119%-46%36%-33%37%-71%31%-81%-75%-48%95%-83%-75%57%39%2%67%57%-25%8%33%49%-58%109%107%-83%82%-22%44%80%41%-123%82%122%-80%-83%-75%54%-58%60%75%41%-67%-9%-49%41%37%-50%-7%51%76%-116%-79%-100%-13%-3%-121%-42%123%-121%19%33%68%-83%-11%-26%-113%49%32%60%-124%-16%1%-49%-8%112%-111%72%93%-123%-80%0%0%0%0%73%69%78%68%-82%66%96%-126%">
+            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_bR9FwHBVEd2Nss_u28cvSA" source="image_papyrus">
+              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_bSG2wHBVEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cOveIHBVEd2Nss_u28cvSA" key="image_expr_key" value="kind=required"/>
             </eAnnotations>
           </icon>
-          <icon xmi:id="_WEhXkHBVEd2Nss_u28cvSA" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%9%0%0%0%9%8%2%0%0%0%111%-13%-111%71%0%0%0%1%115%82%71%66%0%-82%-50%28%-23%0%0%0%4%103%65%77%65%0%0%-79%-113%11%-4%97%5%0%0%0%32%99%72%82%77%0%0%122%38%0%0%-128%-124%0%0%-6%0%0%0%-128%-24%0%0%117%48%0%0%-22%96%0%0%58%-104%0%0%23%112%-100%-70%81%60%0%0%0%-101%73%68%65%84%24%87%93%-113%-95%13%4%33%16%69%57%71%25%72%36%18%-119%-36%18%40%-127%18%112%72%74%-96%4%74%-40%18%88%-121%68%34%-111%72%112%-36%-33%-29%-78%98%39%25%-14%-13%-33%-52%-49%-16%89%107%-111%95%93%-41%53%-25%-92%-108%74%41%-73%67%-64%122%-17%-57%113%-64%82%74%-31%69%-43%90%-17%29%52%64%-116%17%98%87%74%73%8%49%-58%32%80%24%124%-64%22%-58%-104%16%2%65%67%-67%-40%54%-55%121%-98%-56%124%49%107%-83%-9%-98%32%23%-23%-91%-108%7%-61%97%-116%-75%-42%-18%91%114%-50%-100%115%-52%-30%34%-25%28%0%-62%-2%119%-18%111%32%68%107%13%-122%-115%-99%-15%5%-23%37%-91%-8%1%36%-4%-87%0%0%0%0%73%69%78%68%-82%66%96%-126%">
-            <eAnnotations xmi:id="_dRWKoHBVEd2Nss_u28cvSA" source="image_papyrus">
-              <details xmi:id="_dRfUkHBVEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
-              <details xmi:id="_eFyfUHBVEd2Nss_u28cvSA" key="image_expr_key" value="kind=provided"/>
+          <icon xmi:type="uml:Image" xmi:id="_WEhXkHBVEd2Nss_u28cvSA" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%9%0%0%0%9%8%2%0%0%0%111%-13%-111%71%0%0%0%1%115%82%71%66%0%-82%-50%28%-23%0%0%0%4%103%65%77%65%0%0%-79%-113%11%-4%97%5%0%0%0%32%99%72%82%77%0%0%122%38%0%0%-128%-124%0%0%-6%0%0%0%-128%-24%0%0%117%48%0%0%-22%96%0%0%58%-104%0%0%23%112%-100%-70%81%60%0%0%0%-101%73%68%65%84%24%87%93%-113%-95%13%4%33%16%69%57%71%25%72%36%18%-119%-36%18%40%-127%18%112%72%74%-96%4%74%-40%18%88%-121%68%34%-111%72%112%-36%-33%-29%-78%98%39%25%-14%-13%-33%-52%-49%-16%89%107%-111%95%93%-41%53%-25%-92%-108%74%41%-73%67%-64%122%-17%-57%113%-64%82%74%-31%69%-43%90%-17%29%52%64%-116%17%98%87%74%73%8%49%-58%32%80%24%124%-64%22%-58%-104%16%2%65%67%-67%-40%54%-55%121%-98%-56%124%49%107%-83%-9%-98%32%23%-23%-91%-108%7%-61%97%-116%-75%-42%-18%91%114%-50%-100%115%-52%-30%34%-25%28%0%-62%-2%119%-18%111%32%68%107%13%-122%-115%-99%-15%5%-23%37%-91%-8%1%36%-4%-87%0%0%0%0%73%69%78%68%-82%66%96%-126%">
+            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dRWKoHBVEd2Nss_u28cvSA" source="image_papyrus">
+              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dRfUkHBVEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_eFyfUHBVEd2Nss_u28cvSA" key="image_expr_key" value="kind=provided"/>
             </eAnnotations>
           </icon>
-          <icon xmi:id="_XdeHgHBVEd2Nss_u28cvSA" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%7%0%0%0%15%8%2%0%0%0%-89%99%66%-23%0%0%0%1%115%82%71%66%0%-82%-50%28%-23%0%0%0%4%103%65%77%65%0%0%-79%-113%11%-4%97%5%0%0%0%32%99%72%82%77%0%0%122%38%0%0%-128%-124%0%0%-6%0%0%0%-128%-24%0%0%117%48%0%0%-22%96%0%0%58%-104%0%0%23%112%-100%-70%81%60%0%0%0%-84%73%68%65%84%40%83%117%-113%-95%17%-60%32%16%69%-71%14%34%41%33%37%32%83%2%50%37%68%34%-23%0%-127%-120%68%70%70%82%66%100%36%45%92%7%-111%-111%-36%-29%-56%-112%-55%-51%-36%-118%101%-2%-101%-65%127%-105%87%-50%89%8%-15%-2%-106%-108%-78%-17%123%-92%-128%46%-53%-126%24%-122%-127%-18%-100%43%-66%125%-33%-107%82%-25%121%34%-88%113%28%49%9%99%-52%60%-49%21%81%-37%-74%49%-12%-121%-90%-108%72%56%-114%3%35%57%90%-21%117%93%-53%54%-98%-82%-21%24%-92%-41%-76%66%91%98%-37%121%81%52%55%49%94%29%23%37%-38%90%-53%-114%-101%-110%-53%-103%45%-22%-14%122%-17%49%-2%-46%24%99%75%124%-28%66%-89%105%-30%-81%15%-118%8%33%112%70%61%-18%3%-125%89%-24%7%90%-3%-9%4%0%0%0%0%73%69%78%68%-82%66%96%-126%">
-            <eAnnotations xmi:id="_e8UesHBVEd2Nss_u28cvSA" source="image_papyrus">
-              <details xmi:id="_e8ePsHBVEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
-              <details xmi:id="_gLb9MHBVEd2Nss_u28cvSA" key="image_expr_key" value="kind=proreq"/>
+          <icon xmi:type="uml:Image" xmi:id="_XdeHgHBVEd2Nss_u28cvSA" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%7%0%0%0%15%8%2%0%0%0%-89%99%66%-23%0%0%0%1%115%82%71%66%0%-82%-50%28%-23%0%0%0%4%103%65%77%65%0%0%-79%-113%11%-4%97%5%0%0%0%32%99%72%82%77%0%0%122%38%0%0%-128%-124%0%0%-6%0%0%0%-128%-24%0%0%117%48%0%0%-22%96%0%0%58%-104%0%0%23%112%-100%-70%81%60%0%0%0%-84%73%68%65%84%40%83%117%-113%-95%17%-60%32%16%69%-71%14%34%41%33%37%32%83%2%50%37%68%34%-23%0%-127%-120%68%70%70%82%66%100%36%45%92%7%-111%-111%-36%-29%-56%-112%-55%-51%-36%-118%101%-2%-101%-65%127%-105%87%-50%89%8%-15%-2%-106%-108%-78%-17%123%-92%-128%46%-53%-126%24%-122%-127%-18%-100%43%-66%125%-33%-107%82%-25%121%34%-88%113%28%49%9%99%-52%60%-49%21%81%-37%-74%49%-12%-121%-90%-108%72%56%-114%3%35%57%90%-21%117%93%-53%54%-98%-82%-21%24%-92%-41%-76%66%91%98%-37%121%81%52%55%49%94%29%23%37%-38%90%-53%-114%-101%-110%-53%-103%45%-22%-14%122%-17%49%-2%-46%24%99%75%124%-28%66%-89%105%-30%-81%15%-118%8%33%112%70%61%-18%3%-125%89%-24%7%90%-3%-9%4%0%0%0%0%73%69%78%68%-82%66%96%-126%">
+            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_e8UesHBVEd2Nss_u28cvSA" source="image_papyrus">
+              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_e8ePsHBVEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_gLb9MHBVEd2Nss_u28cvSA" key="image_expr_key" value="kind=proreq"/>
             </eAnnotations>
           </icon>
         </packagedElement>
@@ -3932,7 +3932,7 @@
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_JZtDYBHZEdyWC5IKDhzksw" name="extension_MsgPort" type="_xgP68BHYEdyWC5IKDhzksw" aggregation="composite" association="_JZZhYBHZEdyWC5IKDhzksw"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_bH1SABHZEdyWC5IKDhzksw" name="FlowSpecification">
-          <ownedAttribute xmi:id="_hOZAkBHZEdyWC5IKDhzksw" name="base_Interface" isUnique="false" association="_hOPPkBHZEdyWC5IKDhzksw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_hOZAkBHZEdyWC5IKDhzksw" name="base_Interface" isUnique="false" association="_hOPPkBHZEdyWC5IKDhzksw">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Interface"/>
           </ownedAttribute>
         </packagedElement>
@@ -3940,7 +3940,7 @@
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_hOPPkRHZEdyWC5IKDhzksw" name="extension_FlowSpecification" type="_bH1SABHZEdyWC5IKDhzksw" aggregation="composite" association="_hOPPkBHZEdyWC5IKDhzksw"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_lOsNQBHZEdyWC5IKDhzksw" name="ClientServerSpecification">
-          <ownedAttribute xmi:id="_vGWO4BHZEdyWC5IKDhzksw" name="base_Interface" isUnique="false" association="_vF5i8BHZEdyWC5IKDhzksw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_vGWO4BHZEdyWC5IKDhzksw" name="base_Interface" isUnique="false" association="_vF5i8BHZEdyWC5IKDhzksw">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Interface"/>
           </ownedAttribute>
         </packagedElement>
@@ -3948,35 +3948,35 @@
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_vGDT8BHZEdyWC5IKDhzksw" name="extension_SignalSpecification" type="_lOsNQBHZEdyWC5IKDhzksw" aggregation="composite" association="_vF5i8BHZEdyWC5IKDhzksw"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Enumeration" xmi:id="_DdY_gBRWEdyCa-N9ek5e_w" name="ClientServerKind">
-          <ownedLiteral xmi:id="_FZOaEBRWEdyCa-N9ek5e_w" name="required"/>
-          <ownedLiteral xmi:id="_FjzSYBRWEdyCa-N9ek5e_w" name="provided"/>
-          <ownedLiteral xmi:id="_gzJIAEE7Ed6UW4qJC-Vahw" name="proreq"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_FZOaEBRWEdyCa-N9ek5e_w" name="required"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_FjzSYBRWEdyCa-N9ek5e_w" name="provided"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_gzJIAEE7Ed6UW4qJC-Vahw" name="proreq"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_cC1EMBRWEdyCa-N9ek5e_w" name="ClientServerFeature">
-          <ownedAttribute xmi:id="_dip4MBRWEdyCa-N9ek5e_w" name="kind" visibility="public" type="_DdY_gBRWEdyCa-N9ek5e_w" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_dip4MBRWEdyCa-N9ek5e_w" name="kind" visibility="public" type="_DdY_gBRWEdyCa-N9ek5e_w" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_fIIBMBRWEdyCa-N9ek5e_w" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fIRyMBRWEdyCa-N9ek5e_w" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_fIbjMBRWEdyCa-N9ek5e_w" value="proreq"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_wLpMkBRWEdyCa-N9ek5e_w" name="base_BehavioralFeature" isUnique="false" association="_wKJ-0BRWEdyCa-N9ek5e_w">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_wLpMkBRWEdyCa-N9ek5e_w" name="base_BehavioralFeature" isUnique="false" association="_wKJ-0BRWEdyCa-N9ek5e_w">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
           </ownedAttribute>
-          <icon xmi:id="_RcEwUHBWEd2Nss_u28cvSA" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%5%0%0%0%10%8%2%0%0%0%-13%91%3%103%0%0%0%1%115%82%71%66%0%-82%-50%28%-23%0%0%0%4%103%65%77%65%0%0%-79%-113%11%-4%97%5%0%0%0%32%99%72%82%77%0%0%122%38%0%0%-128%-124%0%0%-6%0%0%0%-128%-24%0%0%117%48%0%0%-22%96%0%0%58%-104%0%0%23%112%-100%-70%81%60%0%0%0%113%73%68%65%84%24%87%69%-51%-79%17%64%17%12%6%96%-74%48%-122%17%-116%96%4%58%59%40%-108%74%-107%83%26%65%105%12%-91%21%116%74%58%47%30%119%-46%36%-33%37%-71%31%-81%-75%-48%95%-83%-75%57%39%2%67%57%-25%8%33%49%-58%109%107%-83%82%-22%44%80%41%-123%82%122%-80%-83%-75%54%-58%60%75%41%-67%-9%-49%41%37%-50%-7%51%76%-116%-79%-100%-13%-3%-121%-42%123%-121%19%33%68%-83%-11%-26%-113%49%32%60%-124%-16%1%-49%-8%112%-111%72%93%-123%-80%0%0%0%0%73%69%78%68%-82%66%96%-126%">
-            <eAnnotations xmi:id="_Xy0P8HBWEd2Nss_u28cvSA" source="image_papyrus">
-              <details xmi:id="_Xy-A8HBWEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
-              <details xmi:id="_Y6VRoHBWEd2Nss_u28cvSA" key="image_expr_key" value="kind=required"/>
+          <icon xmi:type="uml:Image" xmi:id="_RcEwUHBWEd2Nss_u28cvSA" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%5%0%0%0%10%8%2%0%0%0%-13%91%3%103%0%0%0%1%115%82%71%66%0%-82%-50%28%-23%0%0%0%4%103%65%77%65%0%0%-79%-113%11%-4%97%5%0%0%0%32%99%72%82%77%0%0%122%38%0%0%-128%-124%0%0%-6%0%0%0%-128%-24%0%0%117%48%0%0%-22%96%0%0%58%-104%0%0%23%112%-100%-70%81%60%0%0%0%113%73%68%65%84%24%87%69%-51%-79%17%64%17%12%6%96%-74%48%-122%17%-116%96%4%58%59%40%-108%74%-107%83%26%65%105%12%-91%21%116%74%58%47%30%119%-46%36%-33%37%-71%31%-81%-75%-48%95%-83%-75%57%39%2%67%57%-25%8%33%49%-58%109%107%-83%82%-22%44%80%41%-123%82%122%-80%-83%-75%54%-58%60%75%41%-67%-9%-49%41%37%-50%-7%51%76%-116%-79%-100%-13%-3%-121%-42%123%-121%19%33%68%-83%-11%-26%-113%49%32%60%-124%-16%1%-49%-8%112%-111%72%93%-123%-80%0%0%0%0%73%69%78%68%-82%66%96%-126%">
+            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Xy0P8HBWEd2Nss_u28cvSA" source="image_papyrus">
+              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Xy-A8HBWEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y6VRoHBWEd2Nss_u28cvSA" key="image_expr_key" value="kind=required"/>
             </eAnnotations>
           </icon>
-          <icon xmi:id="_R9TOEHBWEd2Nss_u28cvSA" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%9%0%0%0%9%8%2%0%0%0%111%-13%-111%71%0%0%0%1%115%82%71%66%0%-82%-50%28%-23%0%0%0%4%103%65%77%65%0%0%-79%-113%11%-4%97%5%0%0%0%32%99%72%82%77%0%0%122%38%0%0%-128%-124%0%0%-6%0%0%0%-128%-24%0%0%117%48%0%0%-22%96%0%0%58%-104%0%0%23%112%-100%-70%81%60%0%0%0%-101%73%68%65%84%24%87%93%-113%-95%13%4%33%16%69%57%71%25%72%36%18%-119%-36%18%40%-127%18%112%72%74%-96%4%74%-40%18%88%-121%68%34%-111%72%112%-36%-33%-29%-78%98%39%25%-14%-13%-33%-52%-49%-16%89%107%-111%95%93%-41%53%-25%-92%-108%74%41%-73%67%-64%122%-17%-57%113%-64%82%74%-31%69%-43%90%-17%29%52%64%-116%17%98%87%74%73%8%49%-58%32%80%24%124%-64%22%-58%-104%16%2%65%67%-67%-40%54%-55%121%-98%-56%124%49%107%-83%-9%-98%32%23%-23%-91%-108%7%-61%97%-116%-75%-42%-18%91%114%-50%-100%115%-52%-30%34%-25%28%0%-62%-2%119%-18%111%32%68%107%13%-122%-115%-99%-15%5%-23%37%-91%-8%1%36%-4%-87%0%0%0%0%73%69%78%68%-82%66%96%-126%">
-            <eAnnotations xmi:id="_Z041YHBWEd2Nss_u28cvSA" source="image_papyrus">
-              <details xmi:id="_Z041YXBWEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
-              <details xmi:id="_awe68HBWEd2Nss_u28cvSA" key="image_expr_key" value="kind=provided"/>
+          <icon xmi:type="uml:Image" xmi:id="_R9TOEHBWEd2Nss_u28cvSA" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%9%0%0%0%9%8%2%0%0%0%111%-13%-111%71%0%0%0%1%115%82%71%66%0%-82%-50%28%-23%0%0%0%4%103%65%77%65%0%0%-79%-113%11%-4%97%5%0%0%0%32%99%72%82%77%0%0%122%38%0%0%-128%-124%0%0%-6%0%0%0%-128%-24%0%0%117%48%0%0%-22%96%0%0%58%-104%0%0%23%112%-100%-70%81%60%0%0%0%-101%73%68%65%84%24%87%93%-113%-95%13%4%33%16%69%57%71%25%72%36%18%-119%-36%18%40%-127%18%112%72%74%-96%4%74%-40%18%88%-121%68%34%-111%72%112%-36%-33%-29%-78%98%39%25%-14%-13%-33%-52%-49%-16%89%107%-111%95%93%-41%53%-25%-92%-108%74%41%-73%67%-64%122%-17%-57%113%-64%82%74%-31%69%-43%90%-17%29%52%64%-116%17%98%87%74%73%8%49%-58%32%80%24%124%-64%22%-58%-104%16%2%65%67%-67%-40%54%-55%121%-98%-56%124%49%107%-83%-9%-98%32%23%-23%-91%-108%7%-61%97%-116%-75%-42%-18%91%114%-50%-100%115%-52%-30%34%-25%28%0%-62%-2%119%-18%111%32%68%107%13%-122%-115%-99%-15%5%-23%37%-91%-8%1%36%-4%-87%0%0%0%0%73%69%78%68%-82%66%96%-126%">
+            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Z041YHBWEd2Nss_u28cvSA" source="image_papyrus">
+              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Z041YXBWEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_awe68HBWEd2Nss_u28cvSA" key="image_expr_key" value="kind=provided"/>
             </eAnnotations>
           </icon>
-          <icon xmi:id="_ShNMYHBWEd2Nss_u28cvSA" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%7%0%0%0%15%8%2%0%0%0%-89%99%66%-23%0%0%0%1%115%82%71%66%0%-82%-50%28%-23%0%0%0%4%103%65%77%65%0%0%-79%-113%11%-4%97%5%0%0%0%32%99%72%82%77%0%0%122%38%0%0%-128%-124%0%0%-6%0%0%0%-128%-24%0%0%117%48%0%0%-22%96%0%0%58%-104%0%0%23%112%-100%-70%81%60%0%0%0%-84%73%68%65%84%40%83%117%-113%-95%17%-60%32%16%69%-71%14%34%41%33%37%32%83%2%50%37%68%34%-23%0%-127%-120%68%70%70%82%66%100%36%45%92%7%-111%-111%-36%-29%-56%-112%-55%-51%-36%-118%101%-2%-101%-65%127%-105%87%-50%89%8%-15%-2%-106%-108%-78%-17%123%-92%-128%46%-53%-126%24%-122%-127%-18%-100%43%-66%125%-33%-107%82%-25%121%34%-88%113%28%49%9%99%-52%60%-49%21%81%-37%-74%49%-12%-121%-90%-108%72%56%-114%3%35%57%90%-21%117%93%-53%54%-98%-82%-21%24%-92%-41%-76%66%91%98%-37%121%81%52%55%49%94%29%23%37%-38%90%-53%-114%-101%-110%-53%-103%45%-22%-14%122%-17%49%-2%-46%24%99%75%124%-28%66%-89%105%-30%-81%15%-118%8%33%112%70%61%-18%3%-125%89%-24%7%90%-3%-9%4%0%0%0%0%73%69%78%68%-82%66%96%-126%" location="">
-            <eAnnotations xmi:id="_b32LoHBWEd2Nss_u28cvSA" source="image_papyrus">
-              <details xmi:id="_b3_8oHBWEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
-              <details xmi:id="_c3d1kHBWEd2Nss_u28cvSA" key="image_expr_key" value="kind=proreq"/>
+          <icon xmi:type="uml:Image" xmi:id="_ShNMYHBWEd2Nss_u28cvSA" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%7%0%0%0%15%8%2%0%0%0%-89%99%66%-23%0%0%0%1%115%82%71%66%0%-82%-50%28%-23%0%0%0%4%103%65%77%65%0%0%-79%-113%11%-4%97%5%0%0%0%32%99%72%82%77%0%0%122%38%0%0%-128%-124%0%0%-6%0%0%0%-128%-24%0%0%117%48%0%0%-22%96%0%0%58%-104%0%0%23%112%-100%-70%81%60%0%0%0%-84%73%68%65%84%40%83%117%-113%-95%17%-60%32%16%69%-71%14%34%41%33%37%32%83%2%50%37%68%34%-23%0%-127%-120%68%70%70%82%66%100%36%45%92%7%-111%-111%-36%-29%-56%-112%-55%-51%-36%-118%101%-2%-101%-65%127%-105%87%-50%89%8%-15%-2%-106%-108%-78%-17%123%-92%-128%46%-53%-126%24%-122%-127%-18%-100%43%-66%125%-33%-107%82%-25%121%34%-88%113%28%49%9%99%-52%60%-49%21%81%-37%-74%49%-12%-121%-90%-108%72%56%-114%3%35%57%90%-21%117%93%-53%54%-98%-82%-21%24%-92%-41%-76%66%91%98%-37%121%81%52%55%49%94%29%23%37%-38%90%-53%-114%-101%-110%-53%-103%45%-22%-14%122%-17%49%-2%-46%24%99%75%124%-28%66%-89%105%-30%-81%15%-118%8%33%112%70%61%-18%3%-125%89%-24%7%90%-3%-9%4%0%0%0%0%73%69%78%68%-82%66%96%-126%" location="">
+            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_b32LoHBWEd2Nss_u28cvSA" source="image_papyrus">
+              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_b3_8oHBWEd2Nss_u28cvSA" key="image_kind_key" value="icon"/>
+              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_c3d1kHBWEd2Nss_u28cvSA" key="image_expr_key" value="kind=proreq"/>
             </eAnnotations>
           </icon>
         </packagedElement>
@@ -3984,53 +3984,53 @@
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_wKv0sBRWEdyCa-N9ek5e_w" name="extension_FlowBFeature" type="_cC1EMBRWEdyCa-N9ek5e_w" aggregation="composite" association="_wKJ-0BRWEdyCa-N9ek5e_w"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Enumeration" xmi:id="_LptasEE8Ed6UW4qJC-Vahw" name="PortSpecificationKind">
-          <ownedLiteral xmi:id="_PHnE8EE8Ed6UW4qJC-Vahw" name="atomic"/>
-          <ownedLiteral xmi:id="_PRI0YEE8Ed6UW4qJC-Vahw" name="interfaceBased"/>
-          <ownedLiteral xmi:id="_PW3B4EE8Ed6UW4qJC-Vahw" name="featureBased"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_PHnE8EE8Ed6UW4qJC-Vahw" name="atomic"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_PRI0YEE8Ed6UW4qJC-Vahw" name="interfaceBased"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_PW3B4EE8Ed6UW4qJC-Vahw" name="featureBased"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Association" xmi:id="_IAK0QEFUEd6UW4qJC-Vahw" name="A_ClientServerPort_Interface" memberEnd="_IEghsEFUEd6UW4qJC-Vahw _IFjqkEFUEd6UW4qJC-Vahw">
-          <ownedEnd xmi:id="_IFjqkEFUEd6UW4qJC-Vahw" name="clientServerPort" type="_xgP68BHYEdyWC5IKDhzksw" isUnique="false" association="_IAK0QEFUEd6UW4qJC-Vahw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_IFjqkEFUEd6UW4qJC-Vahw" name="clientServerPort" type="_xgP68BHYEdyWC5IKDhzksw" isUnique="false" association="_IAK0QEFUEd6UW4qJC-Vahw">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IGLVoEFUEd6UW4qJC-Vahw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IGISUEFUEd6UW4qJC-Vahw" value="*"/>
           </ownedEnd>
         </packagedElement>
         <packagedElement xmi:type="uml:Association" xmi:id="_MBIIQEFUEd6UW4qJC-Vahw" name="A_ClientServerPort_Interface" memberEnd="_MEBrQEFUEd6UW4qJC-Vahw _MFKTsEFUEd6UW4qJC-Vahw">
-          <ownedEnd xmi:id="_MFKTsEFUEd6UW4qJC-Vahw" name="clientServerPort" type="_xgP68BHYEdyWC5IKDhzksw" isUnique="false" association="_MBIIQEFUEd6UW4qJC-Vahw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_MFKTsEFUEd6UW4qJC-Vahw" name="clientServerPort" type="_xgP68BHYEdyWC5IKDhzksw" isUnique="false" association="_MBIIQEFUEd6UW4qJC-Vahw">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_MF2QMEFUEd6UW4qJC-Vahw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MFzz8EFUEd6UW4qJC-Vahw" value="*"/>
           </ownedEnd>
         </packagedElement>
         <packagedElement xmi:type="uml:Association" xmi:id="_Qbzj0EFUEd6UW4qJC-Vahw" name="A_ClientServerPort_ClientServerSpecification" memberEnd="_QfslUEFUEd6UW4qJC-Vahw _Qg0msEFUEd6UW4qJC-Vahw">
-          <ownedEnd xmi:id="_Qg0msEFUEd6UW4qJC-Vahw" name="clientServerPort" type="_xgP68BHYEdyWC5IKDhzksw" isUnique="false" association="_Qbzj0EFUEd6UW4qJC-Vahw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_Qg0msEFUEd6UW4qJC-Vahw" name="clientServerPort" type="_xgP68BHYEdyWC5IKDhzksw" isUnique="false" association="_Qbzj0EFUEd6UW4qJC-Vahw">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_QhbqsEFUEd6UW4qJC-Vahw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_QhZOcEFUEd6UW4qJC-Vahw" value="*"/>
           </ownedEnd>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_T6i0MEFXEd6UW4qJC-Vahw" name="GCMTrigger">
-          <ownedAttribute xmi:id="_5-58IEFXEd6UW4qJC-Vahw" name="base_Trigger" isUnique="false" association="_56UXEEFXEd6UW4qJC-Vahw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5-58IEFXEd6UW4qJC-Vahw" name="base_Trigger" isUnique="false" association="_56UXEEFXEd6UW4qJC-Vahw">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Trigger"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_NoNeAEFYEd6UW4qJC-Vahw" name="feature" isUnique="false" association="_Ni0nsEFYEd6UW4qJC-Vahw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_NoNeAEFYEd6UW4qJC-Vahw" name="feature" isUnique="false" association="_Ni0nsEFYEd6UW4qJC-Vahw">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Feature"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_PVPAgEFYEd6UW4qJC-Vahw" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PVW8UEFYEd6UW4qJC-Vahw" value="1"/>
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_Vj4wkEFXEd6UW4qJC-Vahw" name="GCMInvocationAction">
-          <ownedAttribute xmi:id="_-yDiEEFXEd6UW4qJC-Vahw" name="base_InvocationAction" isUnique="false" association="_-uAIgEFXEd6UW4qJC-Vahw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_-yDiEEFXEd6UW4qJC-Vahw" name="base_InvocationAction" isUnique="false" association="_-uAIgEFXEd6UW4qJC-Vahw">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#InvocationAction"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_KMTX0EFYEd6UW4qJC-Vahw" name="onFeature" isUnique="false" association="_KIhEAEFYEd6UW4qJC-Vahw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_KMTX0EFYEd6UW4qJC-Vahw" name="onFeature" isUnique="false" association="_KIhEAEFYEd6UW4qJC-Vahw">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Feature"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_MQT28EFYEd6UW4qJC-Vahw" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MQakoEFYEd6UW4qJC-Vahw" value="1"/>
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_aXqBkEFXEd6UW4qJC-Vahw" name="DataEvent">
-          <ownedAttribute xmi:id="_TF4AkEFYEd6UW4qJC-Vahw" name="base_AnyReceiveEvent" isUnique="false" association="_TADFYEFYEd6UW4qJC-Vahw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_TF4AkEFYEd6UW4qJC-Vahw" name="base_AnyReceiveEvent" isUnique="false" association="_TADFYEFYEd6UW4qJC-Vahw">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#AnyReceiveEvent"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_VBagMEFYEd6UW4qJC-Vahw" name="classifier" isUnique="false" association="_U8OeMEFYEd6UW4qJC-Vahw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_VBagMEFYEd6UW4qJC-Vahw" name="classifier" isUnique="false" association="_U8OeMEFYEd6UW4qJC-Vahw">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Classifier"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WfPwIEFYEd6UW4qJC-Vahw" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WfmVcEFYEd6UW4qJC-Vahw" value="1"/>
@@ -4043,13 +4043,13 @@
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_-xuK4EFXEd6UW4qJC-Vahw" name="extension_GCMInvocationAction" type="_Vj4wkEFXEd6UW4qJC-Vahw" aggregation="composite" association="_-uAIgEFXEd6UW4qJC-Vahw"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Association" xmi:id="_KIhEAEFYEd6UW4qJC-Vahw" name="A_GCMInvocationAction_Feature" memberEnd="_KMTX0EFYEd6UW4qJC-Vahw _KM3_kEFYEd6UW4qJC-Vahw">
-          <ownedEnd xmi:id="_KM3_kEFYEd6UW4qJC-Vahw" name="gCMInvocationAction" type="_Vj4wkEFXEd6UW4qJC-Vahw" isUnique="false" association="_KIhEAEFYEd6UW4qJC-Vahw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_KM3_kEFYEd6UW4qJC-Vahw" name="gCMInvocationAction" type="_Vj4wkEFXEd6UW4qJC-Vahw" isUnique="false" association="_KIhEAEFYEd6UW4qJC-Vahw">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_KNhf0EFYEd6UW4qJC-Vahw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KNecgEFYEd6UW4qJC-Vahw" value="*"/>
           </ownedEnd>
         </packagedElement>
         <packagedElement xmi:type="uml:Association" xmi:id="_Ni0nsEFYEd6UW4qJC-Vahw" name="A_GCMTrigger_Feature" memberEnd="_NoNeAEFYEd6UW4qJC-Vahw _NpDLgEFYEd6UW4qJC-Vahw">
-          <ownedEnd xmi:id="_NpDLgEFYEd6UW4qJC-Vahw" name="gCMTrigger" type="_T6i0MEFXEd6UW4qJC-Vahw" isUnique="false" association="_Ni0nsEFYEd6UW4qJC-Vahw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_NpDLgEFYEd6UW4qJC-Vahw" name="gCMTrigger" type="_T6i0MEFXEd6UW4qJC-Vahw" isUnique="false" association="_Ni0nsEFYEd6UW4qJC-Vahw">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NqA00EFYEd6UW4qJC-Vahw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Np9xgEFYEd6UW4qJC-Vahw" value="*"/>
           </ownedEnd>
@@ -4058,56 +4058,56 @@
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_TFWcIEFYEd6UW4qJC-Vahw" name="extension_DataEvent" type="_aXqBkEFXEd6UW4qJC-Vahw" aggregation="composite" association="_TADFYEFYEd6UW4qJC-Vahw"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Association" xmi:id="_U8OeMEFYEd6UW4qJC-Vahw" name="A_DataEvent_Classifier" memberEnd="_VBagMEFYEd6UW4qJC-Vahw _VCXicEFYEd6UW4qJC-Vahw">
-          <ownedEnd xmi:id="_VCXicEFYEd6UW4qJC-Vahw" name="dataEvent" type="_aXqBkEFXEd6UW4qJC-Vahw" isUnique="false" association="_U8OeMEFYEd6UW4qJC-Vahw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_VCXicEFYEd6UW4qJC-Vahw" name="dataEvent" type="_aXqBkEFXEd6UW4qJC-Vahw" isUnique="false" association="_U8OeMEFYEd6UW4qJC-Vahw">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VDZdMEFYEd6UW4qJC-Vahw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VDVy0EFYEd6UW4qJC-Vahw" value="*"/>
           </ownedEnd>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_ewP9AEFYEd6UW4qJC-Vahw" name="DataPool">
-          <ownedAttribute xmi:id="_gfUt8EFYEd6UW4qJC-Vahw" name="ordering" visibility="public" type="_h8ugEEFYEd6UW4qJC-Vahw" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_gfUt8EFYEd6UW4qJC-Vahw" name="ordering" visibility="public" type="_h8ugEEFYEd6UW4qJC-Vahw" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_stZNUEFYEd6UW4qJC-Vahw" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_stn20EFYEd6UW4qJC-Vahw" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_st3HYEFYEd6UW4qJC-Vahw" value="FIFO"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_yuJO0EFYEd6UW4qJC-Vahw" name="base_Property" isUnique="false" association="_yoRQUEFYEd6UW4qJC-Vahw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_yuJO0EFYEd6UW4qJC-Vahw" name="base_Property" isUnique="false" association="_yoRQUEFYEd6UW4qJC-Vahw">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_3rZL8EFYEd6UW4qJC-Vahw" name="insertion" isUnique="false" association="_3jAE8EFYEd6UW4qJC-Vahw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_3rZL8EFYEd6UW4qJC-Vahw" name="insertion" isUnique="false" association="_3jAE8EFYEd6UW4qJC-Vahw">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Behavior"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8efukEFYEd6UW4qJC-Vahw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8erUwEFYEd6UW4qJC-Vahw" value="1"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_4kCrMEFYEd6UW4qJC-Vahw" name="selection" isUnique="false" association="_4byuIEFYEd6UW4qJC-Vahw">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_4kCrMEFYEd6UW4qJC-Vahw" name="selection" isUnique="false" association="_4byuIEFYEd6UW4qJC-Vahw">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Behavior"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_98uAEEFYEd6UW4qJC-Vahw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_983xEEFYEd6UW4qJC-Vahw" value="1"/>
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Enumeration" xmi:id="_h8ugEEFYEd6UW4qJC-Vahw" name="DataPoolOrderingKind">
-          <ownedLiteral xmi:id="_ljzUcEFYEd6UW4qJC-Vahw" name="FIFO"/>
-          <ownedLiteral xmi:id="_ltSAkEFYEd6UW4qJC-Vahw" name="LIFO"/>
-          <ownedLiteral xmi:id="_l3gTkEFYEd6UW4qJC-Vahw" name="UserDefined"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ljzUcEFYEd6UW4qJC-Vahw" name="FIFO"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ltSAkEFYEd6UW4qJC-Vahw" name="LIFO"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_l3gTkEFYEd6UW4qJC-Vahw" name="UserDefined"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Extension" xmi:id="_yoRQUEFYEd6UW4qJC-Vahw" name="Extension_DataPool" memberEnd="_ytkAAEFYEd6UW4qJC-Vahw _yuJO0EFYEd6UW4qJC-Vahw">
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_ytkAAEFYEd6UW4qJC-Vahw" name="extension_DataPool" type="_ewP9AEFYEd6UW4qJC-Vahw" aggregation="composite" association="_yoRQUEFYEd6UW4qJC-Vahw"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Association" xmi:id="_3jAE8EFYEd6UW4qJC-Vahw" name="A_DataPool_Behavior" memberEnd="_3rZL8EFYEd6UW4qJC-Vahw _3sbtwEFYEd6UW4qJC-Vahw">
-          <ownedEnd xmi:id="_3sbtwEFYEd6UW4qJC-Vahw" name="dataPool" type="_ewP9AEFYEd6UW4qJC-Vahw" isUnique="false" association="_3jAE8EFYEd6UW4qJC-Vahw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_3sbtwEFYEd6UW4qJC-Vahw" name="dataPool" type="_ewP9AEFYEd6UW4qJC-Vahw" isUnique="false" association="_3jAE8EFYEd6UW4qJC-Vahw">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_3tfdsEFYEd6UW4qJC-Vahw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3tYI8EFYEd6UW4qJC-Vahw" value="*"/>
           </ownedEnd>
         </packagedElement>
         <packagedElement xmi:type="uml:Association" xmi:id="_4byuIEFYEd6UW4qJC-Vahw" name="A_DataPool_Behavior" memberEnd="_4kCrMEFYEd6UW4qJC-Vahw _4lF0EEFYEd6UW4qJC-Vahw">
-          <ownedEnd xmi:id="_4lF0EEFYEd6UW4qJC-Vahw" name="dataPool" type="_ewP9AEFYEd6UW4qJC-Vahw" isUnique="false" association="_4byuIEFYEd6UW4qJC-Vahw">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_4lF0EEFYEd6UW4qJC-Vahw" name="dataPool" type="_ewP9AEFYEd6UW4qJC-Vahw" isUnique="false" association="_4byuIEFYEd6UW4qJC-Vahw">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4mMAQEFYEd6UW4qJC-Vahw"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4mHHwEFYEd6UW4qJC-Vahw" value="*"/>
           </ownedEnd>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_MltCULG2Ed-tmN4hwNCxXQ" name="GCMInvocatingBehavior">
-          <ownedAttribute xmi:id="_RMyiMLG2Ed-tmN4hwNCxXQ" name="base_Behavior" association="_RMyiMbG2Ed-tmN4hwNCxXQ">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_RMyiMLG2Ed-tmN4hwNCxXQ" name="base_Behavior" association="_RMyiMbG2Ed-tmN4hwNCxXQ">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Behavior"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_a4JNMLG2Ed-tmN4hwNCxXQ" name="onPorts" visibility="public">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_a4JNMLG2Ed-tmN4hwNCxXQ" name="onPorts" visibility="public">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Port"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_cwqOALG2Ed-tmN4hwNCxXQ"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cwzX8LG2Ed-tmN4hwNCxXQ" value="*"/>
@@ -4115,7 +4115,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_epTxsLG2Ed-tmN4hwNCxXQ" name="onFeatures" visibility="public">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_epTxsLG2Ed-tmN4hwNCxXQ" name="onFeatures" visibility="public">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Feature"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gei1ALG2Ed-tmN4hwNCxXQ"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ger-8LG2Ed-tmN4hwNCxXQ" value="*"/>
@@ -4123,7 +4123,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_ht8AULG2Ed-tmN4hwNCxXQ" name="invocations" visibility="public">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_ht8AULG2Ed-tmN4hwNCxXQ" name="invocations" visibility="public">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#InvocationAction"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kw7QMLG2Ed-tmN4hwNCxXQ"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kxOLILG2Ed-tmN4hwNCxXQ" value="*"/>
@@ -4137,17 +4137,17 @@
         </packagedElement>
       </packagedElement>
     </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_u8y4wAPMEdyuUt-4qHuVvQ" clientDependency="_zyMT8A9dEdy-lroUn0KWEw" name="MARTE_AnalysisModel">
+    <packagedElement xmi:type="uml:Package" xmi:id="_u8y4wAPMEdyuUt-4qHuVvQ" name="MARTE_AnalysisModel">
       <packagedElement xmi:type="uml:Profile" xmi:id="_4bV20APMEdyuUt-4qHuVvQ" name="GQAM">
-        <packageImport xmi:id="_nm1YABKXEdyGYuetzx6T5A" importedPackage="_XVWGUAPMEdyuUt-4qHuVvQ"/>
+        <packageImport xmi:type="uml:PackageImport" xmi:id="_nm1YABKXEdyGYuetzx6T5A" importedPackage="_XVWGUAPMEdyuUt-4qHuVvQ"/>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_YzhUsBKXEdyGYuetzx6T5A" name="GaWorkloadGenerator">
-          <ownedAttribute xmi:id="_aRcrQBKXEdyGYuetzx6T5A" name="pop" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_aRcrQBKXEdyGYuetzx6T5A" name="pop" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_0KWSgBFQEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_dzNh0BKXEdyGYuetzx6T5A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dzWrwBKXEdyGYuetzx6T5A" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_dzgcwBKXEdyGYuetzx6T5A" value="1"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_tDo-8BKXEdyGYuetzx6T5A" name="base_Behavior" isUnique="false" association="_tCwOIBKXEdyGYuetzx6T5A">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_tDo-8BKXEdyGYuetzx6T5A" name="base_Behavior" isUnique="false" association="_tCwOIBKXEdyGYuetzx6T5A">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Behavior"/>
           </ownedAttribute>
         </packagedElement>
@@ -4155,7 +4155,7 @@
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_tDDJEBKXEdyGYuetzx6T5A" name="extension_GaWorkloadGenerator" type="_YzhUsBKXEdyGYuetzx6T5A" aggregation="composite" association="_tCwOIBKXEdyGYuetzx6T5A"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_4cVVgBKXEdyGYuetzx6T5A" name="GaEventTrace">
-          <ownedAttribute xmi:id="_55hFMBKXEdyGYuetzx6T5A" name="content" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_55hFMBKXEdyGYuetzx6T5A" name="content" visibility="public" isUnique="false">
             <type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_qZ3GUAnxEdy9WM11hWri2g"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_7hjaABKXEdyGYuetzx6T5A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7htLABKXEdyGYuetzx6T5A" value="1"/>
@@ -4163,7 +4163,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_587lkBKXEdyGYuetzx6T5A" name="format" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_587lkBKXEdyGYuetzx6T5A" name="format" visibility="public" isUnique="false">
             <type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_qZ3GUAnxEdy9WM11hWri2g"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9TG3MBKXEdyGYuetzx6T5A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9TQoMBKXEdyGYuetzx6T5A" value="1"/>
@@ -4171,7 +4171,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_6Apn8BKXEdyGYuetzx6T5A" name="location" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_6Apn8BKXEdyGYuetzx6T5A" name="location" visibility="public" isUnique="false">
             <type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_qZ3GUAnxEdy9WM11hWri2g"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-4oDgBKXEdyGYuetzx6T5A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-4x0gBKXEdyGYuetzx6T5A" value="1"/>
@@ -4179,7 +4179,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_BnuHABKYEdyGYuetzx6T5A" name="base_NamedElement" isUnique="false" association="_BmrlMBKYEdyGYuetzx6T5A">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_BnuHABKYEdyGYuetzx6T5A" name="base_NamedElement" isUnique="false" association="_BmrlMBKYEdyGYuetzx6T5A">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#NamedElement"/>
           </ownedAttribute>
         </packagedElement>
@@ -4187,7 +4187,7 @@
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_Bm-gIBKYEdyGYuetzx6T5A" name="extension_GaEventTrace" type="_4cVVgBKXEdyGYuetzx6T5A" aggregation="composite" association="_BmrlMBKYEdyGYuetzx6T5A"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_CGyBkBKYEdyGYuetzx6T5A" name="GaWorkloadEvent">
-          <ownedAttribute xmi:id="_DurMcBKYEdyGYuetzx6T5A" name="pattern" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_DurMcBKYEdyGYuetzx6T5A" name="pattern" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_VDec8BFXEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Fp478BKYEdyGYuetzx6T5A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FqMd8BKYEdyGYuetzx6T5A" value="1"/>
@@ -4195,47 +4195,47 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_Dxf28BKYEdyGYuetzx6T5A" name="generator" visibility="public" type="_YzhUsBKXEdyGYuetzx6T5A" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Dxf28BKYEdyGYuetzx6T5A" name="generator" visibility="public" type="_YzhUsBKXEdyGYuetzx6T5A" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_KTm5EBKYEdyGYuetzx6T5A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KTwDABKYEdyGYuetzx6T5A" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_KTwDARKYEdyGYuetzx6T5A">
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_D0xNYBKYEdyGYuetzx6T5A" name="trace" visibility="public" type="_4cVVgBKXEdyGYuetzx6T5A" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_D0xNYBKYEdyGYuetzx6T5A" name="trace" visibility="public" type="_4cVVgBKXEdyGYuetzx6T5A" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L-BzgBKYEdyGYuetzx6T5A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L-K9cBKYEdyGYuetzx6T5A" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_L-UucBKYEdyGYuetzx6T5A">
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_D5hxkBKYEdyGYuetzx6T5A" name="effect" visibility="public" type="_XYaMIBKYEdyGYuetzx6T5A" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_D5hxkBKYEdyGYuetzx6T5A" name="effect" visibility="public" type="_XYaMIBKYEdyGYuetzx6T5A" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_O1cFgBKYEdyGYuetzx6T5A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_O1vAcBKYEdyGYuetzx6T5A" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_O14xcBKYEdyGYuetzx6T5A">
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_X0yJoBKZEdyGYuetzx6T5A" name="timedEvent" isUnique="false" association="_X0enoBKZEdyGYuetzx6T5A">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_X0yJoBKZEdyGYuetzx6T5A" name="timedEvent" isUnique="false" association="_X0enoBKZEdyGYuetzx6T5A">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TimeEvent"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_cDcicBKZEdyGYuetzx6T5A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cDmTcBKZEdyGYuetzx6T5A" value="1"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_4iNCEBKZEdyGYuetzx6T5A" name="base_NamedElement" isUnique="false" association="_4hURQBKZEdyGYuetzx6T5A">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_4iNCEBKZEdyGYuetzx6T5A" name="base_NamedElement" isUnique="false" association="_4hURQBKZEdyGYuetzx6T5A">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#NamedElement"/>
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_XYaMIBKYEdyGYuetzx6T5A" name="GaScenario">
-          <generalization xmi:id="_HsMVcBKZEdyGYuetzx6T5A" general="_8JKLcBG5Edyb1KzJ7GkiGA"/>
-          <generalization xmi:id="_IK9VEBKZEdyGYuetzx6T5A" general="_3V3e0BD5EdyybZnLxHsjyA"/>
-          <ownedAttribute xmi:id="_aAzxwBKYEdyGYuetzx6T5A" name="cause" visibility="public" type="_CGyBkBKYEdyGYuetzx6T5A" isUnique="false">
+          <generalization xmi:type="uml:Generalization" xmi:id="_HsMVcBKZEdyGYuetzx6T5A" general="_8JKLcBG5Edyb1KzJ7GkiGA"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_IK9VEBKZEdyGYuetzx6T5A" general="_3V3e0BD5EdyybZnLxHsjyA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_aAzxwBKYEdyGYuetzx6T5A" name="cause" visibility="public" type="_CGyBkBKYEdyGYuetzx6T5A" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_lB7V0BKYEdyGYuetzx6T5A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lCEfwBKYEdyGYuetzx6T5A" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_lCOQwBKYEdyGYuetzx6T5A">
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_aDyNQBKYEdyGYuetzx6T5A" name="hostDemand" visibility="public">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_aDyNQBKYEdyGYuetzx6T5A" name="hostDemand" visibility="public">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nPINMBKYEdyGYuetzx6T5A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nPbIIBKYEdyGYuetzx6T5A" value="*"/>
@@ -4243,7 +4243,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_aGm3wBKYEdyGYuetzx6T5A" name="hostDemandOps" visibility="public">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_aGm3wBKYEdyGYuetzx6T5A" name="hostDemandOps" visibility="public">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_pUv14BKYEdyGYuetzx6T5A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_pU5m4BKYEdyGYuetzx6T5A" value="*"/>
@@ -4251,7 +4251,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_aJlTQBKYEdyGYuetzx6T5A" name="interOccT" visibility="public">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_aJlTQBKYEdyGYuetzx6T5A" name="interOccT" visibility="public">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_r4GjcBKYEdyGYuetzx6T5A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_r4QUcBKYEdyGYuetzx6T5A" value="*"/>
@@ -4259,7 +4259,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_aMs4sBKYEdyGYuetzx6T5A" name="throughput" visibility="public">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_aMs4sBKYEdyGYuetzx6T5A" name="throughput" visibility="public">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_UDZSQBFSEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_u_RvwBKYEdyGYuetzx6T5A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_u_bgwBKYEdyGYuetzx6T5A" value="*"/>
@@ -4267,7 +4267,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_aP0eIBKYEdyGYuetzx6T5A" name="respT" visibility="public">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_aP0eIBKYEdyGYuetzx6T5A" name="respT" visibility="public">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__qlsIGqgEdyHVMM3AaZxvA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__qovcGqgEdyHVMM3AaZxvA" value="*"/>
@@ -4275,7 +4275,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_aS8qoBKYEdyGYuetzx6T5A" name="utilization" visibility="public">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_aS8qoBKYEdyGYuetzx6T5A" name="utilization" visibility="public">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_zyzwMBKYEdyGYuetzx6T5A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zy9hMBKYEdyGYuetzx6T5A" value="*"/>
@@ -4283,7 +4283,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_aWEQEBKYEdyGYuetzx6T5A" name="utilizationOnHost" visibility="public">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_aWEQEBKYEdyGYuetzx6T5A" name="utilizationOnHost" visibility="public">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2_CboBKYEdyGYuetzx6T5A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2_MMoBKYEdyGYuetzx6T5A" value="*"/>
@@ -4291,38 +4291,38 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_aZL1gBKYEdyGYuetzx6T5A" name="root" visibility="public" type="_eXMtwBKZEdyGYuetzx6T5A" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_aZL1gBKYEdyGYuetzx6T5A" name="root" visibility="public" type="_eXMtwBKZEdyGYuetzx6T5A" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_BMmb0BKZEdyGYuetzx6T5A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BMvlwBKZEdyGYuetzx6T5A" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_8QS54BKYEdyGYuetzx6T5A">
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_acTa8BKYEdyGYuetzx6T5A" name="timing" visibility="public" type="_En1FMBKcEdymP89M8JXkzA" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_acTa8BKYEdyGYuetzx6T5A" name="timing" visibility="public" type="_En1FMBKcEdymP89M8JXkzA" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__xfIsBKYEdyGYuetzx6T5A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__xoSoBKYEdyGYuetzx6T5A" value="*"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="__xyDoBKYEdyGYuetzx6T5A">
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_PVZ_QLG1Ed-tmN4hwNCxXQ" name="steps" type="_eXMtwBKZEdyGYuetzx6T5A" association="_PVjJMLG1Ed-tmN4hwNCxXQ">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_PVZ_QLG1Ed-tmN4hwNCxXQ" name="steps" type="_eXMtwBKZEdyGYuetzx6T5A" association="_PVjJMLG1Ed-tmN4hwNCxXQ">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_PVZ_QrG1Ed-tmN4hwNCxXQ" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PVZ_QbG1Ed-tmN4hwNCxXQ" value="*"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_TkyJwLG1Ed-tmN4hwNCxXQ" name="parentStep" type="_eXMtwBKZEdyGYuetzx6T5A" association="_TkyJw7G1Ed-tmN4hwNCxXQ">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_TkyJwLG1Ed-tmN4hwNCxXQ" name="parentStep" type="_eXMtwBKZEdyGYuetzx6T5A" association="_TkyJw7G1Ed-tmN4hwNCxXQ">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_TkyJwrG1Ed-tmN4hwNCxXQ" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TkyJwbG1Ed-tmN4hwNCxXQ" value="*"/>
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Association" xmi:id="_X0enoBKZEdyGYuetzx6T5A" name="Association_GaWorkloadEvent_TimeEvent" memberEnd="_X0yJoBKZEdyGYuetzx6T5A _X10rcBKZEdyGYuetzx6T5A">
-          <ownedEnd xmi:id="_X10rcBKZEdyGYuetzx6T5A" name="gaWorkloadEvent" type="_CGyBkBKYEdyGYuetzx6T5A" isUnique="false" association="_X0enoBKZEdyGYuetzx6T5A">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_X10rcBKZEdyGYuetzx6T5A" name="gaWorkloadEvent" type="_CGyBkBKYEdyGYuetzx6T5A" isUnique="false" association="_X0enoBKZEdyGYuetzx6T5A">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_X2tcQBKZEdyGYuetzx6T5A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_X2kSUBKZEdyGYuetzx6T5A" value="*"/>
           </ownedEnd>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_eXMtwBKZEdyGYuetzx6T5A" name="GaStep">
-          <generalization xmi:id="_gbL-wBKZEdyGYuetzx6T5A" general="_XYaMIBKYEdyGYuetzx6T5A"/>
-          <ownedAttribute xmi:id="_5pjrsBKZEdyGYuetzx6T5A" name="isAtomic" visibility="public" isUnique="false">
+          <generalization xmi:type="uml:Generalization" xmi:id="_gbL-wBKZEdyGYuetzx6T5A" general="_XYaMIBKYEdyGYuetzx6T5A"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5pjrsBKZEdyGYuetzx6T5A" name="isAtomic" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_55fyMBFGEdyBd9q9NMDXUQ"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C-L4wBKaEdyGYuetzx6T5A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C-VpwBKaEdyGYuetzx6T5A" value="1"/>
@@ -4330,7 +4330,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_5qJhkBKZEdyGYuetzx6T5A" name="blockT" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5qJhkBKZEdyGYuetzx6T5A" name="blockT" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2dJoEEOFEd6caK5ICj_pSQ"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2dbU4EOFEd6caK5ICj_pSQ" value="1"/>
@@ -4338,19 +4338,19 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_5xk_QBKZEdyGYuetzx6T5A" name="rep" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5xk_QBKZEdyGYuetzx6T5A" name="rep" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_uIsmQEIfEd6dmI2dd6jVFQ"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uI6osEIfEd6dmI2dd6jVFQ" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_Ha1DMBKaEdyGYuetzx6T5A" value="1.0"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_5143gBKZEdyGYuetzx6T5A" name="prob" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_5143gBKZEdyGYuetzx6T5A" name="prob" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LWLecBKaEdyGYuetzx6T5A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LWVPcBKaEdyGYuetzx6T5A" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_LWVPcRKaEdyGYuetzx6T5A" value="1.0"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_55500BKZEdyGYuetzx6T5A" name="priority" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_55500BKZEdyGYuetzx6T5A" name="priority" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_0KWSgBFQEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NiMqEBKaEdyGYuetzx6T5A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NiWbEBKaEdyGYuetzx6T5A" value="1"/>
@@ -4358,28 +4358,28 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_59xBIBKZEdyGYuetzx6T5A" name="concurRes" visibility="public" type="_1zYucBG0Edyb1KzJ7GkiGA" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_59xBIBKZEdyGYuetzx6T5A" name="concurRes" visibility="public" type="_1zYucBG0Edyb1KzJ7GkiGA" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Q4sEwBKaEdyGYuetzx6T5A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Q41OsBKaEdyGYuetzx6T5A" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_Q4-_sBKaEdyGYuetzx6T5A">
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_6BMIkBKZEdyGYuetzx6T5A" name="host" visibility="public" type="_MDZCYBKdEdymP89M8JXkzA" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_6BMIkBKZEdyGYuetzx6T5A" name="host" visibility="public" type="_MDZCYBKdEdymP89M8JXkzA" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_TCebwBKaEdyGYuetzx6T5A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TCnlsBKaEdyGYuetzx6T5A" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_TCxWsBKaEdyGYuetzx6T5A">
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_6FDU4BKZEdyGYuetzx6T5A" name="servDemand" visibility="public" type="_gCsw0BKaEdyGYuetzx6T5A" isOrdered="true" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_6FDU4BKZEdyGYuetzx6T5A" name="servDemand" visibility="public" type="_gCsw0BKaEdyGYuetzx6T5A" isOrdered="true" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XqHVQBKaEdyGYuetzx6T5A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XqRGQBKaEdyGYuetzx6T5A" value="*"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_XqaQMBKaEdyGYuetzx6T5A">
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_6InmQBKZEdyGYuetzx6T5A" name="servCount" visibility="public" isOrdered="true">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_6InmQBKZEdyGYuetzx6T5A" name="servCount" visibility="public" isOrdered="true">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_cd8QoBKaEdyGYuetzx6T5A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ceGBoBKaEdyGYuetzx6T5A" value="*"/>
@@ -4387,7 +4387,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_I1gR0DL6Ed2HYNz2hI9A2g" name="selfDelay" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_I1gR0DL6Ed2HYNz2hI9A2g" name="selfDelay" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ziy3cEIfEd6dmI2dd6jVFQ"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zjA54EIfEd6dmI2dd6jVFQ" value="1"/>
@@ -4395,11 +4395,11 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_PVjJMbG1Ed-tmN4hwNCxXQ" name="scenario" type="_XYaMIBKYEdyGYuetzx6T5A" association="_PVjJMLG1Ed-tmN4hwNCxXQ">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_PVjJMbG1Ed-tmN4hwNCxXQ" name="scenario" type="_XYaMIBKYEdyGYuetzx6T5A" association="_PVjJMLG1Ed-tmN4hwNCxXQ">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_PVjJM7G1Ed-tmN4hwNCxXQ"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PVjJMrG1Ed-tmN4hwNCxXQ" value="1"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_TkyJxLG1Ed-tmN4hwNCxXQ" name="childScenario" type="_XYaMIBKYEdyGYuetzx6T5A" association="_TkyJw7G1Ed-tmN4hwNCxXQ">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_TkyJxLG1Ed-tmN4hwNCxXQ" name="childScenario" type="_XYaMIBKYEdyGYuetzx6T5A" association="_TkyJw7G1Ed-tmN4hwNCxXQ">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_TkyJxrG1Ed-tmN4hwNCxXQ"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TkyJxbG1Ed-tmN4hwNCxXQ" value="1"/>
           </ownedAttribute>
@@ -4408,8 +4408,8 @@
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_4hnMMBKZEdyGYuetzx6T5A" name="extension_GaWorkloadEvent" type="_CGyBkBKYEdyGYuetzx6T5A" aggregation="composite" association="_4hURQBKZEdyGYuetzx6T5A"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_gCsw0BKaEdyGYuetzx6T5A" name="GaRequestedService">
-          <generalization xmi:id="_jk7hcBKaEdyGYuetzx6T5A" general="_eXMtwBKZEdyGYuetzx6T5A"/>
-          <ownedAttribute xmi:id="_ny26cBKaEdyGYuetzx6T5A" name="base_Operation" isUnique="false" association="_nx0YoBKaEdyGYuetzx6T5A">
+          <generalization xmi:type="uml:Generalization" xmi:id="_jk7hcBKaEdyGYuetzx6T5A" general="_eXMtwBKZEdyGYuetzx6T5A"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_ny26cBKaEdyGYuetzx6T5A" name="base_Operation" isUnique="false" association="_nx0YoBKaEdyGYuetzx6T5A">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>
           </ownedAttribute>
         </packagedElement>
@@ -4417,18 +4417,18 @@
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_nyHTkBKaEdyGYuetzx6T5A" name="extension_GaRequestedService" type="_gCsw0BKaEdyGYuetzx6T5A" aggregation="composite" association="_nx0YoBKaEdyGYuetzx6T5A"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_riBT0BKaEdyGYuetzx6T5A" name="GaCommStep">
-          <generalization xmi:id="_1j_IABKaEdyGYuetzx6T5A" general="_eXMtwBKZEdyGYuetzx6T5A"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_1j_IABKaEdyGYuetzx6T5A" general="_eXMtwBKZEdyGYuetzx6T5A"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_3P53QBKaEdyGYuetzx6T5A" name="GaAcqStep">
-          <generalization xmi:id="__6xVoBKaEdyGYuetzx6T5A" general="_eXMtwBKZEdyGYuetzx6T5A"/>
-          <ownedAttribute xmi:id="_4kVTkBKaEdyGYuetzx6T5A" name="acqRes" visibility="public" type="_BthQEBGzEdyb1KzJ7GkiGA" isUnique="false">
+          <generalization xmi:type="uml:Generalization" xmi:id="__6xVoBKaEdyGYuetzx6T5A" general="_eXMtwBKZEdyGYuetzx6T5A"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_4kVTkBKaEdyGYuetzx6T5A" name="acqRes" visibility="public" type="_BthQEBGzEdyb1KzJ7GkiGA" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_7JxEwBKaEdyGYuetzx6T5A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7J6OsBKaEdyGYuetzx6T5A" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_7KD_sBKaEdyGYuetzx6T5A">
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_70IQYBKaEdyGYuetzx6T5A" name="resUnits" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_70IQYBKaEdyGYuetzx6T5A" name="resUnits" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_0KWSgBFQEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-vRL0BKaEdyGYuetzx6T5A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-vRL0RKaEdyGYuetzx6T5A" value="1"/>
@@ -4436,15 +4436,15 @@
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_G9mfMBKbEdyGYuetzx6T5A" name="GaRelStep">
-          <generalization xmi:id="_RHKJIBKbEdyGYuetzx6T5A" general="_eXMtwBKZEdyGYuetzx6T5A"/>
-          <ownedAttribute xmi:id="_IhCn4BKbEdyGYuetzx6T5A" name="relRes" visibility="public" type="_BthQEBGzEdyb1KzJ7GkiGA" isUnique="false">
+          <generalization xmi:type="uml:Generalization" xmi:id="_RHKJIBKbEdyGYuetzx6T5A" general="_eXMtwBKZEdyGYuetzx6T5A"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_IhCn4BKbEdyGYuetzx6T5A" name="relRes" visibility="public" type="_BthQEBGzEdyb1KzJ7GkiGA" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Lr72kBKbEdyGYuetzx6T5A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LsFAgBKbEdyGYuetzx6T5A" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_LsOxgBKbEdyGYuetzx6T5A">
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_Ikm5QBKbEdyGYuetzx6T5A" name="resUnits" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Ikm5QBKbEdyGYuetzx6T5A" name="resUnits" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_0KWSgBFQEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NzyT4BKbEdyGYuetzx6T5A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Nz8E4BKbEdyGYuetzx6T5A" value="1"/>
@@ -4452,45 +4452,45 @@
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_En1FMBKcEdymP89M8JXkzA" name="GaTimedObs">
-          <generalization xmi:id="_q7M5gBKcEdymP89M8JXkzA" general="_P9c2AA4wEdysTsAUPnp57Q"/>
-          <ownedAttribute xmi:id="_KjAqMBKcEdymP89M8JXkzA" name="laxity" visibility="public" type="_Gs3fEBKcEdymP89M8JXkzA" isOrdered="true" isUnique="false">
+          <generalization xmi:type="uml:Generalization" xmi:id="_q7M5gBKcEdymP89M8JXkzA" general="_P9c2AA4wEdysTsAUPnp57Q"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_KjAqMBKcEdymP89M8JXkzA" name="laxity" visibility="public" type="_Gs3fEBKcEdymP89M8JXkzA" isOrdered="true" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_MQjxIBKcEdymP89M8JXkzA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MQtiIBKcEdymP89M8JXkzA" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_MQ2sEBKcEdymP89M8JXkzA">
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_QBqEMBKcEdymP89M8JXkzA" name="startObs" isOrdered="true" isUnique="false" association="_QBNYQBKcEdymP89M8JXkzA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_QBqEMBKcEdymP89M8JXkzA" name="startObs" isOrdered="true" isUnique="false" association="_QBNYQBKcEdymP89M8JXkzA">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TimeObservation"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_U5pt4BKcEdymP89M8JXkzA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_U5y30BKcEdymP89M8JXkzA" value="*"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_XM8mMBKcEdymP89M8JXkzA" name="endObs" isOrdered="true" isUnique="false" association="_XMprQBKcEdymP89M8JXkzA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_XM8mMBKcEdymP89M8JXkzA" name="endObs" isOrdered="true" isUnique="false" association="_XMprQBKcEdymP89M8JXkzA">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TimeObservation"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Y1AJIBKcEdymP89M8JXkzA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Y1JTEBKcEdymP89M8JXkzA" value="*"/>
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Enumeration" xmi:id="_Gs3fEBKcEdymP89M8JXkzA" name="LaxityKind">
-          <ownedLiteral xmi:id="_HpqegBKcEdymP89M8JXkzA" name="hard"/>
-          <ownedLiteral xmi:id="_HvKCgBKcEdymP89M8JXkzA" name="soft"/>
-          <ownedLiteral xmi:id="_HznrwBKcEdymP89M8JXkzA" name="other"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_HpqegBKcEdymP89M8JXkzA" name="hard"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_HvKCgBKcEdymP89M8JXkzA" name="soft"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_HznrwBKcEdymP89M8JXkzA" name="other"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Association" xmi:id="_QBNYQBKcEdymP89M8JXkzA" name="Association_GaTimingObs_TimeObservation" memberEnd="_QBqEMBKcEdymP89M8JXkzA _QCsmABKcEdymP89M8JXkzA">
-          <ownedEnd xmi:id="_QCsmABKcEdymP89M8JXkzA" name="gaTimingObs" type="_En1FMBKcEdymP89M8JXkzA" isUnique="false" association="_QBNYQBKcEdymP89M8JXkzA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_QCsmABKcEdymP89M8JXkzA" name="gaTimingObs" type="_En1FMBKcEdymP89M8JXkzA" isUnique="false" association="_QBNYQBKcEdymP89M8JXkzA">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_QDlW0RKcEdymP89M8JXkzA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_QDlW0BKcEdymP89M8JXkzA" value="*"/>
           </ownedEnd>
         </packagedElement>
         <packagedElement xmi:type="uml:Association" xmi:id="_XMprQBKcEdymP89M8JXkzA" name="Association_GaTimingObs_TimeObservation" memberEnd="_XM8mMBKcEdymP89M8JXkzA _XN_vEBKcEdymP89M8JXkzA">
-          <ownedEnd xmi:id="_XN_vEBKcEdymP89M8JXkzA" name="gaTimingObs" type="_En1FMBKcEdymP89M8JXkzA" isUnique="false" association="_XMprQBKcEdymP89M8JXkzA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_XN_vEBKcEdymP89M8JXkzA" name="gaTimingObs" type="_En1FMBKcEdymP89M8JXkzA" isUnique="false" association="_XMprQBKcEdymP89M8JXkzA">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XO4f4RKcEdymP89M8JXkzA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XO4f4BKcEdymP89M8JXkzA" value="*"/>
           </ownedEnd>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_a6Ls8BKcEdymP89M8JXkzA" name="GaLatencyObs">
-          <generalization xmi:id="_nXosIBKcEdymP89M8JXkzA" general="_En1FMBKcEdymP89M8JXkzA"/>
-          <ownedAttribute xmi:id="_cVcKABKcEdymP89M8JXkzA" name="latency" visibility="public">
+          <generalization xmi:type="uml:Generalization" xmi:id="_nXosIBKcEdymP89M8JXkzA" general="_En1FMBKcEdymP89M8JXkzA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_cVcKABKcEdymP89M8JXkzA" name="latency" visibility="public">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gEdZcBKcEdymP89M8JXkzA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gEmjYBKcEdymP89M8JXkzA" value="*"/>
@@ -4498,7 +4498,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_ce9SYBKcEdymP89M8JXkzA" name="miss" visibility="public">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_ce9SYBKcEdymP89M8JXkzA" name="miss" visibility="public">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_iAkg0BKcEdymP89M8JXkzA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iAuR0BKcEdymP89M8JXkzA" value="*"/>
@@ -4506,7 +4506,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_ci-PsBKcEdymP89M8JXkzA" name="utility" visibility="public">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_ci-PsBKcEdymP89M8JXkzA" name="utility" visibility="public">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_4TENQBEBEdyx6M3BlUjlCQ"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kH-5QBKcEdymP89M8JXkzA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kIIqQBKcEdymP89M8JXkzA" value="*"/>
@@ -4514,7 +4514,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_cmYwEBKcEdymP89M8JXkzA" name="maxJitter" visibility="public">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_cmYwEBKcEdymP89M8JXkzA" name="maxJitter" visibility="public">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_l64aQBKcEdymP89M8JXkzA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_l7CLQBKcEdymP89M8JXkzA" value="*"/>
@@ -4524,9 +4524,9 @@
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_MDZCYBKdEdymP89M8JXkzA" name="GaExecHost">
-          <generalization xmi:id="_riWjoBKdEdymP89M8JXkzA" general="_rU9dMBGzEdyb1KzJ7GkiGA"/>
-          <generalization xmi:id="_UsdCwDLbEd2HYNz2hI9A2g" general="_e_tF0BG1Edyb1KzJ7GkiGA"/>
-          <ownedAttribute xmi:id="_ONVKYBKdEdymP89M8JXkzA" name="commTxOvh" visibility="public" isUnique="false">
+          <generalization xmi:type="uml:Generalization" xmi:id="_riWjoBKdEdymP89M8JXkzA" general="_rU9dMBGzEdyb1KzJ7GkiGA"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_UsdCwDLbEd2HYNz2hI9A2g" general="_e_tF0BG1Edyb1KzJ7GkiGA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_ONVKYBKdEdymP89M8JXkzA" name="commTxOvh" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_USLBsBKdEdymP89M8JXkzA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_USUysBKdEdymP89M8JXkzA" value="1"/>
@@ -4534,7 +4534,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_OQAq8BKdEdymP89M8JXkzA" name="commRcvOvh" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_OQAq8BKdEdymP89M8JXkzA" name="commRcvOvh" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WOb6EBKdEdymP89M8JXkzA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WOlrEBKdEdymP89M8JXkzA" value="1"/>
@@ -4542,7 +4542,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_OSiagBKdEdymP89M8JXkzA" name="cntxtSwT" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_OSiagBKdEdymP89M8JXkzA" name="cntxtSwT" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Y7AOABKdEdymP89M8JXkzA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Y7J_ABKdEdymP89M8JXkzA" value="1"/>
@@ -4550,7 +4550,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_OWGr4BKdEdymP89M8JXkzA" name="clockOvh" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_OWGr4BKdEdymP89M8JXkzA" name="clockOvh" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bSK5sBKdEdymP89M8JXkzA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bSUqsBKdEdymP89M8JXkzA" value="1"/>
@@ -4558,7 +4558,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_OZYCUBKdEdymP89M8JXkzA" name="schedPriRange" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_OZYCUBKdEdymP89M8JXkzA" name="schedPriRange" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_ehpdoBEBEdyx6M3BlUjlCQ"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_jxAuQBKdEdymP89M8JXkzA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jxJ4MBKdEdymP89M8JXkzA" value="1"/>
@@ -4566,7 +4566,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_OcyisBKdEdymP89M8JXkzA" name="memSize" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_OcyisBKdEdymP89M8JXkzA" name="memSize" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_lyUesBKdEdymP89M8JXkzA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lyePsBKdEdymP89M8JXkzA" value="1"/>
@@ -4574,7 +4574,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_OgW0EBKdEdymP89M8JXkzA" name="utilization" visibility="public">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_OgW0EBKdEdymP89M8JXkzA" name="utilization" visibility="public">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_n6oPABKdEdymP89M8JXkzA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_n6xY8BKdEdymP89M8JXkzA" value="*"/>
@@ -4582,7 +4582,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_Oj7FcBKdEdymP89M8JXkzA" name="throughput" visibility="public">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Oj7FcBKdEdymP89M8JXkzA" name="throughput" visibility="public">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_UDZSQBFSEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qKzh4BKdEdymP89M8JXkzA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qK9S4BKdEdymP89M8JXkzA" value="*"/>
@@ -4592,9 +4592,9 @@
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_sEF-wBKdEdymP89M8JXkzA" name="GaCommHost">
-          <generalization xmi:id="_CvkRIBKeEdymP89M8JXkzA" general="_rU9dMBGzEdyb1KzJ7GkiGA"/>
-          <generalization xmi:id="_VeYO8DLbEd2HYNz2hI9A2g" general="_XpH50BG1Edyb1KzJ7GkiGA"/>
-          <ownedAttribute xmi:id="_uMsqABKdEdymP89M8JXkzA" name="throughput" visibility="public">
+          <generalization xmi:type="uml:Generalization" xmi:id="_CvkRIBKeEdymP89M8JXkzA" general="_rU9dMBGzEdyb1KzJ7GkiGA"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_VeYO8DLbEd2HYNz2hI9A2g" general="_XpH50BG1Edyb1KzJ7GkiGA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_uMsqABKdEdymP89M8JXkzA" name="throughput" visibility="public">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_UDZSQBFSEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A0o1gBKeEdymP89M8JXkzA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A0ymgBKeEdymP89M8JXkzA" value="*"/>
@@ -4602,7 +4602,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_uH8F0BKdEdymP89M8JXkzA" name="utilization" visibility="public">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_uH8F0BKdEdymP89M8JXkzA" name="utilization" visibility="public">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-hyCEBKdEdymP89M8JXkzA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-h7zEBKdEdymP89M8JXkzA" value="*"/>
@@ -4612,8 +4612,8 @@
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_DRvxIBKeEdymP89M8JXkzA" name="GaCommChannel">
-          <generalization xmi:id="_ODI3IBKeEdymP89M8JXkzA" general="_1zYucBG0Edyb1KzJ7GkiGA"/>
-          <ownedAttribute xmi:id="_Est6UBKeEdymP89M8JXkzA" name="packetSize" visibility="public" isUnique="false">
+          <generalization xmi:type="uml:Generalization" xmi:id="_ODI3IBKeEdymP89M8JXkzA" general="_1zYucBG0Edyb1KzJ7GkiGA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Est6UBKeEdymP89M8JXkzA" name="packetSize" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_J4L5oBKeEdymP89M8JXkzA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_J4VDkBKeEdymP89M8JXkzA" value="1"/>
@@ -4621,7 +4621,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_ExxZcBKeEdymP89M8JXkzA" name="utilization" visibility="public">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_ExxZcBKeEdymP89M8JXkzA" name="utilization" visibility="public">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L20wkBKeEdymP89M8JXkzA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L2-hkBKeEdymP89M8JXkzA" value="1"/>
@@ -4631,21 +4631,21 @@
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_xoNcsBKfEdyaWJN1BYon3A" name="GaWorkloadBehavior">
-          <ownedAttribute xmi:id="_z-pIkBKfEdyaWJN1BYon3A" name="behavior" visibility="public" type="_XYaMIBKYEdyGYuetzx6T5A" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_z-pIkBKfEdyaWJN1BYon3A" name="behavior" visibility="public" type="_XYaMIBKYEdyGYuetzx6T5A" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_27KkEBKfEdyaWJN1BYon3A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_27UVEBKfEdyaWJN1BYon3A" value="*"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_27dfABKfEdyaWJN1BYon3A">
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_0Eyz4BKfEdyaWJN1BYon3A" name="demand" visibility="public" type="_CGyBkBKYEdyGYuetzx6T5A" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_0Eyz4BKfEdyaWJN1BYon3A" name="demand" visibility="public" type="_CGyBkBKYEdyGYuetzx6T5A" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5OJTUBKfEdyaWJN1BYon3A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5OSdQBKfEdyaWJN1BYon3A" value="*"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_5OSdQRKfEdyaWJN1BYon3A">
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_8_do0BKfEdyaWJN1BYon3A" name="base_NamedElement" isUnique="false" association="_8-Qu8BKfEdyaWJN1BYon3A">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_8_do0BKfEdyaWJN1BYon3A" name="base_NamedElement" isUnique="false" association="_8-Qu8BKfEdyaWJN1BYon3A">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#NamedElement"/>
           </ownedAttribute>
         </packagedElement>
@@ -4653,9 +4653,9 @@
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_8-ta4BKfEdyaWJN1BYon3A" name="extension_GaWorkloadBehavior" type="_xoNcsBKfEdyaWJN1BYon3A" aggregation="composite" association="_8-Qu8BKfEdyaWJN1BYon3A"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_9gc2ABKfEdyaWJN1BYon3A" name="GaAnalysisContext">
-          <generalization xmi:id="_T_yJ0BKgEdyaWJN1BYon3A" general="_UXvlwBBOEdyt6tGzWCpUVA"/>
-          <generalization xmi:id="_WHuOoEIhEd6dmI2dd6jVFQ" general="_H0HcsECNEd6UTJZnztgOLw"/>
-          <ownedAttribute xmi:id="__J45ABKfEdyaWJN1BYon3A" name="context" visibility="public">
+          <generalization xmi:type="uml:Generalization" xmi:id="_T_yJ0BKgEdyaWJN1BYon3A" general="_UXvlwBBOEdyt6tGzWCpUVA"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_WHuOoEIhEd6dmI2dd6jVFQ" general="_H0HcsECNEd6UTJZnztgOLw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="__J45ABKfEdyaWJN1BYon3A" name="context" visibility="public">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_B5VngBFQEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C7DdgBKgEdyaWJN1BYon3A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C7NOgBKgEdyaWJN1BYon3A" value="*"/>
@@ -4663,14 +4663,14 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="__M5JsBKfEdyaWJN1BYon3A" name="workload" visibility="public" type="_xoNcsBKfEdyaWJN1BYon3A" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="__M5JsBKfEdyaWJN1BYon3A" name="workload" visibility="public" type="_xoNcsBKfEdyaWJN1BYon3A" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_GXBOEBKgEdyaWJN1BYon3A" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GXK_EBKgEdyaWJN1BYon3A" value="*"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_GXUwEBKgEdyaWJN1BYon3A">
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="__PvCUBKfEdyaWJN1BYon3A" name="platform" visibility="public" type="_JSAYgBKgEdyaWJN1BYon3A" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="__PvCUBKfEdyaWJN1BYon3A" name="platform" visibility="public" type="_JSAYgBKgEdyaWJN1BYon3A" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IzXUsBKgEdyaWJN1BYon3A" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IzhFsBKgEdyaWJN1BYon3A" value="*"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_IzhFsRKgEdyaWJN1BYon3A">
@@ -4679,14 +4679,14 @@
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_JSAYgBKgEdyaWJN1BYon3A" name="GaResourcesPlatform">
-          <ownedAttribute xmi:id="_LSGoABKgEdyaWJN1BYon3A" name="resources" visibility="public" type="_BthQEBGzEdyb1KzJ7GkiGA" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_LSGoABKgEdyaWJN1BYon3A" name="resources" visibility="public" type="_BthQEBGzEdyb1KzJ7GkiGA" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NgjckBKgEdyaWJN1BYon3A"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NgtNkBKgEdyaWJN1BYon3A" value="*"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_NgtNkRKgEdyaWJN1BYon3A">
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_PbuIwBKgEdyaWJN1BYon3A" name="base_Classifier" isUnique="false" association="_Paq_4BKgEdyaWJN1BYon3A">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_PbuIwBKgEdyaWJN1BYon3A" name="base_Classifier" isUnique="false" association="_Paq_4BKgEdyaWJN1BYon3A">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Classifier"/>
           </ownedAttribute>
         </packagedElement>
@@ -4697,19 +4697,19 @@
         <packagedElement xmi:type="uml:Association" xmi:id="_TkyJw7G1Ed-tmN4hwNCxXQ" name="Association1" memberEnd="_TkyJxLG1Ed-tmN4hwNCxXQ _TkyJwLG1Ed-tmN4hwNCxXQ"/>
       </packagedElement>
       <packagedElement xmi:type="uml:Profile" xmi:id="_5ZCOIAPMEdyuUt-4qHuVvQ" name="SAM">
-        <packageImport xmi:id="_m827ABKkEdyxBYjIJwIrZA">
-          <importedPackage href="MARTE_Library.library.uml#_g2qR8A74EdyML4mHwjNDrw"/>
+        <packageImport xmi:type="uml:PackageImport" xmi:id="_m827ABKkEdyxBYjIJwIrZA">
+          <importedPackage xmi:type="uml:Package" href="MARTE_Library.library.uml#_g2qR8A74EdyML4mHwjNDrw"/>
         </packageImport>
         <packagedElement xmi:type="uml:Enumeration" xmi:id="__N1IYBKgEdyxBYjIJwIrZA" name="OptimallityCriterionKind">
-          <ownedLiteral xmi:id="_BoDIEBKhEdyxBYjIJwIrZA" name="meetHardDeadlines"/>
-          <ownedLiteral xmi:id="_BzZccBKhEdyxBYjIJwIrZA" name="minimizeMissedDeadlines"/>
-          <ownedLiteral xmi:id="_B4xEoBKhEdyxBYjIJwIrZA" name="minimizedMeanTardiness"/>
-          <ownedLiteral xmi:id="_B9ZtABKhEdyxBYjIJwIrZA" name="undef"/>
-          <ownedLiteral xmi:id="_CB39UBKhEdyxBYjIJwIrZA" name="other"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_BoDIEBKhEdyxBYjIJwIrZA" name="meetHardDeadlines"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_BzZccBKhEdyxBYjIJwIrZA" name="minimizeMissedDeadlines"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_B4xEoBKhEdyxBYjIJwIrZA" name="minimizedMeanTardiness"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_B9ZtABKhEdyxBYjIJwIrZA" name="undef"/>
+          <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_CB39UBKhEdyxBYjIJwIrZA" name="other"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_JAGTsBKhEdyxBYjIJwIrZA" name="SaAnalysisContext">
-          <generalization xmi:id="_SqmDEBKhEdyxBYjIJwIrZA" general="_9gc2ABKfEdyaWJN1BYon3A"/>
-          <ownedAttribute xmi:id="_Kthe0BKhEdyxBYjIJwIrZA" name="isSched" visibility="public" isUnique="false">
+          <generalization xmi:type="uml:Generalization" xmi:id="_SqmDEBKhEdyxBYjIJwIrZA" general="_9gc2ABKfEdyaWJN1BYon3A"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Kthe0BKhEdyxBYjIJwIrZA" name="isSched" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_55fyMBFGEdyBd9q9NMDXUQ"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NkZlUBKhEdyxBYjIJwIrZA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NkjWUBKhEdyxBYjIJwIrZA" value="1"/>
@@ -4717,7 +4717,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_K4bHQBKhEdyxBYjIJwIrZA" name="optCriterion" visibility="public" type="__N1IYBKgEdyxBYjIJwIrZA" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_K4bHQBKhEdyxBYjIJwIrZA" name="optCriterion" visibility="public" type="__N1IYBKgEdyxBYjIJwIrZA" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_P3JrEBKhEdyxBYjIJwIrZA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P3TcEBKhEdyxBYjIJwIrZA" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_P3dNEBKhEdyxBYjIJwIrZA">
@@ -4726,7 +4726,7 @@
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_V4UjUBKhEdyxBYjIJwIrZA" name="SaEndtoEndFlow">
-          <ownedAttribute xmi:id="_Xpx54BKhEdyxBYjIJwIrZA" name="isSched" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Xpx54BKhEdyxBYjIJwIrZA" name="isSched" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_55fyMBFGEdyBd9q9NMDXUQ"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_cv0moBKhEdyxBYjIJwIrZA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cv-XoBKhEdyxBYjIJwIrZA" value="1"/>
@@ -4734,7 +4734,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_X131IBKhEdyxBYjIJwIrZA" name="schSlack" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_X131IBKhEdyxBYjIJwIrZA" name="schSlack" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_fK7-MBKhEdyxBYjIJwIrZA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fLFIIBKhEdyxBYjIJwIrZA" value="1"/>
@@ -4742,7 +4742,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_X5mekBKhEdyxBYjIJwIrZA" name="end2EndT" visibility="public">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_X5mekBKhEdyxBYjIJwIrZA" name="end2EndT" visibility="public">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hfR_YBKhEdyxBYjIJwIrZA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hfbJUBKhEdyxBYjIJwIrZA" value="*"/>
@@ -4750,7 +4750,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_X9e5ABKhEdyxBYjIJwIrZA" name="end2EndD" visibility="public">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_X9e5ABKhEdyxBYjIJwIrZA" name="end2EndD" visibility="public">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_je3RgBKhEdyxBYjIJwIrZA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jfBCgBKhEdyxBYjIJwIrZA" value="*"/>
@@ -4758,14 +4758,14 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_YBhEcBKhEdyxBYjIJwIrZA" name="timing" visibility="public" type="_En1FMBKcEdymP89M8JXkzA" isOrdered="true" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_YBhEcBKhEdyxBYjIJwIrZA" name="timing" visibility="public" type="_En1FMBKcEdymP89M8JXkzA" isOrdered="true" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_r9lxUBKhEdyxBYjIJwIrZA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_r9u7QBKhEdyxBYjIJwIrZA" value="*"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_o6ZtIBKhEdyxBYjIJwIrZA">
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_vhTIoBKhEdyxBYjIJwIrZA" name="base_NamedElement" isUnique="false" association="_vgQm0BKhEdyxBYjIJwIrZA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_vhTIoBKhEdyxBYjIJwIrZA" name="base_NamedElement" isUnique="false" association="_vgQm0BKhEdyxBYjIJwIrZA">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#NamedElement"/>
           </ownedAttribute>
         </packagedElement>
@@ -4773,8 +4773,8 @@
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_vgjhwBKhEdyxBYjIJwIrZA" name="extension_SaEnd2EndFlow" type="_V4UjUBKhEdyxBYjIJwIrZA" aggregation="composite" association="_vgQm0BKhEdyxBYjIJwIrZA"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_KVOeIBKiEdyxBYjIJwIrZA" name="SaCommStep">
-          <generalization xmi:id="_VmeI4BKiEdyxBYjIJwIrZA" general="_riBT0BKaEdyGYuetzx6T5A"/>
-          <ownedAttribute xmi:id="_L0R2EBKiEdyxBYjIJwIrZA" name="deadline" visibility="public" isUnique="false">
+          <generalization xmi:type="uml:Generalization" xmi:id="_VmeI4BKiEdyxBYjIJwIrZA" general="_riBT0BKaEdyGYuetzx6T5A"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_L0R2EBKiEdyxBYjIJwIrZA" name="deadline" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_POkLoBKiEdyxBYjIJwIrZA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_POtVkBKiEdyxBYjIJwIrZA" value="1"/>
@@ -4782,7 +4782,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_L4AfgBKiEdyxBYjIJwIrZA" name="spareCap" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_L4AfgBKiEdyxBYjIJwIrZA" name="spareCap" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_RcTOgBKiEdyxBYjIJwIrZA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Rcc_gBKiEdyxBYjIJwIrZA" value="1"/>
@@ -4790,7 +4790,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_L7cOABKiEdyxBYjIJwIrZA" name="schSlack" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_L7cOABKiEdyxBYjIJwIrZA" name="schSlack" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_TXZCMBKiEdyxBYjIJwIrZA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TXr9IBKiEdyxBYjIJwIrZA" value="1"/>
@@ -4798,7 +4798,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_UxNU0BKiEdyxBYjIJwIrZA" name="base_BehavioralFeature" isUnique="false" association="_UwBCABKiEdyxBYjIJwIrZA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_UxNU0BKiEdyxBYjIJwIrZA" name="base_BehavioralFeature" isUnique="false" association="_UwBCABKiEdyxBYjIJwIrZA">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
           </ownedAttribute>
         </packagedElement>
@@ -4806,11 +4806,11 @@
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_Uwdt8BKiEdyxBYjIJwIrZA" name="extension_SaCommStep" type="_KVOeIBKiEdyxBYjIJwIrZA" aggregation="composite" association="_UwBCABKiEdyxBYjIJwIrZA"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_W2mUABKiEdyxBYjIJwIrZA" name="SaStep">
-          <generalization xmi:id="_aO7hwBKiEdyxBYjIJwIrZA" general="_eXMtwBKZEdyGYuetzx6T5A"/>
-          <ownedAttribute xmi:id="_ZJj1IBKiEdyxBYjIJwIrZA" name="base_BehavioralFeature" isUnique="false" association="_ZIgsQBKiEdyxBYjIJwIrZA">
+          <generalization xmi:type="uml:Generalization" xmi:id="_aO7hwBKiEdyxBYjIJwIrZA" general="_eXMtwBKZEdyGYuetzx6T5A"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_ZJj1IBKiEdyxBYjIJwIrZA" name="base_BehavioralFeature" isUnique="false" association="_ZIgsQBKiEdyxBYjIJwIrZA">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_bFPesBKiEdyxBYjIJwIrZA" name="deadline" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_bFPesBKiEdyxBYjIJwIrZA" name="deadline" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_fs9QsBKiEdyxBYjIJwIrZA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fs9QsRKiEdyxBYjIJwIrZA" value="1"/>
@@ -4818,7 +4818,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_bJa0EBKiEdyxBYjIJwIrZA" name="spareCap" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_bJa0EBKiEdyxBYjIJwIrZA" name="spareCap" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hwG0MBKiEdyxBYjIJwIrZA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hwP-IBKiEdyxBYjIJwIrZA" value="1"/>
@@ -4826,7 +4826,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_bNJdgBKiEdyxBYjIJwIrZA" name="schSlack" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_bNJdgBKiEdyxBYjIJwIrZA" name="schSlack" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_jyWYwBKiEdyxBYjIJwIrZA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jyWYwRKiEdyxBYjIJwIrZA" value="1"/>
@@ -4834,7 +4834,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_bRB38BKiEdyxBYjIJwIrZA" name="preemptT" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_bRB38BKiEdyxBYjIJwIrZA" name="preemptT" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_lzQgkBKiEdyxBYjIJwIrZA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lzaRkBKiEdyxBYjIJwIrZA" value="1"/>
@@ -4842,7 +4842,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_bU6SYBKiEdyxBYjIJwIrZA" name="readyT" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_bU6SYBKiEdyxBYjIJwIrZA" name="readyT" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_oH3ngBKiEdyxBYjIJwIrZA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oH3ngRKiEdyxBYjIJwIrZA" value="1"/>
@@ -4850,7 +4850,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_bYo70BKiEdyxBYjIJwIrZA" name="nonpreemptionBlocking" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_bYo70BKiEdyxBYjIJwIrZA" name="nonpreemptionBlocking" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_q5aiEBKiEdyxBYjIJwIrZA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_q5jsABKiEdyxBYjIJwIrZA" value="1"/>
@@ -4858,14 +4858,14 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_89iBcDL9Ed2-hZkEerSQAg" name="sharedRes" visibility="public" type="_eEgPsBKjEdyxBYjIJwIrZA" isUnique="false" redefinedProperty="_nUkswBG6Edyb1KzJ7GkiGA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_89iBcDL9Ed2-hZkEerSQAg" name="sharedRes" visibility="public" type="_eEgPsBKjEdyxBYjIJwIrZA" isUnique="false" redefinedProperty="_nUkswBG6Edyb1KzJ7GkiGA">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Jq_LgDL-Ed2-hZkEerSQAg"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JrI8gDL-Ed2-hZkEerSQAg" value="*"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_JrSGcDL-Ed2-hZkEerSQAg">
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_7seFYDMBEd2-hZkEerSQAg" name="selfSuspensionBlocking" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_7seFYDMBEd2-hZkEerSQAg" name="selfSuspensionBlocking" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_7seFYjMBEd2-hZkEerSQAg"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7seFYTMBEd2-hZkEerSQAg" value="1"/>
@@ -4873,7 +4873,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="__54hADMBEd2-hZkEerSQAg" name="numberSelfSuspensions" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="__54hADMBEd2-hZkEerSQAg" name="numberSelfSuspensions" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_0KWSgBFQEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_EEA_IDMCEd2-hZkEerSQAg"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EEKwIDMCEd2-hZkEerSQAg" value="1"/>
@@ -4886,8 +4886,8 @@
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_ZIznMBKiEdyxBYjIJwIrZA" name="extension_SaExecStep" type="_W2mUABKiEdyxBYjIJwIrZA" aggregation="composite" association="_ZIgsQBKiEdyxBYjIJwIrZA"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_7UEWoBKiEdyxBYjIJwIrZA" name="SaSchedObs">
-          <generalization xmi:id="_-Nzj4BKiEdyxBYjIJwIrZA" general="_En1FMBKcEdymP89M8JXkzA"/>
-          <ownedAttribute xmi:id="_-3R-sBKiEdyxBYjIJwIrZA" name="suspentions" visibility="public">
+          <generalization xmi:type="uml:Generalization" xmi:id="_-Nzj4BKiEdyxBYjIJwIrZA" general="_En1FMBKcEdymP89M8JXkzA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_-3R-sBKiEdyxBYjIJwIrZA" name="suspentions" visibility="public">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_0KWSgBFQEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ch9gsBKjEdyxBYjIJwIrZA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ch9gsRKjEdyxBYjIJwIrZA" value="*"/>
@@ -4895,7 +4895,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_-50VUBKiEdyxBYjIJwIrZA" name="blockT" visibility="public">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_-50VUBKiEdyxBYjIJwIrZA" name="blockT" visibility="public">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_EsQ1EBKjEdyxBYjIJwIrZA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EsamEBKjEdyxBYjIJwIrZA" value="*"/>
@@ -4903,7 +4903,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_-89I4BKiEdyxBYjIJwIrZA" name="overlaps" visibility="public">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_-89I4BKiEdyxBYjIJwIrZA" name="overlaps" visibility="public">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_0KWSgBFQEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_G4gDIBKjEdyxBYjIJwIrZA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_G4p0IBKjEdyxBYjIJwIrZA" value="*"/>
@@ -4913,8 +4913,8 @@
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_eEgPsBKjEdyxBYjIJwIrZA" name="SaSharedResource">
-          <generalization xmi:id="_uIkJMBKjEdyxBYjIJwIrZA" general="_y3mvQBGzEdyb1KzJ7GkiGA"/>
-          <ownedAttribute xmi:id="_fz80EBKjEdyxBYjIJwIrZA" name="capacity" visibility="public" isUnique="false">
+          <generalization xmi:type="uml:Generalization" xmi:id="_uIkJMBKjEdyxBYjIJwIrZA" general="_y3mvQBGzEdyb1KzJ7GkiGA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_fz80EBKjEdyxBYjIJwIrZA" name="capacity" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_0KWSgBFQEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kViI4BKjEdyxBYjIJwIrZA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kVrS0BKjEdyxBYjIJwIrZA" value="1"/>
@@ -4922,7 +4922,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_f43wUBKjEdyxBYjIJwIrZA" name="isPreemp" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_f43wUBKjEdyxBYjIJwIrZA" name="isPreemp" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_55fyMBFGEdyBd9q9NMDXUQ"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mNLnABKjEdyxBYjIJwIrZA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mNLnARKjEdyxBYjIJwIrZA" value="1"/>
@@ -4930,7 +4930,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_f72y4BKjEdyxBYjIJwIrZA" name="isConsum" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_f72y4BKjEdyxBYjIJwIrZA" name="isConsum" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_55fyMBFGEdyBd9q9NMDXUQ"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_oofL0BKjEdyxBYjIJwIrZA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oooVwBKjEdyxBYjIJwIrZA" value="1"/>
@@ -4938,7 +4938,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_gAVDMBKjEdyxBYjIJwIrZA" name="acquisT" visibility="public">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_gAVDMBKjEdyxBYjIJwIrZA" name="acquisT" visibility="public">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_rFuqUBKjEdyxBYjIJwIrZA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rF4bUBKjEdyxBYjIJwIrZA" value="*"/>
@@ -4946,7 +4946,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_gEDsoBKjEdyxBYjIJwIrZA" name="releaseT" visibility="public">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_gEDsoBKjEdyxBYjIJwIrZA" name="releaseT" visibility="public">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s6sA0BKjEdyxBYjIJwIrZA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s61x0BKjEdyxBYjIJwIrZA" value="*"/>
@@ -4956,8 +4956,8 @@
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_uuA_oBKjEdyxBYjIJwIrZA" name="SaCommHost">
-          <generalization xmi:id="_4ckvoBKjEdyxBYjIJwIrZA" general="_sEF-wBKdEdymP89M8JXkzA"/>
-          <ownedAttribute xmi:id="_wLaKsBKjEdyxBYjIJwIrZA" name="isSched" visibility="public" isUnique="false">
+          <generalization xmi:type="uml:Generalization" xmi:id="_4ckvoBKjEdyxBYjIJwIrZA" general="_sEF-wBKdEdymP89M8JXkzA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_wLaKsBKjEdyxBYjIJwIrZA" name="isSched" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_55fyMBFGEdyBd9q9NMDXUQ"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yx5r0BKjEdyxBYjIJwIrZA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yyC1wBKjEdyxBYjIJwIrZA" value="1"/>
@@ -4965,7 +4965,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_wOPcQBKjEdyxBYjIJwIrZA" name="schSlack" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_wOPcQBKjEdyxBYjIJwIrZA" name="schSlack" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_3CxEEBKjEdyxBYjIJwIrZA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3C6OABKjEdyxBYjIJwIrZA" value="1"/>
@@ -4975,8 +4975,8 @@
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_6d68UBKjEdyxBYjIJwIrZA" name="SaExecHost">
-          <generalization xmi:id="_VnqJwBKkEdyxBYjIJwIrZA" general="_MDZCYBKdEdymP89M8JXkzA"/>
-          <ownedAttribute xmi:id="_8Q8ZIBKjEdyxBYjIJwIrZA" name="isSched" visibility="public" isUnique="false">
+          <generalization xmi:type="uml:Generalization" xmi:id="_VnqJwBKkEdyxBYjIJwIrZA" general="_MDZCYBKdEdymP89M8JXkzA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_8Q8ZIBKjEdyxBYjIJwIrZA" name="isSched" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_55fyMBFGEdyBd9q9NMDXUQ"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_BVuhoBKkEdyxBYjIJwIrZA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BV4SoBKkEdyxBYjIJwIrZA" value="1"/>
@@ -4984,7 +4984,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_8Uh4oBKjEdyxBYjIJwIrZA" name="schSlack" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_8Uh4oBKjEdyxBYjIJwIrZA" name="schSlack" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DTyw0BKkEdyxBYjIJwIrZA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DT8h0BKkEdyxBYjIJwIrZA" value="1"/>
@@ -4992,7 +4992,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_8Xz2IBKjEdyxBYjIJwIrZA" name="schedUtiliz" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_8Xz2IBKjEdyxBYjIJwIrZA" name="schedUtiliz" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Fxe7QBKkEdyxBYjIJwIrZA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Fxe7QRKkEdyxBYjIJwIrZA" value="1"/>
@@ -5000,7 +5000,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_8bifkBKjEdyxBYjIJwIrZA" name="ISRswitchT" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_8bifkBKjEdyxBYjIJwIrZA" name="ISRswitchT" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IagzABKkEdyxBYjIJwIrZA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Iazt8BKkEdyxBYjIJwIrZA" value="1"/>
@@ -5008,7 +5008,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_8gAv4BKjEdyxBYjIJwIrZA" name="ISRprioRange" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_8gAv4BKjEdyxBYjIJwIrZA" name="ISRprioRange" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_ehpdoBEBEdyx6M3BlUjlCQ"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_M7C-8BKkEdyxBYjIJwIrZA"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_M7V54BKkEdyxBYjIJwIrZA" value="1"/>
@@ -5019,17 +5019,17 @@
         </packagedElement>
       </packagedElement>
       <packagedElement xmi:type="uml:Profile" xmi:id="_6c2bkAPMEdyuUt-4qHuVvQ" name="PAM">
-        <packageImport xmi:id="_zuhJcGqlEdyHVMM3AaZxvA" importedPackage="_XVWGUAPMEdyuUt-4qHuVvQ"/>
-        <packageImport xmi:id="_zupFQGqlEdyHVMM3AaZxvA" importedPackage="_4bV20APMEdyuUt-4qHuVvQ"/>
+        <packageImport xmi:type="uml:PackageImport" xmi:id="_zuhJcGqlEdyHVMM3AaZxvA" importedPackage="_XVWGUAPMEdyuUt-4qHuVvQ"/>
+        <packageImport xmi:type="uml:PackageImport" xmi:id="_zupFQGqlEdyHVMM3AaZxvA" importedPackage="_4bV20APMEdyuUt-4qHuVvQ"/>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_HSkooBKmEdyghqIjFIG1tQ" name="PaStep">
-          <generalization xmi:id="_l_878BKmEdyghqIjFIG1tQ" general="_eXMtwBKZEdyGYuetzx6T5A"/>
-          <ownedAttribute xmi:id="_IV2qkBKmEdyghqIjFIG1tQ" name="noSync" visibility="public" isUnique="false">
+          <generalization xmi:type="uml:Generalization" xmi:id="_l_878BKmEdyghqIjFIG1tQ" general="_eXMtwBKZEdyGYuetzx6T5A"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_IV2qkBKmEdyghqIjFIG1tQ" name="noSync" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_55fyMBFGEdyBd9q9NMDXUQ"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NoqA8BKmEdyghqIjFIG1tQ"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Nozx8BKmEdyghqIjFIG1tQ" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_No9i8BKmEdyghqIjFIG1tQ" value="false"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_IZ42ABKmEdyghqIjFIG1tQ" name="extOpDemand" visibility="public" isOrdered="true">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_IZ42ABKmEdyghqIjFIG1tQ" name="extOpDemand" visibility="public" isOrdered="true">
             <type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_qZ3GUAnxEdy9WM11hWri2g"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WLRiQBKmEdyghqIjFIG1tQ"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WLbTQBKmEdyghqIjFIG1tQ" value="*"/>
@@ -5037,20 +5037,20 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_In6D4BKmEdyghqIjFIG1tQ" name="extOpCount" visibility="public" isOrdered="true">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_In6D4BKmEdyghqIjFIG1tQ" name="extOpCount" visibility="public" isOrdered="true">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VA-5YBKmEdyghqIjFIG1tQ"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VBIqYBKmEdyghqIjFIG1tQ" value="*"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_VBR0UBKmEdyghqIjFIG1tQ" value="1"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_Isr2MBKmEdyghqIjFIG1tQ" name="behavDemand" visibility="public" type="_XYaMIBKYEdyGYuetzx6T5A" isOrdered="true">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_Isr2MBKmEdyghqIjFIG1tQ" name="behavDemand" visibility="public" type="_XYaMIBKYEdyGYuetzx6T5A" isOrdered="true">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_elZO4BKmEdyghqIjFIG1tQ"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_elsJ0BKmEdyghqIjFIG1tQ" value="*"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_el160BKmEdyghqIjFIG1tQ">
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_IwafoBKmEdyghqIjFIG1tQ" name="behavCount" visibility="public" isOrdered="true">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_IwafoBKmEdyghqIjFIG1tQ" name="behavCount" visibility="public" isOrdered="true">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_jy09EBKmEdyghqIjFIG1tQ"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jy-HABKmEdyghqIjFIG1tQ" value="*"/>
@@ -5060,23 +5060,23 @@
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_oEIaMBKmEdyghqIjFIG1tQ" name="PaRequestedStep">
-          <generalization xmi:id="_w3nCABKmEdyghqIjFIG1tQ" general="_HSkooBKmEdyghqIjFIG1tQ"/>
-          <generalization xmi:id="_qw8JQBKnEdyghqIjFIG1tQ" general="_gCsw0BKaEdyGYuetzx6T5A"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_w3nCABKmEdyghqIjFIG1tQ" general="_HSkooBKmEdyghqIjFIG1tQ"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_qw8JQBKnEdyghqIjFIG1tQ" general="_gCsw0BKaEdyGYuetzx6T5A"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_qAs0kBKmEdyghqIjFIG1tQ" name="PaCommStep">
-          <generalization xmi:id="_wcdXEBKmEdyghqIjFIG1tQ" general="_HSkooBKmEdyghqIjFIG1tQ"/>
-          <generalization xmi:id="_NvpEsBRREdyCa-N9ek5e_w" general="_riBT0BKaEdyGYuetzx6T5A"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_wcdXEBKmEdyghqIjFIG1tQ" general="_HSkooBKmEdyghqIjFIG1tQ"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_NvpEsBRREdyCa-N9ek5e_w" general="_riBT0BKaEdyGYuetzx6T5A"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="__s4NIBKmEdyghqIjFIG1tQ" name="PaResPassStep">
-          <generalization xmi:id="_hGkVsBKnEdyghqIjFIG1tQ" general="_eXMtwBKZEdyGYuetzx6T5A"/>
-          <ownedAttribute xmi:id="_CG1uIBKnEdyghqIjFIG1tQ" name="resource" visibility="public" type="_BthQEBGzEdyb1KzJ7GkiGA" isUnique="false">
+          <generalization xmi:type="uml:Generalization" xmi:id="_hGkVsBKnEdyghqIjFIG1tQ" general="_eXMtwBKZEdyGYuetzx6T5A"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_CG1uIBKnEdyghqIjFIG1tQ" name="resource" visibility="public" type="_BthQEBGzEdyb1KzJ7GkiGA" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Fsls0BKnEdyghqIjFIG1tQ"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Fsu2wBKnEdyghqIjFIG1tQ" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_Fs4nwBKnEdyghqIjFIG1tQ">
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_CJh1wBKnEdyghqIjFIG1tQ" name="resUnits" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_CJh1wBKnEdyghqIjFIG1tQ" name="resUnits" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_0KWSgBFQEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_JfdhgBKnEdyghqIjFIG1tQ"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JfwccBKnEdyghqIjFIG1tQ" value="1"/>
@@ -5084,8 +5084,8 @@
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_WR8gEBKoEdyghqIjFIG1tQ" name="PaLogicalResource">
-          <generalization xmi:id="_g_4pcBKoEdyghqIjFIG1tQ" general="_BthQEBGzEdyb1KzJ7GkiGA"/>
-          <ownedAttribute xmi:id="_XkSRsBKoEdyghqIjFIG1tQ" name="utilization" visibility="public" isUnique="false">
+          <generalization xmi:type="uml:Generalization" xmi:id="_g_4pcBKoEdyghqIjFIG1tQ" general="_BthQEBGzEdyb1KzJ7GkiGA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_XkSRsBKoEdyghqIjFIG1tQ" name="utilization" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bUHZcBKoEdyghqIjFIG1tQ"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bUQjYBKoEdyghqIjFIG1tQ" value="1"/>
@@ -5093,7 +5093,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_XtzaEBKoEdyghqIjFIG1tQ" name="throughput" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_XtzaEBKoEdyghqIjFIG1tQ" name="throughput" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_UDZSQBFSEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_eNASIBKoEdyghqIjFIG1tQ"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_eNJcEBKoEdyghqIjFIG1tQ" value="1"/>
@@ -5101,7 +5101,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_XxUoIBKoEdyghqIjFIG1tQ" name="poolSize" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_XxUoIBKoEdyghqIjFIG1tQ" name="poolSize" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_0KWSgBFQEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ft-8sBKoEdyghqIjFIG1tQ" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fuItsBKoEdyghqIjFIG1tQ" value="1"/>
@@ -5111,7 +5111,7 @@
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_kG1zUBKoEdyghqIjFIG1tQ" name="PaRunTInstance">
-          <ownedAttribute xmi:id="_ls81gBKoEdyghqIjFIG1tQ" name="poolSize" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_ls81gBKoEdyghqIjFIG1tQ" name="poolSize" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_0KWSgBFQEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_rJfWsBKoEdyghqIjFIG1tQ"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rJogoBKoEdyghqIjFIG1tQ" value="1"/>
@@ -5119,27 +5119,27 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_lwU5oBKoEdyghqIjFIG1tQ" name="unbddPool" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_lwU5oBKoEdyghqIjFIG1tQ" name="unbddPool" visibility="public" isUnique="false">
             <type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_uU14YBKoEdyghqIjFIG1tQ"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uU_CUBKoEdyghqIjFIG1tQ" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_uVIMQBKoEdyghqIjFIG1tQ" value="false"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_l4q9UBKoEdyghqIjFIG1tQ" name="instance" visibility="public" type="_1zYucBG0Edyb1KzJ7GkiGA" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_l4q9UBKoEdyghqIjFIG1tQ" name="instance" visibility="public" type="_1zYucBG0Edyb1KzJ7GkiGA" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wxv_sBKoEdyghqIjFIG1tQ"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wyCTkBKoEdyghqIjFIG1tQ" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_wyMEkBKoEdyghqIjFIG1tQ">
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_mGJ_sBKoEdyghqIjFIG1tQ" name="host" visibility="public" type="_MDZCYBKdEdymP89M8JXkzA" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_mGJ_sBKoEdyghqIjFIG1tQ" name="host" visibility="public" type="_MDZCYBKdEdymP89M8JXkzA" isUnique="false">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yWizQBKoEdyghqIjFIG1tQ"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yWr9MBKoEdyghqIjFIG1tQ" value="1"/>
             <defaultValue xmi:type="uml:LiteralString" xmi:id="_yW1HIBKoEdyghqIjFIG1tQ">
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_mJYS0BKoEdyghqIjFIG1tQ" name="utilization" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_mJYS0BKoEdyghqIjFIG1tQ" name="utilization" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0BMXMBKoEdyghqIjFIG1tQ"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0BWIMBKoEdyghqIjFIG1tQ" value="1"/>
@@ -5147,7 +5147,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_mMc08BKoEdyghqIjFIG1tQ" name="throughput" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_mMc08BKoEdyghqIjFIG1tQ" name="throughput" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_UDZSQBFSEdyUJeMeN__D-A"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1vg6MBKoEdyghqIjFIG1tQ"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1vqrMBKoEdyghqIjFIG1tQ" value="1"/>
@@ -5155,7 +5155,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_6xF9sBKoEdyghqIjFIG1tQ" name="base_NamedElement" isUnique="false" association="_6v65ABKoEdyghqIjFIG1tQ">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_6xF9sBKoEdyghqIjFIG1tQ" name="base_NamedElement" isUnique="false" association="_6v65ABKoEdyghqIjFIG1tQ">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#NamedElement"/>
           </ownedAttribute>
         </packagedElement>
@@ -5166,18 +5166,18 @@
     </packagedElement>
     <packagedElement xmi:type="uml:Package" xmi:id="_9ZhBAAPMEdyuUt-4qHuVvQ" name="MARTE_Annexes">
       <packagedElement xmi:type="uml:Profile" xmi:id="_DIIJoAPNEdyuUt-4qHuVvQ" name="RSM" metaclassReference="_gbrKUGqmEdyHVMM3AaZxvA _qQcScDJIEd211cMdxu944g">
-        <elementImport xmi:id="_gbrKUGqmEdyHVMM3AaZxvA" alias="MultiplicityElement">
+        <elementImport xmi:type="uml:ElementImport" xmi:id="_gbrKUGqmEdyHVMM3AaZxvA" alias="MultiplicityElement">
           <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#MultiplicityElement"/>
         </elementImport>
-        <elementImport xmi:id="_qQcScDJIEd211cMdxu944g" alias="ConnectorEnd">
+        <elementImport xmi:type="uml:ElementImport" xmi:id="_qQcScDJIEd211cMdxu944g" alias="ConnectorEnd">
           <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ConnectorEnd"/>
         </elementImport>
-        <packageImport xmi:id="_ZmexYBmXEdyKYph7niDrbQ">
-          <importedPackage href="MARTE_Library.library.uml#_RTwjABgzEdyHL91mBnoLNQ"/>
+        <packageImport xmi:type="uml:PackageImport" xmi:id="_ZmexYBmXEdyKYph7niDrbQ">
+          <importedPackage xmi:type="uml:Package" href="MARTE_Library.library.uml#_RTwjABgzEdyHL91mBnoLNQ"/>
         </packageImport>
-        <packageImport xmi:id="_nmc2wBmYEdyKYph7niDrbQ" importedPackage="_ar8OsAPMEdyuUt-4qHuVvQ"/>
+        <packageImport xmi:type="uml:PackageImport" xmi:id="_nmc2wBmYEdyKYph7niDrbQ" importedPackage="_ar8OsAPMEdyuUt-4qHuVvQ"/>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_xKpbwBmWEdyKYph7niDrbQ" name="LinkTopology" isAbstract="true">
-          <ownedAttribute xmi:id="_1mAMwBmWEdyKYph7niDrbQ" name="base_Connector" isUnique="false" association="_1kqwABmWEdyKYph7niDrbQ">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_1mAMwBmWEdyKYph7niDrbQ" name="base_Connector" isUnique="false" association="_1kqwABmWEdyKYph7niDrbQ">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Connector"/>
           </ownedAttribute>
         </packagedElement>
@@ -5185,11 +5185,11 @@
           <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_1lQl4BmWEdyKYph7niDrbQ" name="extension_LinkTopology" type="_xKpbwBmWEdyKYph7niDrbQ" aggregation="composite" association="_1kqwABmWEdyKYph7niDrbQ"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_4y-fEBmWEdyKYph7niDrbQ" name="DefaultLink">
-          <generalization xmi:id="_7oHgMBmWEdyKYph7niDrbQ" general="_xKpbwBmWEdyKYph7niDrbQ"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_7oHgMBmWEdyKYph7niDrbQ" general="_xKpbwBmWEdyKYph7niDrbQ"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_8XV9sBmWEdyKYph7niDrbQ" name="InterRepetition">
-          <generalization xmi:id="_LBEnMBmXEdyKYph7niDrbQ" general="_xKpbwBmWEdyKYph7niDrbQ"/>
-          <ownedAttribute xmi:id="_-kaSMBmWEdyKYph7niDrbQ" name="repetitionShapeDependence" visibility="public" isUnique="false">
+          <generalization xmi:type="uml:Generalization" xmi:id="_LBEnMBmXEdyKYph7niDrbQ" general="_xKpbwBmWEdyKYph7niDrbQ"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_-kaSMBmWEdyKYph7niDrbQ" name="repetitionShapeDependence" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_WkRCQBD_EdyybZnLxHsjyA"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_CSwMMBmXEdyKYph7niDrbQ" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CSwMMRmXEdyKYph7niDrbQ" value="1"/>
@@ -5197,7 +5197,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_-mMa4BmWEdyKYph7niDrbQ" name="isModulo" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_-mMa4BmWEdyKYph7niDrbQ" name="isModulo" visibility="public" isUnique="false">
             <type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_GEq-oBmXEdyKYph7niDrbQ"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GE95kBmXEdyKYph7niDrbQ" value="1"/>
@@ -5205,8 +5205,8 @@
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_rlEocBmYEdyKYph7niDrbQ" name="Distribute">
-          <generalization xmi:id="_7xJOcBmYEdyKYph7niDrbQ" general="_kzoXABHbEdyWC5IKDhzksw"/>
-          <ownedAttribute xmi:id="_srPmUBmYEdyKYph7niDrbQ" name="patternShape" visibility="public" isUnique="false">
+          <generalization xmi:type="uml:Generalization" xmi:id="_7xJOcBmYEdyKYph7niDrbQ" general="_kzoXABHbEdyWC5IKDhzksw"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_srPmUBmYEdyKYph7niDrbQ" name="patternShape" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5jgZkBmVEdyKYph7niDrbQ"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_vq2LABmYEdyKYph7niDrbQ" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vq2LARmYEdyKYph7niDrbQ" value="1"/>
@@ -5214,7 +5214,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_s3ddYBmYEdyKYph7niDrbQ" name="repetitionSpace" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_s3ddYBmYEdyKYph7niDrbQ" name="repetitionSpace" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5jgZkBmVEdyKYph7niDrbQ"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yIxmABmYEdyKYph7niDrbQ" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yI6v8BmYEdyKYph7niDrbQ" value="1"/>
@@ -5222,7 +5222,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_s7x8sBmYEdyKYph7niDrbQ" name="fromTiler" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_s7x8sBmYEdyKYph7niDrbQ" name="fromTiler" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_hwFnsBmVEdyKYph7niDrbQ"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0pOwkBmYEdyKYph7niDrbQ" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0pOwkRmYEdyKYph7niDrbQ" value="1"/>
@@ -5230,7 +5230,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_tLbiQBmYEdyKYph7niDrbQ" name="toTiler" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_tLbiQBmYEdyKYph7niDrbQ" name="toTiler" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_hwFnsBmVEdyKYph7niDrbQ"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2vLJYBmYEdyKYph7niDrbQ" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2vLJYRmYEdyKYph7niDrbQ" value="1"/>
@@ -5240,8 +5240,8 @@
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_yWN5MBmlEdyHOO9ydeHscA" name="Reshape">
-          <generalization xmi:id="_6058wBmlEdyHOO9ydeHscA" general="_xKpbwBmWEdyKYph7niDrbQ"/>
-          <ownedAttribute xmi:id="_zbffMBmlEdyHOO9ydeHscA" name="patternShape" visibility="public" isUnique="false">
+          <generalization xmi:type="uml:Generalization" xmi:id="_6058wBmlEdyHOO9ydeHscA" general="_xKpbwBmWEdyKYph7niDrbQ"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_zbffMBmlEdyHOO9ydeHscA" name="patternShape" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5jgZkBmVEdyKYph7niDrbQ"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1vtkkBmlEdyHOO9ydeHscA" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1vtkkRmlEdyHOO9ydeHscA" value="1"/>
@@ -5249,7 +5249,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_zfqNgBmlEdyHOO9ydeHscA" name="repetitonShape" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_zfqNgBmlEdyHOO9ydeHscA" name="repetitonShape" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5jgZkBmVEdyKYph7niDrbQ"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4JJhIBmlEdyHOO9ydeHscA" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4JJhIRmlEdyHOO9ydeHscA" value="1"/>
@@ -5259,8 +5259,8 @@
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_UXdCkBmpEdy7eNTGSxTSvg" name="Tiler">
-          <generalization xmi:id="_l0hWYBmpEdy7eNTGSxTSvg" general="_xKpbwBmWEdyKYph7niDrbQ"/>
-          <ownedAttribute xmi:id="_VJzskBmpEdy7eNTGSxTSvg" name="origin" visibility="public" isUnique="false">
+          <generalization xmi:type="uml:Generalization" xmi:id="_l0hWYBmpEdy7eNTGSxTSvg" general="_xKpbwBmWEdyKYph7niDrbQ"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_VJzskBmpEdy7eNTGSxTSvg" name="origin" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_WkRCQBD_EdyybZnLxHsjyA"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YdMv8BmpEdy7eNTGSxTSvg"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YdWg8BmpEdy7eNTGSxTSvg" value="1"/>
@@ -5268,7 +5268,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_VSJJMBmpEdy7eNTGSxTSvg" name="paving" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_VSJJMBmpEdy7eNTGSxTSvg" name="paving" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_yhmP0BD_EdyybZnLxHsjyA"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bB9ywBmpEdy7eNTGSxTSvg"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bCG8sBmpEdy7eNTGSxTSvg" value="1"/>
@@ -5276,7 +5276,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_VUrf0BmpEdy7eNTGSxTSvg" name="fitting" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_VUrf0BmpEdy7eNTGSxTSvg" name="fitting" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_yhmP0BD_EdyybZnLxHsjyA"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_dznbABmpEdy7eNTGSxTSvg"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dzwk8BmpEdy7eNTGSxTSvg" value="1"/>
@@ -5284,7 +5284,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_PhZLMBmsEdy7eNTGSxTSvg" name="tiler" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_PhZLMBmsEdy7eNTGSxTSvg" name="tiler" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_hwFnsBmVEdyKYph7niDrbQ"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_RUJiQBmsEdy7eNTGSxTSvg"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_RUSsMBmsEdy7eNTGSxTSvg" value="1"/>
@@ -5292,12 +5292,12 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_xElfwDJIEd211cMdxu944g" name="base_ConnectorEnd" isUnique="false" association="_w-LVwDJIEd211cMdxu944g">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_xElfwDJIEd211cMdxu944g" name="base_ConnectorEnd" isUnique="false" association="_w-LVwDJIEd211cMdxu944g">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ConnectorEnd"/>
           </ownedAttribute>
         </packagedElement>
         <packagedElement xmi:type="uml:Stereotype" xmi:id="_iPxlMGqmEdyHVMM3AaZxvA" name="Shaped">
-          <ownedAttribute xmi:id="_jWnRcGqmEdyHVMM3AaZxvA" name="shape" visibility="public" isUnique="false">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_jWnRcGqmEdyHVMM3AaZxvA" name="shape" visibility="public" isUnique="false">
             <type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5jgZkBmVEdyKYph7niDrbQ"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_k_qS4GqmEdyHVMM3AaZxvA" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_k_svIGqmEdyHVMM3AaZxvA" value="1"/>
@@ -5305,7 +5305,7 @@
               <value xsi:nil="true"/>
             </defaultValue>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_saJHcGqmEdyHVMM3AaZxvA" name="base_MultiplicityElement" isUnique="false" association="_sZ1lcGqmEdyHVMM3AaZxvA">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_saJHcGqmEdyHVMM3AaZxvA" name="base_MultiplicityElement" isUnique="false" association="_sZ1lcGqmEdyHVMM3AaZxvA">
             <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#MultiplicityElement"/>
           </ownedAttribute>
         </packagedElement>
@@ -5319,7 +5319,7 @@
       <packagedElement xmi:type="uml:Profile" xmi:id="_CHiIYA-LEdyNj8xzjk-DoA" name="VSL">
         <packagedElement xmi:type="uml:Profile" xmi:id="_9FdqwA-MEdyLh7muGbCqMw" name="DataTypes">
           <packagedElement xmi:type="uml:Stereotype" xmi:id="_HYVowA-NEdyLh7muGbCqMw" name="BoundedSubtype">
-            <ownedAttribute xmi:id="_OrmbAA-NEdyLh7muGbCqMw" name="baseType" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_OrmbAA-NEdyLh7muGbCqMw" name="baseType" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#DataType"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_RF-LsA-NEdyLh7muGbCqMw" value="1"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_RF-LsQ-NEdyLh7muGbCqMw" value="1"/>
@@ -5327,7 +5327,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_SpzV8A-NEdyLh7muGbCqMw" name="minValue" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_SpzV8A-NEdyLh7muGbCqMw" name="minValue" visibility="public" isUnique="false">
               <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2JYXgA-OEdyLh7muGbCqMw" value="1"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2JhhcA-OEdyLh7muGbCqMw" value="1"/>
@@ -5335,7 +5335,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_vCnJIA-OEdyLh7muGbCqMw" name="maxValue" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_vCnJIA-OEdyLh7muGbCqMw" name="maxValue" visibility="public" isUnique="false">
               <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_299PEA-OEdyLh7muGbCqMw" value="1"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2-HAEA-OEdyLh7muGbCqMw" value="1"/>
@@ -5343,7 +5343,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_3UdDgA-OEdyLh7muGbCqMw" name="isMinOpen" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_3UdDgA-OEdyLh7muGbCqMw" name="isMinOpen" visibility="public" isUnique="false">
               <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6FQ-QA-OEdyLh7muGbCqMw" value="1"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6FQ-QQ-OEdyLh7muGbCqMw" value="1"/>
@@ -5351,7 +5351,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_7kTIEA-OEdyLh7muGbCqMw" name="isMaxOpen" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_7kTIEA-OEdyLh7muGbCqMw" name="isMaxOpen" visibility="public" isUnique="false">
               <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9YCWkA-OEdyLh7muGbCqMw" value="1"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9YMHkA-OEdyLh7muGbCqMw" value="1"/>
@@ -5359,12 +5359,12 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_AfDK0Q-PEdyLh7muGbCqMw" name="base_DataType" isUnique="false" association="_Ae5Z0A-PEdyLh7muGbCqMw">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_AfDK0Q-PEdyLh7muGbCqMw" name="base_DataType" isUnique="false" association="_Ae5Z0A-PEdyLh7muGbCqMw">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#DataType"/>
             </ownedAttribute>
           </packagedElement>
           <packagedElement xmi:type="uml:Stereotype" xmi:id="_HvlrIA-NEdyLh7muGbCqMw" name="IntervalType">
-            <ownedAttribute xmi:id="_DTvgAA-PEdyLh7muGbCqMw" name="intervalAttrib" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_DTvgAA-PEdyLh7muGbCqMw" name="intervalAttrib" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_H-4ZcA-PEdyLh7muGbCqMw" value="1"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_H_BjYA-PEdyLh7muGbCqMw" value="1"/>
@@ -5372,12 +5372,12 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_qmOA4A-PEdyLh7muGbCqMw" name="base_DataType" isUnique="false" association="_qmEP4A-PEdyLh7muGbCqMw">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_qmOA4A-PEdyLh7muGbCqMw" name="base_DataType" isUnique="false" association="_qmEP4A-PEdyLh7muGbCqMw">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#DataType"/>
             </ownedAttribute>
           </packagedElement>
           <packagedElement xmi:type="uml:Stereotype" xmi:id="_IFV4sA-NEdyLh7muGbCqMw" name="CollectionType">
-            <ownedAttribute xmi:id="_Sj86sA-PEdyLh7muGbCqMw" name="collectionAttrib" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_Sj86sA-PEdyLh7muGbCqMw" name="collectionAttrib" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Sj86sg-PEdyLh7muGbCqMw" value="1"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Sj86sQ-PEdyLh7muGbCqMw" value="1"/>
@@ -5385,12 +5385,12 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_rEdcEA-PEdyLh7muGbCqMw" name="base_DataType" isUnique="false" association="_rETrEA-PEdyLh7muGbCqMw">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_rEdcEA-PEdyLh7muGbCqMw" name="base_DataType" isUnique="false" association="_rETrEA-PEdyLh7muGbCqMw">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#DataType"/>
             </ownedAttribute>
           </packagedElement>
           <packagedElement xmi:type="uml:Stereotype" xmi:id="_IkLw0A-NEdyLh7muGbCqMw" name="TupleType">
-            <ownedAttribute xmi:id="_Xy1aYA-PEdyLh7muGbCqMw" name="tupleAttrib" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_Xy1aYA-PEdyLh7muGbCqMw" name="tupleAttrib" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_aSO1AA-PEdyLh7muGbCqMw"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_aSO1AQ-PEdyLh7muGbCqMw" value="*"/>
@@ -5398,12 +5398,12 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_sXIk4A-PEdyLh7muGbCqMw" name="base_DataType" isUnique="false" association="_sW_a8A-PEdyLh7muGbCqMw">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_sXIk4A-PEdyLh7muGbCqMw" name="base_DataType" isUnique="false" association="_sW_a8A-PEdyLh7muGbCqMw">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#DataType"/>
             </ownedAttribute>
           </packagedElement>
           <packagedElement xmi:type="uml:Stereotype" xmi:id="_I0uHMA-NEdyLh7muGbCqMw" name="ChoiceType">
-            <ownedAttribute xmi:id="_dFJokA-PEdyLh7muGbCqMw" name="choiceAttrib" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_dFJokA-PEdyLh7muGbCqMw" name="choiceAttrib" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_fellIA-PEdyLh7muGbCqMw"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fellIQ-PEdyLh7muGbCqMw" value="*"/>
@@ -5411,7 +5411,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_drugYA-PEdyLh7muGbCqMw" name="defaultAttrib" visibility="public" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_drugYA-PEdyLh7muGbCqMw" name="defaultAttrib" visibility="public" isUnique="false">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_iMumYA-PEdyLh7muGbCqMw"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iMumYQ-PEdyLh7muGbCqMw" value="1"/>
@@ -5419,7 +5419,7 @@
                 <value xsi:nil="true"/>
               </defaultValue>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_tzDJQA-PEdyLh7muGbCqMw" name="base_DataType" isUnique="false" association="_ty5_UA-PEdyLh7muGbCqMw">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_tzDJQA-PEdyLh7muGbCqMw" name="base_DataType" isUnique="false" association="_ty5_UA-PEdyLh7muGbCqMw">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#DataType"/>
             </ownedAttribute>
           </packagedElement>
@@ -5441,17 +5441,17 @@
         </packagedElement>
         <packagedElement xmi:type="uml:Profile" xmi:id="_9UgzYA-MEdyLh7muGbCqMw" name="Variables">
           <packagedElement xmi:type="uml:Enumeration" xmi:id="_zT7mkBBNEdyt6tGzWCpUVA" name="VariableDirectionKind">
-            <ownedLiteral xmi:id="_1NX0cBBNEdyt6tGzWCpUVA" name="in"/>
-            <ownedLiteral xmi:id="_1PwaEBBNEdyt6tGzWCpUVA" name="out"/>
-            <ownedLiteral xmi:id="_1bE5QBBNEdyt6tGzWCpUVA" name="inout"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_1NX0cBBNEdyt6tGzWCpUVA" name="in"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_1PwaEBBNEdyt6tGzWCpUVA" name="out"/>
+            <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_1bE5QBBNEdyt6tGzWCpUVA" name="inout"/>
           </packagedElement>
           <packagedElement xmi:type="uml:Stereotype" xmi:id="_7-_5QBBNEdyt6tGzWCpUVA" name="Var">
-            <ownedAttribute xmi:id="_9QgkcBBNEdyt6tGzWCpUVA" name="dir" visibility="public" type="_zT7mkBBNEdyt6tGzWCpUVA" isUnique="false">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_9QgkcBBNEdyt6tGzWCpUVA" name="dir" visibility="public" type="_zT7mkBBNEdyt6tGzWCpUVA" isUnique="false">
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_BxvT8BBOEdyt6tGzWCpUVA"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Bx4d4BBOEdyt6tGzWCpUVA" value="1"/>
               <defaultValue xmi:type="uml:LiteralString" xmi:id="_Bx4d4RBOEdyt6tGzWCpUVA" value="inout"/>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_NhDawRBOEdyt6tGzWCpUVA" name="base_Property" isUnique="false" association="_Ng5pwBBOEdyt6tGzWCpUVA">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_NhDawRBOEdyt6tGzWCpUVA" name="base_Property" isUnique="false" association="_Ng5pwBBOEdyt6tGzWCpUVA">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
             </ownedAttribute>
           </packagedElement>
@@ -5459,7 +5459,7 @@
             <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_NhDawBBOEdyt6tGzWCpUVA" name="extension_Var" type="_7-_5QBBNEdyt6tGzWCpUVA" aggregation="composite" association="_Ng5pwBBOEdyt6tGzWCpUVA"/>
           </packagedElement>
           <packagedElement xmi:type="uml:Stereotype" xmi:id="_UXvlwBBOEdyt6tGzWCpUVA" name="ExpressionContext">
-            <ownedAttribute xmi:id="_bJ0WgRBOEdyt6tGzWCpUVA" name="base_NamedElement" isUnique="false" association="_bJqlgBBOEdyt6tGzWCpUVA">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_bJ0WgRBOEdyt6tGzWCpUVA" name="base_NamedElement" isUnique="false" association="_bJqlgBBOEdyt6tGzWCpUVA">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#NamedElement"/>
             </ownedAttribute>
           </packagedElement>
@@ -5468,17 +5468,17 @@
           </packagedElement>
         </packagedElement>
         <packagedElement xmi:type="uml:Profile" xmi:id="_jg_Z8PfhEd-f4r3MXmUB9g" name="Operators" metaclassReference="_pYWO4PfhEd-f4r3MXmUB9g">
-          <elementImport xmi:id="_pYWO4PfhEd-f4r3MXmUB9g" alias="Behavior">
+          <elementImport xmi:type="uml:ElementImport" xmi:id="_pYWO4PfhEd-f4r3MXmUB9g" alias="Behavior">
             <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Behavior"/>
           </elementImport>
           <packagedElement xmi:type="uml:Stereotype" xmi:id="_qRak4PfhEd-f4r3MXmUB9g" name="Operator">
-            <ownedAttribute xmi:id="_zaH10PfhEd-f4r3MXmUB9g" name="symbol">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_zaH10PfhEd-f4r3MXmUB9g" name="symbol">
               <type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_qZ3GUAnxEdy9WM11hWri2g"/>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_0EvgIPfhEd-f4r3MXmUB9g" name="arity" isDerived="true">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_0EvgIPfhEd-f4r3MXmUB9g" name="arity" isDerived="true">
               <type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_HJ1zcAnfEdy9WM11hWri2g"/>
             </ownedAttribute>
-            <ownedAttribute xmi:id="_-UFB8PfhEd-f4r3MXmUB9g" name="base_Behavior" association="_-UFB8ffhEd-f4r3MXmUB9g">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="_-UFB8PfhEd-f4r3MXmUB9g" name="base_Behavior" association="_-UFB8ffhEd-f4r3MXmUB9g">
               <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Behavior"/>
             </ownedAttribute>
           </packagedElement>
@@ -5490,11 +5490,11 @@
     </packagedElement>
     <packagedElement xmi:type="uml:Dependency" xmi:id="_y9JiUA9dEdy-lroUn0KWEw" name="FromMARTE design modeltoMARTE foundations" client="_tADfQAPMEdyuUt-4qHuVvQ" supplier="_jG1CQAPKEdy6wIwMc4WDOQ"/>
     <packagedElement xmi:type="uml:Dependency" xmi:id="_zyMT8A9dEdy-lroUn0KWEw" name="FromMARTE analysis modeltoMARTE foundations" client="_u8y4wAPMEdyuUt-4qHuVvQ" supplier="_jG1CQAPKEdy6wIwMc4WDOQ"/>
-    <profileApplication xmi:id="_eojtYJiUEd-m0Oaexd_lJA">
-      <eAnnotations xmi:id="_eojtYZiUEd-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_eojtYJiUEd-m0Oaexd_lJA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_eojtYZiUEd-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML">
         <references xmi:type="ecore:EPackage" href="pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA"/>
       </eAnnotations>
-      <appliedProfile href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/>
     </profileApplication>
   </uml:Profile>
   <Ecore:EPackage xmi:id="_pLm1YJiUEd-m0Oaexd_lJA" base_Package="_U_GAoAPMEdyuUt-4qHuVvQ" packageName="NFPs" nsPrefix="NFPs" nsURI="http://www.eclipse.org/papyrus/NFPs/1" prefix="NFPs"/>
author	Camille Letavernier	2014-03-06 15:25:20 +0000
committer	Camille Letavernier	2014-03-06 15:25:20 +0000
commit	e70c14b2a0bcab60cf10aad9ea37be871b3ece01 (patch)
tree	8b2eb1c37e1422e560a5fc598224a7220d5bb583 /extraplugins/marte/org.eclipse.papyrus.marte.static.profile
parent	5b3797b60cdc537f12156d075071840b01d17767 (diff)
download	org.eclipse.papyrus-e70c14b2a0bcab60cf10aad9ea37be871b3ece01.tar.gz org.eclipse.papyrus-e70c14b2a0bcab60cf10aad9ea37be871b3ece01.tar.xz org.eclipse.papyrus-e70c14b2a0bcab60cf10aad9ea37be871b3ece01.zip