diff --git a/core/profile/org.polarsys.esf.core.profile.esfcore/META-INF/MANIFEST.MF b/core/profile/org.polarsys.esf.core.profile.esfcore/META-INF/MANIFEST.MF
index 91456af..c848ec8 100644
--- a/core/profile/org.polarsys.esf.core.profile.esfcore/META-INF/MANIFEST.MF
+++ b/core/profile/org.polarsys.esf.core.profile.esfcore/META-INF/MANIFEST.MF
@@ -1,18 +1,19 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.esf.core.profile.esfcore;singleton:=true
 Bundle-Version: 0.7.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.polarsys.esf.core.profile.esfcore.ESFCoreActivator$Implementation
-Bundle-Vendor: %Bundle-Vendor
-Bundle-Localization: src/main/resources/properties/plugin
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
 Require-Bundle: org.eclipse.uml2.uml;bundle-version="5.1.0",
  org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.0",
  org.eclipse.core.runtime;bundle-version="3.11.1",
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.uml2.types;visibility:=reexport,
- org.eclipse.emf.ecore.xmi;bundle-version="2.11.1";visibility:=reexport
+ org.eclipse.emf.ecore.xmi;bundle-version="2.11.1";visibility:=reexport,
+ org.junit;visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Export-Package: org.polarsys.esf.esfcore,
  org.polarsys.esf.esfcore.impl,
diff --git a/core/profile/org.polarsys.esf.core.profile.esfcore/plugin.xml b/core/profile/org.polarsys.esf.core.profile.esfcore/plugin.xml
index 39c327d..9e41438 100644
--- a/core/profile/org.polarsys.esf.core.profile.esfcore/plugin.xml
+++ b/core/profile/org.polarsys.esf.core.profile.esfcore/plugin.xml
@@ -6,31 +6,6 @@
 
 <plugin>
 
-   <extension
-         point="org.eclipse.emf.ecore.uri_mapping">
-      <mapping
-            source="pathmap://ESFCORE_PROFILE/"
-            target="platform:/plugin/org.polarsys.esf.core.profile.esfcore/src/main/resources/models/profile/">
-      </mapping>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.uml.extensionpoints.UMLProfile">
-      <profile
-            description="UML profile for safety analysis"
-            iconpath="src/main/resources/icons/icon_esfcore_profile.png"
-            name="%esfcore.profile.name"
-            path="pathmap://ESFCORE_PROFILE/esfcore.profile.uml">
-      </profile>
-   </extension>
-   <extension
-         point="org.eclipse.uml2.uml.generated_package">
-      <profile
-            location="pathmap://ESFCORE_PROFILE/esfcore.profile.uml#_5CO-gA3OEeWIHrhJxYOO3w"
-            uri="http://www.polarsys.org/esf/0.7.0/ESFCore">
-      </profile>
-   </extension>
-
-
    <extension point="org.eclipse.emf.ecore.generated_package">
       <!-- @generated esfcore -->
       <package
diff --git a/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/IAbstractSArchitectureElement.java b/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/IAbstractSArchitectureElement.java
index 205070a..994da73 100644
--- a/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/IAbstractSArchitectureElement.java
+++ b/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/IAbstractSArchitectureElement.java
@@ -21,8 +21,8 @@
  * The following features are supported:
  * </p>
  * <ul>
- * <li>{@link org.polarsys.esf.esfcore.IAbstractSArchitectureElement#getSSafetyConceptsList
- * <em>SSafety Concepts List</em>}</li>
+ * <li>{@link org.polarsys.esf.esfcore.IAbstractSArchitectureElement#getSSafetyConceptsList <em>SSafety Concepts
+ * List</em>}</li>
  * </ul>
  *
  * @see org.polarsys.esf.esfcore.IESFCorePackage#getAbstractSArchitectureElement()
@@ -35,9 +35,9 @@
     /**
      * Returns the value of the '<em><b>SSafety Concepts List</b></em>' reference list.
      * The list contents are of type {@link org.polarsys.esf.esfcore.IAbstractSSafetyConcept}.
-     * It is bidirectional and its opposite is '
-     * {@link org.polarsys.esf.esfcore.IAbstractSSafetyConcept#getSArchitectureElementsList
-     * <em>SArchitecture Elements List</em>}'.
+     * It is bidirectional and its opposite is
+     * '{@link org.polarsys.esf.esfcore.IAbstractSSafetyConcept#getSArchitectureElementsList <em>SArchitecture Elements
+     * List</em>}'.
      * <!-- begin-user-doc -->
      * <p>
      * If the meaning of the '<em>SSafety Concepts List</em>' reference list isn't clear,
@@ -48,7 +48,7 @@
      * @return the value of the '<em>SSafety Concepts List</em>' reference list.
      * @see org.polarsys.esf.esfcore.IESFCorePackage#getAbstractSArchitectureElement_SSafetyConceptsList()
      * @see org.polarsys.esf.esfcore.IAbstractSSafetyConcept#getSArchitectureElementsList
-     * @model opposite="sArchitectureElementsList"
+     * @model opposite="sArchitectureElementsList" ordered="false"
      * @generated
      */
     EList<IAbstractSSafetyConcept> getSSafetyConceptsList();
diff --git a/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/IAbstractSRequirement.java b/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/IAbstractSRequirement.java
index 5adad3f..7ecf6cc 100644
--- a/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/IAbstractSRequirement.java
+++ b/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/IAbstractSRequirement.java
@@ -43,7 +43,7 @@
      * 
      * @return the value of the '<em>SElements List</em>' reference list.
      * @see org.polarsys.esf.esfcore.IESFCorePackage#getAbstractSRequirement_SElementsList()
-     * @model
+     * @model ordered="false"
      * @generated
      */
     EList<IAbstractSElement> getSElementsList();
diff --git a/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/IAbstractSSafetyAnalysis.java b/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/IAbstractSSafetyAnalysis.java
index 13c4d86..50a0664 100644
--- a/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/IAbstractSSafetyAnalysis.java
+++ b/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/IAbstractSSafetyAnalysis.java
@@ -21,8 +21,8 @@
  * The following features are supported:
  * </p>
  * <ul>
