Refactoring graphical resources and not build useless plug-ins.

- Add org.polarsys.esf.core.resources.graphical. This plug-in contains
all icons: profile, wiard, menu, etc.
- Update the icon sets in profile, palettes, element types.
- Remove the useless plug-in from pom files and core feature definition.

Change-Id: Id830e46746b6a62f1688793bb0300db6ad4cc3b4
diff --git a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/META-INF/MANIFEST.MF b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/META-INF/MANIFEST.MF
index 2ebc6d5..4cafea1 100644
--- a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/META-INF/MANIFEST.MF
+++ b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/META-INF/MANIFEST.MF
@@ -7,7 +7,6 @@
 Bundle-Activator: org.polarsys.esf.core.diagram.esfarchitectureconcepts.ESFArchitectureConceptsDiagramActivator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime;bundle-version="3.12.0",
- org.polarsys.esf.core.common.ui;bundle-version="0.7.0",
  org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.papyrus.infra.core;bundle-version="2.0.0",
  org.polarsys.esf.core.profile.esfarchitectureconcepts;bundle-version="0.7.0",
diff --git a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts-extension.elementtypesconfigurations b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts-extension.elementtypesconfigurations
index d16c59f..67f01a6 100644
--- a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts-extension.elementtypesconfigurations
+++ b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts-extension.elementtypesconfigurations
@@ -5,60 +5,60 @@
     <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_erkwcA3-EeaHB_LaPvqtvw" editHelperAdviceClassName="org.polarsys.esf.core.diagram.esfarchitectureconcepts.advice.AfterConfigureCommandEditHelperAdvice"/>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_EXEFYA3_EeaHB_LaPvqtvw" identifier="org.polarsys.esf.ESFArchitectureConcepts.InOutputSPort" name="InOutput SPort" hint="UML::Port">
-    <iconEntry xmi:id="_E-qQ4A3_EeaHB_LaPvqtvw" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.common.ui"/>
+    <iconEntry xmi:id="_E-qQ4A3_EeaHB_LaPvqtvw" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Port</specializedTypesID>
     <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_hr0Y4A3_EeaHB_LaPvqtvw">
       <stereotypesQualifiedNames>ESFArchitectureConcepts::SPort</stereotypesQualifiedNames>
     </matcherConfiguration>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_T1kawA3_EeaHB_LaPvqtvw" identifier="org.polarsys.esf.ESFArchitectureConcepts.InputSPort" name="Input SPort" hint="UML::Port">
-    <iconEntry xmi:id="_YtkrgA3_EeaHB_LaPvqtvw" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_input_sport.png" bundleId="org.polarsys.esf.core.common.ui"/>
+    <iconEntry xmi:id="_YtkrgA3_EeaHB_LaPvqtvw" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_input_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Port</specializedTypesID>
     <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_mBFwAA3_EeaHB_LaPvqtvw">
       <stereotypesQualifiedNames>ESFArchitectureConcepts::SPort</stereotypesQualifiedNames>
     </matcherConfiguration>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Wb1SYA3_EeaHB_LaPvqtvw" identifier="org.polarsys.esf.ESFArchitectureConcepts.OutputSPort" name="Output SPort" hint="UML::Port">
-    <iconEntry xmi:id="_ZE0G0A3_EeaHB_LaPvqtvw" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_output_sport.png" bundleId="org.polarsys.esf.core.common.ui"/>
+    <iconEntry xmi:id="_ZE0G0A3_EeaHB_LaPvqtvw" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_output_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Port</specializedTypesID>
     <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_nh6pkA3_EeaHB_LaPvqtvw">
       <stereotypesQualifiedNames>ESFArchitectureConcepts::SPort</stereotypesQualifiedNames>
     </matcherConfiguration>
   </elementTypeConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_tl9kwA4BEeaHB_LaPvqtvw" description="InOutput SPort" identifier="org.polarsys.esf.ESFArchitectureConcepts.inoutputSPort" target="_EXEFYA3_EeaHB_LaPvqtvw">
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_tl9kwA4BEeaHB_LaPvqtvw" identifier="org.polarsys.esf.ESFArchitectureConcepts.inoutputSPort" description="InOutput SPort" target="_EXEFYA3_EeaHB_LaPvqtvw">
     <stereotypesToApply xmi:id="_83OvYA4BEeaHB_LaPvqtvw" stereotypeQualifiedName="ESFArchitectureConcepts::SPort" updateName="true">
       <requiredProfiles>ESFArchitectureConcepts</requiredProfiles>
       <featuresToSet xmi:id="_C6bn8A4CEeaHB_LaPvqtvw" featureName="sDirection">
         <value xsi:type="applystereotypeadvice:ConstantValue" xmi:id="_HnAr0A4CEeaHB_LaPvqtvw">
           <valueInstance xsi:type="uml:InstanceValue" xmi:id="_IwZ80A4CEeaHB_LaPvqtvw" name="">
-            <type xsi:type="uml:Enumeration" href="platform:/plugin/org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/profile/esfarchitectureconcepts.profile.uml#_sfK48MXNEeWgbp76yZjh7g"/>
-            <instance href="platform:/plugin/org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/profile/esfarchitectureconcepts.profile.uml#_sfK488XNEeWgbp76yZjh7g"/>
+            <type xsi:type="uml:Enumeration" href="../../../../../../plugin/org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/profile/esfarchitectureconcepts.profile.uml#_sfK48MXNEeWgbp76yZjh7g"/>
+            <instance href="../../../../../../plugin/org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/profile/esfarchitectureconcepts.profile.uml#_sfK488XNEeWgbp76yZjh7g"/>
           </valueInstance>
         </value>
       </featuresToSet>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_kyf5IA4DEeaHB_LaPvqtvw" description="Input SPort" identifier="org.polarsys.esf.ESFArchitectureConcepts.inputSPort" target="_T1kawA3_EeaHB_LaPvqtvw">
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_kyf5IA4DEeaHB_LaPvqtvw" identifier="org.polarsys.esf.ESFArchitectureConcepts.inputSPort" description="Input SPort" target="_T1kawA3_EeaHB_LaPvqtvw">
     <stereotypesToApply xmi:id="_tCk48A4DEeaHB_LaPvqtvw" stereotypeQualifiedName="ESFArchitectureConcepts::SPort" updateName="true">
       <requiredProfiles>ESFArchitectureConcepts</requiredProfiles>
       <featuresToSet xmi:id="_-3_7AA4GEeaHB_LaPvqtvw" featureName="sDirection">
         <value xsi:type="applystereotypeadvice:ConstantValue" xmi:id="_BL3bEA4HEeaHB_LaPvqtvw">
           <valueInstance xsi:type="uml:InstanceValue" xmi:id="_B9lL4A4HEeaHB_LaPvqtvw" name="">
-            <type xsi:type="uml:Enumeration" href="platform:/plugin/org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/profile/esfarchitectureconcepts.profile.uml#_sfK48MXNEeWgbp76yZjh7g"/>
-            <instance href="platform:/plugin/org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/profile/esfarchitectureconcepts.profile.uml#_sfK48cXNEeWgbp76yZjh7g"/>
+            <type xsi:type="uml:Enumeration" href="../../../../../../plugin/org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/profile/esfarchitectureconcepts.profile.uml#_sfK48MXNEeWgbp76yZjh7g"/>
+            <instance href="../../../../../../plugin/org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/profile/esfarchitectureconcepts.profile.uml#_sfK48cXNEeWgbp76yZjh7g"/>
           </valueInstance>
         </value>
       </featuresToSet>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_mFwQwA4DEeaHB_LaPvqtvw" description="Output SPort" identifier="org.polarsys.esf.ESFArchitectureConcepts.outputSPort" target="_Wb1SYA3_EeaHB_LaPvqtvw">
+  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_mFwQwA4DEeaHB_LaPvqtvw" identifier="org.polarsys.esf.ESFArchitectureConcepts.outputSPort" description="Output SPort" target="_Wb1SYA3_EeaHB_LaPvqtvw">
     <stereotypesToApply xmi:id="_0BRwcA4DEeaHB_LaPvqtvw" stereotypeQualifiedName="ESFArchitectureConcepts::SPort" updateName="true">
       <requiredProfiles>ESFArchitectureConcepts</requiredProfiles>
       <featuresToSet xmi:id="_U7oKQA4HEeaHB_LaPvqtvw" featureName="sDirection">
         <value xsi:type="applystereotypeadvice:ConstantValue" xmi:id="_WyK1IA4HEeaHB_LaPvqtvw">
           <valueInstance xsi:type="uml:InstanceValue" xmi:id="_XnRRIA4HEeaHB_LaPvqtvw" name="">
-            <type xsi:type="uml:Enumeration" href="platform:/plugin/org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/profile/esfarchitectureconcepts.profile.uml#_sfK48MXNEeWgbp76yZjh7g"/>
-            <instance href="platform:/plugin/org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/profile/esfarchitectureconcepts.profile.uml#_sfK48sXNEeWgbp76yZjh7g"/>
+            <type xsi:type="uml:Enumeration" href="../../../../../../plugin/org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/profile/esfarchitectureconcepts.profile.uml#_sfK48MXNEeWgbp76yZjh7g"/>
+            <instance href="../../../../../../plugin/org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/profile/esfarchitectureconcepts.profile.uml#_sfK48sXNEeWgbp76yZjh7g"/>
           </valueInstance>
         </value>
       </featuresToSet>
diff --git a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations
index 7b1b8f6..f556e5c 100644
--- a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations
+++ b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
 <elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:applystereotypeadvice="http://www.eclipse.org/papyrus/uml/types/applystereotypeadvice/1.1" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:stereotypematcher="http://www.eclipse.org/papyrus/uml/types/stereotypematcher/1.1" identifier="org.polarsys.esf.ESFArchitectureConcepts.elementTypes" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConcepts.SBlock" name="SBlock" hint="UML::Class">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_sblock.png" bundleId="org.polarsys.esf.core.common.ui"/>
+    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_sblock.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
     <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
       <stereotypesQualifiedNames>ESFArchitectureConcepts::SBlock</stereotypesQualifiedNames>
@@ -15,21 +15,21 @@
     </matcherConfiguration>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConcepts.SModel" name="SModel" hint="UML::Package">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.common.ui"/>
+    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
     <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
       <stereotypesQualifiedNames>ESFArchitectureConcepts::SModel</stereotypesQualifiedNames>
     </matcherConfiguration>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConcepts.SPart" name="SPart" hint="UML::Property">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_spart.png" bundleId="org.polarsys.esf.core.common.ui"/>
+    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_spart.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
     <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
       <stereotypesQualifiedNames>ESFArchitectureConcepts::SPart</stereotypesQualifiedNames>
     </matcherConfiguration>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConcepts.SPort" name="SPort" hint="UML::Port">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.common.ui"/>
+    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Port</specializedTypesID>
     <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
       <stereotypesQualifiedNames>ESFArchitectureConcepts::SPort</stereotypesQualifiedNames>
diff --git a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts_di-extension.elementtypesconfigurations b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts_di-extension.elementtypesconfigurations
index a6dc14d..732c783 100644
--- a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts_di-extension.elementtypesconfigurations
+++ b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts_di-extension.elementtypesconfigurations
@@ -1,102 +1,102 @@
 <?xml version="1.0" encoding="ASCII"?>
-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" identifier="org.polarsys.esf.ESFArchitectureConceptsDI-Extension.elementTypes" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPart_Property_AttributeLabel" name="SPart (Property_AttributeLabel)" hint="Property_AttributeLabel">
+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmi:id="_IycWUJquEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI-Extension.elementTypes" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_IycWUZquEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPart_Property_AttributeLabel" name="SPart (Property_AttributeLabel)" hint="Property_AttributeLabel">
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SPart</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Property_AttributeLabel</specializedTypesID>
-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" editHelperAdviceClassName="org.polarsys.esf.core.diagram.esfarchitectureconcepts.advice.CreateOrSelectSBlockPropertyTypeEditHelperAdvice"/>
+    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_IycWUpquEeaT4-l9OTA0mQ" editHelperAdviceClassName="org.polarsys.esf.core.diagram.esfarchitectureconcepts.advice.CreateOrSelectSBlockPropertyTypeEditHelperAdvice"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPart_Property_Shape" name="SPart (Property_Shape)" hint="Property_Shape">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_IycWU5quEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPart_Property_Shape" name="SPart (Property_Shape)" hint="Property_Shape">
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SPart</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Property_Shape</specializedTypesID>
-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" editHelperAdviceClassName="org.polarsys.esf.core.diagram.esfarchitectureconcepts.advice.CreateOrSelectSBlockPropertyTypeEditHelperAdvice"/>
+    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_Iyc9YJquEeaT4-l9OTA0mQ" editHelperAdviceClassName="org.polarsys.esf.core.diagram.esfarchitectureconcepts.advice.CreateOrSelectSBlockPropertyTypeEditHelperAdvice"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InputSPort_Port_AttributeLabel" name="InputSPort (Port_AttributeLabel)" hint="Port_AttributeLabel">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_input_sport.png" bundleId="org.polarsys.esf.core.common.ui"/>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Iyc9YZquEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InputSPort_Port_AttributeLabel" name="InputSPort (Port_AttributeLabel)" hint="Port_AttributeLabel">
+    <iconEntry xmi:id="_Iyc9YpquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_input_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.InputSPort</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Port_AttributeLabel</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InputSPort_Port_BehaviorEdge" name="Input SPort (Port_BehaviorEdge)" hint="Port_BehaviorEdge">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_input_sport.png" bundleId="org.polarsys.esf.core.common.ui"/>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Iyc9Y5quEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InputSPort_Port_BehaviorEdge" name="Input SPort (Port_BehaviorEdge)" hint="Port_BehaviorEdge">
+    <iconEntry xmi:id="_Iyc9ZJquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_input_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.InputSPort</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Port_BehaviorEdge</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InputSPort_Port_BehaviorShape" name="Input SPort (Port_BehaviorShape)" hint="Port_BehaviorShape">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_input_sport.png" bundleId="org.polarsys.esf.core.common.ui"/>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Iyc9ZZquEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InputSPort_Port_BehaviorShape" name="Input SPort (Port_BehaviorShape)" hint="Port_BehaviorShape">
+    <iconEntry xmi:id="_Iyc9ZpquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_input_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.InputSPort</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Port_BehaviorShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InputSPort_Port_Edge" name="Input SPort (Port_Edge)" hint="Port_Edge">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_input_sport.png" bundleId="org.polarsys.esf.core.common.ui"/>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Iyc9Z5quEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InputSPort_Port_Edge" name="Input SPort (Port_Edge)" hint="Port_Edge">
+    <iconEntry xmi:id="_Iyc9aJquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_input_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.InputSPort</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Port_Edge</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InputSPort_Port_Shape" name="Input SPort (Port_Shape)" hint="Port_Shape">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_input_sport.png" bundleId="org.polarsys.esf.core.common.ui"/>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Iyc9aZquEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InputSPort_Port_Shape" name="Input SPort (Port_Shape)" hint="Port_Shape">
+    <iconEntry xmi:id="_Iyc9apquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_input_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.InputSPort</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Port_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InputSPort_Port_Shape_CN" name="Input SPort (Port_Shape_CN)" hint="Port_Shape_CN">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_input_sport.png" bundleId="org.polarsys.esf.core.common.ui"/>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Iyc9a5quEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InputSPort_Port_Shape_CN" name="Input SPort (Port_Shape_CN)" hint="Port_Shape_CN">
+    <iconEntry xmi:id="_Iyc9bJquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_input_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.InputSPort</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Port_Shape_CN</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.OutputSPort_Port_AttributeLabel" name="Output SPort (Port_AttributeLabel)" hint="Port_AttributeLabel">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_output_sport.png" bundleId="org.polarsys.esf.core.common.ui"/>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Iyc9bZquEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.OutputSPort_Port_AttributeLabel" name="Output SPort (Port_AttributeLabel)" hint="Port_AttributeLabel">
+    <iconEntry xmi:id="_Iyc9bpquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_output_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.OutputSPort</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Port_AttributeLabel</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.OutputSPort_Port_BehaviorEdge" name="Output SPort (Port_BehaviorEdge)" hint="Port_BehaviorEdge">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_output_sport.png" bundleId="org.polarsys.esf.core.common.ui"/>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Iyc9b5quEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.OutputSPort_Port_BehaviorEdge" name="Output SPort (Port_BehaviorEdge)" hint="Port_BehaviorEdge">
+    <iconEntry xmi:id="_Iyc9cJquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_output_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.OutputSPort</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Port_BehaviorEdge</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.OutputSPort_Port_BehaviorShape" name="Output SPort (Port_BehaviorShape)" hint="Port_BehaviorShape">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_output_sport.png" bundleId="org.polarsys.esf.core.common.ui"/>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Iyc9cZquEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.OutputSPort_Port_BehaviorShape" name="Output SPort (Port_BehaviorShape)" hint="Port_BehaviorShape">
+    <iconEntry xmi:id="_Iyc9cpquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_output_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.OutputSPort</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Port_BehaviorShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.OutputSPort_Port_Edge" name="Output SPort (Port_Edge)" hint="Port_Edge">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_output_sport.png" bundleId="org.polarsys.esf.core.common.ui"/>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Iyc9c5quEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.OutputSPort_Port_Edge" name="Output SPort (Port_Edge)" hint="Port_Edge">
+    <iconEntry xmi:id="_Iyc9dJquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_output_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.OutputSPort</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Port_Edge</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.OutputSPort_Port_Shape" name="Output SPort (Port_Shape)" hint="Port_Shape">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_output_sport.png" bundleId="org.polarsys.esf.core.common.ui"/>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Iyc9dZquEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.OutputSPort_Port_Shape" name="Output SPort (Port_Shape)" hint="Port_Shape">
+    <iconEntry xmi:id="_Iyc9dpquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_output_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.OutputSPort</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Port_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.OutputSPort_Port_Shape_CN" name="Output SPort (Port_Shape_CN)" hint="Port_Shape_CN">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_output_sport.png" bundleId="org.polarsys.esf.core.common.ui"/>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Iyc9d5quEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.OutputSPort_Port_Shape_CN" name="Output SPort (Port_Shape_CN)" hint="Port_Shape_CN">
+    <iconEntry xmi:id="_Iyc9eJquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_output_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.OutputSPort</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Port_Shape_CN</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InOutputSPort_Port_AttributeLabel" name="InOutput SPort (Port_AttributeLabel)" hint="Port_AttributeLabel">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.common.ui"/>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Iyc9eZquEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InOutputSPort_Port_AttributeLabel" name="InOutput SPort (Port_AttributeLabel)" hint="Port_AttributeLabel">
+    <iconEntry xmi:id="_Iyc9epquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.InOutputSPort</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Port_AttributeLabel</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InOutputSPort_Port_BehaviorEdge" name="InOutput SPort (Port_BehaviorEdge)" hint="Port_BehaviorEdge">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.common.ui"/>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Iyc9e5quEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InOutputSPort_Port_BehaviorEdge" name="InOutput SPort (Port_BehaviorEdge)" hint="Port_BehaviorEdge">
+    <iconEntry xmi:id="_Iyc9fJquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.InOutputSPort</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Port_BehaviorEdge</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InOutputSPort_Port_BehaviorShape" name="InOutput SPort (Port_BehaviorShape)" hint="Port_BehaviorShape">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.common.ui"/>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Iyc9fZquEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InOutputSPort_Port_BehaviorShape" name="InOutput SPort (Port_BehaviorShape)" hint="Port_BehaviorShape">
+    <iconEntry xmi:id="_Iyc9fpquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.InOutputSPort</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Port_BehaviorShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InOutputSPort_Port_Edge" name="InOutput SPort (Port_Edge)" hint="Port_Edge">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.common.ui"/>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Iyc9f5quEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InOutputSPort_Port_Edge" name="InOutput SPort (Port_Edge)" hint="Port_Edge">
+    <iconEntry xmi:id="_Iyc9gJquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.InOutputSPort</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Port_Edge</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InOutputSPort_Port_Shape" name="InOutput SPort (Port_Shape)" hint="Port_Shape">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.common.ui"/>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Iyc9gZquEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InOutputSPort_Port_Shape" name="InOutput SPort (Port_Shape)" hint="Port_Shape">
+    <iconEntry xmi:id="_Iyc9gpquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.InOutputSPort</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Port_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InOutputSPort_Port_Shape_CN" name="InOutput SPort (Port_Shape_CN)" hint="Port_Shape_CN">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.common.ui"/>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Iyc9g5quEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InOutputSPort_Port_Shape_CN" name="InOutput SPort (Port_Shape_CN)" hint="Port_Shape_CN">
+    <iconEntry xmi:id="_Iyc9hJquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.InOutputSPort</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Port_Shape_CN</specializedTypesID>
   </elementTypeConfigurations>
diff --git a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts_di.elementtypesconfigurations b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts_di.elementtypesconfigurations
index 8c83c3d..f3cb598 100644
--- a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts_di.elementtypesconfigurations
+++ b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts_di.elementtypesconfigurations
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="ASCII"?>
 <elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:applystereotypeadvice="http://www.eclipse.org/papyrus/uml/types/applystereotypeadvice/1.1" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:stereotypematcher="http://www.eclipse.org/papyrus/uml/types/stereotypematcher/1.1" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.elementTypes" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SBlock_Class_MetaclassShape" name="SBlock (Class_MetaclassShape)" hint="Class_MetaclassShape">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_sblock.png" bundleId="org.polarsys.esf.core.common.ui"/>
+    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_sblock.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SBlock</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Class_MetaclassShape</specializedTypesID>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SBlock_Class_MetaclassShape_CN" name="SBlock (Class_MetaclassShape_CN)" hint="Class_MetaclassShape_CN">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_sblock.png" bundleId="org.polarsys.esf.core.common.ui"/>
+    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_sblock.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SBlock</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Class_MetaclassShape_CN</specializedTypesID>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SBlock_Class_NestedClassifierLabel" name="SBlock (Class_NestedClassifierLabel)" hint="Class_NestedClassifierLabel">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_sblock.png" bundleId="org.polarsys.esf.core.common.ui"/>
+    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_sblock.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SBlock</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Class_NestedClassifierLabel</specializedTypesID>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SBlock_Class_Shape" name="SBlock (Class_Shape)" hint="Class_Shape">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_sblock.png" bundleId="org.polarsys.esf.core.common.ui"/>
+    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_sblock.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SBlock</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Class_Shape</specializedTypesID>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SBlock_Class_Shape_CN" name="SBlock (Class_Shape_CN)" hint="Class_Shape_CN">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_sblock.png" bundleId="org.polarsys.esf.core.common.ui"/>
+    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_sblock.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SBlock</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Class_Shape_CN</specializedTypesID>
   </elementTypeConfigurations>
@@ -31,96 +31,96 @@
     <specializedTypesID>org.eclipse.papyrus.umldi.Connector_Edge</specializedTypesID>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_CompositeStructure" name="SModel (CompositeStructure)" hint="CompositeStructure">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.common.ui"/>
+    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.eclipse.papyrus.umldi.Package_CompositeStructureDiagram</specializedTypesID>
     <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
       <stereotypesQualifiedNames>ESFArchitectureConcepts::SModel</stereotypesQualifiedNames>
     </matcherConfiguration>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_Package_Shape" name="SModel (Package_Shape)" hint="Package_Shape">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.common.ui"/>
+    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SModel</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Package_Shape</specializedTypesID>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_Package_Shape_CN" name="SModel (Package_Shape_CN)" hint="Package_Shape_CN">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.common.ui"/>
+    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SModel</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Package_Shape_CN</specializedTypesID>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_PapyrusUMLActivityDiagram" name="SModel (PapyrusUMLActivityDiagram)" hint="PapyrusUMLActivityDiagram">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.common.ui"/>
+    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SModel</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Package_ActivityDiagram</specializedTypesID>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_PapyrusUMLClassDiagram" name="SModel (PapyrusUMLClassDiagram)" hint="PapyrusUMLClassDiagram">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.common.ui"/>
+    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SModel</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Package_ClassDiagram</specializedTypesID>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_PapyrusUMLCommunicationDiagram" name="SModel (PapyrusUMLCommunicationDiagram)" hint="PapyrusUMLCommunicationDiagram">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.common.ui"/>
+    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SModel</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Package_CommunicationDiagram</specializedTypesID>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_PapyrusUMLComponentDiagram" name="SModel (PapyrusUMLComponentDiagram)" hint="PapyrusUMLComponentDiagram">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.common.ui"/>
+    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SModel</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Package_ComponentDiagram</specializedTypesID>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_PapyrusUMLDeploymentDiagram" name="SModel (PapyrusUMLDeploymentDiagram)" hint="PapyrusUMLDeploymentDiagram">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.common.ui"/>
+    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SModel</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Package_DeploymentDiagram</specializedTypesID>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_PapyrusUMLInteractionOverviewDiagram" name="SModel (PapyrusUMLInteractionOverviewDiagram)" hint="PapyrusUMLInteractionOverviewDiagram">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.common.ui"/>
+    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SModel</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Package_InteractionOverviewDiagram</specializedTypesID>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_PapyrusUMLProfileDiagram" name="SModel (PapyrusUMLProfileDiagram)" hint="PapyrusUMLProfileDiagram">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.common.ui"/>
+    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SModel</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Package_ProfileDiagram</specializedTypesID>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_PapyrusUMLSequenceDiagram" name="SModel (PapyrusUMLSequenceDiagram)" hint="PapyrusUMLSequenceDiagram">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.common.ui"/>
+    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SModel</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Package_SequenceDiagram</specializedTypesID>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_PapyrusUMLStateMachineDiagram" name="SModel (PapyrusUMLStateMachineDiagram)" hint="PapyrusUMLStateMachineDiagram">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.common.ui"/>
+    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SModel</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Package_StateMachineDiagram</specializedTypesID>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_PapyrusUMLTimingDiagram" name="SModel (PapyrusUMLTimingDiagram)" hint="PapyrusUMLTimingDiagram">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.common.ui"/>
+    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SModel</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Package_TimingDiagram</specializedTypesID>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_UseCase" name="SModel (UseCase)" hint="UseCase">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.common.ui"/>
+    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.eclipse.papyrus.umldi.Package_UseCaseDiagram</specializedTypesID>
     <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
       <stereotypesQualifiedNames>ESFArchitectureConcepts::SModel</stereotypesQualifiedNames>
     </matcherConfiguration>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPart_Property_AttributeLabel" name="SPart (Property_AttributeLabel)" hint="Property_AttributeLabel">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_spart.png" bundleId="org.polarsys.esf.core.common.ui"/>
+    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_spart.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SPart</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Property_AttributeLabel</specializedTypesID>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPart_Property_Edge" name="SPart (Property_Edge)" hint="Property_Edge">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_spart.png" bundleId="org.polarsys.esf.core.common.ui"/>
+    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_spart.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SPart</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Property_Edge</specializedTypesID>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPart_Property_Shape" name="SPart (Property_Shape)" hint="Property_Shape">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_spart.png" bundleId="org.polarsys.esf.core.common.ui"/>
+    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_spart.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SPart</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Property_Shape</specializedTypesID>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPart_Property_Shape_CN" name="SPart (Property_Shape_CN)" hint="Property_Shape_CN">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_spart.png" bundleId="org.polarsys.esf.core.common.ui"/>
+    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_spart.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SPart</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Property_Shape_CN</specializedTypesID>
   </elementTypeConfigurations>
@@ -155,32 +155,32 @@
     <specializedTypesID>org.eclipse.papyrus.umldi.Port_Shape_CN</specializedTypesID>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPort_Port_AttributeLabel" name="SPort (Port_AttributeLabel)" hint="Port_AttributeLabel">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.common.ui"/>
+    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SPort</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Port_AttributeLabel</specializedTypesID>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPort_Port_BehaviorEdge" name="SPort (Port_BehaviorEdge)" hint="Port_BehaviorEdge">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.common.ui"/>
+    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SPort</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Port_BehaviorEdge</specializedTypesID>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPort_Port_BehaviorShape" name="SPort (Port_BehaviorShape)" hint="Port_BehaviorShape">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.common.ui"/>
+    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SPort</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Port_BehaviorShape</specializedTypesID>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPort_Port_Edge" name="SPort (Port_Edge)" hint="Port_Edge">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.common.ui"/>
+    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SPort</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Port_Edge</specializedTypesID>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPort_Port_Shape" name="SPort (Port_Shape)" hint="Port_Shape">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.common.ui"/>
+    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SPort</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Port_Shape</specializedTypesID>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPort_Port_Shape_CN" name="SPort (Port_Shape_CN)" hint="Port_Shape_CN">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.common.ui"/>
+    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
     <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SPort</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.umldi.Port_Shape_CN</specializedTypesID>
   </elementTypeConfigurations>
diff --git a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/palette/architectureConceptsDiagram.paletteconfiguration b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/palette/architectureConceptsDiagram.paletteconfiguration
index bafe841..2bc8fac 100644
--- a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/palette/architectureConceptsDiagram.paletteconfiguration
+++ b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/palette/architectureConceptsDiagram.paletteconfiguration
@@ -2,19 +2,19 @@
 <paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7" id="org.polarsys.esf.esfarchitectureconcepts.acd.palette.model" label="ESFArchitectureConcepts ACD Palette">
   <drawerConfigurations id="org.polarsys.esf.esfarchitectureconcepts.acd.palette.node" label="Nodes" description="Nodes">
     <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.polarsys.esf.esfarchitectureconcepts.acd.palette.node.InputSPort" label="Input SPort" description="Create an Input SPort">
-      <icon pluginID="org.polarsys.esf.core.common.ui" iconPath="src/main/resources/icons/profile/esfarchitectureconcepts/icon_input_sport.png"/>
+      <icon pluginID="org.polarsys.esf.core.resources.graphical" iconPath="src/main/resources/icons/profile/esfarchitectureconcepts/icon_input_sport.png"/>
       <elementDescriptors elementTypeId="org.polarsys.esf.ESFArchitectureConceptsDI.InputSPort_Port_Shape"/>
     </ownedConfigurations>
     <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.polarsys.esf.esfarchitectureconcepts.acd.palette.node.OutputSPort" label="Output SPort" description="Create an Output SPort">
-      <icon pluginID="org.polarsys.esf.core.common.ui" iconPath="src/main/resources/icons/profile/esfarchitectureconcepts/icon_output_sport.png"/>
+      <icon pluginID="org.polarsys.esf.core.resources.graphical" iconPath="src/main/resources/icons/profile/esfarchitectureconcepts/icon_output_sport.png"/>
       <elementDescriptors elementTypeId="org.polarsys.esf.ESFArchitectureConceptsDI.OutputSPort_Port_Shape"/>
     </ownedConfigurations>
     <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.polarsys.esf.esfarchitectureconcepts.acd.palette.node.InOutputSPort" label="InOutput SPort" description="Create an InOutput SPort">
-      <icon pluginID="org.polarsys.esf.core.common.ui" iconPath="src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png"/>
+      <icon pluginID="org.polarsys.esf.core.resources.graphical" iconPath="src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png"/>
       <elementDescriptors elementTypeId="org.polarsys.esf.ESFArchitectureConceptsDI.InOutputSPort_Port_Shape"/>
     </ownedConfigurations>
     <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.polarsys.esf.esfarchitectureconcepts.acd.palette.node.SPart" label="SPart" description="Create a SPart">
-      <icon pluginID="org.polarsys.esf.core.common.ui" iconPath="src/main/resources/icons/profile/esfarchitectureconcepts/icon_spart.png"/>
+      <icon pluginID="org.polarsys.esf.core.resources.graphical" iconPath="src/main/resources/icons/profile/esfarchitectureconcepts/icon_spart.png"/>
       <elementDescriptors elementTypeId="org.polarsys.esf.ESFArchitectureConceptsDI.SPart_Property_Shape"/>
       <elementDescriptors elementTypeId="org.polarsys.esf.ESFArchitectureConceptsDI.SPart_Property_AttributeLabel"/>
     </ownedConfigurations>
diff --git a/core/org.polarsys.esf.core.wizard.ui/META-INF/MANIFEST.MF b/core/org.polarsys.esf.core.wizard.ui/META-INF/MANIFEST.MF
index 032ca7b..9b9692a 100644
--- a/core/org.polarsys.esf.core.wizard.ui/META-INF/MANIFEST.MF
+++ b/core/org.polarsys.esf.core.wizard.ui/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@
 Bundle-Vendor: %Bundle-Vendor
 Bundle-SymbolicName: org.polarsys.esf.core.wizard.ui;singleton:=true
 Bundle-Version: 0.7.0.qualifier
-Bundle-Activator: org.polarsys.esf.core.wizard.ui.WizardUIActivator
+Bundle-Activator: org.polarsys.esf.core.wizard.ui.WizardUIActivator$Implementation
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime;bundle-version="3.11.1",
  org.eclipse.emf.common;bundle-version="2.11.0",
diff --git a/core/org.polarsys.esf.core.wizard.ui/plugin.xml b/core/org.polarsys.esf.core.wizard.ui/plugin.xml
index 3ad5bda..fc07c03 100644
--- a/core/org.polarsys.esf.core.wizard.ui/plugin.xml
+++ b/core/org.polarsys.esf.core.wizard.ui/plugin.xml
@@ -6,7 +6,7 @@
       <diagramCategory
             class="org.polarsys.esf.core.wizard.ui.commands.ESFModelCreationCommand"
             description="%DiagramCategory-Description"
-            icon="platform:/plugin/org.polarsys.esf.core.ui/src/main/resources/icons/logos/icon_esf_32x32.png"
+            icon="platform:/plugin/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/logos/icon_esf_32x32.png"
             id="ESF"
             label="%DiagramCategory-Label">
       </diagramCategory>
@@ -21,7 +21,7 @@
             category="org.polarsys.esf.core.wizard.ui.category"
             class="org.polarsys.esf.core.wizard.ui.wizards.CreateESFModelWizard"
             finalPerspective="org.eclipse.papyrus.infra.core.perspective"
-            icon="platform:/plugin/org.polarsys.esf.core.ui/src/main/resources/icons/logos/icon_esf_32x32.png"
+            icon="platform:/plugin/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/logos/icon_esf_32x32.png"
             id="org.polarsys.esf.core.wizard.ui.esfmodelcreation"
             name="%wizard.new.model.name">
          <selection
@@ -31,8 +31,8 @@
       <wizard
             category="org.polarsys.esf.core.wizard.ui.category"
             class="org.polarsys.esf.core.wizard.ui.wizards.CreateESFProjectWizard"
-            finalPerspective="org.polarsys.esf.core.ui.perspective.design"
-            icon="platform:/plugin/org.polarsys.esf.core.ui/src/main/resources/icons/files/icon_project_open.png"
+            finalPerspective="org.eclipse.papyrus.infra.core.perspective"
+            icon="platform:/plugin/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/files/icon_project_open.png"
             id="org.polarsys.esf.core.wizard.ui.esfprojectcreation"
             name="%wizard.new.project.name"
             project="true">
diff --git a/core/pom.xml b/core/pom.xml
index b052b90..cc56d4e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -25,16 +25,10 @@
     <module>metamodel</module>
     <module>profile</module>
     <module>releng</module>
+	<module>resources</module>
     <module>org.polarsys.esf.core.common</module>
-    <module>org.polarsys.esf.core.common.metamodel</module>
-    <module>org.polarsys.esf.core.common.ui</module>
-    <module>org.polarsys.esf.core.framework</module>
-    <module>org.polarsys.esf.core.help</module>
-    <module>org.polarsys.esf.core.rcp</module>
-    <module>org.polarsys.esf.core.ui</module>
     <module>org.polarsys.esf.core.utils</module>
     <module>org.polarsys.esf.core.wizard.ui</module>
-    <module>org.polarsys.esf.core.workspace</module>
    </modules>
   
 </project>
diff --git a/core/profile/org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/profile/esfarchitectureconcepts.profile.notation b/core/profile/org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/profile/esfarchitectureconcepts.profile.notation
index 36de2a5..fc5dcbb 100644
--- a/core/profile/org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/profile/esfarchitectureconcepts.profile.notation
+++ b/core/profile/org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/profile/esfarchitectureconcepts.profile.notation
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
   <notation:Diagram xmi:id="_BTWOMA3REeWIHrhJxYOO3w" type="PapyrusUMLProfileDiagram" name="ESFArchitectureConcepts Overview ProfileDiagram" measurementUnit="Pixel">
-    <children xmi:type="notation:Shape" xmi:id="_sssx8BUxEeWsuO0tI_iXIw" type="1030" fillColor="10011046">
+    <children xmi:type="notation:Shape" xmi:id="_sssx8BUxEeWsuO0tI_iXIw" type="Profile_Shape" fillColor="10011046">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NkmN0BjcEeWhPZtBPxjsVg" source="PapyrusHyperLink_Page" references="_iyLVIBaHEeWc7uebO1is2A">
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NkmN0RjcEeWhPZtBPxjsVg" key="tooltip_text" value="ESFArchitectureConcepts ProfileDiagram"/>
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NkmN0hjcEeWhPZtBPxjsVg" key="pageName" value="PapyrusHyperLink_Page"/>
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NkmN0xjcEeWhPZtBPxjsVg" key="is_default_navigation" value="true"/>
       </eAnnotations>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ss2i8BUxEeWsuO0tI_iXIw" type="1047"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ss2i8RUxEeWsuO0tI_iXIw" type="1042">
-        <children xmi:type="notation:Shape" xmi:id="_2TuWkBUxEeWsuO0tI_iXIw" type="1023">
-          <children xmi:type="notation:DecorationNode" xmi:id="_2TuWkhUxEeWsuO0tI_iXIw" type="1046"/>
-          <children xmi:type="notation:BasicCompartment" xmi:id="_2TuWkxUxEeWsuO0tI_iXIw" visible="false" type="1052">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ss2i8BUxEeWsuO0tI_iXIw" type="Profile_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ss2i8RUxEeWsuO0tI_iXIw" type="Profile_PackagedElementCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_2TuWkBUxEeWsuO0tI_iXIw" type="Stereotype_Shape_CN">
+          <children xmi:type="notation:DecorationNode" xmi:id="_2TuWkhUxEeWsuO0tI_iXIw" type="Stereotype_NameLabel_CN"/>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_2TuWkxUxEeWsuO0tI_iXIw" visible="false" type="Stereotype_AttributeCompartment_CN">
             <styles xmi:type="notation:TitleStyle" xmi:id="_2TuWlBUxEeWsuO0tI_iXIw"/>
             <styles xmi:type="notation:SortingStyle" xmi:id="_2TuWlRUxEeWsuO0tI_iXIw"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_2TuWlhUxEeWsuO0tI_iXIw"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2TuWlxUxEeWsuO0tI_iXIw"/>
           </children>
-          <children xmi:type="notation:BasicCompartment" xmi:id="_2TuWmBUxEeWsuO0tI_iXIw" visible="false" type="1053">
+          <children xmi:type="notation:BasicCompartment" xmi:id="_2TuWmBUxEeWsuO0tI_iXIw" visible="false" type="Stereotype_OperationCompartment_CN">
             <styles xmi:type="notation:TitleStyle" xmi:id="_2TuWmRUxEeWsuO0tI_iXIw"/>
             <styles xmi:type="notation:SortingStyle" xmi:id="_2TuWmhUxEeWsuO0tI_iXIw"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_2TuWmxUxEeWsuO0tI_iXIw"/>
@@ -26,15 +26,15 @@
           <element xmi:type="uml:Stereotype" href="esfarchitectureconcepts.profile.uml#_BwcZ4A3REeWIHrhJxYOO3w"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2TuWkRUxEeWsuO0tI_iXIw" x="73" y="143"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_5R27oBUxEeWsuO0tI_iXIw" type="1023">
-          <children xmi:type="notation:DecorationNode" xmi:id="_5SAsoBUxEeWsuO0tI_iXIw" type="1046"/>
-          <children xmi:type="notation:BasicCompartment" xmi:id="_5SAsoRUxEeWsuO0tI_iXIw" visible="false" type="1052">
+        <children xmi:type="notation:Shape" xmi:id="_5R27oBUxEeWsuO0tI_iXIw" type="Stereotype_Shape_CN">
+          <children xmi:type="notation:DecorationNode" xmi:id="_5SAsoBUxEeWsuO0tI_iXIw" type="Stereotype_NameLabel_CN"/>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_5SAsoRUxEeWsuO0tI_iXIw" visible="false" type="Stereotype_AttributeCompartment_CN">
             <styles xmi:type="notation:TitleStyle" xmi:id="_5SAsohUxEeWsuO0tI_iXIw"/>
             <styles xmi:type="notation:SortingStyle" xmi:id="_5SAsoxUxEeWsuO0tI_iXIw"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_5SAspBUxEeWsuO0tI_iXIw"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5SAspRUxEeWsuO0tI_iXIw"/>
           </children>
-          <children xmi:type="notation:BasicCompartment" xmi:id="_5SAsphUxEeWsuO0tI_iXIw" visible="false" type="1053">
+          <children xmi:type="notation:BasicCompartment" xmi:id="_5SAsphUxEeWsuO0tI_iXIw" visible="false" type="Stereotype_OperationCompartment_CN">
             <styles xmi:type="notation:TitleStyle" xmi:id="_5SAspxUxEeWsuO0tI_iXIw"/>
             <styles xmi:type="notation:SortingStyle" xmi:id="_5SAsqBUxEeWsuO0tI_iXIw"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_5SAsqRUxEeWsuO0tI_iXIw"/>
@@ -43,15 +43,15 @@
           <element xmi:type="uml:Stereotype" href="esfarchitectureconcepts.profile.uml#_m_6nIBM1EeWOCLsnVbWZoA"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5R27oRUxEeWsuO0tI_iXIw" x="373" y="16"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_6XfuABUxEeWsuO0tI_iXIw" type="1023">
-          <children xmi:type="notation:DecorationNode" xmi:id="_6XfuAhUxEeWsuO0tI_iXIw" type="1046"/>
-          <children xmi:type="notation:BasicCompartment" xmi:id="_6XfuAxUxEeWsuO0tI_iXIw" visible="false" type="1052">
+        <children xmi:type="notation:Shape" xmi:id="_6XfuABUxEeWsuO0tI_iXIw" type="Stereotype_Shape_CN">
+          <children xmi:type="notation:DecorationNode" xmi:id="_6XfuAhUxEeWsuO0tI_iXIw" type="Stereotype_NameLabel_CN"/>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_6XfuAxUxEeWsuO0tI_iXIw" visible="false" type="Stereotype_AttributeCompartment_CN">
             <styles xmi:type="notation:TitleStyle" xmi:id="_6XfuBBUxEeWsuO0tI_iXIw"/>
             <styles xmi:type="notation:SortingStyle" xmi:id="_6XfuBRUxEeWsuO0tI_iXIw"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_6XfuBhUxEeWsuO0tI_iXIw"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6XfuBxUxEeWsuO0tI_iXIw"/>
           </children>
-          <children xmi:type="notation:BasicCompartment" xmi:id="_6XfuCBUxEeWsuO0tI_iXIw" visible="false" type="1053">
+          <children xmi:type="notation:BasicCompartment" xmi:id="_6XfuCBUxEeWsuO0tI_iXIw" visible="false" type="Stereotype_OperationCompartment_CN">
             <styles xmi:type="notation:TitleStyle" xmi:id="_6XfuCRUxEeWsuO0tI_iXIw"/>
             <styles xmi:type="notation:SortingStyle" xmi:id="_6XfuChUxEeWsuO0tI_iXIw"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_6XfuCxUxEeWsuO0tI_iXIw"/>
@@ -60,15 +60,15 @@
           <element xmi:type="uml:Stereotype" href="esfarchitectureconcepts.profile.uml#_IKyAEA3REeWIHrhJxYOO3w"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6XfuARUxEeWsuO0tI_iXIw" x="679" y="16"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_-hNVYBUxEeWsuO0tI_iXIw" type="1023">
-          <children xmi:type="notation:DecorationNode" xmi:id="_-hNVYhUxEeWsuO0tI_iXIw" type="1046"/>
-          <children xmi:type="notation:BasicCompartment" xmi:id="_-hNVYxUxEeWsuO0tI_iXIw" visible="false" type="1052">
+        <children xmi:type="notation:Shape" xmi:id="_-hNVYBUxEeWsuO0tI_iXIw" type="Stereotype_Shape_CN">
+          <children xmi:type="notation:DecorationNode" xmi:id="_-hNVYhUxEeWsuO0tI_iXIw" type="Stereotype_NameLabel_CN"/>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_-hNVYxUxEeWsuO0tI_iXIw" visible="false" type="Stereotype_AttributeCompartment_CN">
             <styles xmi:type="notation:TitleStyle" xmi:id="_-hWfUBUxEeWsuO0tI_iXIw"/>
             <styles xmi:type="notation:SortingStyle" xmi:id="_-hWfURUxEeWsuO0tI_iXIw"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_-hWfUhUxEeWsuO0tI_iXIw"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-hWfUxUxEeWsuO0tI_iXIw"/>
           </children>
-          <children xmi:type="notation:BasicCompartment" xmi:id="_-hWfVBUxEeWsuO0tI_iXIw" visible="false" type="1053">
+          <children xmi:type="notation:BasicCompartment" xmi:id="_-hWfVBUxEeWsuO0tI_iXIw" visible="false" type="Stereotype_OperationCompartment_CN">
             <styles xmi:type="notation:TitleStyle" xmi:id="_-hWfVRUxEeWsuO0tI_iXIw"/>
             <styles xmi:type="notation:SortingStyle" xmi:id="_-hWfVhUxEeWsuO0tI_iXIw"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_-hWfVxUxEeWsuO0tI_iXIw"/>
@@ -77,15 +77,15 @@
           <element xmi:type="uml:Stereotype" href="esfarchitectureconcepts.profile.uml#_FgN3QA3REeWIHrhJxYOO3w"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-hNVYRUxEeWsuO0tI_iXIw" x="209" y="143"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="__f_R0BUxEeWsuO0tI_iXIw" type="1023">
-          <children xmi:type="notation:DecorationNode" xmi:id="__f_R0hUxEeWsuO0tI_iXIw" type="1046"/>
-          <children xmi:type="notation:BasicCompartment" xmi:id="__f_R0xUxEeWsuO0tI_iXIw" visible="false" type="1052">
+        <children xmi:type="notation:Shape" xmi:id="__f_R0BUxEeWsuO0tI_iXIw" type="Stereotype_Shape_CN">
+          <children xmi:type="notation:DecorationNode" xmi:id="__f_R0hUxEeWsuO0tI_iXIw" type="Stereotype_NameLabel_CN"/>
+          <children xmi:type="notation:BasicCompartment" xmi:id="__f_R0xUxEeWsuO0tI_iXIw" visible="false" type="Stereotype_AttributeCompartment_CN">
             <styles xmi:type="notation:TitleStyle" xmi:id="__f_R1BUxEeWsuO0tI_iXIw"/>
             <styles xmi:type="notation:SortingStyle" xmi:id="__f_R1RUxEeWsuO0tI_iXIw"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="__f_R1hUxEeWsuO0tI_iXIw"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="__f_R1xUxEeWsuO0tI_iXIw"/>
           </children>
-          <children xmi:type="notation:BasicCompartment" xmi:id="__f_R2BUxEeWsuO0tI_iXIw" visible="false" type="1053">
+          <children xmi:type="notation:BasicCompartment" xmi:id="__f_R2BUxEeWsuO0tI_iXIw" visible="false" type="Stereotype_OperationCompartment_CN">
             <styles xmi:type="notation:TitleStyle" xmi:id="__f_R2RUxEeWsuO0tI_iXIw"/>
             <styles xmi:type="notation:SortingStyle" xmi:id="__f_R2hUxEeWsuO0tI_iXIw"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="__f_R2xUxEeWsuO0tI_iXIw"/>
@@ -94,15 +94,15 @@
           <element xmi:type="uml:Stereotype" href="esfarchitectureconcepts.profile.uml#_EqLAEA3REeWIHrhJxYOO3w"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="__f_R0RUxEeWsuO0tI_iXIw" x="523" y="16"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_AUWuABUyEeWsuO0tI_iXIw" type="1023">