- * <li>{@link org.polarsys.esf.esfcore.IAbstractSSafetyAnalysis#getSSafetyConceptsList <em>SSafety Concepts List</em>}
- * </li>
+ * <li>{@link org.polarsys.esf.esfcore.IAbstractSSafetyAnalysis#getSSafetyConceptsList <em>SSafety Concepts
+ * List</em>}</li>
  * </ul>
  *
  * @see org.polarsys.esf.esfcore.IESFCorePackage#getAbstractSSafetyAnalysis()
@@ -44,7 +44,7 @@
      * 
      * @return the value of the '<em>SSafety Concepts List</em>' reference list.
      * @see org.polarsys.esf.esfcore.IESFCorePackage#getAbstractSSafetyAnalysis_SSafetyConceptsList()
-     * @model required="true"
+     * @model ordered="false"
      * @generated
      */
     EList<IAbstractSSafetyConcept> getSSafetyConceptsList();
diff --git a/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/IAbstractSSafetyConcept.java b/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/IAbstractSSafetyConcept.java
index a0854a4..d305c46 100644
--- a/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/IAbstractSSafetyConcept.java
+++ b/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/IAbstractSSafetyConcept.java
@@ -21,8 +21,8 @@
  * The following features are supported:
  * </p>
  * <ul>
- * <li>{@link org.polarsys.esf.esfcore.IAbstractSSafetyConcept#getSArchitectureElementsList
- * <em>SArchitecture Elements List</em>}</li>
+ * <li>{@link org.polarsys.esf.esfcore.IAbstractSSafetyConcept#getSArchitectureElementsList <em>SArchitecture Elements
+ * List</em>}</li>
  * </ul>
  *
  * @see org.polarsys.esf.esfcore.IESFCorePackage#getAbstractSSafetyConcept()
@@ -35,9 +35,9 @@
     /**
      * Returns the value of the '<em><b>SArchitecture Elements List</b></em>' reference list.
      * The list contents are of type {@link org.polarsys.esf.esfcore.IAbstractSArchitectureElement}.
-     * It is bidirectional and its opposite is '
-     * {@link org.polarsys.esf.esfcore.IAbstractSArchitectureElement#getSSafetyConceptsList
-     * <em>SSafety Concepts List</em>}'.
+     * It is bidirectional and its opposite is
+     * '{@link org.polarsys.esf.esfcore.IAbstractSArchitectureElement#getSSafetyConceptsList <em>SSafety Concepts
+     * List</em>}'.
      * <!-- begin-user-doc -->
      * <p>
      * If the meaning of the '<em>SArchitecture Elements List</em>' reference list isn't clear,
@@ -48,7 +48,7 @@
      * @return the value of the '<em>SArchitecture Elements List</em>' reference list.
      * @see org.polarsys.esf.esfcore.IESFCorePackage#getAbstractSSafetyConcept_SArchitectureElementsList()
      * @see org.polarsys.esf.esfcore.IAbstractSArchitectureElement#getSSafetyConceptsList
-     * @model opposite="sSafetyConceptsList"
+     * @model opposite="sSafetyConceptsList" ordered="false"
      * @generated
      */
     EList<IAbstractSArchitectureElement> getSArchitectureElementsList();
diff --git a/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/IESFCorePackage.java b/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/IESFCorePackage.java
index f1871fa..e2f4aa4 100644
--- a/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/IESFCorePackage.java
+++ b/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/IESFCorePackage.java
@@ -135,8 +135,8 @@
     int ABSTRACT_SELEMENT_OPERATION_COUNT = 0;
 
     /**
-     * The meta object id for the '{@link org.polarsys.esf.esfcore.impl.AbstractSArchitectureElement
-     * <em>Abstract SArchitecture Element</em>}' class.
+     * The meta object id for the '{@link org.polarsys.esf.esfcore.impl.AbstractSArchitectureElement <em>Abstract
+     * SArchitecture Element</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * 
@@ -207,8 +207,8 @@
     int ABSTRACT_SARCHITECTURE_ELEMENT_OPERATION_COUNT = ABSTRACT_SELEMENT_OPERATION_COUNT + 0;
 
     /**
-     * The meta object id for the '{@link org.polarsys.esf.esfcore.impl.AbstractSSafetyConcept
-     * <em>Abstract SSafety Concept</em>}' class.
+     * The meta object id for the '{@link org.polarsys.esf.esfcore.impl.AbstractSSafetyConcept <em>Abstract SSafety
+     * Concept</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * 
@@ -279,8 +279,8 @@
     int ABSTRACT_SSAFETY_CONCEPT_OPERATION_COUNT = ABSTRACT_SELEMENT_OPERATION_COUNT + 0;
 
     /**
-     * The meta object id for the '{@link org.polarsys.esf.esfcore.impl.AbstractSSafetyAnalysis
-     * <em>Abstract SSafety Analysis</em>}' class.
+     * The meta object id for the '{@link org.polarsys.esf.esfcore.impl.AbstractSSafetyAnalysis <em>Abstract SSafety
+     * Analysis</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * 
@@ -351,8 +351,8 @@
     int ABSTRACT_SSAFETY_ANALYSIS_OPERATION_COUNT = ABSTRACT_SELEMENT_OPERATION_COUNT + 0;
 
     /**
-     * The meta object id for the '{@link org.polarsys.esf.esfcore.impl.AbstractSRequirement
-     * <em>Abstract SRequirement</em>}' class.
+     * The meta object id for the '{@link org.polarsys.esf.esfcore.impl.AbstractSRequirement <em>Abstract
+     * SRequirement</em>}' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * 
@@ -423,8 +423,8 @@
     int ABSTRACT_SREQUIREMENT_OPERATION_COUNT = ABSTRACT_SELEMENT_OPERATION_COUNT + 0;
 
     /**
-     * Returns the meta object for class '{@link org.polarsys.esf.esfcore.IAbstractSElement <em>Abstract SElement</em>}
-     * '.
+     * Returns the meta object for class '{@link org.polarsys.esf.esfcore.IAbstractSElement <em>Abstract
+     * SElement</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * 
@@ -474,8 +474,8 @@
     EAttribute getAbstractSElement_Description();
 
     /**
-     * Returns the meta object for class '{@link org.polarsys.esf.esfcore.IAbstractSArchitectureElement
-     * <em>Abstract SArchitecture Element</em>}'.
+     * Returns the meta object for class '{@link org.polarsys.esf.esfcore.IAbstractSArchitectureElement <em>Abstract
+     * SArchitecture Element</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * 
@@ -486,9 +486,9 @@
     EClass getAbstractSArchitectureElement();
 
     /**
-     * Returns the meta object for the reference list '
-     * {@link org.polarsys.esf.esfcore.IAbstractSArchitectureElement#getSSafetyConceptsList
-     * <em>SSafety Concepts List</em>}'.
+     * Returns the meta object for the reference list
+     * '{@link org.polarsys.esf.esfcore.IAbstractSArchitectureElement#getSSafetyConceptsList <em>SSafety Concepts
+     * List</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * 
@@ -500,8 +500,8 @@
     EReference getAbstractSArchitectureElement_SSafetyConceptsList();
 
     /**
-     * Returns the meta object for class '{@link org.polarsys.esf.esfcore.IAbstractSSafetyConcept
-     * <em>Abstract SSafety Concept</em>}'.
+     * Returns the meta object for class '{@link org.polarsys.esf.esfcore.IAbstractSSafetyConcept <em>Abstract SSafety
+     * Concept</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * 
@@ -512,9 +512,9 @@
     EClass getAbstractSSafetyConcept();
 
     /**
-     * Returns the meta object for the reference list '
-     * {@link org.polarsys.esf.esfcore.IAbstractSSafetyConcept#getSArchitectureElementsList
-     * <em>SArchitecture Elements List</em>}'.
+     * Returns the meta object for the reference list
+     * '{@link org.polarsys.esf.esfcore.IAbstractSSafetyConcept#getSArchitectureElementsList <em>SArchitecture Elements
+     * List</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * 
@@ -526,8 +526,8 @@
     EReference getAbstractSSafetyConcept_SArchitectureElementsList();
 
     /**
-     * Returns the meta object for class '{@link org.polarsys.esf.esfcore.IAbstractSSafetyAnalysis
-     * <em>Abstract SSafety Analysis</em>}'.
+     * Returns the meta object for class '{@link org.polarsys.esf.esfcore.IAbstractSSafetyAnalysis <em>Abstract SSafety
+     * Analysis</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * 
@@ -538,8 +538,9 @@
     EClass getAbstractSSafetyAnalysis();
 
     /**
-     * Returns the meta object for the reference list '
-     * {@link org.polarsys.esf.esfcore.IAbstractSSafetyAnalysis#getSSafetyConceptsList <em>SSafety Concepts List</em>}'.
+     * Returns the meta object for the reference list
+     * '{@link org.polarsys.esf.esfcore.IAbstractSSafetyAnalysis#getSSafetyConceptsList <em>SSafety Concepts
+     * List</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * 
@@ -551,8 +552,8 @@
     EReference getAbstractSSafetyAnalysis_SSafetyConceptsList();
 
     /**
-     * Returns the meta object for class '{@link org.polarsys.esf.esfcore.IAbstractSRequirement
-     * <em>Abstract SRequirement</em>}'.
+     * Returns the meta object for class '{@link org.polarsys.esf.esfcore.IAbstractSRequirement <em>Abstract
+     * SRequirement</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * 
@@ -563,8 +564,8 @@
     EClass getAbstractSRequirement();
 
     /**
-     * Returns the meta object for the reference list '
-     * {@link org.polarsys.esf.esfcore.IAbstractSRequirement#getSElementsList <em>SElements List</em>}'.
+     * Returns the meta object for the reference list
+     * '{@link org.polarsys.esf.esfcore.IAbstractSRequirement#getSElementsList <em>SElements List</em>}'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * 
@@ -602,8 +603,8 @@
     interface Literals {
 
         /**
-         * The meta object literal for the '{@link org.polarsys.esf.esfcore.impl.AbstractSElement
-         * <em>Abstract SElement</em>}' class.
+         * The meta object literal for the '{@link org.polarsys.esf.esfcore.impl.AbstractSElement <em>Abstract
+         * SElement</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * 
@@ -663,8 +664,8 @@
             eINSTANCE.getAbstractSArchitectureElement_SSafetyConceptsList();
 
         /**
-         * The meta object literal for the '{@link org.polarsys.esf.esfcore.impl.AbstractSSafetyConcept
-         * <em>Abstract SSafety Concept</em>}' class.
+         * The meta object literal for the '{@link org.polarsys.esf.esfcore.impl.AbstractSSafetyConcept <em>Abstract
+         * SSafety Concept</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * 
@@ -685,8 +686,8 @@
             eINSTANCE.getAbstractSSafetyConcept_SArchitectureElementsList();
 
         /**
-         * The meta object literal for the '{@link org.polarsys.esf.esfcore.impl.AbstractSSafetyAnalysis
-         * <em>Abstract SSafety Analysis</em>}' class.
+         * The meta object literal for the '{@link org.polarsys.esf.esfcore.impl.AbstractSSafetyAnalysis <em>Abstract
+         * SSafety Analysis</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * 
@@ -707,8 +708,8 @@
             eINSTANCE.getAbstractSSafetyAnalysis_SSafetyConceptsList();
 
         /**
-         * The meta object literal for the '{@link org.polarsys.esf.esfcore.impl.AbstractSRequirement
-         * <em>Abstract SRequirement</em>}' class.
+         * The meta object literal for the '{@link org.polarsys.esf.esfcore.impl.AbstractSRequirement <em>Abstract
+         * SRequirement</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * 
diff --git a/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/impl/AbstractSArchitectureElement.java b/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/impl/AbstractSArchitectureElement.java
index 139ced6..6f6f4cd 100644
--- a/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/impl/AbstractSArchitectureElement.java
+++ b/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/impl/AbstractSArchitectureElement.java
@@ -34,8 +34,8 @@
  * The following features are implemented:
  * </p>
  * <ul>
- * <li>{@link org.polarsys.esf.esfcore.impl.AbstractSArchitectureElement#getSSafetyConceptsList
- * <em>SSafety Concepts List</em>}</li>
+ * <li>{@link org.polarsys.esf.esfcore.impl.AbstractSArchitectureElement#getSSafetyConceptsList <em>SSafety Concepts
+ * List</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/impl/AbstractSElement.java b/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/impl/AbstractSElement.java
index 383677c..2f832b4 100644
--- a/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/impl/AbstractSElement.java
+++ b/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/impl/AbstractSElement.java
@@ -194,12 +194,13 @@
         String oldDescription = description;
         description = newDescription;
         if (eNotificationRequired())
-            eNotify(new ENotificationImpl(
-                this,
-                Notification.SET,
-                IESFCorePackage.ABSTRACT_SELEMENT__DESCRIPTION,
-                oldDescription,
-                description));
+            eNotify(
+                new ENotificationImpl(
+                    this,
+                    Notification.SET,
+                    IESFCorePackage.ABSTRACT_SELEMENT__DESCRIPTION,
+                    oldDescription,
+                    description));
     }
 
     /**
diff --git a/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/impl/AbstractSSafetyAnalysis.java b/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/impl/AbstractSSafetyAnalysis.java
index d2348bf..eb71cbd 100644
--- a/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/impl/AbstractSSafetyAnalysis.java
+++ b/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/impl/AbstractSSafetyAnalysis.java
@@ -30,8 +30,8 @@
  * The following features are implemented:
  * </p>
  * <ul>
- * <li>{@link org.polarsys.esf.esfcore.impl.AbstractSSafetyAnalysis#getSSafetyConceptsList
- * <em>SSafety Concepts List</em>}</li>
+ * <li>{@link org.polarsys.esf.esfcore.impl.AbstractSSafetyAnalysis#getSSafetyConceptsList <em>SSafety Concepts
+ * List</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/impl/AbstractSSafetyConcept.java b/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/impl/AbstractSSafetyConcept.java
index 6113797..409e051 100644
--- a/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/impl/AbstractSSafetyConcept.java
+++ b/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/impl/AbstractSSafetyConcept.java
@@ -30,8 +30,8 @@
  * The following features are implemented:
  * </p>
  * <ul>
- * <li>{@link org.polarsys.esf.esfcore.impl.AbstractSSafetyConcept#getSArchitectureElementsList
- * <em>SArchitecture Elements List</em>}</li>
+ * <li>{@link org.polarsys.esf.esfcore.impl.AbstractSSafetyConcept#getSArchitectureElementsList <em>SArchitecture
+ * Elements List</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/impl/ESFCorePackage.java b/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/impl/ESFCorePackage.java
index 81b8b9d..09c3597 100644
--- a/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/impl/ESFCorePackage.java
+++ b/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/impl/ESFCorePackage.java
@@ -440,7 +440,7 @@
             !IS_UNSETTABLE,
             IS_UNIQUE,
             !IS_DERIVED,
-            IS_ORDERED);
+            !IS_ORDERED);
 
         initEClass(
             abstractSSafetyConceptEClass,
@@ -466,7 +466,7 @@
             !IS_UNSETTABLE,
             IS_UNIQUE,
             !IS_DERIVED,
-            IS_ORDERED);
+            !IS_ORDERED);
 
         initEClass(
             abstractSSafetyAnalysisEClass,
@@ -481,7 +481,7 @@
             null,
             "sSafetyConceptsList", //$NON-NLS-1$
             null,
-            1,
+            0,
             -1,
             IAbstractSSafetyAnalysis.class,
             !IS_TRANSIENT,
@@ -492,7 +492,7 @@
             !IS_UNSETTABLE,
             IS_UNIQUE,
             !IS_DERIVED,
-            IS_ORDERED);
+            !IS_ORDERED);
 
         initEClass(
             abstractSRequirementEClass,
@@ -518,7 +518,7 @@
             !IS_UNSETTABLE,
             IS_UNIQUE,
             !IS_DERIVED,
-            IS_ORDERED);
+            !IS_ORDERED);
 
         // Create resource
         createResource(eNS_URI);
diff --git a/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/util/ESFCoreAdapterFactory.java b/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/util/ESFCoreAdapterFactory.java
index d6ac25f..f81b706 100644
--- a/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/util/ESFCoreAdapterFactory.java
+++ b/core/profile/org.polarsys.esf.core.profile.esfcore/src-gen/main/java/org/polarsys/esf/esfcore/util/ESFCoreAdapterFactory.java
@@ -129,8 +129,8 @@
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link org.polarsys.esf.esfcore.IAbstractSElement
-     * <em>Abstract SElement</em>}'.
+     * Creates a new adapter for an object of class '{@link org.polarsys.esf.esfcore.IAbstractSElement <em>Abstract
+     * SElement</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
@@ -193,8 +193,8 @@
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link org.polarsys.esf.esfcore.IAbstractSRequirement
-     * <em>Abstract SRequirement</em>}'.
+     * Creates a new adapter for an object of class '{@link org.polarsys.esf.esfcore.IAbstractSRequirement <em>Abstract
+     * SRequirement</em>}'.
      * <!-- begin-user-doc -->
      * This default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases anyway.
diff --git a/core/profile/org.polarsys.esf.core.profile.esfcore/src/main/resources/models/genmodel/esfcore.ecore b/core/profile/org.polarsys.esf.core.profile.esfcore/src/main/resources/models/genmodel/esfcore.ecore
index dfbc5eb..f1422de 100644
--- a/core/profile/org.polarsys.esf.core.profile.esfcore/src/main/resources/models/genmodel/esfcore.ecore
+++ b/core/profile/org.polarsys.esf.core.profile.esfcore/src/main/resources/models/genmodel/esfcore.ecore
@@ -14,22 +14,22 @@
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="AbstractSArchitectureElement" abstract="true"
       eSuperTypes="#//AbstractSElement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="sSafetyConceptsList" upperBound="-1"
-        eType="#//AbstractSSafetyConcept" eOpposite="#//AbstractSSafetyConcept/sArchitectureElementsList"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="sSafetyConceptsList" ordered="false"
+        upperBound="-1" eType="#//AbstractSSafetyConcept" eOpposite="#//AbstractSSafetyConcept/sArchitectureElementsList"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="AbstractSSafetyConcept" abstract="true"
       eSuperTypes="#//AbstractSElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="sArchitectureElementsList"
-        upperBound="-1" eType="#//AbstractSArchitectureElement" eOpposite="#//AbstractSArchitectureElement/sSafetyConceptsList"/>
+        ordered="false" upperBound="-1" eType="#//AbstractSArchitectureElement" eOpposite="#//AbstractSArchitectureElement/sSafetyConceptsList"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="AbstractSSafetyAnalysis" abstract="true"
       eSuperTypes="#//AbstractSElement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="sSafetyConceptsList" lowerBound="1"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="sSafetyConceptsList" ordered="false"
         upperBound="-1" eType="#//AbstractSSafetyConcept"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="AbstractSRequirement" abstract="true"
       eSuperTypes="#//AbstractSElement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="sElementsList" upperBound="-1"
-        eType="#//AbstractSElement"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="sElementsList" ordered="false"
+        upperBound="-1" eType="#//AbstractSElement"/>
   </eClassifiers>
 </ecore:EPackage>
diff --git a/core/profile/org.polarsys.esf.core.profile.esfcore/src/main/resources/models/profile/esfcore.profile.notation b/core/profile/org.polarsys.esf.core.profile.esfcore/src/main/resources/models/profile/esfcore.profile.notation
index b0f50b4..af3b6eb 100644
--- a/core/profile/org.polarsys.esf.core.profile.esfcore/src/main/resources/models/profile/esfcore.profile.notation
+++ b/core/profile/org.polarsys.esf.core.profile.esfcore/src/main/resources/models/profile/esfcore.profile.notation
@@ -1,301 +1,301 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" xmi:id="_ArrcIA3PEeWIHrhJxYOO3w" type="PapyrusUMLProfileDiagram" name="ESFCore ProfileDiagram" measurementUnit="Pixel">
-  <children xmi:type="notation:Shape" xmi:id="_pgslcBUwEeWsuO0tI_iXIw" type="1030" fillColor="12621752">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_K5-eUBUxEeWsuO0tI_iXIw" source="PapyrusCSSForceValue">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_K5-eURUxEeWsuO0tI_iXIw" key="fillColor" value="true"/>
-    </eAnnotations>
-    <children xmi:type="notation:DecorationNode" xmi:id="_pgslchUwEeWsuO0tI_iXIw" type="1047"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_pgslcxUwEeWsuO0tI_iXIw" type="1042">
-      <children xmi:type="notation:Shape" xmi:id="_2RnTMBUwEeWsuO0tI_iXIw" type="1023">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_K5-eUhUxEeWsuO0tI_iXIw" source="PapyrusCSSForceValue">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_K5-eUxUxEeWsuO0tI_iXIw" key="fillColor" value="true"/>
-        </eAnnotations>
-        <children xmi:type="notation:DecorationNode" xmi:id="_2RnTMhUwEeWsuO0tI_iXIw" type="1046"/>
-        <children xmi:type="notation:BasicCompartment" xmi:id="_2RnTMxUwEeWsuO0tI_iXIw" type="1052">
-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_w2xc0BZ9EeWk6K24hE6izQ" source="PapyrusCSSForceValue">
-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_w2xc0RZ9EeWk6K24hE6izQ" key="visible" value="true"/>
-          </eAnnotations>
-          <children xmi:type="notation:Shape" xmi:id="_FU5t4BZ-EeWk6K24hE6izQ" type="3002">
-            <styles xmi:type="notation:StringListValueStyle" xmi:id="_TFV-8BZ-EeWk6K24hE6izQ" name="maskLabel">
-              <stringListValue>name</stringListValue>
-              <stringListValue>derived</stringListValue>
-              <stringListValue>multiplicity</stringListValue>
-              <stringListValue>type</stringListValue>
-            </styles>
-            <element xmi:type="uml:Property" href="esfcore.profile.uml#_FU2DgBZ-EeWk6K24hE6izQ"/>
-            <layoutConstraint xmi:type="notation:Location" xmi:id="_FU5t4RZ-EeWk6K24hE6izQ"/>
-          </children>
-          <children xmi:type="notation:Shape" xmi:id="_QqCaIBZ-EeWk6K24hE6izQ" type="3002">
-            <styles xmi:type="notation:StringListValueStyle" xmi:id="_UpD0cBZ-EeWk6K24hE6izQ" name="maskLabel">
-              <stringListValue>name</stringListValue>
-              <stringListValue>derived</stringListValue>
-              <stringListValue>multiplicity</stringListValue>
-              <stringListValue>type</stringListValue>
-            </styles>
-            <element xmi:type="uml:Property" href="esfcore.profile.uml#_Qp-IsBZ-EeWk6K24hE6izQ"/>
-            <layoutConstraint xmi:type="notation:Location" xmi:id="_QqCaIRZ-EeWk6K24hE6izQ"/>
-          </children>
-          <children xmi:type="notation:Shape" xmi:id="_a73PQBZ-EeWk6K24hE6izQ" type="3002">
-            <styles xmi:type="notation:StringListValueStyle" xmi:id="_mTOwIBZ-EeWk6K24hE6izQ" name="maskLabel">
-              <stringListValue>name</stringListValue>
-              <stringListValue>derived</stringListValue>
-              <stringListValue>multiplicity</stringListValue>
-              <stringListValue>type</stringListValue>
-            </styles>
-            <element xmi:type="uml:Property" href="esfcore.profile.uml#_a70zABZ-EeWk6K24hE6izQ"/>
-            <layoutConstraint xmi:type="notation:Location" xmi:id="_a73PQRZ-EeWk6K24hE6izQ"/>
-          </children>
-          <styles xmi:type="notation:TitleStyle" xmi:id="_2RnTNBUwEeWsuO0tI_iXIw"/>
-          <styles xmi:type="notation:SortingStyle" xmi:id="_2RnTNRUwEeWsuO0tI_iXIw"/>
-          <styles xmi:type="notation:FilteringStyle" xmi:id="_2RnTNhUwEeWsuO0tI_iXIw"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2RnTNxUwEeWsuO0tI_iXIw"/>
-        </children>
-        <children xmi:type="notation:BasicCompartment" xmi:id="_2RnTOBUwEeWsuO0tI_iXIw" visible="false" type="1053">
-          <styles xmi:type="notation:TitleStyle" xmi:id="_2RnTORUwEeWsuO0tI_iXIw"/>
-          <styles xmi:type="notation:SortingStyle" xmi:id="_2RnTOhUwEeWsuO0tI_iXIw"/>
-          <styles xmi:type="notation:FilteringStyle" xmi:id="_2RnTOxUwEeWsuO0tI_iXIw"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2RnTPBUwEeWsuO0tI_iXIw"/>
-        </children>
-        <element xmi:type="uml:Stereotype" href="esfcore.profile.uml#_CzxxEA3PEeWIHrhJxYOO3w"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2RnTMRUwEeWsuO0tI_iXIw" x="430" y="48" width="220"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_2u66QBUwEeWsuO0tI_iXIw" type="1023">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_K5-eVBUxEeWsuO0tI_iXIw" source="PapyrusCSSForceValue">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_K5-eVRUxEeWsuO0tI_iXIw" key="fillColor" value="true"/>
-        </eAnnotations>
-        <children xmi:type="notation:DecorationNode" xmi:id="_2vErQRUwEeWsuO0tI_iXIw" type="1046"/>
-        <children xmi:type="notation:BasicCompartment" xmi:id="_2vErQhUwEeWsuO0tI_iXIw" visible="false" type="1052">
-          <styles xmi:type="notation:TitleStyle" xmi:id="_2vErQxUwEeWsuO0tI_iXIw"/>
-          <styles xmi:type="notation:SortingStyle" xmi:id="_2vErRBUwEeWsuO0tI_iXIw"/>
-          <styles xmi:type="notation:FilteringStyle" xmi:id="_2vErRRUwEeWsuO0tI_iXIw"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2vErRhUwEeWsuO0tI_iXIw"/>
-        </children>
-        <children xmi:type="notation:BasicCompartment" xmi:id="_2vErRxUwEeWsuO0tI_iXIw" visible="false" type="1053">
-          <styles xmi:type="notation:TitleStyle" xmi:id="_2vErSBUwEeWsuO0tI_iXIw"/>
-          <styles xmi:type="notation:SortingStyle" xmi:id="_2vErSRUwEeWsuO0tI_iXIw"/>
-          <styles xmi:type="notation:FilteringStyle" xmi:id="_2vErShUwEeWsuO0tI_iXIw"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2vErSxUwEeWsuO0tI_iXIw"/>
-        </children>
-        <element xmi:type="uml:Stereotype" href="esfcore.profile.uml#_FrK08A3PEeWIHrhJxYOO3w"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2vErQBUwEeWsuO0tI_iXIw" x="69" y="261" width="220"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_3M-IMBUwEeWsuO0tI_iXIw" type="1023">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_K5-eVhUxEeWsuO0tI_iXIw" source="PapyrusCSSForceValue">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_K6IPUBUxEeWsuO0tI_iXIw" key="fillColor" value="true"/>
-        </eAnnotations>
-        <children xmi:type="notation:DecorationNode" xmi:id="_3M-IMhUwEeWsuO0tI_iXIw" type="1046"/>
-        <children xmi:type="notation:BasicCompartment" xmi:id="_3M-IMxUwEeWsuO0tI_iXIw" visible="false" type="1052">
-          <styles xmi:type="notation:TitleStyle" xmi:id="_3M-INBUwEeWsuO0tI_iXIw"/>
-          <styles xmi:type="notation:SortingStyle" xmi:id="_3M-INRUwEeWsuO0tI_iXIw"/>
-          <styles xmi:type="notation:FilteringStyle" xmi:id="_3M-INhUwEeWsuO0tI_iXIw"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3M-INxUwEeWsuO0tI_iXIw"/>
-        </children>
-        <children xmi:type="notation:BasicCompartment" xmi:id="_3M-IOBUwEeWsuO0tI_iXIw" visible="false" type="1053">
-          <styles xmi:type="notation:TitleStyle" xmi:id="_3M-IORUwEeWsuO0tI_iXIw"/>
-          <styles xmi:type="notation:SortingStyle" xmi:id="_3M-IOhUwEeWsuO0tI_iXIw"/>
-          <styles xmi:type="notation:FilteringStyle" xmi:id="_3M-IOxUwEeWsuO0tI_iXIw"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3M-IPBUwEeWsuO0tI_iXIw"/>
-        </children>
-        <element xmi:type="uml:Stereotype" href="esfcore.profile.uml#_Urtb8A3PEeWIHrhJxYOO3w"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3M-IMRUwEeWsuO0tI_iXIw" x="434" y="261" width="220"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_3jcHcBUwEeWsuO0tI_iXIw" type="1023">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NmjZUBUxEeWsuO0tI_iXIw" source="PapyrusCSSForceValue">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NmjZURUxEeWsuO0tI_iXIw" key="fillColor" value="true"/>
-        </eAnnotations>
-        <children xmi:type="notation:DecorationNode" xmi:id="_3jcHchUwEeWsuO0tI_iXIw" type="1046"/>
-        <children xmi:type="notation:BasicCompartment" xmi:id="_3jcHcxUwEeWsuO0tI_iXIw" visible="false" type="1052">
-          <styles xmi:type="notation:TitleStyle" xmi:id="_3jcHdBUwEeWsuO0tI_iXIw"/>
-          <styles xmi:type="notation:SortingStyle" xmi:id="_3jcHdRUwEeWsuO0tI_iXIw"/>
-          <styles xmi:type="notation:FilteringStyle" xmi:id="_3jcHdhUwEeWsuO0tI_iXIw"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3jcHdxUwEeWsuO0tI_iXIw"/>
-        </children>
-        <children xmi:type="notation:BasicCompartment" xmi:id="_3jcHeBUwEeWsuO0tI_iXIw" visible="false" type="1053">
-          <styles xmi:type="notation:TitleStyle" xmi:id="_3jcHeRUwEeWsuO0tI_iXIw"/>
-          <styles xmi:type="notation:SortingStyle" xmi:id="_3jcHehUwEeWsuO0tI_iXIw"/>
-          <styles xmi:type="notation:FilteringStyle" xmi:id="_3jcHexUwEeWsuO0tI_iXIw"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3jcHfBUwEeWsuO0tI_iXIw"/>
-        </children>
-        <element xmi:type="uml:Stereotype" href="esfcore.profile.uml#_dAMaoA3PEeWIHrhJxYOO3w"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3jcHcRUwEeWsuO0tI_iXIw" x="750" y="261" width="220"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_6zPUkI0vEeWHTsP20wwFZA" type="1023">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__6lo4I0vEeWHTsP20wwFZA" source="PapyrusCSSForceValue">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__6lo4Y0vEeWHTsP20wwFZA" key="fillColor" value="true"/>
-        </eAnnotations>
-        <children xmi:type="notation:DecorationNode" xmi:id="_6zUNEI0vEeWHTsP20wwFZA" type="1046"/>
-        <children xmi:type="notation:BasicCompartment" xmi:id="_6zUNEY0vEeWHTsP20wwFZA" visible="false" type="1052">
-          <styles xmi:type="notation:TitleStyle" xmi:id="_6zUNEo0vEeWHTsP20wwFZA"/>
-          <styles xmi:type="notation:SortingStyle" xmi:id="_6zUNE40vEeWHTsP20wwFZA"/>
-          <styles xmi:type="notation:FilteringStyle" xmi:id="_6zUNFI0vEeWHTsP20wwFZA"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6zUNFY0vEeWHTsP20wwFZA"/>
-        </children>
-        <children xmi:type="notation:BasicCompartment" xmi:id="_6zUNFo0vEeWHTsP20wwFZA" visible="false" type="1053">
-          <styles xmi:type="notation:TitleStyle" xmi:id="_6zUNF40vEeWHTsP20wwFZA"/>
-          <styles xmi:type="notation:SortingStyle" xmi:id="_6zUNGI0vEeWHTsP20wwFZA"/>
-          <styles xmi:type="notation:FilteringStyle" xmi:id="_6zUNGY0vEeWHTsP20wwFZA"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6zUNGo0vEeWHTsP20wwFZA"/>
-        </children>
-        <element xmi:type="uml:Stereotype" href="esfcore.profile.uml#_6yz2wI0vEeWHTsP20wwFZA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6zPUkY0vEeWHTsP20wwFZA" x="825" y="56" width="220" height="100"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_pgsldBUwEeWsuO0tI_iXIw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pgsldRUwEeWsuO0tI_iXIw"/>
-    </children>
-    <element xmi:type="uml:Profile" href="esfcore.profile.uml#_5CO-gA3OEeWIHrhJxYOO3w"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pgslcRUwEeWsuO0tI_iXIw" x="72" y="43" width="1072" height="612"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_vE2hsCVvEeW1r-I29laTnw" type="StereotypeComment">
-    <styles xmi:type="notation:TitleStyle" xmi:id="_vE2hsSVvEeW1r-I29laTnw" showTitle="true"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vE3IwCVvEeW1r-I29laTnw" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Profile" href="esfcore.profile.uml#_5CO-gA3OEeWIHrhJxYOO3w"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vE2hsiVvEeW1r-I29laTnw" x="272" y="43"/>
-  </children>
-  <styles xmi:type="notation:StringValueStyle" xmi:id="_ArrcIQ3PEeWIHrhJxYOO3w" name="diagram_compatibility_version" stringValue="1.1.0"/>
-  <styles xmi:type="notation:DiagramStyle" xmi:id="_ArrcIg3PEeWIHrhJxYOO3w"/>
-  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_ArrcIw3PEeWIHrhJxYOO3w">
-    <owner xmi:type="uml:Profile" href="esfcore.profile.uml#_5CO-gA3OEeWIHrhJxYOO3w"/>
-  </styles>
-  <element xmi:type="uml:Profile" href="esfcore.profile.uml#_5CO-gA3OEeWIHrhJxYOO3w"/>
-  <edges xmi:type="notation:Connector" xmi:id="_5xhIkBUwEeWsuO0tI_iXIw" type="4002" source="_2u66QBUwEeWsuO0tI_iXIw" target="_2RnTMBUwEeWsuO0tI_iXIw" routing="Rectilinear">
-    <children xmi:type="notation:DecorationNode" xmi:id="_5xhIkxUwEeWsuO0tI_iXIw" visible="false" type="6007">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_5xhIlBUwEeWsuO0tI_iXIw" y="60"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_5xhIkRUwEeWsuO0tI_iXIw"/>
-    <element xmi:type="uml:Generalization" href="esfcore.profile.uml#_nKjV0A3PEeWIHrhJxYOO3w"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_5xhIkhUwEeWsuO0tI_iXIw" points="[89, -50, -272, 148]$[89, -169, -272, 29]$[251, -169, -110, 29]"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_6IIRwBUwEeWsuO0tI_iXIw" type="4002" source="_3M-IMBUwEeWsuO0tI_iXIw" target="_2RnTMBUwEeWsuO0tI_iXIw" routing="Rectilinear">
-    <children xmi:type="notation:DecorationNode" xmi:id="_6IIRwxUwEeWsuO0tI_iXIw" visible="false" type="6007">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_6IIRxBUwEeWsuO0tI_iXIw" y="60"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_6IIRwRUwEeWsuO0tI_iXIw"/>
-    <element xmi:type="uml:Generalization" href="esfcore.profile.uml#_nsflQA3PEeWIHrhJxYOO3w"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6IIRwhUwEeWsuO0tI_iXIw" points="[-6, -53, 18, 168]$[-19, -168, 5, 53]"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_6eJlEBUwEeWsuO0tI_iXIw" type="4002" source="_3jcHcBUwEeWsuO0tI_iXIw" target="_2RnTMBUwEeWsuO0tI_iXIw" routing="Rectilinear">
-    <children xmi:type="notation:DecorationNode" xmi:id="_6eJlExUwEeWsuO0tI_iXIw" visible="false" type="6007">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_6eJlFBUwEeWsuO0tI_iXIw" y="60"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_6eJlERUwEeWsuO0tI_iXIw"/>
-    <element xmi:type="uml:Generalization" href="esfcore.profile.uml#_mtzvcA3PEeWIHrhJxYOO3w"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6eJlEhUwEeWsuO0tI_iXIw" points="[-49, -50, 271, 138]$[-49, -134, 271, 54]$[-210, -134, 110, 54]"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_s16aABZ-EeWk6K24hE6izQ" type="4001" source="_2u66QBUwEeWsuO0tI_iXIw" target="_3M-IMBUwEeWsuO0tI_iXIw" routing="Rectilinear">
-    <children xmi:type="notation:DecorationNode" xmi:id="_s16aAxZ-EeWk6K24hE6izQ" type="6001">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_s17BEBZ-EeWk6K24hE6izQ" y="60"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_s17BERZ-EeWk6K24hE6izQ" visible="false" type="6002">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_s17BEhZ-EeWk6K24hE6izQ" y="20"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_s17BExZ-EeWk6K24hE6izQ" type="6003">
-      <styles xmi:type="notation:StringListValueStyle" xmi:id="_V-YkcBaFEeWBi6giG6rLvA" name="maskLabel">
-        <stringListValue>name</stringListValue>
-        <stringListValue>derived</stringListValue>
-      </styles>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_s17BFBZ-EeWk6K24hE6izQ" x="-25" y="-77"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_s17oIBZ-EeWk6K24hE6izQ" type="6005">
-      <styles xmi:type="notation:StringListValueStyle" xmi:id="_WsEw4BaFEeWBi6giG6rLvA" name="maskLabel">
-        <stringListValue>name</stringListValue>
-        <stringListValue>derived</stringListValue>
-      </styles>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_s17oIRZ-EeWk6K24hE6izQ" x="21" y="104"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_s17oIhZ-EeWk6K24hE6izQ" type="6033">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_s17oIxZ-EeWk6K24hE6izQ" x="27" y="-18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_s17oJBZ-EeWk6K24hE6izQ" type="6034">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_s17oJRZ-EeWk6K24hE6izQ" x="-29" y="16"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_s16aARZ-EeWk6K24hE6izQ"/>
-    <element xmi:type="uml:Association" href="esfcore.profile.uml#_s13WsBZ-EeWk6K24hE6izQ"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_s16aAhZ-EeWk6K24hE6izQ" points="[29, 17, -261, 15]$[29, 76, -261, 74]$[278, 76, -12, 74]$[278, 17, -12, 15]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_s2OjEBZ-EeWk6K24hE6izQ" id="(0.6909090909090909,0.83)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_s2OjERZ-EeWk6K24hE6izQ" id="(0.35,0.85)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_7JUUkBaGEeWc7uebO1is2A" type="4001" source="_3jcHcBUwEeWsuO0tI_iXIw" target="_3M-IMBUwEeWsuO0tI_iXIw" routing="Rectilinear">
-    <children xmi:type="notation:DecorationNode" xmi:id="_7JVisBaGEeWc7uebO1is2A" visible="false" type="6001">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_7JVisRaGEeWc7uebO1is2A" y="60"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_7JWJwBaGEeWc7uebO1is2A" visible="false" type="6002">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_7JWJwRaGEeWc7uebO1is2A" y="20"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_7JWJwhaGEeWc7uebO1is2A" type="6003">
-      <styles xmi:type="notation:StringListValueStyle" xmi:id="_ChxI0BaHEeWc7uebO1is2A" name="maskLabel">
-        <stringListValue>name</stringListValue>
-        <stringListValue>derived</stringListValue>
-      </styles>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_7JWJwxaGEeWc7uebO1is2A" x="-20" y="72"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_7JWJxBaGEeWc7uebO1is2A" visible="false" type="6005">
-      <styles xmi:type="notation:StringListValueStyle" xmi:id="_B2jBkBaHEeWc7uebO1is2A" name="maskLabel">
-        <stringListValue>name</stringListValue>
-        <stringListValue>derived</stringListValue>
-      </styles>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_7JWJxRaGEeWc7uebO1is2A" x="-43" y="-90"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_7JWJxhaGEeWc7uebO1is2A" type="6033">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_7JWJxxaGEeWc7uebO1is2A" x="16" y="10"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_7JWJyBaGEeWc7uebO1is2A" type="6034">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_7JWJyRaGEeWc7uebO1is2A" x="-20" y="-21"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_7JUUkRaGEeWc7uebO1is2A"/>
-    <element xmi:type="uml:Association" href="esfcore.profile.uml#_7I-WUBaGEeWc7uebO1is2A"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7JUUkhaGEeWc7uebO1is2A" points="[58, 8, 259, 12]$[58, 67, 259, 71]$[-209, 67, -8, 71]$[-209, 8, -8, 12]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7JtWIBaGEeWc7uebO1is2A" id="(0.23636363636363636,0.92)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7Jt9MBaGEeWc7uebO1is2A" id="(0.759090909090909,0.88)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_vE3IwSVvEeW1r-I29laTnw" type="StereotypeCommentLink" source="_pgslcBUwEeWsuO0tI_iXIw" target="_vE2hsCVvEeW1r-I29laTnw">
-    <styles xmi:type="notation:FontStyle" xmi:id="_vE3IwiVvEeW1r-I29laTnw"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vE3v0iVvEeW1r-I29laTnw" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Profile" href="esfcore.profile.uml#_5CO-gA3OEeWIHrhJxYOO3w"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vE3IwyVvEeW1r-I29laTnw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vE3v0CVvEeW1r-I29laTnw"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vE3v0SVvEeW1r-I29laTnw"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_Be8-oI0wEeWHTsP20wwFZA" type="4002" source="_6zPUkI0vEeWHTsP20wwFZA" target="_2RnTMBUwEeWsuO0tI_iXIw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_Be8-o40wEeWHTsP20wwFZA" visible="false" type="6007">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Be8-pI0wEeWHTsP20wwFZA" y="60"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_Be8-oY0wEeWHTsP20wwFZA"/>
-    <element xmi:type="uml:Generalization" href="esfcore.profile.uml#_BeUFcI0wEeWHTsP20wwFZA"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Be8-oo0wEeWHTsP20wwFZA" points="[-17, -1, 166, 0]$[-159, -17, 24, -16]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BffxMI0wEeWHTsP20wwFZA" id="(0.0,0.12)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BfgYQI0wEeWHTsP20wwFZA" id="(1.0,0.13333333333333333)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_Deje4I0wEeWHTsP20wwFZA" type="4001" source="_6zPUkI0vEeWHTsP20wwFZA" target="_2RnTMBUwEeWsuO0tI_iXIw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_Deje440wEeWHTsP20wwFZA" visible="false" type="6001">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Deje5I0wEeWHTsP20wwFZA" y="60"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_Deje5Y0wEeWHTsP20wwFZA" type="6002">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Deje5o0wEeWHTsP20wwFZA" y="20"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_Deje540wEeWHTsP20wwFZA" type="6003">
-      <styles xmi:type="notation:StringListValueStyle" xmi:id="_SGhN0I0wEeWHTsP20wwFZA" name="maskLabel">
-        <stringListValue>name</stringListValue>
-        <stringListValue>derived</stringListValue>
-      </styles>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Deje6I0wEeWHTsP20wwFZA" x="-49" y="-17"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_Deje6Y0wEeWHTsP20wwFZA" visible="false" type="6005">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Deje6o0wEeWHTsP20wwFZA" y="-20"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_Deje640wEeWHTsP20wwFZA" type="6033">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_DekF8I0wEeWHTsP20wwFZA" x="10" y="13"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_DekF8Y0wEeWHTsP20wwFZA" type="6034">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_DekF8o0wEeWHTsP20wwFZA" x="-12" y="10"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_Deje4Y0wEeWHTsP20wwFZA"/>
-    <element xmi:type="uml:Association" href="esfcore.profile.uml#_DeMSgI0wEeWHTsP20wwFZA"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Deje4o0wEeWHTsP20wwFZA" points="[-6, -5, 252, -12]$[-259, -68, -1, -75]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DfItsI0wEeWHTsP20wwFZA" id="(0.0,0.59)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DfItsY0wEeWHTsP20wwFZA" id="(1.0,0.43333333333333335)"/>
-  </edges>
-</notation:Diagram>
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" xmi:id="_ArrcIA3PEeWIHrhJxYOO3w" type="PapyrusUMLProfileDiagram" name="ESFCore ProfileDiagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_pgslcBUwEeWsuO0tI_iXIw" type="Profile_Shape" fillColor="12621752">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_K5-eUBUxEeWsuO0tI_iXIw" source="PapyrusCSSForceValue">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_K5-eURUxEeWsuO0tI_iXIw" key="fillColor" value="true"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_pgslchUwEeWsuO0tI_iXIw" type="Profile_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_pgslcxUwEeWsuO0tI_iXIw" type="Profile_PackagedElementCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_2RnTMBUwEeWsuO0tI_iXIw" type="Stereotype_Shape_CN">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_K5-eUhUxEeWsuO0tI_iXIw" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_K5-eUxUxEeWsuO0tI_iXIw" key="fillColor" value="true"/>
+        </eAnnotations>
+        <children xmi:type="notation:DecorationNode" xmi:id="_2RnTMhUwEeWsuO0tI_iXIw" type="Stereotype_NameLabel_CN"/>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_2RnTMxUwEeWsuO0tI_iXIw" type="Stereotype_AttributeCompartment_CN">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_w2xc0BZ9EeWk6K24hE6izQ" source="PapyrusCSSForceValue">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_w2xc0RZ9EeWk6K24hE6izQ" key="visible" value="true"/>
+          </eAnnotations>
+          <children xmi:type="notation:Shape" xmi:id="_FU5t4BZ-EeWk6K24hE6izQ" type="Property_ClassAttributeLabel">
+            <styles xmi:type="notation:StringListValueStyle" xmi:id="_TFV-8BZ-EeWk6K24hE6izQ" name="maskLabel">
+              <stringListValue>name</stringListValue>
+              <stringListValue>derived</stringListValue>
+              <stringListValue>multiplicity</stringListValue>
+              <stringListValue>type</stringListValue>
+            </styles>
+            <element xmi:type="uml:Property" href="esfcore.profile.uml#_FU2DgBZ-EeWk6K24hE6izQ"/>
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_FU5t4RZ-EeWk6K24hE6izQ"/>
+          </children>
+          <children xmi:type="notation:Shape" xmi:id="_QqCaIBZ-EeWk6K24hE6izQ" type="Property_ClassAttributeLabel">
+            <styles xmi:type="notation:StringListValueStyle" xmi:id="_UpD0cBZ-EeWk6K24hE6izQ" name="maskLabel">
+              <stringListValue>name</stringListValue>
+              <stringListValue>derived</stringListValue>
+              <stringListValue>multiplicity</stringListValue>
+              <stringListValue>type</stringListValue>
+            </styles>
+            <element xmi:type="uml:Property" href="esfcore.profile.uml#_Qp-IsBZ-EeWk6K24hE6izQ"/>
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_QqCaIRZ-EeWk6K24hE6izQ"/>
+          </children>
+          <children xmi:type="notation:Shape" xmi:id="_a73PQBZ-EeWk6K24hE6izQ" type="Property_ClassAttributeLabel">
+            <styles xmi:type="notation:StringListValueStyle" xmi:id="_mTOwIBZ-EeWk6K24hE6izQ" name="maskLabel">
+              <stringListValue>name</stringListValue>
+              <stringListValue>derived</stringListValue>
+              <stringListValue>multiplicity</stringListValue>
+              <stringListValue>type</stringListValue>
+            </styles>
+            <element xmi:type="uml:Property" href="esfcore.profile.uml#_a70zABZ-EeWk6K24hE6izQ"/>
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_a73PQRZ-EeWk6K24hE6izQ"/>
+          </children>
+          <styles xmi:type="notation:TitleStyle" xmi:id="_2RnTNBUwEeWsuO0tI_iXIw"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_2RnTNRUwEeWsuO0tI_iXIw"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_2RnTNhUwEeWsuO0tI_iXIw"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2RnTNxUwEeWsuO0tI_iXIw"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_2RnTOBUwEeWsuO0tI_iXIw" visible="false" type="Stereotype_OperationCompartment_CN">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_2RnTORUwEeWsuO0tI_iXIw"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_2RnTOhUwEeWsuO0tI_iXIw"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_2RnTOxUwEeWsuO0tI_iXIw"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2RnTPBUwEeWsuO0tI_iXIw"/>
+        </children>
+        <element xmi:type="uml:Stereotype" href="esfcore.profile.uml#_CzxxEA3PEeWIHrhJxYOO3w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2RnTMRUwEeWsuO0tI_iXIw" x="430" y="48" width="220"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_2u66QBUwEeWsuO0tI_iXIw" type="Stereotype_Shape_CN">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_K5-eVBUxEeWsuO0tI_iXIw" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_K5-eVRUxEeWsuO0tI_iXIw" key="fillColor" value="true"/>
+        </eAnnotations>
+        <children xmi:type="notation:DecorationNode" xmi:id="_2vErQRUwEeWsuO0tI_iXIw" type="Stereotype_NameLabel_CN"/>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_2vErQhUwEeWsuO0tI_iXIw" visible="false" type="Stereotype_AttributeCompartment_CN">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_2vErQxUwEeWsuO0tI_iXIw"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_2vErRBUwEeWsuO0tI_iXIw"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_2vErRRUwEeWsuO0tI_iXIw"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2vErRhUwEeWsuO0tI_iXIw"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_2vErRxUwEeWsuO0tI_iXIw" visible="false" type="Stereotype_OperationCompartment_CN">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_2vErSBUwEeWsuO0tI_iXIw"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_2vErSRUwEeWsuO0tI_iXIw"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_2vErShUwEeWsuO0tI_iXIw"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2vErSxUwEeWsuO0tI_iXIw"/>
+        </children>
+        <element xmi:type="uml:Stereotype" href="esfcore.profile.uml#_FrK08A3PEeWIHrhJxYOO3w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2vErQBUwEeWsuO0tI_iXIw" x="69" y="261" width="220"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_3M-IMBUwEeWsuO0tI_iXIw" type="Stereotype_Shape_CN">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_K5-eVhUxEeWsuO0tI_iXIw" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_K6IPUBUxEeWsuO0tI_iXIw" key="fillColor" value="true"/>
+        </eAnnotations>
+        <children xmi:type="notation:DecorationNode" xmi:id="_3M-IMhUwEeWsuO0tI_iXIw" type="Stereotype_NameLabel_CN"/>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_3M-IMxUwEeWsuO0tI_iXIw" visible="false" type="Stereotype_AttributeCompartment_CN">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_3M-INBUwEeWsuO0tI_iXIw"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_3M-INRUwEeWsuO0tI_iXIw"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_3M-INhUwEeWsuO0tI_iXIw"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3M-INxUwEeWsuO0tI_iXIw"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_3M-IOBUwEeWsuO0tI_iXIw" visible="false" type="Stereotype_OperationCompartment_CN">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_3M-IORUwEeWsuO0tI_iXIw"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_3M-IOhUwEeWsuO0tI_iXIw"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_3M-IOxUwEeWsuO0tI_iXIw"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3M-IPBUwEeWsuO0tI_iXIw"/>
+        </children>
+        <element xmi:type="uml:Stereotype" href="esfcore.profile.uml#_Urtb8A3PEeWIHrhJxYOO3w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3M-IMRUwEeWsuO0tI_iXIw" x="434" y="261" width="220"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_3jcHcBUwEeWsuO0tI_iXIw" type="Stereotype_Shape_CN">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NmjZUBUxEeWsuO0tI_iXIw" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NmjZURUxEeWsuO0tI_iXIw" key="fillColor" value="true"/>
+        </eAnnotations>
+        <children xmi:type="notation:DecorationNode" xmi:id="_3jcHchUwEeWsuO0tI_iXIw" type="Stereotype_NameLabel_CN"/>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_3jcHcxUwEeWsuO0tI_iXIw" visible="false" type="Stereotype_AttributeCompartment_CN">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_3jcHdBUwEeWsuO0tI_iXIw"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_3jcHdRUwEeWsuO0tI_iXIw"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_3jcHdhUwEeWsuO0tI_iXIw"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3jcHdxUwEeWsuO0tI_iXIw"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_3jcHeBUwEeWsuO0tI_iXIw" visible="false" type="Stereotype_OperationCompartment_CN">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_3jcHeRUwEeWsuO0tI_iXIw"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_3jcHehUwEeWsuO0tI_iXIw"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_3jcHexUwEeWsuO0tI_iXIw"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3jcHfBUwEeWsuO0tI_iXIw"/>
+        </children>
+        <element xmi:type="uml:Stereotype" href="esfcore.profile.uml#_dAMaoA3PEeWIHrhJxYOO3w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3jcHcRUwEeWsuO0tI_iXIw" x="750" y="261" width="220"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_6zPUkI0vEeWHTsP20wwFZA" type="Stereotype_Shape_CN">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__6lo4I0vEeWHTsP20wwFZA" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__6lo4Y0vEeWHTsP20wwFZA" key="fillColor" value="true"/>
+        </eAnnotations>
+        <children xmi:type="notation:DecorationNode" xmi:id="_6zUNEI0vEeWHTsP20wwFZA" type="Stereotype_NameLabel_CN"/>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_6zUNEY0vEeWHTsP20wwFZA" visible="false" type="Stereotype_AttributeCompartment_CN">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_6zUNEo0vEeWHTsP20wwFZA"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_6zUNE40vEeWHTsP20wwFZA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_6zUNFI0vEeWHTsP20wwFZA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6zUNFY0vEeWHTsP20wwFZA"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_6zUNFo0vEeWHTsP20wwFZA" visible="false" type="Stereotype_OperationCompartment_CN">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_6zUNF40vEeWHTsP20wwFZA"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_6zUNGI0vEeWHTsP20wwFZA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_6zUNGY0vEeWHTsP20wwFZA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6zUNGo0vEeWHTsP20wwFZA"/>
+        </children>
+        <element xmi:type="uml:Stereotype" href="esfcore.profile.uml#_6yz2wI0vEeWHTsP20wwFZA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6zPUkY0vEeWHTsP20wwFZA" x="825" y="56" width="220" height="100"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_pgsldBUwEeWsuO0tI_iXIw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pgsldRUwEeWsuO0tI_iXIw"/>
+    </children>
+    <element xmi:type="uml:Profile" href="esfcore.profile.uml#_5CO-gA3OEeWIHrhJxYOO3w"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pgslcRUwEeWsuO0tI_iXIw" x="72" y="43" width="1072" height="612"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_vE2hsCVvEeW1r-I29laTnw" type="StereotypeComment">
+    <styles xmi:type="notation:TitleStyle" xmi:id="_vE2hsSVvEeW1r-I29laTnw" showTitle="true"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vE3IwCVvEeW1r-I29laTnw" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Profile" href="esfcore.profile.uml#_5CO-gA3OEeWIHrhJxYOO3w"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vE2hsiVvEeW1r-I29laTnw" x="272" y="43"/>
+  </children>
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_ArrcIQ3PEeWIHrhJxYOO3w" name="diagram_compatibility_version" stringValue="1.2.0"/>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_ArrcIg3PEeWIHrhJxYOO3w"/>
+  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_ArrcIw3PEeWIHrhJxYOO3w">
+    <owner xmi:type="uml:Profile" href="esfcore.profile.uml#_5CO-gA3OEeWIHrhJxYOO3w"/>
+  </styles>
+  <element xmi:type="uml:Profile" href="esfcore.profile.uml#_5CO-gA3OEeWIHrhJxYOO3w"/>
+  <edges xmi:type="notation:Connector" xmi:id="_5xhIkBUwEeWsuO0tI_iXIw" type="Generalization_Edge" source="_2u66QBUwEeWsuO0tI_iXIw" target="_2RnTMBUwEeWsuO0tI_iXIw" routing="Rectilinear">
+    <children xmi:type="notation:DecorationNode" xmi:id="_5xhIkxUwEeWsuO0tI_iXIw" visible="false" type="Generalization_StereotypeLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_5xhIlBUwEeWsuO0tI_iXIw" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_5xhIkRUwEeWsuO0tI_iXIw"/>
+    <element xmi:type="uml:Generalization" href="esfcore.profile.uml#_nKjV0A3PEeWIHrhJxYOO3w"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_5xhIkhUwEeWsuO0tI_iXIw" points="[89, -50, -272, 148]$[89, -169, -272, 29]$[251, -169, -110, 29]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_6IIRwBUwEeWsuO0tI_iXIw" type="Generalization_Edge" source="_3M-IMBUwEeWsuO0tI_iXIw" target="_2RnTMBUwEeWsuO0tI_iXIw" routing="Rectilinear">
+    <children xmi:type="notation:DecorationNode" xmi:id="_6IIRwxUwEeWsuO0tI_iXIw" visible="false" type="Generalization_StereotypeLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_6IIRxBUwEeWsuO0tI_iXIw" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_6IIRwRUwEeWsuO0tI_iXIw"/>
+    <element xmi:type="uml:Generalization" href="esfcore.profile.uml#_nsflQA3PEeWIHrhJxYOO3w"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6IIRwhUwEeWsuO0tI_iXIw" points="[-6, -53, 18, 168]$[-19, -168, 5, 53]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_6eJlEBUwEeWsuO0tI_iXIw" type="Generalization_Edge" source="_3jcHcBUwEeWsuO0tI_iXIw" target="_2RnTMBUwEeWsuO0tI_iXIw" routing="Rectilinear">
+    <children xmi:type="notation:DecorationNode" xmi:id="_6eJlExUwEeWsuO0tI_iXIw" visible="false" type="Generalization_StereotypeLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_6eJlFBUwEeWsuO0tI_iXIw" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_6eJlERUwEeWsuO0tI_iXIw"/>
+    <element xmi:type="uml:Generalization" href="esfcore.profile.uml#_mtzvcA3PEeWIHrhJxYOO3w"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6eJlEhUwEeWsuO0tI_iXIw" points="[-49, -50, 271, 138]$[-49, -134, 271, 54]$[-210, -134, 110, 54]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_s16aABZ-EeWk6K24hE6izQ" type="Association_Edge" source="_2u66QBUwEeWsuO0tI_iXIw" target="_3M-IMBUwEeWsuO0tI_iXIw" routing="Rectilinear">
+    <children xmi:type="notation:DecorationNode" xmi:id="_s16aAxZ-EeWk6K24hE6izQ" type="Association_StereotypeLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_s17BEBZ-EeWk6K24hE6izQ" y="60"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_s17BERZ-EeWk6K24hE6izQ" visible="false" type="Association_NameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_s17BEhZ-EeWk6K24hE6izQ" y="20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_s17BExZ-EeWk6K24hE6izQ" type="Association_TargetRoleLabel">
+      <styles xmi:type="notation:StringListValueStyle" xmi:id="_V-YkcBaFEeWBi6giG6rLvA" name="maskLabel">
+        <stringListValue>name</stringListValue>
+        <stringListValue>derived</stringListValue>
+      </styles>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_s17BFBZ-EeWk6K24hE6izQ" x="-25" y="-77"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_s17oIBZ-EeWk6K24hE6izQ" type="Association_SourceRoleLabel">
+      <styles xmi:type="notation:StringListValueStyle" xmi:id="_WsEw4BaFEeWBi6giG6rLvA" name="maskLabel">
+        <stringListValue>name</stringListValue>
+        <stringListValue>derived</stringListValue>
+      </styles>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_s17oIRZ-EeWk6K24hE6izQ" x="21" y="104"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_s17oIhZ-EeWk6K24hE6izQ" type="Association_SourceMultiplicityLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_s17oIxZ-EeWk6K24hE6izQ" x="27" y="-18"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_s17oJBZ-EeWk6K24hE6izQ" type="Association_TargetMultiplicityLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_s17oJRZ-EeWk6K24hE6izQ" x="-29" y="16"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_s16aARZ-EeWk6K24hE6izQ"/>
+    <element xmi:type="uml:Association" href="esfcore.profile.uml#_s13WsBZ-EeWk6K24hE6izQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_s16aAhZ-EeWk6K24hE6izQ" points="[29, 17, -261, 15]$[29, 76, -261, 74]$[278, 76, -12, 74]$[278, 17, -12, 15]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_s2OjEBZ-EeWk6K24hE6izQ" id="(0.6909090909090909,0.83)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_s2OjERZ-EeWk6K24hE6izQ" id="(0.35,0.85)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_7JUUkBaGEeWc7uebO1is2A" type="Association_Edge" source="_3jcHcBUwEeWsuO0tI_iXIw" target="_3M-IMBUwEeWsuO0tI_iXIw" routing="Rectilinear">
+    <children xmi:type="notation:DecorationNode" xmi:id="_7JVisBaGEeWc7uebO1is2A" visible="false" type="Association_StereotypeLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_7JVisRaGEeWc7uebO1is2A" y="60"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_7JWJwBaGEeWc7uebO1is2A" visible="false" type="Association_NameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_7JWJwRaGEeWc7uebO1is2A" y="20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_7JWJwhaGEeWc7uebO1is2A" type="Association_TargetRoleLabel">
+      <styles xmi:type="notation:StringListValueStyle" xmi:id="_ChxI0BaHEeWc7uebO1is2A" name="maskLabel">
+        <stringListValue>name</stringListValue>
+        <stringListValue>derived</stringListValue>
+      </styles>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_7JWJwxaGEeWc7uebO1is2A" x="-20" y="72"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_7JWJxBaGEeWc7uebO1is2A" visible="false" type="Association_SourceRoleLabel">
+      <styles xmi:type="notation:StringListValueStyle" xmi:id="_B2jBkBaHEeWc7uebO1is2A" name="maskLabel">
+        <stringListValue>name</stringListValue>
+        <stringListValue>derived</stringListValue>
+      </styles>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_7JWJxRaGEeWc7uebO1is2A" x="-43" y="-90"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_7JWJxhaGEeWc7uebO1is2A" type="Association_SourceMultiplicityLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_7JWJxxaGEeWc7uebO1is2A" x="16" y="10"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_7JWJyBaGEeWc7uebO1is2A" type="Association_TargetMultiplicityLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_7JWJyRaGEeWc7uebO1is2A" x="-20" y="-21"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_7JUUkRaGEeWc7uebO1is2A"/>
+    <element xmi:type="uml:Association" href="esfcore.profile.uml#_7I-WUBaGEeWc7uebO1is2A"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7JUUkhaGEeWc7uebO1is2A" points="[58, 8, 259, 12]$[58, 67, 259, 71]$[-209, 67, -8, 71]$[-209, 8, -8, 12]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7JtWIBaGEeWc7uebO1is2A" id="(0.23636363636363636,0.92)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7Jt9MBaGEeWc7uebO1is2A" id="(0.759090909090909,0.88)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_vE3IwSVvEeW1r-I29laTnw" type="StereotypeCommentLink" source="_pgslcBUwEeWsuO0tI_iXIw" target="_vE2hsCVvEeW1r-I29laTnw">
+    <styles xmi:type="notation:FontStyle" xmi:id="_vE3IwiVvEeW1r-I29laTnw"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_vE3v0iVvEeW1r-I29laTnw" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Profile" href="esfcore.profile.uml#_5CO-gA3OEeWIHrhJxYOO3w"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vE3IwyVvEeW1r-I29laTnw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vE3v0CVvEeW1r-I29laTnw"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vE3v0SVvEeW1r-I29laTnw"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_Be8-oI0wEeWHTsP20wwFZA" type="Generalization_Edge" source="_6zPUkI0vEeWHTsP20wwFZA" target="_2RnTMBUwEeWsuO0tI_iXIw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_Be8-o40wEeWHTsP20wwFZA" visible="false" type="Generalization_StereotypeLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Be8-pI0wEeWHTsP20wwFZA" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Be8-oY0wEeWHTsP20wwFZA"/>
+    <element xmi:type="uml:Generalization" href="esfcore.profile.uml#_BeUFcI0wEeWHTsP20wwFZA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Be8-oo0wEeWHTsP20wwFZA" points="[-17, -1, 166, 0]$[-159, -17, 24, -16]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BffxMI0wEeWHTsP20wwFZA" id="(0.0,0.12)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BfgYQI0wEeWHTsP20wwFZA" id="(1.0,0.13333333333333333)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_Deje4I0wEeWHTsP20wwFZA" type="Association_Edge" source="_6zPUkI0vEeWHTsP20wwFZA" target="_2RnTMBUwEeWsuO0tI_iXIw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_Deje440wEeWHTsP20wwFZA" visible="false" type="Association_StereotypeLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Deje5I0wEeWHTsP20wwFZA" y="60"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_Deje5Y0wEeWHTsP20wwFZA" type="Association_NameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Deje5o0wEeWHTsP20wwFZA" y="20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_Deje540wEeWHTsP20wwFZA" type="Association_TargetRoleLabel">
+      <styles xmi:type="notation:StringListValueStyle" xmi:id="_SGhN0I0wEeWHTsP20wwFZA" name="maskLabel">
+        <stringListValue>name</stringListValue>
+        <stringListValue>derived</stringListValue>
+      </styles>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Deje6I0wEeWHTsP20wwFZA" x="-49" y="-17"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_Deje6Y0wEeWHTsP20wwFZA" visible="false" type="Association_SourceRoleLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Deje6o0wEeWHTsP20wwFZA" y="-20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_Deje640wEeWHTsP20wwFZA" type="Association_SourceMultiplicityLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_DekF8I0wEeWHTsP20wwFZA" x="10" y="13"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_DekF8Y0wEeWHTsP20wwFZA" type="Association_TargetMultiplicityLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_DekF8o0wEeWHTsP20wwFZA" x="-12" y="10"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Deje4Y0wEeWHTsP20wwFZA"/>
+    <element xmi:type="uml:Association" href="esfcore.profile.uml#_DeMSgI0wEeWHTsP20wwFZA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Deje4o0wEeWHTsP20wwFZA" points="[-6, -5, 252, -12]$[-259, -68, -1, -75]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DfItsI0wEeWHTsP20wwFZA" id="(0.0,0.59)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DfItsY0wEeWHTsP20wwFZA" id="(1.0,0.43333333333333335)"/>
+  </edges>
+</notation:Diagram>
diff --git a/core/profile/org.polarsys.esf.core.profile.esfcore/src/main/resources/models/profile/esfcore.profile.uml b/core/profile/org.polarsys.esf.core.profile.esfcore/src/main/resources/models/profile/esfcore.profile.uml
index fdb0c5e..4dc1899 100644
--- a/core/profile/org.polarsys.esf.core.profile.esfcore/src/main/resources/models/profile/esfcore.profile.uml
+++ b/core/profile/org.polarsys.esf.core.profile.esfcore/src/main/resources/models/profile/esfcore.profile.uml
@@ -1,88 +1,88 @@
-<?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="_5CO-gA3OEeWIHrhJxYOO3w" name="ESFCore" metaclassReference="_wWmOoA3PEeWIHrhJxYOO3w">
-    <elementImport xmi:type="uml:ElementImport" xmi:id="_wWmOoA3PEeWIHrhJxYOO3w" alias="NamedElement">
-      <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#NamedElement"/>
-    </elementImport>
-    <packagedElement xmi:type="uml:Stereotype" xmi:id="_CzxxEA3PEeWIHrhJxYOO3w" name="AbstractSElement" isAbstract="true">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_FU2DgBZ-EeWk6K24hE6izQ" name="UUID">
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        <defaultValue xmi:type="uml:LiteralString" xmi:id="_K3yOABaGEeWBi6giG6rLvA"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_Qp-IsBZ-EeWk6K24hE6izQ" name="name">
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        <defaultValue xmi:type="uml:LiteralString" xmi:id="_IuaGsBaGEeWBi6giG6rLvA"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_a70zABZ-EeWk6K24hE6izQ" name="description" isUnique="false">
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_enXQoBZ-EeWk6K24hE6izQ"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_enYewBZ-EeWk6K24hE6izQ" value="1"/>
-        <defaultValue xmi:type="uml:LiteralString" xmi:id="_i1AVwBZ-EeWk6K24hE6izQ"/>
-      </ownedAttribute>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Stereotype" xmi:id="_FrK08A3PEeWIHrhJxYOO3w" name="AbstractSArchitectureElement" isAbstract="true">
-      <generalization xmi:type="uml:Generalization" xmi:id="_nKjV0A3PEeWIHrhJxYOO3w" general="_CzxxEA3PEeWIHrhJxYOO3w"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_s12voBZ-EeWk6K24hE6izQ" name="sSafetyConceptsList" type="_Urtb8A3PEeWIHrhJxYOO3w" association="_s13WsBZ-EeWk6K24hE6izQ">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s12voRZ-EeWk6K24hE6izQ"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s12vohZ-EeWk6K24hE6izQ" value="*"/>
-      </ownedAttribute>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Stereotype" xmi:id="_Urtb8A3PEeWIHrhJxYOO3w" name="AbstractSSafetyConcept" isAbstract="true">
-      <generalization xmi:type="uml:Generalization" xmi:id="_nsflQA3PEeWIHrhJxYOO3w" general="_CzxxEA3PEeWIHrhJxYOO3w"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_s13WsRZ-EeWk6K24hE6izQ" name="sArchitectureElementsList" type="_FrK08A3PEeWIHrhJxYOO3w" association="_s13WsBZ-EeWk6K24hE6izQ">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s13WshZ-EeWk6K24hE6izQ"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s13WsxZ-EeWk6K24hE6izQ" value="*"/>
-      </ownedAttribute>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Stereotype" xmi:id="_dAMaoA3PEeWIHrhJxYOO3w" name="AbstractSSafetyAnalysis" isAbstract="true">
-      <generalization xmi:type="uml:Generalization" xmi:id="_mtzvcA3PEeWIHrhJxYOO3w" general="_CzxxEA3PEeWIHrhJxYOO3w"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_7I76EBaGEeWc7uebO1is2A" name="sSafetyConceptsList" type="_Urtb8A3PEeWIHrhJxYOO3w" association="_7I-WUBaGEeWc7uebO1is2A">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_7I76ERaGEeWc7uebO1is2A" value="1"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7I76EhaGEeWc7uebO1is2A" value="*"/>
-      </ownedAttribute>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_s13WsBZ-EeWk6K24hE6izQ" name="abstractSAchitectureElement_abstractSSafetyConcept_1" memberEnd="_s13WsRZ-EeWk6K24hE6izQ _s12voBZ-EeWk6K24hE6izQ"/>
-    <packagedElement xmi:type="uml:Association" xmi:id="_7I-WUBaGEeWc7uebO1is2A" name="abstractSSafetyAnalysis_abstractSSafetyConcept_1" memberEnd="_7I-WURaGEeWc7uebO1is2A _7I76EBaGEeWc7uebO1is2A">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_7I-WURaGEeWc7uebO1is2A" name="sSafetyAnalysesList" type="_dAMaoA3PEeWIHrhJxYOO3w" association="_7I-WUBaGEeWc7uebO1is2A">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_7I-WUhaGEeWc7uebO1is2A"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7I-WUxaGEeWc7uebO1is2A" value="*"/>
-      </ownedEnd>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Stereotype" xmi:id="_6yz2wI0vEeWHTsP20wwFZA" name="AbstractSRequirement" isAbstract="true">
-      <generalization xmi:type="uml:Generalization" xmi:id="_BeUFcI0wEeWHTsP20wwFZA" general="_CzxxEA3PEeWIHrhJxYOO3w"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_DeSZII0wEeWHTsP20wwFZA" name="sElementsList" type="_CzxxEA3PEeWIHrhJxYOO3w" association="_DeMSgI0wEeWHTsP20wwFZA">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_OPxlwI0wEeWHTsP20wwFZA"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OP13MI0wEeWHTsP20wwFZA" value="*"/>
-      </ownedAttribute>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_DeMSgI0wEeWHTsP20wwFZA" memberEnd="_DeSZII0wEeWHTsP20wwFZA _DeTAMI0wEeWHTsP20wwFZA">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_DePV0I0wEeWHTsP20wwFZA" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DeP84I0wEeWHTsP20wwFZA" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_DeTAMI0wEeWHTsP20wwFZA" name="sRequirementsList" type="_6yz2wI0vEeWHTsP20wwFZA" association="_DeMSgI0wEeWHTsP20wwFZA">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_zU_yoI01EeWHTsP20wwFZA"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zVDdAI01EeWHTsP20wwFZA" value="*"/>
-      </ownedEnd>
-    </packagedElement>
-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_2RAQ4BZ9EeWk6K24hE6izQ">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZRzYUL3OEeWaFrysrt8vfg" source="PapyrusVersion">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZRzYUb3OEeWaFrysrt8vfg" key="Version" value="0.1.1"/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZRzYUr3OEeWaFrysrt8vfg" key="Comment" value=""/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZRzYU73OEeWaFrysrt8vfg" key="Copyright" value=""/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZRzYVL3OEeWaFrysrt8vfg" key="Date" value="2015-01-21"/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZRzYVb3OEeWaFrysrt8vfg" key="Author" value=""/>
-      </eAnnotations>
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2R9TIBZ9EeWk6K24hE6izQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>
-      </eAnnotations>
-      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>
-    </profileApplication>
-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_uKo8MCVvEeW1r-I29laTnw">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uKsmkCVvEeW1r-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="_vEeHMCVvEeW1r-I29laTnw" base_Package="_5CO-gA3OEeWIHrhJxYOO3w" packageName="esfcore" nsPrefix="ESFCore" nsURI="http://www.polarsys.org/esf/0.7.0/ESFCore" basePackage="org.polarsys.esf" prefix="ESFCore"/>
-</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="_5CO-gA3OEeWIHrhJxYOO3w" name="ESFCore" metaclassReference="_wWmOoA3PEeWIHrhJxYOO3w">
+    <elementImport xmi:type="uml:ElementImport" xmi:id="_wWmOoA3PEeWIHrhJxYOO3w" alias="NamedElement">
+      <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#NamedElement"/>
+    </elementImport>
+    <packagedElement xmi:type="uml:Stereotype" xmi:id="_CzxxEA3PEeWIHrhJxYOO3w" name="AbstractSElement" isAbstract="true">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_FU2DgBZ-EeWk6K24hE6izQ" name="UUID">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_K3yOABaGEeWBi6giG6rLvA"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_Qp-IsBZ-EeWk6K24hE6izQ" name="name">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_IuaGsBaGEeWBi6giG6rLvA"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_a70zABZ-EeWk6K24hE6izQ" name="description" isUnique="false">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_enXQoBZ-EeWk6K24hE6izQ"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_enYewBZ-EeWk6K24hE6izQ" value="1"/>
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_i1AVwBZ-EeWk6K24hE6izQ"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Stereotype" xmi:id="_FrK08A3PEeWIHrhJxYOO3w" name="AbstractSArchitectureElement" isAbstract="true">
+      <generalization xmi:type="uml:Generalization" xmi:id="_nKjV0A3PEeWIHrhJxYOO3w" general="_CzxxEA3PEeWIHrhJxYOO3w"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_s12voBZ-EeWk6K24hE6izQ" name="sSafetyConceptsList" type="_Urtb8A3PEeWIHrhJxYOO3w" association="_s13WsBZ-EeWk6K24hE6izQ">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s12voRZ-EeWk6K24hE6izQ"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s12vohZ-EeWk6K24hE6izQ" value="*"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Stereotype" xmi:id="_Urtb8A3PEeWIHrhJxYOO3w" name="AbstractSSafetyConcept" isAbstract="true">
+      <generalization xmi:type="uml:Generalization" xmi:id="_nsflQA3PEeWIHrhJxYOO3w" general="_CzxxEA3PEeWIHrhJxYOO3w"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_s13WsRZ-EeWk6K24hE6izQ" name="sArchitectureElementsList" type="_FrK08A3PEeWIHrhJxYOO3w" association="_s13WsBZ-EeWk6K24hE6izQ">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s13WshZ-EeWk6K24hE6izQ"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s13WsxZ-EeWk6K24hE6izQ" value="*"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Stereotype" xmi:id="_dAMaoA3PEeWIHrhJxYOO3w" name="AbstractSSafetyAnalysis" isAbstract="true">
+      <generalization xmi:type="uml:Generalization" xmi:id="_mtzvcA3PEeWIHrhJxYOO3w" general="_CzxxEA3PEeWIHrhJxYOO3w"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_7I76EBaGEeWc7uebO1is2A" name="sSafetyConceptsList" type="_Urtb8A3PEeWIHrhJxYOO3w" association="_7I-WUBaGEeWc7uebO1is2A">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_7I76ERaGEeWc7uebO1is2A"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7I76EhaGEeWc7uebO1is2A" value="*"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_s13WsBZ-EeWk6K24hE6izQ" name="abstractSAchitectureElement_abstractSSafetyConcept_1" memberEnd="_s13WsRZ-EeWk6K24hE6izQ _s12voBZ-EeWk6K24hE6izQ"/>
+    <packagedElement xmi:type="uml:Association" xmi:id="_7I-WUBaGEeWc7uebO1is2A" name="abstractSSafetyAnalysis_abstractSSafetyConcept_1" memberEnd="_7I-WURaGEeWc7uebO1is2A _7I76EBaGEeWc7uebO1is2A">
+      <ownedEnd xmi:type="uml:Property" xmi:id="_7I-WURaGEeWc7uebO1is2A" name="sSafetyAnalysesList" type="_dAMaoA3PEeWIHrhJxYOO3w" association="_7I-WUBaGEeWc7uebO1is2A">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_7I-WUhaGEeWc7uebO1is2A"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7I-WUxaGEeWc7uebO1is2A" value="*"/>
+      </ownedEnd>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Stereotype" xmi:id="_6yz2wI0vEeWHTsP20wwFZA" name="AbstractSRequirement" isAbstract="true">
+      <generalization xmi:type="uml:Generalization" xmi:id="_BeUFcI0wEeWHTsP20wwFZA" general="_CzxxEA3PEeWIHrhJxYOO3w"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_DeSZII0wEeWHTsP20wwFZA" name="sElementsList" type="_CzxxEA3PEeWIHrhJxYOO3w" association="_DeMSgI0wEeWHTsP20wwFZA">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_OPxlwI0wEeWHTsP20wwFZA"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OP13MI0wEeWHTsP20wwFZA" value="*"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_DeMSgI0wEeWHTsP20wwFZA" memberEnd="_DeSZII0wEeWHTsP20wwFZA _DeTAMI0wEeWHTsP20wwFZA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_DePV0I0wEeWHTsP20wwFZA" source="org.eclipse.papyrus">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DeP84I0wEeWHTsP20wwFZA" key="nature" value="UML_Nature"/>
+      </eAnnotations>
+      <ownedEnd xmi:type="uml:Property" xmi:id="_DeTAMI0wEeWHTsP20wwFZA" name="sRequirementsList" type="_6yz2wI0vEeWHTsP20wwFZA" association="_DeMSgI0wEeWHTsP20wwFZA">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_zU_yoI01EeWHTsP20wwFZA"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zVDdAI01EeWHTsP20wwFZA" value="*"/>
+      </ownedEnd>
+    </packagedElement>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_2RAQ4BZ9EeWk6K24hE6izQ">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZRzYUL3OEeWaFrysrt8vfg" source="PapyrusVersion">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZRzYUb3OEeWaFrysrt8vfg" key="Version" value="0.1.1"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZRzYUr3OEeWaFrysrt8vfg" key="Comment" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZRzYU73OEeWaFrysrt8vfg" key="Copyright" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZRzYVL3OEeWaFrysrt8vfg" key="Date" value="2015-01-21"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZRzYVb3OEeWaFrysrt8vfg" key="Author" value=""/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2R9TIBZ9EeWk6K24hE6izQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_Kv8EIKFXEeS_KNX0nfvIVQ"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_uKo8MCVvEeW1r-I29laTnw">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uKsmkCVvEeW1r-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="_vEeHMCVvEeW1r-I29laTnw" base_Package="_5CO-gA3OEeWIHrhJxYOO3w" packageName="esfcore" nsPrefix="ESFCore" nsURI="http://www.polarsys.org/esf/0.7.0/ESFCore" basePackage="org.polarsys.esf" prefix="ESFCore"/>
+</xmi:XMI>