-          <children xmi:type="notation:DecorationNode" xmi:id="_AUWuAhUyEeWsuO0tI_iXIw" type="1046"/>
-          <children xmi:type="notation:BasicCompartment" xmi:id="_AUWuAxUyEeWsuO0tI_iXIw" visible="false" type="1052">
+        <children xmi:type="notation:Shape" xmi:id="_AUWuABUyEeWsuO0tI_iXIw" type="Stereotype_Shape_CN">
+          <children xmi:type="notation:DecorationNode" xmi:id="_AUWuAhUyEeWsuO0tI_iXIw" type="Stereotype_NameLabel_CN"/>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_AUWuAxUyEeWsuO0tI_iXIw" visible="false" type="Stereotype_AttributeCompartment_CN">
             <styles xmi:type="notation:TitleStyle" xmi:id="_AUWuBBUyEeWsuO0tI_iXIw"/>
             <styles xmi:type="notation:SortingStyle" xmi:id="_AUWuBRUyEeWsuO0tI_iXIw"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_AUWuBhUyEeWsuO0tI_iXIw"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AUWuBxUyEeWsuO0tI_iXIw"/>
           </children>
-          <children xmi:type="notation:BasicCompartment" xmi:id="_AUWuCBUyEeWsuO0tI_iXIw" visible="false" type="1053">
+          <children xmi:type="notation:BasicCompartment" xmi:id="_AUWuCBUyEeWsuO0tI_iXIw" visible="false" type="Stereotype_OperationCompartment_CN">
             <styles xmi:type="notation:TitleStyle" xmi:id="_AUWuCRUyEeWsuO0tI_iXIw"/>
             <styles xmi:type="notation:SortingStyle" xmi:id="_AUWuChUyEeWsuO0tI_iXIw"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_AUWuCxUyEeWsuO0tI_iXIw"/>
@@ -111,43 +111,43 @@
           <element xmi:type="uml:Stereotype" href="esfarchitectureconcepts.profile.uml#_C4-IMA3REeWIHrhJxYOO3w"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AUWuARUyEeWsuO0tI_iXIw" x="828" y="16"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_ngjnwBUyEeWsuO0tI_iXIw" type="3028" fillColor="10265827">
-          <children xmi:type="notation:DecorationNode" xmi:id="_ngjnwhUyEeWsuO0tI_iXIw" type="5062"/>
+        <children xmi:type="notation:Shape" xmi:id="_ngjnwBUyEeWsuO0tI_iXIw" type="Class_MetaclassShape_CN" fillColor="10265827">
+          <children xmi:type="notation:DecorationNode" xmi:id="_ngjnwhUyEeWsuO0tI_iXIw" type="Class_MetaclassNameLabel_CN"/>
           <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ngjnwRUyEeWsuO0tI_iXIw" x="679" y="286"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_n6l4YBUyEeWsuO0tI_iXIw" type="3028" fillColor="10265827">
-          <children xmi:type="notation:DecorationNode" xmi:id="_n6l4YhUyEeWsuO0tI_iXIw" type="5062"/>
+        <children xmi:type="notation:Shape" xmi:id="_n6l4YBUyEeWsuO0tI_iXIw" type="Class_MetaclassShape_CN" fillColor="10265827">
+          <children xmi:type="notation:DecorationNode" xmi:id="_n6l4YhUyEeWsuO0tI_iXIw" type="Class_MetaclassNameLabel_CN"/>
           <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n6l4YRUyEeWsuO0tI_iXIw" x="373" y="286"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_otBa4BUyEeWsuO0tI_iXIw" type="3028" fillColor="10265827">
-          <children xmi:type="notation:DecorationNode" xmi:id="_otBa4hUyEeWsuO0tI_iXIw" type="5062"/>
+        <children xmi:type="notation:Shape" xmi:id="_otBa4BUyEeWsuO0tI_iXIw" type="Class_MetaclassShape_CN" fillColor="10265827">
+          <children xmi:type="notation:DecorationNode" xmi:id="_otBa4hUyEeWsuO0tI_iXIw" type="Class_MetaclassNameLabel_CN"/>
           <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Port"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_otBa4RUyEeWsuO0tI_iXIw" x="73" y="286" width="236"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_r9nB4BUyEeWsuO0tI_iXIw" type="3028" fillColor="10265827">
-          <children xmi:type="notation:DecorationNode" xmi:id="_r9nB4hUyEeWsuO0tI_iXIw" type="5062"/>
+        <children xmi:type="notation:Shape" xmi:id="_r9nB4BUyEeWsuO0tI_iXIw" type="Class_MetaclassShape_CN" fillColor="10265827">
+          <children xmi:type="notation:DecorationNode" xmi:id="_r9nB4hUyEeWsuO0tI_iXIw" type="Class_MetaclassNameLabel_CN"/>
           <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_r9nB4RUyEeWsuO0tI_iXIw" x="523" y="286"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_sT7QIBUyEeWsuO0tI_iXIw" type="3028" fillColor="10265827">
-          <children xmi:type="notation:DecorationNode" xmi:id="_sT7QIhUyEeWsuO0tI_iXIw" type="5062"/>
+        <children xmi:type="notation:Shape" xmi:id="_sT7QIBUyEeWsuO0tI_iXIw" type="Class_MetaclassShape_CN" fillColor="10265827">
+          <children xmi:type="notation:DecorationNode" xmi:id="_sT7QIhUyEeWsuO0tI_iXIw" type="Class_MetaclassNameLabel_CN"/>
           <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Connector"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sT7QIRUyEeWsuO0tI_iXIw" x="828" y="286"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_FhN_ARUzEeWsuO0tI_iXIw" type="1023">
+        <children xmi:type="notation:Shape" xmi:id="_FhN_ARUzEeWsuO0tI_iXIw" type="Stereotype_Shape_CN">
           <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ItV8wBUzEeWsuO0tI_iXIw" source="PapyrusCSSForceValue">
             <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ItV8wRUzEeWsuO0tI_iXIw" key="fillColor" value="true"/>
           </eAnnotations>
-          <children xmi:type="notation:DecorationNode" xmi:id="_FhN_AxUzEeWsuO0tI_iXIw" type="1046"/>
-          <children xmi:type="notation:BasicCompartment" xmi:id="_FhN_BBUzEeWsuO0tI_iXIw" visible="false" type="1052">
+          <children xmi:type="notation:DecorationNode" xmi:id="_FhN_AxUzEeWsuO0tI_iXIw" type="Stereotype_NameLabel_CN"/>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_FhN_BBUzEeWsuO0tI_iXIw" visible="false" type="Stereotype_AttributeCompartment_CN">
             <styles xmi:type="notation:TitleStyle" xmi:id="_FhN_BRUzEeWsuO0tI_iXIw"/>
             <styles xmi:type="notation:SortingStyle" xmi:id="_FhN_BhUzEeWsuO0tI_iXIw"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_FhN_BxUzEeWsuO0tI_iXIw"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FhN_CBUzEeWsuO0tI_iXIw"/>
           </children>
-          <children xmi:type="notation:BasicCompartment" xmi:id="_FhN_CRUzEeWsuO0tI_iXIw" visible="false" type="1053">
+          <children xmi:type="notation:BasicCompartment" xmi:id="_FhN_CRUzEeWsuO0tI_iXIw" visible="false" type="Stereotype_OperationCompartment_CN">
             <styles xmi:type="notation:TitleStyle" xmi:id="_FhN_ChUzEeWsuO0tI_iXIw"/>
             <styles xmi:type="notation:SortingStyle" xmi:id="_FhN_CxUzEeWsuO0tI_iXIw"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_FhN_DBUzEeWsuO0tI_iXIw"/>
@@ -196,9 +196,9 @@
           <element xsi:nil="true"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OMsfsi7BEeW5kuiJ1QpjVA" x="1028" y="286"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_VAgkMMXPEeWgbp76yZjh7g" type="3025">
-          <children xmi:type="notation:DecorationNode" xmi:id="_VAhLQMXPEeWgbp76yZjh7g" type="5055"/>
-          <children xmi:type="notation:BasicCompartment" xmi:id="_VAhLQcXPEeWgbp76yZjh7g" visible="false" type="1062">
+        <children xmi:type="notation:Shape" xmi:id="_VAgkMMXPEeWgbp76yZjh7g" type="Enumeration_Shape_CN">
+          <children xmi:type="notation:DecorationNode" xmi:id="_VAhLQMXPEeWgbp76yZjh7g" type="Enumeration_NameLabel_CN"/>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_VAhLQcXPEeWgbp76yZjh7g" visible="false" type="Enumeration_LiteralCompartment_CN">
             <styles xmi:type="notation:TitleStyle" xmi:id="_VAhLQsXPEeWgbp76yZjh7g"/>
             <styles xmi:type="notation:SortingStyle" xmi:id="_VAhLQ8XPEeWgbp76yZjh7g"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_VAhLRMXPEeWgbp76yZjh7g"/>
@@ -213,8 +213,8 @@
       <element xmi:type="uml:Profile" href="esfarchitectureconcepts.profile.uml#_4KUNIA3QEeWIHrhJxYOO3w"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sssx8RUxEeWsuO0tI_iXIw" x="115" y="276" width="1104" height="496"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_Sx_RgBUzEeWsuO0tI_iXIw" type="1002">
-      <children xmi:type="notation:DecorationNode" xmi:id="_Sx_RghUzEeWsuO0tI_iXIw" type="3"/>
+    <children xmi:type="notation:Shape" xmi:id="_Sx_RgBUzEeWsuO0tI_iXIw" type="Comment_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Sx_RghUzEeWsuO0tI_iXIw" type="Comment_BodyLabel"/>
       <element xmi:type="uml:Comment" href="esfarchitectureconcepts.profile.uml#_w18FgBM_EeWOCLsnVbWZoA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Sx_RgRUzEeWsuO0tI_iXIw" x="53" y="90"/>
     </children>
@@ -234,21 +234,21 @@
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZsBpxS7BEeW5kuiJ1QpjVA" x="200"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_hL8JAI3ZEeWEM8PJGngEtA" type="1030" fillColor="12621752">
-      <children xmi:type="notation:DecorationNode" xmi:id="_hL-lQI3ZEeWEM8PJGngEtA" type="1047"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_hL-lQY3ZEeWEM8PJGngEtA" type="1042">
-        <children xmi:type="notation:Shape" xmi:id="_l2-UwI3ZEeWEM8PJGngEtA" type="1023">
+    <children xmi:type="notation:Shape" xmi:id="_hL8JAI3ZEeWEM8PJGngEtA" type="Profile_Shape" fillColor="12621752">
+      <children xmi:type="notation:DecorationNode" xmi:id="_hL-lQI3ZEeWEM8PJGngEtA" type="Profile_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_hL-lQY3ZEeWEM8PJGngEtA" type="Profile_PackagedElementCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_l2-UwI3ZEeWEM8PJGngEtA" type="Stereotype_Shape_CN">
           <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_q6i8UI3ZEeWEM8PJGngEtA" source="PapyrusCSSForceValue">
             <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_q6i8UY3ZEeWEM8PJGngEtA" key="fillColor" value="true"/>
           </eAnnotations>
-          <children xmi:type="notation:DecorationNode" xmi:id="_l2-70I3ZEeWEM8PJGngEtA" type="1046"/>
-          <children xmi:type="notation:BasicCompartment" xmi:id="_l2-70Y3ZEeWEM8PJGngEtA" visible="false" type="1052">
+          <children xmi:type="notation:DecorationNode" xmi:id="_l2-70I3ZEeWEM8PJGngEtA" type="Stereotype_NameLabel_CN"/>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_l2-70Y3ZEeWEM8PJGngEtA" visible="false" type="Stereotype_AttributeCompartment_CN">
             <styles xmi:type="notation:TitleStyle" xmi:id="_l2-70o3ZEeWEM8PJGngEtA"/>
             <styles xmi:type="notation:SortingStyle" xmi:id="_l2-7043ZEeWEM8PJGngEtA"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_l2-71I3ZEeWEM8PJGngEtA"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l2-71Y3ZEeWEM8PJGngEtA"/>
           </children>
-          <children xmi:type="notation:BasicCompartment" xmi:id="_l2-71o3ZEeWEM8PJGngEtA" visible="false" type="1053">
+          <children xmi:type="notation:BasicCompartment" xmi:id="_l2-71o3ZEeWEM8PJGngEtA" visible="false" type="Stereotype_OperationCompartment_CN">
             <styles xmi:type="notation:TitleStyle" xmi:id="_l2-7143ZEeWEM8PJGngEtA"/>
             <styles xmi:type="notation:SortingStyle" xmi:id="_l2-72I3ZEeWEM8PJGngEtA"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_l2-72Y3ZEeWEM8PJGngEtA"/>
@@ -271,14 +271,14 @@
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hMI9Uo3ZEeWEM8PJGngEtA" x="200"/>
     </children>
-    <styles xmi:type="notation:StringValueStyle" xmi:id="_BTWOMQ3REeWIHrhJxYOO3w" name="diagram_compatibility_version" stringValue="1.1.0"/>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_BTWOMQ3REeWIHrhJxYOO3w" name="diagram_compatibility_version" stringValue="1.2.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_BTWOMg3REeWIHrhJxYOO3w"/>
     <styles xmi:type="style:PapyrusViewStyle" xmi:id="_BTWOMw3REeWIHrhJxYOO3w">
       <owner xmi:type="uml:Profile" href="esfarchitectureconcepts.profile.uml#_4KUNIA3QEeWIHrhJxYOO3w"/>
     </styles>
     <element xmi:type="uml:Profile" href="esfarchitectureconcepts.profile.uml#_4KUNIA3QEeWIHrhJxYOO3w"/>
-    <edges xmi:type="notation:Connector" xmi:id="_e5nnIRUyEeWsuO0tI_iXIw" type="4002" source="_2TuWkBUxEeWsuO0tI_iXIw" target="_FhN_ARUzEeWsuO0tI_iXIw" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_e5nnJBUyEeWsuO0tI_iXIw" visible="false" type="6007">
+    <edges xmi:type="notation:Connector" xmi:id="_e5nnIRUyEeWsuO0tI_iXIw" type="Generalization_Edge" source="_2TuWkBUxEeWsuO0tI_iXIw" target="_FhN_ARUzEeWsuO0tI_iXIw" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_e5nnJBUyEeWsuO0tI_iXIw" visible="false" type="Generalization_StereotypeLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_e5nnJRUyEeWsuO0tI_iXIw" y="60"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_e5nnIhUyEeWsuO0tI_iXIw"/>
@@ -287,8 +287,8 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_e5xYIBUyEeWsuO0tI_iXIw" id="(0.57,0.18)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_e5xYIRUyEeWsuO0tI_iXIw" id="(0.2669491525423729,0.92)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_fVvicRUyEeWsuO0tI_iXIw" type="4002" source="_-hNVYBUxEeWsuO0tI_iXIw" target="_FhN_ARUzEeWsuO0tI_iXIw" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_fVvidBUyEeWsuO0tI_iXIw" visible="false" type="6007">
+    <edges xmi:type="notation:Connector" xmi:id="_fVvicRUyEeWsuO0tI_iXIw" type="Generalization_Edge" source="_-hNVYBUxEeWsuO0tI_iXIw" target="_FhN_ARUzEeWsuO0tI_iXIw" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_fVvidBUyEeWsuO0tI_iXIw" visible="false" type="Generalization_StereotypeLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_fVvidRUyEeWsuO0tI_iXIw" y="60"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_fVvichUyEeWsuO0tI_iXIw"/>
@@ -297,32 +297,32 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fWCdYBUyEeWsuO0tI_iXIw" id="(0.45,0.13)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fWCdYRUyEeWsuO0tI_iXIw" id="(0.7669491525423728,0.93)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_ickUABUzEeWsuO0tI_iXIw" type="1013" source="_6XfuABUxEeWsuO0tI_iXIw" target="_ngjnwBUyEeWsuO0tI_iXIw" routing="Rectilinear">
+    <edges xmi:type="notation:Connector" xmi:id="_ickUABUzEeWsuO0tI_iXIw" type="Extension_Edge" source="_6XfuABUxEeWsuO0tI_iXIw" target="_ngjnwBUyEeWsuO0tI_iXIw" routing="Rectilinear">
       <styles xmi:type="notation:FontStyle" xmi:id="_ickUARUzEeWsuO0tI_iXIw"/>
       <element xmi:type="uml:Extension" href="esfarchitectureconcepts.profile.uml#_BGIsoRM3EeWOCLsnVbWZoA"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ickUAhUzEeWsuO0tI_iXIw" points="[0, 50, 0, -195]$[0, 220, 0, -25]"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_i2AuwBUzEeWsuO0tI_iXIw" type="1013" source="_AUWuABUyEeWsuO0tI_iXIw" target="_sT7QIBUyEeWsuO0tI_iXIw" routing="Rectilinear">
+    <edges xmi:type="notation:Connector" xmi:id="_i2AuwBUzEeWsuO0tI_iXIw" type="Extension_Edge" source="_AUWuABUyEeWsuO0tI_iXIw" target="_sT7QIBUyEeWsuO0tI_iXIw" routing="Rectilinear">
       <styles xmi:type="notation:FontStyle" xmi:id="_i2AuwRUzEeWsuO0tI_iXIw"/>
       <element xmi:type="uml:Extension" href="esfarchitectureconcepts.profile.uml#_BeF5oRM3EeWOCLsnVbWZoA"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_i2AuwhUzEeWsuO0tI_iXIw" points="[0, 50, 0, -195]$[0, 220, 0, -25]"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_jK-5MBUzEeWsuO0tI_iXIw" type="1013" source="_5R27oBUxEeWsuO0tI_iXIw" target="_n6l4YBUyEeWsuO0tI_iXIw" routing="Rectilinear">
+    <edges xmi:type="notation:Connector" xmi:id="_jK-5MBUzEeWsuO0tI_iXIw" type="Extension_Edge" source="_5R27oBUxEeWsuO0tI_iXIw" target="_n6l4YBUyEeWsuO0tI_iXIw" routing="Rectilinear">
       <styles xmi:type="notation:FontStyle" xmi:id="_jK-5MRUzEeWsuO0tI_iXIw"/>
       <element xmi:type="uml:Extension" href="esfarchitectureconcepts.profile.uml#_Cn4MMRM3EeWOCLsnVbWZoA"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jK-5MhUzEeWsuO0tI_iXIw" points="[0, 50, 0, -195]$[0, 220, 0, -25]"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_jhTHcBUzEeWsuO0tI_iXIw" type="1013" source="_2TuWkBUxEeWsuO0tI_iXIw" target="_otBa4BUyEeWsuO0tI_iXIw" routing="Rectilinear">
+    <edges xmi:type="notation:Connector" xmi:id="_jhTHcBUzEeWsuO0tI_iXIw" type="Extension_Edge" source="_2TuWkBUxEeWsuO0tI_iXIw" target="_otBa4BUyEeWsuO0tI_iXIw" routing="Rectilinear">
       <styles xmi:type="notation:FontStyle" xmi:id="_jhTHcRUzEeWsuO0tI_iXIw"/>
       <element xmi:type="uml:Extension" href="esfarchitectureconcepts.profile.uml#_DY1IARM3EeWOCLsnVbWZoA"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jhTHchUzEeWsuO0tI_iXIw" points="[4, 50, -64, -68]$[4, 93, -64, -25]"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_kFv4UBUzEeWsuO0tI_iXIw" type="1013" source="_-hNVYBUxEeWsuO0tI_iXIw" target="_otBa4BUyEeWsuO0tI_iXIw" routing="Rectilinear">
+    <edges xmi:type="notation:Connector" xmi:id="_kFv4UBUzEeWsuO0tI_iXIw" type="Extension_Edge" source="_-hNVYBUxEeWsuO0tI_iXIw" target="_otBa4BUyEeWsuO0tI_iXIw" routing="Rectilinear">
       <styles xmi:type="notation:FontStyle" xmi:id="_kFv4URUzEeWsuO0tI_iXIw"/>
       <element xmi:type="uml:Extension" href="esfarchitectureconcepts.profile.uml#_u6JuQRM_EeWOCLsnVbWZoA"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kFv4UhUzEeWsuO0tI_iXIw" points="[0, 50, 68, -68]$[0, 93, 68, -25]"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_kd22UBUzEeWsuO0tI_iXIw" type="1013" source="__f_R0BUxEeWsuO0tI_iXIw" target="_r9nB4BUyEeWsuO0tI_iXIw" routing="Rectilinear">
+    <edges xmi:type="notation:Connector" xmi:id="_kd22UBUzEeWsuO0tI_iXIw" type="Extension_Edge" source="__f_R0BUxEeWsuO0tI_iXIw" target="_r9nB4BUyEeWsuO0tI_iXIw" routing="Rectilinear">
       <styles xmi:type="notation:FontStyle" xmi:id="_kd22URUzEeWsuO0tI_iXIw"/>
       <element xmi:type="uml:Extension" href="esfarchitectureconcepts.profile.uml#_kJru8RM3EeWOCLsnVbWZoA"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kd22UhUzEeWsuO0tI_iXIw" points="[0, 50, 0, -195]$[0, 220, 0, -25]"/>
@@ -397,8 +397,8 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hMI9V43ZEeWEM8PJGngEtA"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hMI9WI3ZEeWEM8PJGngEtA"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_pCJqQJjwEeWQn9V11q-gNA" type="4002" source="_AUWuABUyEeWsuO0tI_iXIw" target="_l2-UwI3ZEeWEM8PJGngEtA" routing="Tree">
-      <children xmi:type="notation:DecorationNode" xmi:id="_pCKRUJjwEeWQn9V11q-gNA" visible="false" type="6007">
+    <edges xmi:type="notation:Connector" xmi:id="_pCJqQJjwEeWQn9V11q-gNA" type="Generalization_Edge" source="_AUWuABUyEeWsuO0tI_iXIw" target="_l2-UwI3ZEeWEM8PJGngEtA" routing="Tree">
+      <children xmi:type="notation:DecorationNode" xmi:id="_pCKRUJjwEeWQn9V11q-gNA" visible="false" type="Generalization_StereotypeLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_pCKRUZjwEeWQn9V11q-gNA" y="60"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_pCJqQZjwEeWQn9V11q-gNA"/>
@@ -407,8 +407,8 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pC7GUJjwEeWQn9V11q-gNA" id="(0.06,0.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pC7GUZjwEeWQn9V11q-gNA" id="(1.0,0.8181818181818182)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_zUHpUJjwEeWQn9V11q-gNA" type="4002" source="__f_R0BUxEeWsuO0tI_iXIw" target="_l2-UwI3ZEeWEM8PJGngEtA" routing="Tree">
-      <children xmi:type="notation:DecorationNode" xmi:id="_zUHpU5jwEeWQn9V11q-gNA" visible="false" type="6007">
+    <edges xmi:type="notation:Connector" xmi:id="_zUHpUJjwEeWQn9V11q-gNA" type="Generalization_Edge" source="__f_R0BUxEeWsuO0tI_iXIw" target="_l2-UwI3ZEeWEM8PJGngEtA" routing="Tree">
+      <children xmi:type="notation:DecorationNode" xmi:id="_zUHpU5jwEeWQn9V11q-gNA" visible="false" type="Generalization_StereotypeLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_zUHpVJjwEeWQn9V11q-gNA" y="60"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_zUHpUZjwEeWQn9V11q-gNA"/>
@@ -417,8 +417,8 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zU0M4JjwEeWQn9V11q-gNA" id=""/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zU0M4ZjwEeWQn9V11q-gNA" id="(0.8220338983050848,1.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_8EAxoJjwEeWQn9V11q-gNA" type="4002" source="_FhN_ARUzEeWsuO0tI_iXIw" target="_l2-UwI3ZEeWEM8PJGngEtA" routing="Tree">
-      <children xmi:type="notation:DecorationNode" xmi:id="_8EAxo5jwEeWQn9V11q-gNA" visible="false" type="6007">
+    <edges xmi:type="notation:Connector" xmi:id="_8EAxoJjwEeWQn9V11q-gNA" type="Generalization_Edge" source="_FhN_ARUzEeWsuO0tI_iXIw" target="_l2-UwI3ZEeWEM8PJGngEtA" routing="Tree">
+      <children xmi:type="notation:DecorationNode" xmi:id="_8EAxo5jwEeWQn9V11q-gNA" visible="false" type="Generalization_StereotypeLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_8EAxpJjwEeWQn9V11q-gNA" y="60"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_8EAxoZjwEeWQn9V11q-gNA"/>
@@ -427,8 +427,8 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8ErgAJjwEeWQn9V11q-gNA" id="(0.6186440677966102,0.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8EsHEJjwEeWQn9V11q-gNA" id="(0.0,0.803030303030303)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_AcZuMJjxEeWQn9V11q-gNA" type="4002" source="_5R27oBUxEeWsuO0tI_iXIw" target="_l2-UwI3ZEeWEM8PJGngEtA" routing="Tree">
-      <children xmi:type="notation:DecorationNode" xmi:id="_AcaVQJjxEeWQn9V11q-gNA" visible="false" type="6007">
+    <edges xmi:type="notation:Connector" xmi:id="_AcZuMJjxEeWQn9V11q-gNA" type="Generalization_Edge" source="_5R27oBUxEeWsuO0tI_iXIw" target="_l2-UwI3ZEeWEM8PJGngEtA" routing="Tree">
+      <children xmi:type="notation:DecorationNode" xmi:id="_AcaVQJjxEeWQn9V11q-gNA" visible="false" type="Generalization_StereotypeLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_AcaVQZjxEeWQn9V11q-gNA" y="60"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_AcZuMZjxEeWQn9V11q-gNA"/>
@@ -437,8 +437,8 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BHU6gJjxEeWQn9V11q-gNA" id="(0.49,0.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BHU6gZjxEeWQn9V11q-gNA" id="(0.211864406779661,1.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_FvIzIJjxEeWQn9V11q-gNA" type="4002" source="_6XfuABUxEeWsuO0tI_iXIw" target="_l2-UwI3ZEeWEM8PJGngEtA" routing="Tree">
-      <children xmi:type="notation:DecorationNode" xmi:id="_FvJaMJjxEeWQn9V11q-gNA" visible="false" type="6007">
+    <edges xmi:type="notation:Connector" xmi:id="_FvIzIJjxEeWQn9V11q-gNA" type="Generalization_Edge" source="_6XfuABUxEeWsuO0tI_iXIw" target="_l2-UwI3ZEeWEM8PJGngEtA" routing="Tree">
+      <children xmi:type="notation:DecorationNode" xmi:id="_FvJaMJjxEeWQn9V11q-gNA" visible="false" type="Generalization_StereotypeLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_FvJaMZjxEeWQn9V11q-gNA" y="60"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_FvIzIZjxEeWQn9V11q-gNA"/>
@@ -449,7 +449,7 @@
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_iyLVIBaHEeWc7uebO1is2A" type="PapyrusUMLProfileDiagram" name="ESFArchitectureConcepts ProfileDiagram" measurementUnit="Pixel">
-    <children xmi:type="notation:Shape" xmi:id="_neodMBaHEeWc7uebO1is2A" type="1030" lineColor="10011046">
+    <children xmi:type="notation:Shape" xmi:id="_neodMBaHEeWc7uebO1is2A" type="Profile_Shape" lineColor="10011046">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_o8XmgBaHEeWc7uebO1is2A" source="PapyrusCSSForceValue">
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_o8YNkBaHEeWc7uebO1is2A" key="fillColor" value="true"/>
       </eAnnotations>
@@ -458,17 +458,17 @@
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_STvdghjcEeWhPZtBPxjsVg" key="pageName" value="PapyrusHyperLink_Page"/>
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_STvdgxjcEeWhPZtBPxjsVg" key="is_default_navigation" value="true"/>
       </eAnnotations>
-      <children xmi:type="notation:DecorationNode" xmi:id="_neodMhaHEeWc7uebO1is2A" type="1047"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_nepEQBaHEeWc7uebO1is2A" type="1042">
-        <children xmi:type="notation:Shape" xmi:id="_5Q_HUBiyEeWc7uebO1is2A" type="1023">
-          <children xmi:type="notation:DecorationNode" xmi:id="_5Q_uYBiyEeWc7uebO1is2A" type="1046"/>
-          <children xmi:type="notation:BasicCompartment" xmi:id="_5Q_uYRiyEeWc7uebO1is2A" visible="false" type="1052">
+      <children xmi:type="notation:DecorationNode" xmi:id="_neodMhaHEeWc7uebO1is2A" type="Profile_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_nepEQBaHEeWc7uebO1is2A" type="Profile_PackagedElementCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_5Q_HUBiyEeWc7uebO1is2A" type="Stereotype_Shape_CN">
+          <children xmi:type="notation:DecorationNode" xmi:id="_5Q_uYBiyEeWc7uebO1is2A" type="Stereotype_NameLabel_CN"/>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_5Q_uYRiyEeWc7uebO1is2A" visible="false" type="Stereotype_AttributeCompartment_CN">
             <styles xmi:type="notation:TitleStyle" xmi:id="_5Q_uYhiyEeWc7uebO1is2A"/>
             <styles xmi:type="notation:SortingStyle" xmi:id="_5Q_uYxiyEeWc7uebO1is2A"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_5Q_uZBiyEeWc7uebO1is2A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5Q_uZRiyEeWc7uebO1is2A"/>
           </children>
-          <children xmi:type="notation:BasicCompartment" xmi:id="_5Q_uZhiyEeWc7uebO1is2A" visible="false" type="1053">
+          <children xmi:type="notation:BasicCompartment" xmi:id="_5Q_uZhiyEeWc7uebO1is2A" visible="false" type="Stereotype_OperationCompartment_CN">
             <styles xmi:type="notation:TitleStyle" xmi:id="_5Q_uZxiyEeWc7uebO1is2A"/>
             <styles xmi:type="notation:SortingStyle" xmi:id="_5Q_uaBiyEeWc7uebO1is2A"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_5Q_uaRiyEeWc7uebO1is2A"/>
@@ -477,10 +477,10 @@
           <element xmi:type="uml:Stereotype" href="esfarchitectureconcepts.profile.uml#_EqLAEA3REeWIHrhJxYOO3w"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5Q_HURiyEeWc7uebO1is2A" x="50" y="25" height="81"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_9ovVQBizEeWc7uebO1is2A" type="1023">
-          <children xmi:type="notation:DecorationNode" xmi:id="_9ov8UBizEeWc7uebO1is2A" type="1046"/>
-          <children xmi:type="notation:BasicCompartment" xmi:id="_9ov8URizEeWc7uebO1is2A" type="1052">
-            <children xmi:type="notation:Shape" xmi:id="_9PwYEBi0EeWc7uebO1is2A" type="3002">
+        <children xmi:type="notation:Shape" xmi:id="_9ovVQBizEeWc7uebO1is2A" type="Stereotype_Shape_CN">
+          <children xmi:type="notation:DecorationNode" xmi:id="_9ov8UBizEeWc7uebO1is2A" type="Stereotype_NameLabel_CN"/>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_9ov8URizEeWc7uebO1is2A" type="Stereotype_AttributeCompartment_CN">
+            <children xmi:type="notation:Shape" xmi:id="_9PwYEBi0EeWc7uebO1is2A" type="Property_ClassAttributeLabel">
               <styles xmi:type="notation:StringListValueStyle" xmi:id="_AqGYABi1EeWc7uebO1is2A" name="maskLabel">
                 <stringListValue>name</stringListValue>
                 <stringListValue>derived</stringListValue>
@@ -495,7 +495,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_9ov8VBizEeWc7uebO1is2A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9ov8VRizEeWc7uebO1is2A"/>
           </children>
-          <children xmi:type="notation:BasicCompartment" xmi:id="_9ov8VhizEeWc7uebO1is2A" visible="false" type="1053">
+          <children xmi:type="notation:BasicCompartment" xmi:id="_9ov8VhizEeWc7uebO1is2A" visible="false" type="Stereotype_OperationCompartment_CN">
             <styles xmi:type="notation:TitleStyle" xmi:id="_9ov8VxizEeWc7uebO1is2A"/>
             <styles xmi:type="notation:SortingStyle" xmi:id="_9ov8WBizEeWc7uebO1is2A"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_9ov8WRizEeWc7uebO1is2A"/>
@@ -504,15 +504,15 @@
           <element xmi:type="uml:Stereotype" href="esfarchitectureconcepts.profile.uml#_IKyAEA3REeWIHrhJxYOO3w"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9ovVQRizEeWc7uebO1is2A" x="419" y="25" width="307" height="127"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_-HGFMBizEeWc7uebO1is2A" type="1023">
-          <children xmi:type="notation:DecorationNode" xmi:id="_-HGsQBizEeWc7uebO1is2A" type="1046"/>
-          <children xmi:type="notation:BasicCompartment" xmi:id="_-HGsQRizEeWc7uebO1is2A" visible="false" type="1052">
+        <children xmi:type="notation:Shape" xmi:id="_-HGFMBizEeWc7uebO1is2A" type="Stereotype_Shape_CN">
+          <children xmi:type="notation:DecorationNode" xmi:id="_-HGsQBizEeWc7uebO1is2A" type="Stereotype_NameLabel_CN"/>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_-HGsQRizEeWc7uebO1is2A" visible="false" type="Stereotype_AttributeCompartment_CN">
             <styles xmi:type="notation:TitleStyle" xmi:id="_-HGsQhizEeWc7uebO1is2A"/>
             <styles xmi:type="notation:SortingStyle" xmi:id="_-HGsQxizEeWc7uebO1is2A"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_-HGsRBizEeWc7uebO1is2A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-HGsRRizEeWc7uebO1is2A"/>
           </children>
-          <children xmi:type="notation:BasicCompartment" xmi:id="_-HGsRhizEeWc7uebO1is2A" visible="false" type="1053">
+          <children xmi:type="notation:BasicCompartment" xmi:id="_-HGsRhizEeWc7uebO1is2A" visible="false" type="Stereotype_OperationCompartment_CN">
             <styles xmi:type="notation:TitleStyle" xmi:id="_-HGsRxizEeWc7uebO1is2A"/>
             <styles xmi:type="notation:SortingStyle" xmi:id="_-HGsSBizEeWc7uebO1is2A"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_-HGsSRizEeWc7uebO1is2A"/>
@@ -521,15 +521,15 @@
           <element xmi:type="uml:Stereotype" href="esfarchitectureconcepts.profile.uml#_m_6nIBM1EeWOCLsnVbWZoA"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-HGFMRizEeWc7uebO1is2A" x="155" y="290" height="81"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="__RQyQBizEeWc7uebO1is2A" type="1023">
-          <children xmi:type="notation:DecorationNode" xmi:id="__RQyQhizEeWc7uebO1is2A" type="1046"/>
-          <children xmi:type="notation:BasicCompartment" xmi:id="__RRZUBizEeWc7uebO1is2A" visible="false" type="1052">
+        <children xmi:type="notation:Shape" xmi:id="__RQyQBizEeWc7uebO1is2A" type="Stereotype_Shape_CN">
+          <children xmi:type="notation:DecorationNode" xmi:id="__RQyQhizEeWc7uebO1is2A" type="Stereotype_NameLabel_CN"/>
+          <children xmi:type="notation:BasicCompartment" xmi:id="__RRZUBizEeWc7uebO1is2A" visible="false" type="Stereotype_AttributeCompartment_CN">
             <styles xmi:type="notation:TitleStyle" xmi:id="__RRZURizEeWc7uebO1is2A"/>
             <styles xmi:type="notation:SortingStyle" xmi:id="__RRZUhizEeWc7uebO1is2A"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="__RRZUxizEeWc7uebO1is2A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="__RRZVBizEeWc7uebO1is2A"/>
           </children>
-          <children xmi:type="notation:BasicCompartment" xmi:id="__RRZVRizEeWc7uebO1is2A" visible="false" type="1053">
+          <children xmi:type="notation:BasicCompartment" xmi:id="__RRZVRizEeWc7uebO1is2A" visible="false" type="Stereotype_OperationCompartment_CN">
             <styles xmi:type="notation:TitleStyle" xmi:id="__RRZVhizEeWc7uebO1is2A"/>
             <styles xmi:type="notation:SortingStyle" xmi:id="__RRZVxizEeWc7uebO1is2A"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="__RRZWBizEeWc7uebO1is2A"/>
@@ -538,17 +538,17 @@
           <element xmi:type="uml:Stereotype" href="esfarchitectureconcepts.profile.uml#_FgN3QA3REeWIHrhJxYOO3w"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="__RQyQRizEeWc7uebO1is2A" x="416" y="290" height="81"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_ATV6UBi0EeWc7uebO1is2A" type="1023">
-          <children xmi:type="notation:DecorationNode" xmi:id="_ATXIcBi0EeWc7uebO1is2A" type="1046"/>
-          <children xmi:type="notation:BasicCompartment" xmi:id="_ATXIcRi0EeWc7uebO1is2A" type="1052">
+        <children xmi:type="notation:Shape" xmi:id="_ATV6UBi0EeWc7uebO1is2A" type="Stereotype_Shape_CN">
+          <children xmi:type="notation:DecorationNode" xmi:id="_ATXIcBi0EeWc7uebO1is2A" type="Stereotype_NameLabel_CN"/>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_ATXIcRi0EeWc7uebO1is2A" type="Stereotype_AttributeCompartment_CN">
             <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CWmfQMXOEeWgbp76yZjh7g" source="PapyrusCSSForceValue">
               <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CWmfQcXOEeWgbp76yZjh7g" key="visible" value="true"/>
             </eAnnotations>
-            <children xmi:type="notation:Shape" xmi:id="_DPTB0MXOEeWgbp76yZjh7g" type="3002">
+            <children xmi:type="notation:Shape" xmi:id="_DPTB0MXOEeWgbp76yZjh7g" type="Property_ClassAttributeLabel">
               <element xmi:type="uml:Property" href="esfarchitectureconcepts.profile.uml#_DPHboMXOEeWgbp76yZjh7g"/>
               <layoutConstraint xmi:type="notation:Location" xmi:id="_DPTB0cXOEeWgbp76yZjh7g"/>
             </children>
-            <children xmi:type="notation:Shape" xmi:id="_Rd4ncMXOEeWgbp76yZjh7g" type="3002">
+            <children xmi:type="notation:Shape" xmi:id="_Rd4ncMXOEeWgbp76yZjh7g" type="Property_ClassAttributeLabel">
               <element xmi:type="uml:Property" href="esfarchitectureconcepts.profile.uml#_Me3vwMXOEeWgbp76yZjh7g"/>
               <layoutConstraint xmi:type="notation:Location" xmi:id="_Rd4nccXOEeWgbp76yZjh7g"/>
             </children>
@@ -557,7 +557,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_ATXIdBi0EeWc7uebO1is2A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ATXIdRi0EeWc7uebO1is2A"/>
           </children>
-          <children xmi:type="notation:BasicCompartment" xmi:id="_ATXvgBi0EeWc7uebO1is2A" visible="false" type="1053">
+          <children xmi:type="notation:BasicCompartment" xmi:id="_ATXvgBi0EeWc7uebO1is2A" visible="false" type="Stereotype_OperationCompartment_CN">
             <styles xmi:type="notation:TitleStyle" xmi:id="_ATXvgRi0EeWc7uebO1is2A"/>
             <styles xmi:type="notation:SortingStyle" xmi:id="_ATXvghi0EeWc7uebO1is2A"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_ATXvgxi0EeWc7uebO1is2A"/>
@@ -566,16 +566,16 @@
           <element xmi:type="uml:Stereotype" href="esfarchitectureconcepts.profile.uml#_C4-IMA3REeWIHrhJxYOO3w"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ATV6URi0EeWc7uebO1is2A" x="786" y="290" width="299" height="81"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_Bcq54Bi0EeWc7uebO1is2A" type="1023">
+        <children xmi:type="notation:Shape" xmi:id="_Bcq54Bi0EeWc7uebO1is2A" type="Stereotype_Shape_CN">
           <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_P2HPMBi1EeWc7uebO1is2A" source="PapyrusCSSForceValue">
             <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_P2H2QBi1EeWc7uebO1is2A" key="fillColor" value="true"/>
           </eAnnotations>
-          <children xmi:type="notation:DecorationNode" xmi:id="_Bcrg8Bi0EeWc7uebO1is2A" type="1046"/>
-          <children xmi:type="notation:BasicCompartment" xmi:id="_Bcrg8Ri0EeWc7uebO1is2A" type="1052">
+          <children xmi:type="notation:DecorationNode" xmi:id="_Bcrg8Bi0EeWc7uebO1is2A" type="Stereotype_NameLabel_CN"/>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_Bcrg8Ri0EeWc7uebO1is2A" type="Stereotype_AttributeCompartment_CN">
             <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_99OOsMkDEeWJK6fhTpTGAQ" source="PapyrusCSSForceValue">
               <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_99OOsckDEeWJK6fhTpTGAQ" key="visible" value="true"/>
             </eAnnotations>
-            <children xmi:type="notation:Shape" xmi:id="_zpv-UMkEEeWJK6fhTpTGAQ" type="3002">
+            <children xmi:type="notation:Shape" xmi:id="_zpv-UMkEEeWJK6fhTpTGAQ" type="Property_ClassAttributeLabel">
               <element xmi:type="uml:Property" href="esfarchitectureconcepts.profile.uml#_t3mZgMkEEeWJK6fhTpTGAQ"/>
               <layoutConstraint xmi:type="notation:Location" xmi:id="_zpv-UckEEeWJK6fhTpTGAQ"/>
             </children>
@@ -584,7 +584,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_Bcrg9Bi0EeWc7uebO1is2A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Bcrg9Ri0EeWc7uebO1is2A"/>
           </children>
-          <children xmi:type="notation:BasicCompartment" xmi:id="_BcsIABi0EeWc7uebO1is2A" visible="false" type="1053">
+          <children xmi:type="notation:BasicCompartment" xmi:id="_BcsIABi0EeWc7uebO1is2A" visible="false" type="Stereotype_OperationCompartment_CN">
             <styles xmi:type="notation:TitleStyle" xmi:id="_BcsIARi0EeWc7uebO1is2A"/>
             <styles xmi:type="notation:SortingStyle" xmi:id="_BcsIAhi0EeWc7uebO1is2A"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_BcsIAxi0EeWc7uebO1is2A"/>
@@ -593,15 +593,15 @@
           <element xmi:type="uml:Stereotype" href="esfarchitectureconcepts.profile.uml#_FhN_ABUzEeWsuO0tI_iXIw"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Bcq54Ri0EeWc7uebO1is2A" x="397" y="451" width="351" height="81"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_DMZLEBi0EeWc7uebO1is2A" type="1023">
-          <children xmi:type="notation:DecorationNode" xmi:id="_DMZyIRi0EeWc7uebO1is2A" type="1046"/>
-          <children xmi:type="notation:BasicCompartment" xmi:id="_DMZyIhi0EeWc7uebO1is2A" visible="false" type="1052">
+        <children xmi:type="notation:Shape" xmi:id="_DMZLEBi0EeWc7uebO1is2A" type="Stereotype_Shape_CN">
+          <children xmi:type="notation:DecorationNode" xmi:id="_DMZyIRi0EeWc7uebO1is2A" type="Stereotype_NameLabel_CN"/>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_DMZyIhi0EeWc7uebO1is2A" visible="false" type="Stereotype_AttributeCompartment_CN">
             <styles xmi:type="notation:TitleStyle" xmi:id="_DMZyIxi0EeWc7uebO1is2A"/>
             <styles xmi:type="notation:SortingStyle" xmi:id="_DMZyJBi0EeWc7uebO1is2A"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_DMZyJRi0EeWc7uebO1is2A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DMZyJhi0EeWc7uebO1is2A"/>
           </children>
-          <children xmi:type="notation:BasicCompartment" xmi:id="_DMaZMBi0EeWc7uebO1is2A" visible="false" type="1053">
+          <children xmi:type="notation:BasicCompartment" xmi:id="_DMaZMBi0EeWc7uebO1is2A" visible="false" type="Stereotype_OperationCompartment_CN">
             <styles xmi:type="notation:TitleStyle" xmi:id="_DMaZMRi0EeWc7uebO1is2A"/>
             <styles xmi:type="notation:SortingStyle" xmi:id="_DMaZMhi0EeWc7uebO1is2A"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_DMaZMxi0EeWc7uebO1is2A"/>
@@ -610,38 +610,38 @@
           <element xmi:type="uml:Stereotype" href="esfarchitectureconcepts.profile.uml#_BwcZ4A3REeWIHrhJxYOO3w"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DMZyIBi0EeWc7uebO1is2A" x="633" y="290" height="81"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_YqyNABi5EeWhPZtBPxjsVg" type="1007">
-          <children xmi:type="notation:DecorationNode" xmi:id="_Yq0CMBi5EeWhPZtBPxjsVg" type="1008"/>
+        <children xmi:type="notation:Shape" xmi:id="_YqyNABi5EeWhPZtBPxjsVg" type="Comment_Shape_CN">
+          <children xmi:type="notation:DecorationNode" xmi:id="_Yq0CMBi5EeWhPZtBPxjsVg" type="Comment_BodyLabel_CN"/>
           <element xmi:type="uml:Comment" href="esfarchitectureconcepts.profile.uml#_YqOzYBi5EeWhPZtBPxjsVg"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YqyNARi5EeWhPZtBPxjsVg" x="253" y="174" width="171"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_GRTpYBi7EeWhPZtBPxjsVg" type="1007">
-          <children xmi:type="notation:DecorationNode" xmi:id="_GRUQcBi7EeWhPZtBPxjsVg" type="1008"/>
+        <children xmi:type="notation:Shape" xmi:id="_GRTpYBi7EeWhPZtBPxjsVg" type="Comment_Shape_CN">
+          <children xmi:type="notation:DecorationNode" xmi:id="_GRUQcBi7EeWhPZtBPxjsVg" type="Comment_BodyLabel_CN"/>
           <element xmi:type="uml:Comment" href="esfarchitectureconcepts.profile.uml#_GRQmEBi7EeWhPZtBPxjsVg"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GRTpYRi7EeWhPZtBPxjsVg" x="814" y="522"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_ALpdQBi8EeWhPZtBPxjsVg" type="1007">
-          <children xmi:type="notation:DecorationNode" xmi:id="_ALqEUBi8EeWhPZtBPxjsVg" type="1008"/>
+        <children xmi:type="notation:Shape" xmi:id="_ALpdQBi8EeWhPZtBPxjsVg" type="Comment_Shape_CN">
+          <children xmi:type="notation:DecorationNode" xmi:id="_ALqEUBi8EeWhPZtBPxjsVg" type="Comment_BodyLabel_CN"/>
           <element xmi:type="uml:Comment" href="esfarchitectureconcepts.profile.uml#_ALnBABi8EeWhPZtBPxjsVg"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ALpdQRi8EeWhPZtBPxjsVg" x="4" y="142" width="154"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_AmowIBi8EeWhPZtBPxjsVg" type="1007">
-          <children xmi:type="notation:DecorationNode" xmi:id="_AmowIhi8EeWhPZtBPxjsVg" type="1008"/>
+        <children xmi:type="notation:Shape" xmi:id="_AmowIBi8EeWhPZtBPxjsVg" type="Comment_Shape_CN">
+          <children xmi:type="notation:DecorationNode" xmi:id="_AmowIhi8EeWhPZtBPxjsVg" type="Comment_BodyLabel_CN"/>
           <element xmi:type="uml:Comment" href="esfarchitectureconcepts.profile.uml#_AmmT4Bi8EeWhPZtBPxjsVg"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AmowIRi8EeWhPZtBPxjsVg" x="155" y="399" width="222"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_sfRmoMXNEeWgbp76yZjh7g" type="3025">
-          <children xmi:type="notation:DecorationNode" xmi:id="_sfSNsMXNEeWgbp76yZjh7g" type="5055"/>
-          <children xmi:type="notation:BasicCompartment" xmi:id="_sfSNscXNEeWgbp76yZjh7g" type="1062">
-            <children xmi:type="notation:Shape" xmi:id="_x613cMXNEeWgbp76yZjh7g" type="1037">
+        <children xmi:type="notation:Shape" xmi:id="_sfRmoMXNEeWgbp76yZjh7g" type="Enumeration_Shape_CN">
+          <children xmi:type="notation:DecorationNode" xmi:id="_sfSNsMXNEeWgbp76yZjh7g" type="Enumeration_NameLabel_CN"/>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_sfSNscXNEeWgbp76yZjh7g" type="Enumeration_LiteralCompartment_CN">
+            <children xmi:type="notation:Shape" xmi:id="_x613cMXNEeWgbp76yZjh7g" type="EnumerationLiteral_LiteralLabel">
               <element xmi:type="uml:EnumerationLiteral" href="esfarchitectureconcepts.profile.uml#_sfK48cXNEeWgbp76yZjh7g"/>
               <layoutConstraint xmi:type="notation:Location" xmi:id="_x613ccXNEeWgbp76yZjh7g"/>
             </children>
-            <children xmi:type="notation:Shape" xmi:id="_x63FkMXNEeWgbp76yZjh7g" type="1037">
+            <children xmi:type="notation:Shape" xmi:id="_x63FkMXNEeWgbp76yZjh7g" type="EnumerationLiteral_LiteralLabel">
               <element xmi:type="uml:EnumerationLiteral" href="esfarchitectureconcepts.profile.uml#_sfK48sXNEeWgbp76yZjh7g"/>
               <layoutConstraint xmi:type="notation:Location" xmi:id="_x63FkcXNEeWgbp76yZjh7g"/>
             </children>
-            <children xmi:type="notation:Shape" xmi:id="_x63FksXNEeWgbp76yZjh7g" type="1037">
+            <children xmi:type="notation:Shape" xmi:id="_x63FksXNEeWgbp76yZjh7g" type="EnumerationLiteral_LiteralLabel">
               <element xmi:type="uml:EnumerationLiteral" href="esfarchitectureconcepts.profile.uml#_sfK488XNEeWgbp76yZjh7g"/>
               <layoutConstraint xmi:type="notation:Location" xmi:id="_x63Fk8XNEeWgbp76yZjh7g"/>
             </children>
@@ -667,37 +667,37 @@
       <element xsi:nil="true"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IGniNS7VEeW5kuiJ1QpjVA" x="229" y="94"/>
     </children>
-    <styles xmi:type="notation:StringValueStyle" xmi:id="_iyLVIRaHEeWc7uebO1is2A" name="diagram_compatibility_version" stringValue="1.1.0"/>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_iyLVIRaHEeWc7uebO1is2A" name="diagram_compatibility_version" stringValue="1.2.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_iyLVIhaHEeWc7uebO1is2A"/>
     <styles xmi:type="style:PapyrusViewStyle" xmi:id="_iyLVIxaHEeWc7uebO1is2A">
       <owner xmi:type="uml:Profile" href="esfarchitectureconcepts.profile.uml#_4KUNIA3QEeWIHrhJxYOO3w"/>
     </styles>
     <element xmi:type="uml:Profile" href="esfarchitectureconcepts.profile.uml#_4KUNIA3QEeWIHrhJxYOO3w"/>
-    <edges xmi:type="notation:Connector" xmi:id="_SBW-wBi1EeWc7uebO1is2A" type="4001" source="_5Q_HUBiyEeWc7uebO1is2A" target="_9ovVQBizEeWc7uebO1is2A" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_SBXl0Bi1EeWc7uebO1is2A" visible="false" type="6001">
+    <edges xmi:type="notation:Connector" xmi:id="_SBW-wBi1EeWc7uebO1is2A" type="Association_Edge" source="_5Q_HUBiyEeWc7uebO1is2A" target="_9ovVQBizEeWc7uebO1is2A" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_SBXl0Bi1EeWc7uebO1is2A" visible="false" type="Association_StereotypeLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_SBXl0Ri1EeWc7uebO1is2A" y="60"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_SBYM4Bi1EeWc7uebO1is2A" visible="false" type="6002">
+      <children xmi:type="notation:DecorationNode" xmi:id="_SBYM4Bi1EeWc7uebO1is2A" visible="false" type="Association_NameLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_SBYM4Ri1EeWc7uebO1is2A" y="20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_SBYM4hi1EeWc7uebO1is2A" type="6003">
+      <children xmi:type="notation:DecorationNode" xmi:id="_SBYM4hi1EeWc7uebO1is2A" type="Association_TargetRoleLabel">
         <styles xmi:type="notation:StringListValueStyle" xmi:id="_5qvcYBi4EeWhPZtBPxjsVg" name="maskLabel">
           <stringListValue>name</stringListValue>
           <stringListValue>derived</stringListValue>
         </styles>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_SBYM4xi1EeWc7uebO1is2A" x="-84" y="-14"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_SBYM5Bi1EeWc7uebO1is2A" type="6005">
+      <children xmi:type="notation:DecorationNode" xmi:id="_SBYM5Bi1EeWc7uebO1is2A" type="Association_SourceRoleLabel">
         <styles xmi:type="notation:StringListValueStyle" xmi:id="_6KXXoBi4EeWhPZtBPxjsVg" name="maskLabel">
           <stringListValue>name</stringListValue>
           <stringListValue>derived</stringListValue>
         </styles>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_SBYM5Ri1EeWc7uebO1is2A" x="51" y="-17"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_SBYM5hi1EeWc7uebO1is2A" type="6033">
+      <children xmi:type="notation:DecorationNode" xmi:id="_SBYM5hi1EeWc7uebO1is2A" type="Association_SourceMultiplicityLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_SBYM5xi1EeWc7uebO1is2A" x="29" y="19"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_SBYM6Bi1EeWc7uebO1is2A" type="6034">
+      <children xmi:type="notation:DecorationNode" xmi:id="_SBYM6Bi1EeWc7uebO1is2A" type="Association_TargetMultiplicityLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_SBYz8Bi1EeWc7uebO1is2A" x="-28" y="12"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_SBW-wRi1EeWc7uebO1is2A"/>
@@ -706,31 +706,31 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SBwAUBi1EeWc7uebO1is2A" id="(0.93,0.32098765432098764)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SBwAURi1EeWc7uebO1is2A" id="(0.06840390879478828,0.32967032967032966)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_UOeWkBi1EeWc7uebO1is2A" type="4001" source="_9ovVQBizEeWc7uebO1is2A" target="_-HGFMBizEeWc7uebO1is2A" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_UOe9oBi1EeWc7uebO1is2A" visible="false" type="6001">
+    <edges xmi:type="notation:Connector" xmi:id="_UOeWkBi1EeWc7uebO1is2A" type="Association_Edge" source="_9ovVQBizEeWc7uebO1is2A" target="_-HGFMBizEeWc7uebO1is2A" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UOe9oBi1EeWc7uebO1is2A" visible="false" type="Association_StereotypeLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_UOe9oRi1EeWc7uebO1is2A" y="60"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UOe9ohi1EeWc7uebO1is2A" visible="false" type="6002">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UOe9ohi1EeWc7uebO1is2A" visible="false" type="Association_NameLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_UOfksBi1EeWc7uebO1is2A" y="20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UOfksRi1EeWc7uebO1is2A" type="6003">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UOfksRi1EeWc7uebO1is2A" type="Association_TargetRoleLabel">
         <styles xmi:type="notation:StringListValueStyle" xmi:id="_B1jhsBi5EeWhPZtBPxjsVg" name="maskLabel">
           <stringListValue>name</stringListValue>
           <stringListValue>derived</stringListValue>
         </styles>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_UOfkshi1EeWc7uebO1is2A" x="19" y="-62"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UOfksxi1EeWc7uebO1is2A" type="6005">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UOfksxi1EeWc7uebO1is2A" type="Association_SourceRoleLabel">
         <styles xmi:type="notation:StringListValueStyle" xmi:id="_pEb6AI3_EeWEM8PJGngEtA" name="maskLabel">
           <stringListValue>name</stringListValue>
           <stringListValue>derived</stringListValue>
         </styles>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_UOfktBi1EeWc7uebO1is2A" x="59" y="14"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UOfktRi1EeWc7uebO1is2A" type="6033">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UOfktRi1EeWc7uebO1is2A" type="Association_SourceMultiplicityLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_UOfkthi1EeWc7uebO1is2A" x="40" y="-17"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UOfktxi1EeWc7uebO1is2A" type="6034">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UOfktxi1EeWc7uebO1is2A" type="Association_TargetMultiplicityLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_UOfkuBi1EeWc7uebO1is2A" x="19" y="14"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_UOeWkRi1EeWc7uebO1is2A"/>
@@ -738,31 +738,31 @@
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UOeWkhi1EeWc7uebO1is2A" points="[-64, -1, 214, -193]$[-255, -1, 23, -193]$[-255, 152, 23, -40]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UO0U0Bi1EeWc7uebO1is2A" id="(0.20846905537459284,0.8901098901098901)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_Uy9jsBi1EeWc7uebO1is2A" type="4001" source="_9ovVQBizEeWc7uebO1is2A" target="_-HGFMBizEeWc7uebO1is2A" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_Uy-KwBi1EeWc7uebO1is2A" visible="false" type="6001">
+    <edges xmi:type="notation:Connector" xmi:id="_Uy9jsBi1EeWc7uebO1is2A" type="Association_Edge" source="_9ovVQBizEeWc7uebO1is2A" target="_-HGFMBizEeWc7uebO1is2A" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Uy-KwBi1EeWc7uebO1is2A" visible="false" type="Association_StereotypeLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_Uy-KwRi1EeWc7uebO1is2A" y="60"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Uy-Kwhi1EeWc7uebO1is2A" visible="false" type="6002">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Uy-Kwhi1EeWc7uebO1is2A" visible="false" type="Association_NameLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_Uy-Kwxi1EeWc7uebO1is2A" y="20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Uy-KxBi1EeWc7uebO1is2A" type="6003">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Uy-KxBi1EeWc7uebO1is2A" type="Association_TargetRoleLabel">
         <styles xmi:type="notation:StringListValueStyle" xmi:id="_BMzfoBi5EeWhPZtBPxjsVg" name="maskLabel">
           <stringListValue>name</stringListValue>
           <stringListValue>derived</stringListValue>
         </styles>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_Uy-KxRi1EeWc7uebO1is2A" x="-23" y="53"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Uy-Kxhi1EeWc7uebO1is2A" type="6005">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Uy-Kxhi1EeWc7uebO1is2A" type="Association_SourceRoleLabel">
         <styles xmi:type="notation:StringListValueStyle" xmi:id="_CnnQwBi5EeWhPZtBPxjsVg" name="maskLabel">
           <stringListValue>name</stringListValue>
           <stringListValue>derived</stringListValue>
         </styles>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_Uy-x0Bi1EeWc7uebO1is2A" x="43" y="12"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Uy-x0Ri1EeWc7uebO1is2A" type="6033">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Uy-x0Ri1EeWc7uebO1is2A" type="Association_SourceMultiplicityLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_Uy-x0hi1EeWc7uebO1is2A" x="18" y="-15"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Uy-x0xi1EeWc7uebO1is2A" type="6034">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Uy-x0xi1EeWc7uebO1is2A" type="Association_TargetMultiplicityLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_Uy-x1Bi1EeWc7uebO1is2A" x="-24" y="-9"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_Uy9jsRi1EeWc7uebO1is2A"/>
@@ -771,31 +771,31 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UzST0Bi1EeWc7uebO1is2A" id="(0.013029315960912053,0.6593406593406593)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UzS64Bi1EeWc7uebO1is2A" id="(0.19,0.2716049382716049)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_WTAaIBi1EeWc7uebO1is2A" type="4001" source="_9ovVQBizEeWc7uebO1is2A" target="_DMZLEBi0EeWc7uebO1is2A" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_WTAaIxi1EeWc7uebO1is2A" visible="false" type="6001">
+    <edges xmi:type="notation:Connector" xmi:id="_WTAaIBi1EeWc7uebO1is2A" type="Association_Edge" source="_9ovVQBizEeWc7uebO1is2A" target="_DMZLEBi0EeWc7uebO1is2A" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_WTAaIxi1EeWc7uebO1is2A" visible="false" type="Association_StereotypeLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_WTAaJBi1EeWc7uebO1is2A" y="60"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_WTBBMBi1EeWc7uebO1is2A" visible="false" type="6002">
+      <children xmi:type="notation:DecorationNode" xmi:id="_WTBBMBi1EeWc7uebO1is2A" visible="false" type="Association_NameLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_WTBBMRi1EeWc7uebO1is2A" y="20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_WTBBMhi1EeWc7uebO1is2A" type="6003">
+      <children xmi:type="notation:DecorationNode" xmi:id="_WTBBMhi1EeWc7uebO1is2A" type="Association_TargetRoleLabel">
         <styles xmi:type="notation:StringListValueStyle" xmi:id="_mprJwBi5EeWhPZtBPxjsVg" name="maskLabel">
           <stringListValue>name</stringListValue>
           <stringListValue>derived</stringListValue>
         </styles>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_WTBBMxi1EeWc7uebO1is2A" x="-27" y="-73"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_WTBBNBi1EeWc7uebO1is2A" type="6005">
+      <children xmi:type="notation:DecorationNode" xmi:id="_WTBBNBi1EeWc7uebO1is2A" type="Association_SourceRoleLabel">
         <styles xmi:type="notation:StringListValueStyle" xmi:id="_l1abQBi5EeWhPZtBPxjsVg" name="maskLabel">
           <stringListValue>name</stringListValue>
           <stringListValue>derived</stringListValue>
         </styles>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_WTBBNRi1EeWc7uebO1is2A" x="24" y="-41"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_WTBBNhi1EeWc7uebO1is2A" type="6033">
+      <children xmi:type="notation:DecorationNode" xmi:id="_WTBBNhi1EeWc7uebO1is2A" type="Association_SourceMultiplicityLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_WTBBNxi1EeWc7uebO1is2A" x="25" y="25"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_WTBBOBi1EeWc7uebO1is2A" type="6034">
+      <children xmi:type="notation:DecorationNode" xmi:id="_WTBBOBi1EeWc7uebO1is2A" type="Association_TargetMultiplicityLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_WTBBORi1EeWc7uebO1is2A" x="-21" y="17"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_WTAaIRi1EeWc7uebO1is2A"/>
@@ -803,31 +803,31 @@
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_WTAaIhi1EeWc7uebO1is2A" points="[137, 26, -3, -178]$[137, 164, -3, -40]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WTUjMBi1EeWc7uebO1is2A" id="(0.40390879478827363,0.8021978021978022)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_Y5YmgBi1EeWc7uebO1is2A" type="4001" source="_9ovVQBizEeWc7uebO1is2A" target="__RQyQBizEeWc7uebO1is2A" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_Y5ZNkBi1EeWc7uebO1is2A" visible="false" type="6001">
+    <edges xmi:type="notation:Connector" xmi:id="_Y5YmgBi1EeWc7uebO1is2A" type="Association_Edge" source="_9ovVQBizEeWc7uebO1is2A" target="__RQyQBizEeWc7uebO1is2A" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Y5ZNkBi1EeWc7uebO1is2A" visible="false" type="Association_StereotypeLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_Y5ZNkRi1EeWc7uebO1is2A" y="60"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Y5ZNkhi1EeWc7uebO1is2A" visible="false" type="6002">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Y5ZNkhi1EeWc7uebO1is2A" visible="false" type="Association_NameLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_Y5ZNkxi1EeWc7uebO1is2A" y="20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Y5ZNlBi1EeWc7uebO1is2A" type="6003">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Y5ZNlBi1EeWc7uebO1is2A" type="Association_TargetRoleLabel">
         <styles xmi:type="notation:StringListValueStyle" xmi:id="_lL6LQBi5EeWhPZtBPxjsVg" name="maskLabel">
           <stringListValue>name</stringListValue>
           <stringListValue>derived</stringListValue>
         </styles>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_Y5ZNlRi1EeWc7uebO1is2A" x="-25" y="-85"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Y5Z0oBi1EeWc7uebO1is2A" type="6005">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Y5Z0oBi1EeWc7uebO1is2A" type="Association_SourceRoleLabel">
         <styles xmi:type="notation:StringListValueStyle" xmi:id="_kiLRwBi5EeWhPZtBPxjsVg" name="maskLabel">
           <stringListValue>name</stringListValue>
           <stringListValue>derived</stringListValue>
         </styles>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_Y5Z0oRi1EeWc7uebO1is2A" x="30" y="-43"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Y5Z0ohi1EeWc7uebO1is2A" type="6033">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Y5Z0ohi1EeWc7uebO1is2A" type="Association_SourceMultiplicityLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_Y5Z0oxi1EeWc7uebO1is2A" x="18" y="17"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Y5Z0pBi1EeWc7uebO1is2A" type="6034">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Y5Z0pBi1EeWc7uebO1is2A" type="Association_TargetMultiplicityLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_Y5Z0pRi1EeWc7uebO1is2A" x="-17" y="20"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_Y5YmgRi1EeWc7uebO1is2A"/>
@@ -835,31 +835,31 @@
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Y5Ymghi1EeWc7uebO1is2A" points="[-41, 24, 10, -178]$[-41, 162, 10, -40]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Y5tWoBi1EeWc7uebO1is2A" id="(0.31921824104234525,0.8131868131868132)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_ZlF18Bi1EeWc7uebO1is2A" type="4001" source="_9ovVQBizEeWc7uebO1is2A" target="_ATV6UBi0EeWc7uebO1is2A" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_ZlGdABi1EeWc7uebO1is2A" visible="false" type="6001">
+    <edges xmi:type="notation:Connector" xmi:id="_ZlF18Bi1EeWc7uebO1is2A" type="Association_Edge" source="_9ovVQBizEeWc7uebO1is2A" target="_ATV6UBi0EeWc7uebO1is2A" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ZlGdABi1EeWc7uebO1is2A" visible="false" type="Association_StereotypeLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_ZlGdARi1EeWc7uebO1is2A" y="60"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ZlGdAhi1EeWc7uebO1is2A" visible="false" type="6002">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ZlGdAhi1EeWc7uebO1is2A" visible="false" type="Association_NameLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_ZlGdAxi1EeWc7uebO1is2A" y="20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ZlGdBBi1EeWc7uebO1is2A" type="6003">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ZlGdBBi1EeWc7uebO1is2A" type="Association_TargetRoleLabel">
         <styles xmi:type="notation:StringListValueStyle" xmi:id="_nY5AMBi5EeWhPZtBPxjsVg" name="maskLabel">
           <stringListValue>name</stringListValue>
           <stringListValue>derived</stringListValue>
         </styles>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_ZlGdBRi1EeWc7uebO1is2A" x="-28" y="-68"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ZlGdBhi1EeWc7uebO1is2A" type="6005">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ZlGdBhi1EeWc7uebO1is2A" type="Association_SourceRoleLabel">
         <styles xmi:type="notation:StringListValueStyle" xmi:id="_oBjisBi5EeWhPZtBPxjsVg" name="maskLabel">
           <stringListValue>name</stringListValue>
           <stringListValue>derived</stringListValue>
         </styles>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_ZlGdBxi1EeWc7uebO1is2A" x="40" y="-19"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ZlHEEBi1EeWc7uebO1is2A" type="6033">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ZlHEEBi1EeWc7uebO1is2A" type="Association_SourceMultiplicityLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_ZlHEERi1EeWc7uebO1is2A" x="35" y="25"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ZlHEEhi1EeWc7uebO1is2A" type="6034">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ZlHEEhi1EeWc7uebO1is2A" type="Association_TargetMultiplicityLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_ZlHEExi1EeWc7uebO1is2A" x="-19" y="21"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_ZlF18Ri1EeWc7uebO1is2A"/>
@@ -867,61 +867,61 @@
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ZlF18hi1EeWc7uebO1is2A" points="[69, -54, -173, -246]$[239, -54, -3, -246]$[239, 152, -3, -40]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Zlb0MBi1EeWc7uebO1is2A" id="(0.7752442996742671,0.8901098901098901)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_iXrJEBi5EeWhPZtBPxjsVg" type="1022" source="_YqyNABi5EeWhPZtBPxjsVg" target="_UOeWkBi1EeWc7uebO1is2A">
+    <edges xmi:type="notation:Connector" xmi:id="_iXrJEBi5EeWhPZtBPxjsVg" type="Comment_AnnotatedElementEdge" source="_YqyNABi5EeWhPZtBPxjsVg" target="_UOeWkBi1EeWc7uebO1is2A">
       <styles xmi:type="notation:FontStyle" xmi:id="_iXrJERi5EeWhPZtBPxjsVg"/>
       <element xsi:nil="true"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_iXrJEhi5EeWhPZtBPxjsVg" points="[-5, -4, 54, 7]$[-58, -62, 1, -51]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iXzE4Bi5EeWhPZtBPxjsVg" id="(0.029239766081871343,0.3472222222222222)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iXzr8Bi5EeWhPZtBPxjsVg" id="(0.0,0.3333333333333333)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_i9LC0Bi5EeWhPZtBPxjsVg" type="1022" source="_YqyNABi5EeWhPZtBPxjsVg" target="_Y5YmgBi1EeWc7uebO1is2A">
+    <edges xmi:type="notation:Connector" xmi:id="_i9LC0Bi5EeWhPZtBPxjsVg" type="Comment_AnnotatedElementEdge" source="_YqyNABi5EeWhPZtBPxjsVg" target="_Y5YmgBi1EeWc7uebO1is2A">
       <styles xmi:type="notation:FontStyle" xmi:id="_i9LC0Ri5EeWhPZtBPxjsVg"/>
       <element xsi:nil="true"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_i9LC0hi5EeWhPZtBPxjsVg" points="[6, 5, -20, -17]$[26, 22, 0, 0]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_i9RwgBi5EeWhPZtBPxjsVg" id="(0.9649122807017544,0.4444444444444444)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_i9SXkBi5EeWhPZtBPxjsVg" id="(0.28,0.5515151515151515)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_RlxcsBi6EeWhPZtBPxjsVg" type="4002" source="_DMZLEBi0EeWc7uebO1is2A" target="_Bcq54Bi0EeWc7uebO1is2A" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_RlyDwBi6EeWhPZtBPxjsVg" visible="false" type="6007">
+    <edges xmi:type="notation:Connector" xmi:id="_RlxcsBi6EeWhPZtBPxjsVg" type="Generalization_Edge" source="_DMZLEBi0EeWc7uebO1is2A" target="_Bcq54Bi0EeWc7uebO1is2A" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_RlyDwBi6EeWhPZtBPxjsVg" visible="false" type="Generalization_StereotypeLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_Rlyq0Bi6EeWhPZtBPxjsVg" y="60"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_RlxcsRi6EeWhPZtBPxjsVg"/>
       <element xmi:type="uml:Generalization" href="esfarchitectureconcepts.profile.uml#_e5nnIBUyEeWsuO0tI_iXIw"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Rlxcshi6EeWhPZtBPxjsVg" points="[-7, 41, 129, -119]$[-7, 120, 129, -40]"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_SUN3EBi6EeWhPZtBPxjsVg" type="4002" source="__RQyQBizEeWc7uebO1is2A" target="_Bcq54Bi0EeWc7uebO1is2A" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_SUN3Exi6EeWhPZtBPxjsVg" visible="false" type="6007">
+    <edges xmi:type="notation:Connector" xmi:id="_SUN3EBi6EeWhPZtBPxjsVg" type="Generalization_Edge" source="__RQyQBizEeWc7uebO1is2A" target="_Bcq54Bi0EeWc7uebO1is2A" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_SUN3Exi6EeWhPZtBPxjsVg" visible="false" type="Generalization_StereotypeLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_SUOeIBi6EeWhPZtBPxjsVg" y="60"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_SUN3ERi6EeWhPZtBPxjsVg"/>
       <element xmi:type="uml:Generalization" href="esfarchitectureconcepts.profile.uml#_fVvicBUyEeWsuO0tI_iXIw"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SUN3Ehi6EeWhPZtBPxjsVg" points="[8, 41, -123, -119]$[8, 120, -123, -40]"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_TZgEIBi6EeWhPZtBPxjsVg" type="4001" source="_ATV6UBi0EeWc7uebO1is2A" target="_Bcq54Bi0EeWc7uebO1is2A" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_TZgrMBi6EeWhPZtBPxjsVg" visible="false" type="6001">
+    <edges xmi:type="notation:Connector" xmi:id="_TZgEIBi6EeWhPZtBPxjsVg" type="Association_Edge" source="_ATV6UBi0EeWc7uebO1is2A" target="_Bcq54Bi0EeWc7uebO1is2A" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_TZgrMBi6EeWhPZtBPxjsVg" visible="false" type="Association_StereotypeLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_TZgrMRi6EeWhPZtBPxjsVg" y="60"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_TZgrMhi6EeWhPZtBPxjsVg" visible="false" type="6002">
+      <children xmi:type="notation:DecorationNode" xmi:id="_TZgrMhi6EeWhPZtBPxjsVg" visible="false" type="Association_NameLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_TZgrMxi6EeWhPZtBPxjsVg" y="20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_TZgrNBi6EeWhPZtBPxjsVg" type="6003">
+      <children xmi:type="notation:DecorationNode" xmi:id="_TZgrNBi6EeWhPZtBPxjsVg" type="Association_TargetRoleLabel">
         <styles xmi:type="notation:StringListValueStyle" xmi:id="_EctfQBi7EeWhPZtBPxjsVg" name="maskLabel">
           <stringListValue>name</stringListValue>
           <stringListValue>derived</stringListValue>
         </styles>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_TZgrNRi6EeWhPZtBPxjsVg" x="-40" y="18"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_TZhSQBi6EeWhPZtBPxjsVg" type="6005">
+      <children xmi:type="notation:DecorationNode" xmi:id="_TZhSQBi6EeWhPZtBPxjsVg" type="Association_SourceRoleLabel">
         <styles xmi:type="notation:StringListValueStyle" xmi:id="_DzC3MBi7EeWhPZtBPxjsVg" name="maskLabel">
           <stringListValue>name</stringListValue>
           <stringListValue>derived</stringListValue>
         </styles>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_TZhSQRi6EeWhPZtBPxjsVg" x="19" y="-65"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_TZhSQhi6EeWhPZtBPxjsVg" type="6033">
+      <children xmi:type="notation:DecorationNode" xmi:id="_TZhSQhi6EeWhPZtBPxjsVg" type="Association_SourceMultiplicityLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_TZhSQxi6EeWhPZtBPxjsVg" x="20" y="17"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_TZhSRBi6EeWhPZtBPxjsVg" type="6034">
+      <children xmi:type="notation:DecorationNode" xmi:id="_TZhSRBi6EeWhPZtBPxjsVg" type="Association_TargetMultiplicityLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_TZhSRRi6EeWhPZtBPxjsVg" x="-26" y="-19"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_TZgEIRi6EeWhPZtBPxjsVg"/>
@@ -929,31 +929,31 @@
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TZgEIhi6EeWhPZtBPxjsVg" points="[-3, 41, 138, -120]$[-3, 155, 138, -6]$[-125, 155, 16, -6]"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TZrDQBi6EeWhPZtBPxjsVg" id="(0.9442508710801394,0.5061728395061729)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_UI0BMBi6EeWhPZtBPxjsVg" type="4001" source="__RQyQBizEeWc7uebO1is2A" target="_DMZLEBi0EeWc7uebO1is2A" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_UI0oQBi6EeWhPZtBPxjsVg" visible="false" type="6001">
+    <edges xmi:type="notation:Connector" xmi:id="_UI0BMBi6EeWhPZtBPxjsVg" type="Association_Edge" source="__RQyQBizEeWc7uebO1is2A" target="_DMZLEBi0EeWc7uebO1is2A" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UI0oQBi6EeWhPZtBPxjsVg" visible="false" type="Association_StereotypeLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_UI0oQRi6EeWhPZtBPxjsVg" y="60"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UI0oQhi6EeWhPZtBPxjsVg" visible="false" type="6002">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UI0oQhi6EeWhPZtBPxjsVg" visible="false" type="Association_NameLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_UI0oQxi6EeWhPZtBPxjsVg" y="20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UI0oRBi6EeWhPZtBPxjsVg" type="6003">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UI0oRBi6EeWhPZtBPxjsVg" type="Association_TargetRoleLabel">
         <styles xmi:type="notation:StringListValueStyle" xmi:id="_pEBaYBi7EeWhPZtBPxjsVg" name="maskLabel">
           <stringListValue>name</stringListValue>
           <stringListValue>derived</stringListValue>
         </styles>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_UI0oRRi6EeWhPZtBPxjsVg" x="-35" y="17"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UI1PUBi6EeWhPZtBPxjsVg" type="6005">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UI1PUBi6EeWhPZtBPxjsVg" type="Association_SourceRoleLabel">
         <styles xmi:type="notation:StringListValueStyle" xmi:id="_puR4UBi7EeWhPZtBPxjsVg" name="maskLabel">
           <stringListValue>name</stringListValue>
           <stringListValue>derived</stringListValue>
         </styles>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_UI1PURi6EeWhPZtBPxjsVg" x="32" y="-17"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UI1PUhi6EeWhPZtBPxjsVg" type="6033">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UI1PUhi6EeWhPZtBPxjsVg" type="Association_SourceMultiplicityLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_UI1PUxi6EeWhPZtBPxjsVg" x="6" y="21"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UI1PVBi6EeWhPZtBPxjsVg" type="6034">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UI1PVBi6EeWhPZtBPxjsVg" type="Association_TargetMultiplicityLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_UI1PVRi6EeWhPZtBPxjsVg" x="-20" y="-21"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_UI0BMRi6EeWhPZtBPxjsVg"/>
@@ -962,31 +962,31 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UJAOcBi6EeWhPZtBPxjsVg" id="(0.82,0.43209876543209874)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UJAOcRi6EeWhPZtBPxjsVg" id="(0.22,0.5061728395061729)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_UwxZEBi6EeWhPZtBPxjsVg" type="4001" source="_-HGFMBizEeWc7uebO1is2A" target="__RQyQBizEeWc7uebO1is2A" routing="Rectilinear">
-      <children xmi:type="notation:DecorationNode" xmi:id="_UwyAIBi6EeWhPZtBPxjsVg" visible="false" type="6001">
+    <edges xmi:type="notation:Connector" xmi:id="_UwxZEBi6EeWhPZtBPxjsVg" type="Association_Edge" source="_-HGFMBizEeWc7uebO1is2A" target="__RQyQBizEeWc7uebO1is2A" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UwyAIBi6EeWhPZtBPxjsVg" visible="false" type="Association_StereotypeLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_UwyAIRi6EeWhPZtBPxjsVg" y="60"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UwyAIhi6EeWhPZtBPxjsVg" visible="false" type="6002">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UwyAIhi6EeWhPZtBPxjsVg" visible="false" type="Association_NameLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_UwyAIxi6EeWhPZtBPxjsVg" y="20"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UwyAJBi6EeWhPZtBPxjsVg" type="6003">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UwyAJBi6EeWhPZtBPxjsVg" type="Association_TargetRoleLabel">
         <styles xmi:type="notation:StringListValueStyle" xmi:id="_wEl6IBi7EeWhPZtBPxjsVg" name="maskLabel">
           <stringListValue>name</stringListValue>
           <stringListValue>derived</stringListValue>
         </styles>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_UwynMBi6EeWhPZtBPxjsVg" x="-56" y="18"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UwynMRi6EeWhPZtBPxjsVg" type="6005">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UwynMRi6EeWhPZtBPxjsVg" type="Association_SourceRoleLabel">
         <styles xmi:type="notation:StringListValueStyle" xmi:id="_3kpLMBi7EeWhPZtBPxjsVg" name="maskLabel">
           <stringListValue>name</stringListValue>
           <stringListValue>derived</stringListValue>
         </styles>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_UwynMhi6EeWhPZtBPxjsVg" x="60" y="-19"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UwynMxi6EeWhPZtBPxjsVg" type="6033">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UwynMxi6EeWhPZtBPxjsVg" type="Association_SourceMultiplicityLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_UwynNBi6EeWhPZtBPxjsVg" x="14" y="17"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_UwynNRi6EeWhPZtBPxjsVg" type="6034">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UwynNRi6EeWhPZtBPxjsVg" type="Association_TargetMultiplicityLabel">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_UwynNhi6EeWhPZtBPxjsVg" x="-19" y="-11"/>
       </children>
       <styles xmi:type="notation:FontStyle" xmi:id="_UwxZERi6EeWhPZtBPxjsVg"/>
@@ -995,28 +995,28 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Uw8_QBi6EeWhPZtBPxjsVg" id="(0.88,0.4567901234567901)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Uw9mUBi6EeWhPZtBPxjsVg" id="(0.91,0.43209876543209874)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_OhMb8Bi7EeWhPZtBPxjsVg" type="1022" source="_GRTpYBi7EeWhPZtBPxjsVg" target="_TZgEIBi6EeWhPZtBPxjsVg">
+    <edges xmi:type="notation:Connector" xmi:id="_OhMb8Bi7EeWhPZtBPxjsVg" type="Comment_AnnotatedElementEdge" source="_GRTpYBi7EeWhPZtBPxjsVg" target="_TZgEIBi6EeWhPZtBPxjsVg">
       <styles xmi:type="notation:FontStyle" xmi:id="_OhMb8Ri7EeWhPZtBPxjsVg"/>
       <element xsi:nil="true"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OhMb8hi7EeWhPZtBPxjsVg" points="[-5, -5, 76, 61]$[-2, -42, 79, 24]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OhRUcBi7EeWhPZtBPxjsVg" id="(0.313953488372093,0.06944444444444445)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OhR7gBi7EeWhPZtBPxjsVg" id="(0.5047021943573667,0.7875)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_mUJB0Bi9EeWhPZtBPxjsVg" type="1022" source="_AmowIBi8EeWhPZtBPxjsVg" target="_UwxZEBi6EeWhPZtBPxjsVg">
+    <edges xmi:type="notation:Connector" xmi:id="_mUJB0Bi9EeWhPZtBPxjsVg" type="Comment_AnnotatedElementEdge" source="_AmowIBi8EeWhPZtBPxjsVg" target="_UwxZEBi6EeWhPZtBPxjsVg">
       <styles xmi:type="notation:FontStyle" xmi:id="_mUJB0Ri9EeWhPZtBPxjsVg"/>
       <element xsi:nil="true"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mUJB0hi9EeWhPZtBPxjsVg" points="[7, -12, -15, 95]$[26, -107, 4, 0]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mUOhYBi9EeWhPZtBPxjsVg" id="(0.6486486486486487,0.13043478260869565)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mUOhYRi9EeWhPZtBPxjsVg" id="(0.34210526315789475,0.5057471264367817)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_nonhcBi9EeWhPZtBPxjsVg" type="1022" source="_AmowIBi8EeWhPZtBPxjsVg" target="_UI0BMBi6EeWhPZtBPxjsVg">
+    <edges xmi:type="notation:Connector" xmi:id="_nonhcBi9EeWhPZtBPxjsVg" type="Comment_AnnotatedElementEdge" source="_AmowIBi8EeWhPZtBPxjsVg" target="_UI0BMBi6EeWhPZtBPxjsVg">
       <styles xmi:type="notation:FontStyle" xmi:id="_nonhcRi9EeWhPZtBPxjsVg"/>
       <element xsi:nil="true"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nonhchi9EeWhPZtBPxjsVg" points="[2, -1, -191, 100]$[193, -10, 0, 91]$[193, -101, 0, 0]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nopWoBi9EeWhPZtBPxjsVg" id="(0.972972972972973,0.20652173913043478)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nop9sBi9EeWhPZtBPxjsVg" id="(0.4421768707482993,0.46511627906976744)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_we3wcBi9EeWhPZtBPxjsVg" type="1022" source="_ALpdQBi8EeWhPZtBPxjsVg" target="_Uy9jsBi1EeWc7uebO1is2A">
+    <edges xmi:type="notation:Connector" xmi:id="_we3wcBi9EeWhPZtBPxjsVg" type="Comment_AnnotatedElementEdge" source="_ALpdQBi8EeWhPZtBPxjsVg" target="_Uy9jsBi1EeWc7uebO1is2A">
       <styles xmi:type="notation:FontStyle" xmi:id="_we3wcRi9EeWhPZtBPxjsVg"/>
       <element xsi:nil="true"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_we3wchi9EeWhPZtBPxjsVg" points="[4, 1, -76, -8]$[68, 1, -12, -8]"/>
diff --git a/core/profile/org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/profile/esfarchitectureconcepts.profile.uml b/core/profile/org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/profile/esfarchitectureconcepts.profile.uml
index 7afd954..5c0ba21 100644
--- a/core/profile/org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/profile/esfarchitectureconcepts.profile.uml
+++ b/core/profile/org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/profile/esfarchitectureconcepts.profile.uml
@@ -1,247 +1,247 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<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="_4KUNIA3QEeWIHrhJxYOO3w" name="ESFArchitectureConcepts" metaclassReference="_jIcJ0BM2EeWOCLsnVbWZoA _jIcJ0RM2EeWOCLsnVbWZoA _oraqMBM2EeWOCLsnVbWZoA _oraqMRM2EeWOCLsnVbWZoA _f9cYABM3EeWOCLsnVbWZoA _Sg35AMXPEeWgbp76yZjh7g">

-    <ownedComment xmi:type="uml:Comment" xmi:id="_w18FgBM_EeWOCLsnVbWZoA" annotatedElement="_u6JuQRM_EeWOCLsnVbWZoA">

-      <body>ATTENTION!&#xD;

-				Must tooling for hiding the SPortRole&#xD;

-				to the users.</body>

-    </ownedComment>

-    <ownedComment xmi:type="uml:Comment" xmi:id="_YqOzYBi5EeWhPZtBPxjsVg" annotatedElement="_UOb6UBi1EeWc7uebO1is2A _Y5VjMBi1EeWc7uebO1is2A">

-      <body>Owner of SPortRole must be the same than SPart's owner</body>

-    </ownedComment>

-    <ownedComment xmi:type="uml:Comment" xmi:id="_GRQmEBi7EeWhPZtBPxjsVg" annotatedElement="_TZRaoBi6EeWhPZtBPxjsVg">

-      <body>Must manage:&#xD;

-				- INOUT ports&#xD;

-				- More than 2 ends by SCconnector

-			</body>

-    </ownedComment>

-    <ownedComment xmi:type="uml:Comment" xmi:id="_ALnBABi8EeWhPZtBPxjsVg" annotatedElement="_Uy6gYBi1EeWc7uebO1is2A">

-      <body>A SBlock knows all the SParts which are of its type, to know

-				wherever it is used.</body>

-    </ownedComment>

-    <ownedComment xmi:type="uml:Comment" xmi:id="_AmmT4Bi8EeWhPZtBPxjsVg" annotatedElement="_UwtusBi6EeWhPZtBPxjsVg _UIuhoBi6EeWhPZtBPxjsVg">

-      <body>Must tooling!&#xD;

-				When SPort or SPart is removed, SPortRole must be removed too.</body>

-    </ownedComment>

-    <elementImport xmi:type="uml:ElementImport" xmi:id="_jIcJ0BM2EeWOCLsnVbWZoA" alias="Class">

-      <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-    </elementImport>

-    <elementImport xmi:type="uml:ElementImport" xmi:id="_jIcJ0RM2EeWOCLsnVbWZoA" alias="Property">

-      <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

-    </elementImport>

-    <elementImport xmi:type="uml:ElementImport" xmi:id="_oraqMBM2EeWOCLsnVbWZoA" alias="Port">

-      <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Port"/>

-    </elementImport>

-    <elementImport xmi:type="uml:ElementImport" xmi:id="_oraqMRM2EeWOCLsnVbWZoA" alias="Connector">

-      <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Connector"/>

-    </elementImport>

-    <elementImport xmi:type="uml:ElementImport" xmi:id="_f9cYABM3EeWOCLsnVbWZoA" alias="Package">

-      <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>

-    </elementImport>

-    <elementImport xmi:type="uml:ElementImport" xmi:id="_Sg35AMXPEeWgbp76yZjh7g" alias="Enumeration">

-      <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Enumeration"/>

-    </elementImport>

-    <packagedElement xmi:type="uml:Stereotype" xmi:id="_BwcZ4A3REeWIHrhJxYOO3w" name="SPort">

-      <generalization xmi:type="uml:Generalization" xmi:id="_e5nnIBUyEeWsuO0tI_iXIw" general="_FhN_ABUzEeWsuO0tI_iXIw"/>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_DY1IABM3EeWOCLsnVbWZoA" name="base_Port" association="_DY1IARM3EeWOCLsnVbWZoA">

-        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Port"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_UIuhoRi6EeWhPZtBPxjsVg" name="rolesList" type="_FgN3QA3REeWIHrhJxYOO3w" aggregation="shared" isDerived="true" association="_UIuhoBi6EeWhPZtBPxjsVg">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_UIuhohi6EeWhPZtBPxjsVg"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UIuhoxi6EeWhPZtBPxjsVg" value="*"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_WS9W0Ri1EeWc7uebO1is2A" name="owner" type="_IKyAEA3REeWIHrhJxYOO3w" isDerived="true" association="_WS9W0Bi1EeWc7uebO1is2A">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WS9W0hi1EeWc7uebO1is2A" value="1"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WS9W0xi1EeWc7uebO1is2A" value="1"/>

-      </ownedAttribute>

-      <icon xmi:type="uml:Image" xmi:id="_7v_K8PDrEeWl5aQli56k3w" format="PNG" location="platform:/plugin/org.polarsys.esf.core.common.ui/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7v_K8fDrEeWl5aQli56k3w" source="image_papyrus">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7v_K8vDrEeWl5aQli56k3w" key="image_name_key" value="Icon_SPort"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7v_K8_DrEeWl5aQli56k3w" key="image_kind_key" value="icon"/>

-        </eAnnotations>

-      </icon>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Stereotype" xmi:id="_C4-IMA3REeWIHrhJxYOO3w" name="SConnector">

-      <generalization xmi:type="uml:Generalization" xmi:id="_pBnewJjwEeWQn9V11q-gNA">

-        <general xmi:type="uml:Stereotype" href="platform:/plugin/org.polarsys.esf.core.profile.esfcore/src/main/resources/models/profile/esfcore.profile.uml#_FrK08A3PEeWIHrhJxYOO3w"/>

-      </generalization>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_BeF5oBM3EeWOCLsnVbWZoA" name="base_Connector" association="_BeF5oRM3EeWOCLsnVbWZoA">

-        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Connector"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_ZlCyoRi1EeWc7uebO1is2A" name="owner" type="_IKyAEA3REeWIHrhJxYOO3w" isDerived="true" association="_ZlCyoBi1EeWc7uebO1is2A">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZlCyohi1EeWc7uebO1is2A" value="1"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZlCyoxi1EeWc7uebO1is2A" value="1"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_TZO-YBi6EeWhPZtBPxjsVg" name="endsList" type="_FhN_ABUzEeWsuO0tI_iXIw" isDerived="true" association="_TZRaoBi6EeWhPZtBPxjsVg">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_TZO-YRi6EeWhPZtBPxjsVg" value="2"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TZO-Yhi6EeWhPZtBPxjsVg" value="*"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_DPHboMXOEeWgbp76yZjh7g" name="sourcesList" type="_FhN_ABUzEeWsuO0tI_iXIw" isDerived="true">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IveF0MXOEeWgbp76yZjh7g"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ivf7AMXOEeWgbp76yZjh7g" value="*"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_Me3vwMXOEeWgbp76yZjh7g" name="targetsList" type="_FhN_ABUzEeWsuO0tI_iXIw" isDerived="true">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Me3vwcXOEeWgbp76yZjh7g"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Me3vwsXOEeWgbp76yZjh7g" value="*"/>

-      </ownedAttribute>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Stereotype" xmi:id="_EqLAEA3REeWIHrhJxYOO3w" name="SModel">

-      <generalization xmi:type="uml:Generalization" xmi:id="_zTmr8JjwEeWQn9V11q-gNA">

-        <general xmi:type="uml:Stereotype" href="platform:/plugin/org.polarsys.esf.core.profile.esfcore/src/main/resources/models/profile/esfcore.profile.uml#_FrK08A3PEeWIHrhJxYOO3w"/>

-      </generalization>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_kJru8BM3EeWOCLsnVbWZoA" name="base_Package" association="_kJru8RM3EeWOCLsnVbWZoA">

-        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_SBStUBi1EeWc7uebO1is2A" name="ownedSBlocksList" type="_IKyAEA3REeWIHrhJxYOO3w" aggregation="composite" isDerived="true" association="_SBTUYBi1EeWc7uebO1is2A">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_SBStURi1EeWc7uebO1is2A"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SBStUhi1EeWc7uebO1is2A" value="*"/>

-      </ownedAttribute>

-      <icon xmi:type="uml:Image" xmi:id="_AsZlIPDtEeWl5aQli56k3w" format="PNG" location="platform:/plugin/org.polarsys.esf.core.common.ui/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AsZlIfDtEeWl5aQli56k3w" source="image_papyrus">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AsZlIvDtEeWl5aQli56k3w" key="image_kind_key" value="icon"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AsZlI_DtEeWl5aQli56k3w" key="image_name_key" value="Icon_SModel"/>

-        </eAnnotations>

-      </icon>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Stereotype" xmi:id="_FgN3QA3REeWIHrhJxYOO3w" name="SPortRole">

-      <generalization xmi:type="uml:Generalization" xmi:id="_fVvicBUyEeWsuO0tI_iXIw" general="_FhN_ABUzEeWsuO0tI_iXIw"/>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_u6JuQBM_EeWOCLsnVbWZoA" name="base_Port" association="_u6JuQRM_EeWOCLsnVbWZoA">

-        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Port"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_UIsscBi6EeWhPZtBPxjsVg" name="type" type="_BwcZ4A3REeWIHrhJxYOO3w" isDerived="true" association="_UIuhoBi6EeWhPZtBPxjsVg">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_UIsscRi6EeWhPZtBPxjsVg" value="1"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UIsschi6EeWhPZtBPxjsVg" value="1"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_UwtusRi6EeWhPZtBPxjsVg" name="usageContext" type="_m_6nIBM1EeWOCLsnVbWZoA" isDerived="true" association="_UwtusBi6EeWhPZtBPxjsVg">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Uwtushi6EeWhPZtBPxjsVg" value="1"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Uwtusxi6EeWhPZtBPxjsVg" value="1"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_Y5VjMRi1EeWc7uebO1is2A" name="owner" type="_IKyAEA3REeWIHrhJxYOO3w" isDerived="true" association="_Y5VjMBi1EeWc7uebO1is2A">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Y5VjMhi1EeWc7uebO1is2A" value="1"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Y5VjMxi1EeWc7uebO1is2A" value="1"/>

-      </ownedAttribute>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Stereotype" xmi:id="_IKyAEA3REeWIHrhJxYOO3w" name="SBlock">

-      <generalization xmi:type="uml:Generalization" xmi:id="_Fuoc0JjxEeWQn9V11q-gNA">

-        <general xmi:type="uml:Stereotype" href="platform:/plugin/org.polarsys.esf.core.profile.esfcore/src/main/resources/models/profile/esfcore.profile.uml#_FrK08A3PEeWIHrhJxYOO3w"/>

-      </generalization>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_BGIsoBM3EeWOCLsnVbWZoA" name="base_Class" association="_BGIsoRM3EeWOCLsnVbWZoA">

-        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_9PeEMBi0EeWc7uebO1is2A" name="topBlock">

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

-        <defaultValue xmi:type="uml:LiteralBoolean" xmi:id="_F7FwgBi1EeWc7uebO1is2A"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_UObTQBi1EeWc7uebO1is2A" name="ownedSPartsList" type="_m_6nIBM1EeWOCLsnVbWZoA" aggregation="composite" isDerived="true" association="_UOb6UBi1EeWc7uebO1is2A">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_UObTQRi1EeWc7uebO1is2A"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UObTQhi1EeWc7uebO1is2A" value="*"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_Uy55UBi1EeWc7uebO1is2A" name="usagesList" type="_m_6nIBM1EeWOCLsnVbWZoA" isDerived="true" association="_Uy6gYBi1EeWc7uebO1is2A">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Uy55URi1EeWc7uebO1is2A"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Uy55Uhi1EeWc7uebO1is2A" value="*"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_WS8vwBi1EeWc7uebO1is2A" name="ownedSPortsList" type="_BwcZ4A3REeWIHrhJxYOO3w" aggregation="composite" isDerived="true" association="_WS9W0Bi1EeWc7uebO1is2A">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WS8vwRi1EeWc7uebO1is2A"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WS8vwhi1EeWc7uebO1is2A" value="*"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_Y5U8IBi1EeWc7uebO1is2A" name="ownedSPortRolesList" type="_FgN3QA3REeWIHrhJxYOO3w" aggregation="composite" isDerived="true" association="_Y5VjMBi1EeWc7uebO1is2A">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Y5U8IRi1EeWc7uebO1is2A"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Y5U8Ihi1EeWc7uebO1is2A" value="*"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_ZlCLkBi1EeWc7uebO1is2A" name="sConnectorsList" type="_C4-IMA3REeWIHrhJxYOO3w" aggregation="composite" isDerived="true" association="_ZlCyoBi1EeWc7uebO1is2A">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZlCLkRi1EeWc7uebO1is2A"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZlCLkhi1EeWc7uebO1is2A" value="*"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_SBTUYRi1EeWc7uebO1is2A" name="sModel" type="_EqLAEA3REeWIHrhJxYOO3w" isDerived="true" association="_SBTUYBi1EeWc7uebO1is2A">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_SBTUYhi1EeWc7uebO1is2A" value="1"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SBTUYxi1EeWc7uebO1is2A" value="1"/>

-      </ownedAttribute>

-      <icon xmi:type="uml:Image" xmi:id="_IIsXkPDtEeWl5aQli56k3w" format="PNG" location="platform:/plugin/org.polarsys.esf.core.common.ui/src/main/resources/icons/profile/esfarchitectureconcepts/icon_sblock.png">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IIsXkfDtEeWl5aQli56k3w" source="image_papyrus">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IIsXkvDtEeWl5aQli56k3w" key="image_kind_key" value="icon"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IIsXk_DtEeWl5aQli56k3w" key="image_name_key" value="Icon_SBlock"/>

-        </eAnnotations>

-      </icon>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Stereotype" xmi:id="_m_6nIBM1EeWOCLsnVbWZoA" name="SPart">

-      <generalization xmi:type="uml:Generalization" xmi:id="_Ab5X4JjxEeWQn9V11q-gNA">

-        <general xmi:type="uml:Stereotype" href="platform:/plugin/org.polarsys.esf.core.profile.esfcore/src/main/resources/models/profile/esfcore.profile.uml#_FrK08A3PEeWIHrhJxYOO3w"/>

-      </generalization>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_Cn4MMBM3EeWOCLsnVbWZoA" name="base_Property" association="_Cn4MMRM3EeWOCLsnVbWZoA">

-        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_Uy6gYRi1EeWc7uebO1is2A" name="type" type="_IKyAEA3REeWIHrhJxYOO3w" isDerived="true" association="_Uy6gYBi1EeWc7uebO1is2A">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Uy6gYhi1EeWc7uebO1is2A" value="1"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Uy6gYxi1EeWc7uebO1is2A" value="1"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_UOb6URi1EeWc7uebO1is2A" name="owner" type="_IKyAEA3REeWIHrhJxYOO3w" isDerived="true" association="_UOb6UBi1EeWc7uebO1is2A">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_UOb6Uhi1EeWc7uebO1is2A" value="1"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UOb6Uxi1EeWc7uebO1is2A" value="1"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_UwsgkBi6EeWhPZtBPxjsVg" name="sPortRolesList" type="_FgN3QA3REeWIHrhJxYOO3w" aggregation="shared" isDerived="true" association="_UwtusBi6EeWhPZtBPxjsVg">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_UwsgkRi6EeWhPZtBPxjsVg"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Uwsgkhi6EeWhPZtBPxjsVg" value="*"/>

-      </ownedAttribute>

-      <icon xmi:type="uml:Image" xmi:id="_LFGwQPDrEeWl5aQli56k3w" format="PNG" location="platform:/plugin/org.polarsys.esf.core.common.ui/src/main/resources/icons/profile/esfarchitectureconcepts/icon_spart.png">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_LFGwQfDrEeWl5aQli56k3w" source="image_papyrus">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_LFGwQvDrEeWl5aQli56k3w" key="image_kind_key" value="icon"/>

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_LFGwQ_DrEeWl5aQli56k3w" key="image_name_key" value="Icon_SPart"/>

-        </eAnnotations>

-      </icon>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Extension" xmi:id="_BGIsoRM3EeWOCLsnVbWZoA" name="E_SBlock_Class1" memberEnd="_BGIsohM3EeWOCLsnVbWZoA _BGIsoBM3EeWOCLsnVbWZoA">

-      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_BGIsohM3EeWOCLsnVbWZoA" name="extension_SBlock" type="_IKyAEA3REeWIHrhJxYOO3w" aggregation="composite" association="_BGIsoRM3EeWOCLsnVbWZoA"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Extension" xmi:id="_BeF5oRM3EeWOCLsnVbWZoA" name="E_SConnector_Connector1" memberEnd="_BeF5ohM3EeWOCLsnVbWZoA _BeF5oBM3EeWOCLsnVbWZoA">

-      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_BeF5ohM3EeWOCLsnVbWZoA" name="extension_SConnector" type="_C4-IMA3REeWIHrhJxYOO3w" aggregation="composite" association="_BeF5oRM3EeWOCLsnVbWZoA"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Extension" xmi:id="_Cn4MMRM3EeWOCLsnVbWZoA" name="E_SPart_Property1" memberEnd="_Cn4MMhM3EeWOCLsnVbWZoA _Cn4MMBM3EeWOCLsnVbWZoA">

-      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_Cn4MMhM3EeWOCLsnVbWZoA" name="extension_SPart" type="_m_6nIBM1EeWOCLsnVbWZoA" aggregation="composite" association="_Cn4MMRM3EeWOCLsnVbWZoA"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Extension" xmi:id="_DY1IARM3EeWOCLsnVbWZoA" name="E_SPort_Port1" memberEnd="_DY1IAhM3EeWOCLsnVbWZoA _DY1IABM3EeWOCLsnVbWZoA">

-      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_DY1IAhM3EeWOCLsnVbWZoA" name="extension_SPort" type="_BwcZ4A3REeWIHrhJxYOO3w" aggregation="composite" association="_DY1IARM3EeWOCLsnVbWZoA"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Extension" xmi:id="_kJru8RM3EeWOCLsnVbWZoA" name="E_SModel_Package1" memberEnd="_kJru8hM3EeWOCLsnVbWZoA _kJru8BM3EeWOCLsnVbWZoA">

-      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_kJru8hM3EeWOCLsnVbWZoA" name="extension_SModel" type="_EqLAEA3REeWIHrhJxYOO3w" aggregation="composite" association="_kJru8RM3EeWOCLsnVbWZoA"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Extension" xmi:id="_u6JuQRM_EeWOCLsnVbWZoA" name="E_SPortRole_Port1" memberEnd="_u6JuQhM_EeWOCLsnVbWZoA _u6JuQBM_EeWOCLsnVbWZoA">

-      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_u6JuQhM_EeWOCLsnVbWZoA" name="extension_SPortRole" type="_FgN3QA3REeWIHrhJxYOO3w" aggregation="composite" association="_u6JuQRM_EeWOCLsnVbWZoA"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Stereotype" xmi:id="_FhN_ABUzEeWsuO0tI_iXIw" name="AbstractSConnectableElement" isAbstract="true">

-      <generalization xmi:type="uml:Generalization" xmi:id="_8DfNMJjwEeWQn9V11q-gNA">

-        <general xmi:type="uml:Stereotype" href="platform:/plugin/org.polarsys.esf.core.profile.esfcore/src/main/resources/models/profile/esfcore.profile.uml#_FrK08A3PEeWIHrhJxYOO3w"/>

-      </generalization>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_TZRaoRi6EeWhPZtBPxjsVg" name="sConnectorsList" type="_C4-IMA3REeWIHrhJxYOO3w" isDerived="true" association="_TZRaoBi6EeWhPZtBPxjsVg">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_TZRaohi6EeWhPZtBPxjsVg"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TZRaoxi6EeWhPZtBPxjsVg" value="*"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_t3mZgMkEEeWJK6fhTpTGAQ" name="sDirection" visibility="public" type="_sfK48MXNEeWgbp76yZjh7g">

-        <defaultValue xmi:type="uml:InstanceValue" xmi:id="_qpxXQPDzEeWl5aQli56k3w" name="INOUT" type="_sfK48MXNEeWgbp76yZjh7g" instance="_sfK488XNEeWgbp76yZjh7g"/>

-      </ownedAttribute>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_SBTUYBi1EeWc7uebO1is2A" name="sModel_sBlock_1" memberEnd="_SBTUYRi1EeWc7uebO1is2A _SBStUBi1EeWc7uebO1is2A"/>

-    <packagedElement xmi:type="uml:Association" xmi:id="_UOb6UBi1EeWc7uebO1is2A" name="sBlock_sPart_1" memberEnd="_UOb6URi1EeWc7uebO1is2A _UObTQBi1EeWc7uebO1is2A"/>

-    <packagedElement xmi:type="uml:Association" xmi:id="_Uy6gYBi1EeWc7uebO1is2A" name="sBlock_sPart_2" memberEnd="_Uy6gYRi1EeWc7uebO1is2A _Uy55UBi1EeWc7uebO1is2A"/>

-    <packagedElement xmi:type="uml:Association" xmi:id="_WS9W0Bi1EeWc7uebO1is2A" name="sBlock_sPort_1" memberEnd="_WS9W0Ri1EeWc7uebO1is2A _WS8vwBi1EeWc7uebO1is2A"/>

-    <packagedElement xmi:type="uml:Association" xmi:id="_Y5VjMBi1EeWc7uebO1is2A" name="sBlock_sPortRole_1" memberEnd="_Y5VjMRi1EeWc7uebO1is2A _Y5U8IBi1EeWc7uebO1is2A"/>

-    <packagedElement xmi:type="uml:Association" xmi:id="_ZlCyoBi1EeWc7uebO1is2A" name="sBlock_sConnector_1" memberEnd="_ZlCyoRi1EeWc7uebO1is2A _ZlCLkBi1EeWc7uebO1is2A"/>

-    <packagedElement xmi:type="uml:Association" xmi:id="_TZRaoBi6EeWhPZtBPxjsVg" name="sConnector_abstractSConnectableElement_1" memberEnd="_TZRaoRi6EeWhPZtBPxjsVg _TZO-YBi6EeWhPZtBPxjsVg"/>

-    <packagedElement xmi:type="uml:Association" xmi:id="_UIuhoBi6EeWhPZtBPxjsVg" name="sPortRole_sPort_1" memberEnd="_UIuhoRi6EeWhPZtBPxjsVg _UIsscBi6EeWhPZtBPxjsVg"/>

-    <packagedElement xmi:type="uml:Association" xmi:id="_UwtusBi6EeWhPZtBPxjsVg" name="sPart_sPortRole_1" memberEnd="_UwtusRi6EeWhPZtBPxjsVg _UwsgkBi6EeWhPZtBPxjsVg"/>

-    <packagedElement xmi:type="uml:Dependency" xmi:id="_47zDgJjwEeWQn9V11q-gNA" client="_4KUNIA3QEeWIHrhJxYOO3w">

-      <supplier xmi:type="uml:Profile" href="platform:/plugin/org.polarsys.esf.core.profile.esfcore/src/main/resources/models/profile/esfcore.profile.uml#_5CO-gA3OEeWIHrhJxYOO3w"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Enumeration" xmi:id="_sfK48MXNEeWgbp76yZjh7g" name="SDirection">

-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_sfK48cXNEeWgbp76yZjh7g" name="IN"/>

-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_sfK48sXNEeWgbp76yZjh7g" name="OUT"/>

-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_sfK488XNEeWgbp76yZjh7g" name="INOUT"/>

-    </packagedElement>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_2x7ekCx0EeW1r-I29laTnw">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2x8ssCx0EeW1r-I29laTnw" 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 xmi:type="uml:Profile" href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/>

-    </profileApplication>

-  </uml:Profile>

-  <Ecore:EPackage xmi:id="_40S-8Cx0EeW1r-I29laTnw" base_Package="_4KUNIA3QEeWIHrhJxYOO3w" packageName="esfarchitectureconcepts" nsPrefix="ESFArchitectureConcepts" nsURI="http://www.polarsys.org/esf/0.7.0/ESFArchitectureConcepts" basePackage="org.polarsys.esf" prefix="ESFArchitectureConcepts"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<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="_4KUNIA3QEeWIHrhJxYOO3w" name="ESFArchitectureConcepts" metaclassReference="_jIcJ0BM2EeWOCLsnVbWZoA _jIcJ0RM2EeWOCLsnVbWZoA _oraqMBM2EeWOCLsnVbWZoA _oraqMRM2EeWOCLsnVbWZoA _f9cYABM3EeWOCLsnVbWZoA _Sg35AMXPEeWgbp76yZjh7g">
+    <ownedComment xmi:type="uml:Comment" xmi:id="_w18FgBM_EeWOCLsnVbWZoA" annotatedElement="_u6JuQRM_EeWOCLsnVbWZoA">
+      <body>ATTENTION!&#xD;
+				Must tooling for hiding the SPortRole&#xD;
+				to the users.</body>
+    </ownedComment>
+    <ownedComment xmi:type="uml:Comment" xmi:id="_YqOzYBi5EeWhPZtBPxjsVg" annotatedElement="_UOb6UBi1EeWc7uebO1is2A _Y5VjMBi1EeWc7uebO1is2A">
+      <body>Owner of SPortRole must be the same than SPart's owner</body>
+    </ownedComment>
+    <ownedComment xmi:type="uml:Comment" xmi:id="_GRQmEBi7EeWhPZtBPxjsVg" annotatedElement="_TZRaoBi6EeWhPZtBPxjsVg">
+      <body>Must manage:&#xD;
+				- INOUT ports&#xD;
+				- More than 2 ends by SCconnector
+			</body>
+    </ownedComment>
+    <ownedComment xmi:type="uml:Comment" xmi:id="_ALnBABi8EeWhPZtBPxjsVg" annotatedElement="_Uy6gYBi1EeWc7uebO1is2A">
+      <body>A SBlock knows all the SParts which are of its type, to know
+				wherever it is used.</body>
+    </ownedComment>
+    <ownedComment xmi:type="uml:Comment" xmi:id="_AmmT4Bi8EeWhPZtBPxjsVg" annotatedElement="_UwtusBi6EeWhPZtBPxjsVg _UIuhoBi6EeWhPZtBPxjsVg">
+      <body>Must tooling!&#xD;
+				When SPort or SPart is removed, SPortRole must be removed too.</body>
+    </ownedComment>
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_jIcJ0BM2EeWOCLsnVbWZoA" alias="Class">
+      <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+    </elementImport>
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_jIcJ0RM2EeWOCLsnVbWZoA" alias="Property">
+      <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
+    </elementImport>
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_oraqMBM2EeWOCLsnVbWZoA" alias="Port">
+      <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Port"/>
+    </elementImport>
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_oraqMRM2EeWOCLsnVbWZoA" alias="Connector">
+      <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Connector"/>
+    </elementImport>
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_f9cYABM3EeWOCLsnVbWZoA" alias="Package">
+      <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>
+    </elementImport>
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_Sg35AMXPEeWgbp76yZjh7g" alias="Enumeration">
+      <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Enumeration"/>
+    </elementImport>
+    <packagedElement xmi:type="uml:Stereotype" xmi:id="_BwcZ4A3REeWIHrhJxYOO3w" name="SPort">
+      <generalization xmi:type="uml:Generalization" xmi:id="_e5nnIBUyEeWsuO0tI_iXIw" general="_FhN_ABUzEeWsuO0tI_iXIw"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_DY1IABM3EeWOCLsnVbWZoA" name="base_Port" association="_DY1IARM3EeWOCLsnVbWZoA">
+        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Port"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_UIuhoRi6EeWhPZtBPxjsVg" name="rolesList" type="_FgN3QA3REeWIHrhJxYOO3w" aggregation="shared" isDerived="true" association="_UIuhoBi6EeWhPZtBPxjsVg">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_UIuhohi6EeWhPZtBPxjsVg"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UIuhoxi6EeWhPZtBPxjsVg" value="*"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_WS9W0Ri1EeWc7uebO1is2A" name="owner" type="_IKyAEA3REeWIHrhJxYOO3w" isDerived="true" association="_WS9W0Bi1EeWc7uebO1is2A">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WS9W0hi1EeWc7uebO1is2A" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WS9W0xi1EeWc7uebO1is2A" value="1"/>
+      </ownedAttribute>
+      <icon xmi:type="uml:Image" xmi:id="_7v_K8PDrEeWl5aQli56k3w" format="PNG" location="platform:/plugin/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7v_K8fDrEeWl5aQli56k3w" source="image_papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7v_K8vDrEeWl5aQli56k3w" key="image_name_key" value="Icon_SPort"/>
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7v_K8_DrEeWl5aQli56k3w" key="image_kind_key" value="icon"/>
+        </eAnnotations>
+      </icon>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Stereotype" xmi:id="_C4-IMA3REeWIHrhJxYOO3w" name="SConnector">
+      <generalization xmi:type="uml:Generalization" xmi:id="_pBnewJjwEeWQn9V11q-gNA">
+        <general xmi:type="uml:Stereotype" href="platform:/plugin/org.polarsys.esf.core.profile.esfcore/src/main/resources/models/profile/esfcore.profile.uml#_FrK08A3PEeWIHrhJxYOO3w"/>
+      </generalization>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_BeF5oBM3EeWOCLsnVbWZoA" name="base_Connector" association="_BeF5oRM3EeWOCLsnVbWZoA">
+        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Connector"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_ZlCyoRi1EeWc7uebO1is2A" name="owner" type="_IKyAEA3REeWIHrhJxYOO3w" isDerived="true" association="_ZlCyoBi1EeWc7uebO1is2A">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZlCyohi1EeWc7uebO1is2A" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZlCyoxi1EeWc7uebO1is2A" value="1"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_TZO-YBi6EeWhPZtBPxjsVg" name="endsList" type="_FhN_ABUzEeWsuO0tI_iXIw" isDerived="true" association="_TZRaoBi6EeWhPZtBPxjsVg">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_TZO-YRi6EeWhPZtBPxjsVg" value="2"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TZO-Yhi6EeWhPZtBPxjsVg" value="*"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_DPHboMXOEeWgbp76yZjh7g" name="sourcesList" type="_FhN_ABUzEeWsuO0tI_iXIw" isDerived="true">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IveF0MXOEeWgbp76yZjh7g"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ivf7AMXOEeWgbp76yZjh7g" value="*"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_Me3vwMXOEeWgbp76yZjh7g" name="targetsList" type="_FhN_ABUzEeWsuO0tI_iXIw" isDerived="true">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Me3vwcXOEeWgbp76yZjh7g"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Me3vwsXOEeWgbp76yZjh7g" value="*"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Stereotype" xmi:id="_EqLAEA3REeWIHrhJxYOO3w" name="SModel">
+      <generalization xmi:type="uml:Generalization" xmi:id="_zTmr8JjwEeWQn9V11q-gNA">
+        <general xmi:type="uml:Stereotype" href="platform:/plugin/org.polarsys.esf.core.profile.esfcore/src/main/resources/models/profile/esfcore.profile.uml#_FrK08A3PEeWIHrhJxYOO3w"/>
+      </generalization>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_kJru8BM3EeWOCLsnVbWZoA" name="base_Package" association="_kJru8RM3EeWOCLsnVbWZoA">
+        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_SBStUBi1EeWc7uebO1is2A" name="ownedSBlocksList" type="_IKyAEA3REeWIHrhJxYOO3w" aggregation="composite" isDerived="true" association="_SBTUYBi1EeWc7uebO1is2A">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_SBStURi1EeWc7uebO1is2A"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SBStUhi1EeWc7uebO1is2A" value="*"/>
+      </ownedAttribute>
+      <icon xmi:type="uml:Image" xmi:id="_AsZlIPDtEeWl5aQli56k3w" format="PNG" location="platform:/plugin/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AsZlIfDtEeWl5aQli56k3w" source="image_papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AsZlIvDtEeWl5aQli56k3w" key="image_kind_key" value="icon"/>
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AsZlI_DtEeWl5aQli56k3w" key="image_name_key" value="Icon_SModel"/>
+        </eAnnotations>
+      </icon>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Stereotype" xmi:id="_FgN3QA3REeWIHrhJxYOO3w" name="SPortRole">
+      <generalization xmi:type="uml:Generalization" xmi:id="_fVvicBUyEeWsuO0tI_iXIw" general="_FhN_ABUzEeWsuO0tI_iXIw"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_u6JuQBM_EeWOCLsnVbWZoA" name="base_Port" association="_u6JuQRM_EeWOCLsnVbWZoA">
+        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Port"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_UIsscBi6EeWhPZtBPxjsVg" name="type" type="_BwcZ4A3REeWIHrhJxYOO3w" isDerived="true" association="_UIuhoBi6EeWhPZtBPxjsVg">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_UIsscRi6EeWhPZtBPxjsVg" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UIsschi6EeWhPZtBPxjsVg" value="1"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_UwtusRi6EeWhPZtBPxjsVg" name="usageContext" type="_m_6nIBM1EeWOCLsnVbWZoA" isDerived="true" association="_UwtusBi6EeWhPZtBPxjsVg">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Uwtushi6EeWhPZtBPxjsVg" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Uwtusxi6EeWhPZtBPxjsVg" value="1"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_Y5VjMRi1EeWc7uebO1is2A" name="owner" type="_IKyAEA3REeWIHrhJxYOO3w" isDerived="true" association="_Y5VjMBi1EeWc7uebO1is2A">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Y5VjMhi1EeWc7uebO1is2A" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Y5VjMxi1EeWc7uebO1is2A" value="1"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Stereotype" xmi:id="_IKyAEA3REeWIHrhJxYOO3w" name="SBlock">
+      <generalization xmi:type="uml:Generalization" xmi:id="_Fuoc0JjxEeWQn9V11q-gNA">
+        <general xmi:type="uml:Stereotype" href="platform:/plugin/org.polarsys.esf.core.profile.esfcore/src/main/resources/models/profile/esfcore.profile.uml#_FrK08A3PEeWIHrhJxYOO3w"/>
+      </generalization>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_BGIsoBM3EeWOCLsnVbWZoA" name="base_Class" association="_BGIsoRM3EeWOCLsnVbWZoA">
+        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_9PeEMBi0EeWc7uebO1is2A" name="topBlock">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
+        <defaultValue xmi:type="uml:LiteralBoolean" xmi:id="_F7FwgBi1EeWc7uebO1is2A"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_UObTQBi1EeWc7uebO1is2A" name="ownedSPartsList" type="_m_6nIBM1EeWOCLsnVbWZoA" aggregation="composite" isDerived="true" association="_UOb6UBi1EeWc7uebO1is2A">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_UObTQRi1EeWc7uebO1is2A"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UObTQhi1EeWc7uebO1is2A" value="*"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_Uy55UBi1EeWc7uebO1is2A" name="usagesList" type="_m_6nIBM1EeWOCLsnVbWZoA" isDerived="true" association="_Uy6gYBi1EeWc7uebO1is2A">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Uy55URi1EeWc7uebO1is2A"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Uy55Uhi1EeWc7uebO1is2A" value="*"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_WS8vwBi1EeWc7uebO1is2A" name="ownedSPortsList" type="_BwcZ4A3REeWIHrhJxYOO3w" aggregation="composite" isDerived="true" association="_WS9W0Bi1EeWc7uebO1is2A">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WS8vwRi1EeWc7uebO1is2A"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WS8vwhi1EeWc7uebO1is2A" value="*"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_Y5U8IBi1EeWc7uebO1is2A" name="ownedSPortRolesList" type="_FgN3QA3REeWIHrhJxYOO3w" aggregation="composite" isDerived="true" association="_Y5VjMBi1EeWc7uebO1is2A">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Y5U8IRi1EeWc7uebO1is2A"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Y5U8Ihi1EeWc7uebO1is2A" value="*"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_ZlCLkBi1EeWc7uebO1is2A" name="sConnectorsList" type="_C4-IMA3REeWIHrhJxYOO3w" aggregation="composite" isDerived="true" association="_ZlCyoBi1EeWc7uebO1is2A">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZlCLkRi1EeWc7uebO1is2A"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZlCLkhi1EeWc7uebO1is2A" value="*"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_SBTUYRi1EeWc7uebO1is2A" name="sModel" type="_EqLAEA3REeWIHrhJxYOO3w" isDerived="true" association="_SBTUYBi1EeWc7uebO1is2A">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_SBTUYhi1EeWc7uebO1is2A" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SBTUYxi1EeWc7uebO1is2A" value="1"/>
+      </ownedAttribute>
+      <icon xmi:type="uml:Image" xmi:id="_IIsXkPDtEeWl5aQli56k3w" format="PNG" location="platform:/plugin/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/profile/esfarchitectureconcepts/icon_sblock.png">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IIsXkfDtEeWl5aQli56k3w" source="image_papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IIsXkvDtEeWl5aQli56k3w" key="image_kind_key" value="icon"/>
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IIsXk_DtEeWl5aQli56k3w" key="image_name_key" value="Icon_SBlock"/>
+        </eAnnotations>
+      </icon>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Stereotype" xmi:id="_m_6nIBM1EeWOCLsnVbWZoA" name="SPart">
+      <generalization xmi:type="uml:Generalization" xmi:id="_Ab5X4JjxEeWQn9V11q-gNA">
+        <general xmi:type="uml:Stereotype" href="platform:/plugin/org.polarsys.esf.core.profile.esfcore/src/main/resources/models/profile/esfcore.profile.uml#_FrK08A3PEeWIHrhJxYOO3w"/>
+      </generalization>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_Cn4MMBM3EeWOCLsnVbWZoA" name="base_Property" association="_Cn4MMRM3EeWOCLsnVbWZoA">
+        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_Uy6gYRi1EeWc7uebO1is2A" name="type" type="_IKyAEA3REeWIHrhJxYOO3w" isDerived="true" association="_Uy6gYBi1EeWc7uebO1is2A">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Uy6gYhi1EeWc7uebO1is2A" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Uy6gYxi1EeWc7uebO1is2A" value="1"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_UOb6URi1EeWc7uebO1is2A" name="owner" type="_IKyAEA3REeWIHrhJxYOO3w" isDerived="true" association="_UOb6UBi1EeWc7uebO1is2A">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_UOb6Uhi1EeWc7uebO1is2A" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UOb6Uxi1EeWc7uebO1is2A" value="1"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_UwsgkBi6EeWhPZtBPxjsVg" name="sPortRolesList" type="_FgN3QA3REeWIHrhJxYOO3w" aggregation="shared" isDerived="true" association="_UwtusBi6EeWhPZtBPxjsVg">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_UwsgkRi6EeWhPZtBPxjsVg"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Uwsgkhi6EeWhPZtBPxjsVg" value="*"/>
+      </ownedAttribute>
+      <icon xmi:type="uml:Image" xmi:id="_LFGwQPDrEeWl5aQli56k3w" format="PNG" location="platform:/plugin/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/profile/esfarchitectureconcepts/icon_spart.png">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_LFGwQfDrEeWl5aQli56k3w" source="image_papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_LFGwQvDrEeWl5aQli56k3w" key="image_kind_key" value="icon"/>
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_LFGwQ_DrEeWl5aQli56k3w" key="image_name_key" value="Icon_SPart"/>
+        </eAnnotations>
+      </icon>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Extension" xmi:id="_BGIsoRM3EeWOCLsnVbWZoA" name="E_SBlock_Class1" memberEnd="_BGIsohM3EeWOCLsnVbWZoA _BGIsoBM3EeWOCLsnVbWZoA">
+      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_BGIsohM3EeWOCLsnVbWZoA" name="extension_SBlock" type="_IKyAEA3REeWIHrhJxYOO3w" aggregation="composite" association="_BGIsoRM3EeWOCLsnVbWZoA"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Extension" xmi:id="_BeF5oRM3EeWOCLsnVbWZoA" name="E_SConnector_Connector1" memberEnd="_BeF5ohM3EeWOCLsnVbWZoA _BeF5oBM3EeWOCLsnVbWZoA">
+      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_BeF5ohM3EeWOCLsnVbWZoA" name="extension_SConnector" type="_C4-IMA3REeWIHrhJxYOO3w" aggregation="composite" association="_BeF5oRM3EeWOCLsnVbWZoA"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Extension" xmi:id="_Cn4MMRM3EeWOCLsnVbWZoA" name="E_SPart_Property1" memberEnd="_Cn4MMhM3EeWOCLsnVbWZoA _Cn4MMBM3EeWOCLsnVbWZoA">
+      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_Cn4MMhM3EeWOCLsnVbWZoA" name="extension_SPart" type="_m_6nIBM1EeWOCLsnVbWZoA" aggregation="composite" association="_Cn4MMRM3EeWOCLsnVbWZoA"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Extension" xmi:id="_DY1IARM3EeWOCLsnVbWZoA" name="E_SPort_Port1" memberEnd="_DY1IAhM3EeWOCLsnVbWZoA _DY1IABM3EeWOCLsnVbWZoA">
+      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_DY1IAhM3EeWOCLsnVbWZoA" name="extension_SPort" type="_BwcZ4A3REeWIHrhJxYOO3w" aggregation="composite" association="_DY1IARM3EeWOCLsnVbWZoA"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Extension" xmi:id="_kJru8RM3EeWOCLsnVbWZoA" name="E_SModel_Package1" memberEnd="_kJru8hM3EeWOCLsnVbWZoA _kJru8BM3EeWOCLsnVbWZoA">
+      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_kJru8hM3EeWOCLsnVbWZoA" name="extension_SModel" type="_EqLAEA3REeWIHrhJxYOO3w" aggregation="composite" association="_kJru8RM3EeWOCLsnVbWZoA"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Extension" xmi:id="_u6JuQRM_EeWOCLsnVbWZoA" name="E_SPortRole_Port1" memberEnd="_u6JuQhM_EeWOCLsnVbWZoA _u6JuQBM_EeWOCLsnVbWZoA">
+      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_u6JuQhM_EeWOCLsnVbWZoA" name="extension_SPortRole" type="_FgN3QA3REeWIHrhJxYOO3w" aggregation="composite" association="_u6JuQRM_EeWOCLsnVbWZoA"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Stereotype" xmi:id="_FhN_ABUzEeWsuO0tI_iXIw" name="AbstractSConnectableElement" isAbstract="true">
+      <generalization xmi:type="uml:Generalization" xmi:id="_8DfNMJjwEeWQn9V11q-gNA">
+        <general xmi:type="uml:Stereotype" href="platform:/plugin/org.polarsys.esf.core.profile.esfcore/src/main/resources/models/profile/esfcore.profile.uml#_FrK08A3PEeWIHrhJxYOO3w"/>
+      </generalization>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_TZRaoRi6EeWhPZtBPxjsVg" name="sConnectorsList" type="_C4-IMA3REeWIHrhJxYOO3w" isDerived="true" association="_TZRaoBi6EeWhPZtBPxjsVg">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_TZRaohi6EeWhPZtBPxjsVg"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TZRaoxi6EeWhPZtBPxjsVg" value="*"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_t3mZgMkEEeWJK6fhTpTGAQ" name="sDirection" visibility="public" type="_sfK48MXNEeWgbp76yZjh7g">
+        <defaultValue xmi:type="uml:InstanceValue" xmi:id="_qpxXQPDzEeWl5aQli56k3w" name="INOUT" type="_sfK48MXNEeWgbp76yZjh7g" instance="_sfK488XNEeWgbp76yZjh7g"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_SBTUYBi1EeWc7uebO1is2A" name="sModel_sBlock_1" memberEnd="_SBTUYRi1EeWc7uebO1is2A _SBStUBi1EeWc7uebO1is2A"/>
+    <packagedElement xmi:type="uml:Association" xmi:id="_UOb6UBi1EeWc7uebO1is2A" name="sBlock_sPart_1" memberEnd="_UOb6URi1EeWc7uebO1is2A _UObTQBi1EeWc7uebO1is2A"/>
+    <packagedElement xmi:type="uml:Association" xmi:id="_Uy6gYBi1EeWc7uebO1is2A" name="sBlock_sPart_2" memberEnd="_Uy6gYRi1EeWc7uebO1is2A _Uy55UBi1EeWc7uebO1is2A"/>
+    <packagedElement xmi:type="uml:Association" xmi:id="_WS9W0Bi1EeWc7uebO1is2A" name="sBlock_sPort_1" memberEnd="_WS9W0Ri1EeWc7uebO1is2A _WS8vwBi1EeWc7uebO1is2A"/>
+    <packagedElement xmi:type="uml:Association" xmi:id="_Y5VjMBi1EeWc7uebO1is2A" name="sBlock_sPortRole_1" memberEnd="_Y5VjMRi1EeWc7uebO1is2A _Y5U8IBi1EeWc7uebO1is2A"/>
+    <packagedElement xmi:type="uml:Association" xmi:id="_ZlCyoBi1EeWc7uebO1is2A" name="sBlock_sConnector_1" memberEnd="_ZlCyoRi1EeWc7uebO1is2A _ZlCLkBi1EeWc7uebO1is2A"/>
+    <packagedElement xmi:type="uml:Association" xmi:id="_TZRaoBi6EeWhPZtBPxjsVg" name="sConnector_abstractSConnectableElement_1" memberEnd="_TZRaoRi6EeWhPZtBPxjsVg _TZO-YBi6EeWhPZtBPxjsVg"/>
+    <packagedElement xmi:type="uml:Association" xmi:id="_UIuhoBi6EeWhPZtBPxjsVg" name="sPortRole_sPort_1" memberEnd="_UIuhoRi6EeWhPZtBPxjsVg _UIsscBi6EeWhPZtBPxjsVg"/>
+    <packagedElement xmi:type="uml:Association" xmi:id="_UwtusBi6EeWhPZtBPxjsVg" name="sPart_sPortRole_1" memberEnd="_UwtusRi6EeWhPZtBPxjsVg _UwsgkBi6EeWhPZtBPxjsVg"/>
+    <packagedElement xmi:type="uml:Dependency" xmi:id="_47zDgJjwEeWQn9V11q-gNA" client="_4KUNIA3QEeWIHrhJxYOO3w">
+      <supplier xmi:type="uml:Profile" href="platform:/plugin/org.polarsys.esf.core.profile.esfcore/src/main/resources/models/profile/esfcore.profile.uml#_5CO-gA3OEeWIHrhJxYOO3w"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Enumeration" xmi:id="_sfK48MXNEeWgbp76yZjh7g" name="SDirection">
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_sfK48cXNEeWgbp76yZjh7g" name="IN"/>
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_sfK48sXNEeWgbp76yZjh7g" name="OUT"/>
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_sfK488XNEeWgbp76yZjh7g" name="INOUT"/>
+    </packagedElement>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_2x7ekCx0EeW1r-I29laTnw">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2x8ssCx0EeW1r-I29laTnw" 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 xmi:type="uml:Profile" href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/>
+    </profileApplication>
+  </uml:Profile>
+  <Ecore:EPackage xmi:id="_40S-8Cx0EeW1r-I29laTnw" base_Package="_4KUNIA3QEeWIHrhJxYOO3w" packageName="esfarchitectureconcepts" nsPrefix="ESFArchitectureConcepts" nsURI="http://www.polarsys.org/esf/0.7.0/ESFArchitectureConcepts" basePackage="org.polarsys.esf" prefix="ESFArchitectureConcepts"/>
+</xmi:XMI>
diff --git a/core/releng/org.polarsys.esf.core.releng/feature.xml b/core/releng/org.polarsys.esf.core.releng/feature.xml
index 1d7a8c2..6e72da1 100644
--- a/core/releng/org.polarsys.esf.core.releng/feature.xml
+++ b/core/releng/org.polarsys.esf.core.releng/feature.xml
@@ -158,34 +158,6 @@
          unpack="false"/>
 
    <plugin
-         id="org.polarsys.esf.core.common.metamodel"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.polarsys.esf.core.common.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.polarsys.esf.core.framework"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.polarsys.esf.core.help"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.polarsys.esf.core.profile.esfbehaviours"
          download-size="0"
          install-size="0"
@@ -207,20 +179,6 @@
          unpack="false"/>
 
    <plugin
-         id="org.polarsys.esf.core.rcp"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.polarsys.esf.core.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.polarsys.esf.core.utils"
          download-size="0"
          install-size="0"
@@ -235,13 +193,6 @@
          unpack="false"/>
 
    <plugin
-         id="org.polarsys.esf.core.workspace"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.polarsys.esf.core.diagram.esfarchitectureconcepts"
          download-size="0"
          install-size="0"
diff --git a/core/resources/org.polarsys.esf.core.resources.graphical/.classpath b/core/resources/org.polarsys.esf.core.resources.graphical/.classpath
new file mode 100644
index 0000000..d97031b
--- /dev/null
+++ b/core/resources/org.polarsys.esf.core.resources.graphical/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="output" path="target/classes/"/>
+</classpath>
diff --git a/core/resources/org.polarsys.esf.core.resources.graphical/.project b/core/resources/org.polarsys.esf.core.resources.graphical/.project
new file mode 100644
index 0000000..3917e34
--- /dev/null
+++ b/core/resources/org.polarsys.esf.core.resources.graphical/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.polarsys.esf.core.resources.graphical</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
+	</natures>
+</projectDescription>
diff --git a/core/resources/org.polarsys.esf.core.resources.graphical/.settings/org.eclipse.jdt.core.prefs b/core/resources/org.polarsys.esf.core.resources.graphical/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..f42de36
--- /dev/null
+++ b/core/resources/org.polarsys.esf.core.resources.graphical/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/core/resources/org.polarsys.esf.core.resources.graphical/META-INF/MANIFEST.MF b/core/resources/org.polarsys.esf.core.resources.graphical/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..6d0933b
--- /dev/null
+++ b/core/resources/org.polarsys.esf.core.resources.graphical/META-INF/MANIFEST.MF
@@ -0,0 +1,15 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-Localization: src/main/resources/properties/plugin
+Bundle-SymbolicName: org.polarsys.esf.core.resources.graphical
+Bundle-Version: 0.7.0.qualifier
+Bundle-Activator: org.polarsys.esf.core.resources.graphical.ESFCoreResourcesGraphicalActivator$Implementation
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.emf.common,
+ org.eclipse.emf.common.ui,
+ org.eclipse.emf.ecore
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-ActivationPolicy: lazy
+Bundle-Vendor: %Bundle-Vendor
diff --git a/core/resources/org.polarsys.esf.core.resources.graphical/about.html b/core/resources/org.polarsys.esf.core.resources.graphical/about.html
new file mode 100644
index 0000000..d35d5ae
--- /dev/null
+++ b/core/resources/org.polarsys.esf.core.resources.graphical/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/core/resources/org.polarsys.esf.core.resources.graphical/build.properties b/core/resources/org.polarsys.esf.core.resources.graphical/build.properties
new file mode 100644
index 0000000..b92e0e7
--- /dev/null
+++ b/core/resources/org.polarsys.esf.core.resources.graphical/build.properties
@@ -0,0 +1,6 @@
+source.. = src/main/java/
+output.. = target/classes/
+bin.includes = META-INF/,\
+               .,\
+               src/main/resources/,\
+               about.html
diff --git a/core/resources/org.polarsys.esf.core.resources.graphical/pom.xml b/core/resources/org.polarsys.esf.core.resources.graphical/pom.xml
new file mode 100644
index 0000000..a3cc665
--- /dev/null
+++ b/core/resources/org.polarsys.esf.core.resources.graphical/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" 
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
+  http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  
+  <parent>
+    <groupId>org.polarsys.esf</groupId>
+    <artifactId>esf-infra.core.resources</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+  </parent>
+  
+  <groupId>org.polarsys.esf</groupId>
+  <artifactId>org.polarsys.esf.core.resources.graphical</artifactId>
+  <packaging>eclipse-plugin</packaging>
+  <name>ESF Core Graphical Resources</name>
+  <description>ESF Core Graphical Resources description.</description>
+
+</project>
\ No newline at end of file
diff --git a/core/resources/org.polarsys.esf.core.resources.graphical/src/main/java/org/polarsys/esf/core/resources/graphical/ESFCoreResourcesGraphicalActivator.java b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/java/org/polarsys/esf/core/resources/graphical/ESFCoreResourcesGraphicalActivator.java
new file mode 100644
index 0000000..05b92dc
--- /dev/null
+++ b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/java/org/polarsys/esf/core/resources/graphical/ESFCoreResourcesGraphicalActivator.java
@@ -0,0 +1,123 @@
+/*******************************************************************************
+ * Copyright (c) 2016 ALL4TEC & CEA LIST.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     ALL4TEC & CEA LIST - initial API and implementation
+ ******************************************************************************/
+package org.polarsys.esf.core.resources.graphical;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.common.EMFPlugin;
+import org.eclipse.emf.common.ui.EclipseUIPlugin;
+import org.eclipse.emf.common.util.ResourceLocator;
+
+/**
+ * The activator class controls the plug-in life cycle.
+ *
+ * @author $Author: ymunoz $
+ * @version $Revision: 168 $
+ */
+public class ESFCoreResourcesGraphicalActivator extends EMFPlugin {
+
+    /** The plug-in ID. */
+	public static final String PLUGIN_ID = "org.polarsys.esf.core.resources.graphical"; //$NON-NLS-1$
+
+	/** Keep track of this singleton activator. */
+    private static final ESFCoreResourcesGraphicalActivator INSTANCE =
+        new ESFCoreResourcesGraphicalActivator();
+
+    /** The shared instance of this plugin. */
+    private static Implementation sPlugin = null;
+
+    /**
+     * The default constructor.
+     */
+    public ESFCoreResourcesGraphicalActivator() {
+        super(new ResourceLocator[] {});
+    }
+
+    /**
+     * Returns the singleton instance of the Eclipse plugin.
+     *
+     * @return The singleton instance.
+     */
+    @Override
+    public ResourceLocator getPluginResourceLocator() {
+        return sPlugin;
+    }
+
+    /**
+     * Returns the shared instance.
+     *
+     * @return The shared instance
+     */
+    public static Implementation getPlugin() {
+        return sPlugin;
+    }
+
+    /**
+     * Create an Error status with the data given in parameter and log it.
+     *
+     * @param pMessage The message to log
+     * @param pException The exception to log
+     */
+    public static void logError(final String pMessage, final Exception pException) {
+        // Create the Error status
+        IStatus vStatus = new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR, pMessage, pException);
+
+        // Log it
+        INSTANCE.log(vStatus);
+    }
+
+    /**
+     * Create a Warning status with the data given in parameter and log it.
+     *
+     * @param pMessage The message to log
+     * @param pException The exception to log
+     */
+    public static void logWarning(final String pMessage, final Exception pException) {
+        // Create the Warning status
+        IStatus vStatus = new Status(IStatus.WARNING, PLUGIN_ID, IStatus.WARNING, pMessage, pException);
+
+        // Log it
+        INSTANCE.log(vStatus);
+    }
+
+    /**
+     * Create an Info status with the data given in parameter and log it.
+     *
+     * @param pMessage The message to log
+     * @param pException The exception to log
+     */
+    public static void logInfo(final String pMessage, final Exception pException) {
+        // Create the Info status
+        IStatus vStatus = new Status(IStatus.INFO, PLUGIN_ID, IStatus.INFO, pMessage, pException);
+
+        // Log it
+        INSTANCE.log(vStatus);
+    }
+
+    /**
+     * The actual implementation of the Eclipse <b>UIPlugin</b>.
+     */
+    public static class Implementation
+        extends EclipseUIPlugin {
+
+        /**
+         * Default constructor.
+         */
+        public Implementation() {
+            super();
+
+            // Remember the static instance
+            sPlugin = this;
+        }
+    }
+
+}
+
diff --git a/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/about/logo_about.png b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/about/logo_about.png
new file mode 100644
index 0000000..60f3064
--- /dev/null
+++ b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/about/logo_about.png
Binary files differ
diff --git a/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/files/icon_file.png b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/files/icon_file.png
new file mode 100644
index 0000000..cd0e258
--- /dev/null
+++ b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/files/icon_file.png
Binary files differ
diff --git a/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/files/icon_project.png b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/files/icon_project.png
new file mode 100644
index 0000000..dbec55f
--- /dev/null
+++ b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/files/icon_project.png
Binary files differ
diff --git a/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/files/icon_project_open.png b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/files/icon_project_open.png
new file mode 100644
index 0000000..fe3a8e2
--- /dev/null
+++ b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/files/icon_project_open.png
Binary files differ
diff --git a/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/logos/icon_esf_128x128.png b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/logos/icon_esf_128x128.png
new file mode 100644
index 0000000..3214cc5
--- /dev/null
+++ b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/logos/icon_esf_128x128.png
Binary files differ
diff --git a/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/logos/icon_esf_16x16.png b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/logos/icon_esf_16x16.png
new file mode 100644
index 0000000..ee1e13a
--- /dev/null
+++ b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/logos/icon_esf_16x16.png
Binary files differ
diff --git a/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/logos/icon_esf_256x256.png b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/logos/icon_esf_256x256.png
new file mode 100644
index 0000000..14e5760
--- /dev/null
+++ b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/logos/icon_esf_256x256.png
Binary files differ
diff --git a/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/logos/icon_esf_32x32.png b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/logos/icon_esf_32x32.png
new file mode 100644
index 0000000..6bf2990
--- /dev/null
+++ b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/logos/icon_esf_32x32.png
Binary files differ
diff --git a/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/logos/icon_esf_48x48.png b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/logos/icon_esf_48x48.png
new file mode 100644
index 0000000..385006d
--- /dev/null
+++ b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/logos/icon_esf_48x48.png
Binary files differ
diff --git a/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/logos/icon_esf_64x64.png b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/logos/icon_esf_64x64.png
new file mode 100644
index 0000000..b2e335b
--- /dev/null
+++ b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/logos/icon_esf_64x64.png
Binary files differ
diff --git a/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png
new file mode 100644
index 0000000..1487bee
--- /dev/null
+++ b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png
Binary files differ
diff --git a/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/profile/esfarchitectureconcepts/icon_input_sport.png b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/profile/esfarchitectureconcepts/icon_input_sport.png
new file mode 100644
index 0000000..e422880
--- /dev/null
+++ b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/profile/esfarchitectureconcepts/icon_input_sport.png
Binary files differ
diff --git a/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/profile/esfarchitectureconcepts/icon_output_sport.png b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/profile/esfarchitectureconcepts/icon_output_sport.png
new file mode 100644
index 0000000..9cd4c4b
--- /dev/null
+++ b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/profile/esfarchitectureconcepts/icon_output_sport.png
Binary files differ
diff --git a/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/profile/esfarchitectureconcepts/icon_sblock.png b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/profile/esfarchitectureconcepts/icon_sblock.png
new file mode 100644
index 0000000..5dea976
--- /dev/null
+++ b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/profile/esfarchitectureconcepts/icon_sblock.png
Binary files differ
diff --git a/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/profile/esfarchitectureconcepts/icon_sconnector.png b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/profile/esfarchitectureconcepts/icon_sconnector.png
new file mode 100644
index 0000000..b1a1819
--- /dev/null
+++ b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/profile/esfarchitectureconcepts/icon_sconnector.png
Binary files differ
diff --git a/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png
new file mode 100644
index 0000000..0905f93
--- /dev/null
+++ b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png
Binary files differ
diff --git a/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/profile/esfarchitectureconcepts/icon_spart.png b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/profile/esfarchitectureconcepts/icon_spart.png
new file mode 100644
index 0000000..7851cf3
--- /dev/null
+++ b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/profile/esfarchitectureconcepts/icon_spart.png
Binary files differ
diff --git a/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/views/icon_views_info_log.png b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/views/icon_views_info_log.png
new file mode 100644
index 0000000..12cd1ae
--- /dev/null
+++ b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/views/icon_views_info_log.png
Binary files differ
diff --git a/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/wizards/wizard_project.gif b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/wizards/wizard_project.gif
new file mode 100644
index 0000000..122cab2
--- /dev/null
+++ b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/wizards/wizard_project.gif
Binary files differ
diff --git a/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/properties/plugin.properties b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/properties/plugin.properties
new file mode 100644
index 0000000..95b7866
--- /dev/null
+++ b/core/resources/org.polarsys.esf.core.resources.graphical/src/main/resources/properties/plugin.properties
@@ -0,0 +1,3 @@
+#Properties file for org.polarsys.esf.core.resources.graphical
+Bundle-Name=ESF Core Graphical Resources
+Bundle-Vendor=PolarSys
diff --git a/core/resources/pom.xml b/core/resources/pom.xml
new file mode 100644
index 0000000..05d1d80
--- /dev/null
+++ b/core/resources/pom.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" 
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
+  http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  
+  <!-- PROJECT DESCRIPTION -->
+  <parent>
+    <groupId>org.polarsys.esf</groupId>
+    <artifactId>esf-infra.core</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+  </parent>
+  
+  <groupId>org.polarsys.esf</groupId>
+  <artifactId>esf-infra.core.resources</artifactId>
+  <packaging>pom</packaging>
+  <name>ESF Core Resources</name>
+  <description>ESF Core Resources description.</description>
+  
+  <!-- MODULES -->  
+  <modules>
+    <module>org.polarsys.esf.core.resources.graphical</module>
+  </modules>
+  
+</project>
\ No newline at end of file