Update to current Papyrus (2018-12)

- update MANIFEST.MF files for current Eclipse / Papyrus

- add a pathmap declaration for the ESF architecture-concepts profile

- migrate element-type configurations, delete .configuration file (old customization mechanism),
  add .architecture file (new customization mechanism)
  
- remove ESF specific wizard (should use standard Papyrus Wizard with ESF architecture context)
  update documentation accordingly, use a creation command that initializes a model from template
  
- do not create a copy of the initial model during import, use profile-externalization to avoid
  "polluting" the imported model with ESF specific stereotypes

Signed-off-by: Ansgar Radermacher <ansgar.radermacher@cea.fr>
Change-Id: Ie1c3146186114c4fb84ebfddb446ca017d4ea20f
diff --git a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/.classpath b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/.classpath
index 5eb97f7..d97031b 100644
--- a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/.classpath
+++ b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src/main/java"/>

-	<classpathentry kind="output" path="target/classes/"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="output" path="target/classes/"/>
+</classpath>
diff --git a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/.settings/org.eclipse.jdt.core.prefs b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/.settings/org.eclipse.jdt.core.prefs
index 11f6e46..f42de36 100644
--- a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/.settings/org.eclipse.jdt.core.prefs
+++ b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7

-org.eclipse.jdt.core.compiler.compliance=1.7

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.7

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/META-INF/MANIFEST.MF b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/META-INF/MANIFEST.MF
index abaa07b..9524be3 100644
--- a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/META-INF/MANIFEST.MF
+++ b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@
 Bundle-Activator: org.polarsys.esf.core.diagram.esfarchitectureconcepts.ESFArchitectureConceptsDiagramActivator$Implementation
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime;bundle-version="3.12.0",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="3.0.0",
  org.eclipse.papyrus.infra.core;bundle-version="2.0.0",
  org.polarsys.esf.core.profile.esfarchitectureconcepts;bundle-version="0.7.0";visibility:=reexport,
  org.polarsys.esf.core.utils;bundle-version="0.7.0",
@@ -23,12 +23,15 @@
  org.eclipse.gmf.runtime.emf.type.core,
  org.eclipse.papyrus.uml.service.types;bundle-version="2.0.0",
  org.eclipse.papyrus.infra.services.edit;bundle-version="2.0.0",
- org.eclipse.papyrus.infra.newchild;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.papyrus.infra.newchild;bundle-version="3.0.0",
  org.eclipse.papyrus.views.properties;bundle-version="2.0.0",
  org.polarsys.esf.core.common.ui;bundle-version="0.7.0";visibility:=reexport,
- org.polarsys.esf.core.resources.graphical;bundle-version="0.7.0";visibility:=reexport
+ org.polarsys.esf.core.resources.graphical;bundle-version="0.7.0";visibility:=reexport,
+ org.eclipse.papyrus.infra.architecture;bundle-version="2.0.0",
+ org.eclipse.papyrus.uml.diagram.composite;bundle-version="3.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: src/main/resources/properties/plugin
 Export-Package: org.polarsys.esf.core.diagram.esfarchitectureconcepts.advice,
+ org.polarsys.esf.core.diagram.esfarchitectureconcepts.command,
  org.polarsys.esf.core.diagram.esfarchitectureconcepts.set
diff --git a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/plugin.xml b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/plugin.xml
index aa4c87f..19dd433 100644
--- a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/plugin.xml
+++ b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/plugin.xml
@@ -1,170 +1,162 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <plugin>
-   <extension
-         point="org.eclipse.papyrus.infra.viewpoints.policy.custom">
-      <contribution
-            file="src/main/resources/viewpoint/architectureConceptsDiagram.configuration"
-            original="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration">
-      </contribution>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.infra.core.modelListener">
-      <listener
-            name="ESFModelListener"
-            realization="org.polarsys.esf.core.diagram.esfarchitectureconcepts.listener.ESFModelListener">
-      </listener>
-   </extension>
-   <extension
-         point="org.eclipse.ui.handlers">
-      <handler
-            class="org.polarsys.esf.core.diagram.esfarchitectureconcepts.handler.CreateESFArchitectureConceptsDiagramHandler"
-            commandId="org.polarsys.esf.core.diagram.esfarchitectureconcepts.editPart.creationCommand">
-            <activeWhen>
-            <with
-                  variable="selection">
-               <test
-                     property="org.polarsys.esf.core.diagram.esfarchitectureconcepts.propertyTester.isSBlockOrSPart"
-                     value="true">
-               </test>
-            </with>
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.polarsys.esf.core.diagram.esfarchitectureconcepts.handler.CreateESFArchitectureConceptsDiagramHandler"
-            commandId="org.polarsys.esf.core.diagram.esfarchitectureconcepts.modelExplorer.creationCommand">
-         <activeWhen>
-            <and>
-               <with
-                     variable="selection">
-                  <iterate>
-                     <adapt
-                           type="org.eclipse.emf.ecore.EObject">
-                        <or>
-                           <instanceof
-                                 value="org.eclipse.uml2.uml.Property">
-                           </instanceof>
-                           <instanceof
-                                 value="org.eclipse.uml2.uml.Class">
-                           </instanceof>
-                        </or>
-                     </adapt>
-                  </iterate>
-               </with>
-               <count
-                     value="1">
-               </count>
-            </and>
-         </activeWhen>
-      </handler>
-   </extension>
-   <extension
-         point="org.eclipse.ui.commands">
-      <command
-            description="%menucontext.diagram.esfarchitectureconcepts.creation.description"
-            id="org.polarsys.esf.core.diagram.esfarchitectureconcepts.editPart.creationCommand"
-            name="%menucontext.diagram.esfarchitectureconcepts.creation.label">
-      </command>
-      <command
-            description="%menucontext.diagram.esfarchitectureconcepts.creation.description"
-            id="org.polarsys.esf.core.diagram.esfarchitectureconcepts.modelExplorer.creationCommand"
-            name="%menucontext.diagram.esfarchitectureconcepts.creation.label">
-      </command>
-   </extension>
-   <extension
-         point="org.eclipse.ui.commandImages">
-      <image
-            commandId="org.polarsys.esf.core.diagram.esfarchitectureconcepts.editPart.creationCommand"
-            icon="src/main/resources/icons/icon_diagram_ architectureconcepts.png">
-      </image>
-      <image
-            commandId="org.polarsys.esf.core.diagram.esfarchitectureconcepts.modelExplorer.creationCommand"
-            icon="src/main/resources/icons/icon_diagram_ architectureconcepts.png">
-      </image>
-   </extension>
-   <extension
-         point="org.eclipse.ui.menus">
-      <menuContribution
-            allPopups="false"
-            locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu?after=filtersMenu">
-         <command
-               commandId="org.polarsys.esf.core.diagram.esfarchitectureconcepts.editPart.creationCommand"
-               icon="src/main/resources/icons/icon_diagram_ architectureconcepts.png"
-               label="%menucontext.diagram.esfarchitectureconcepts.creation.label"
-               style="push">
-               <visibleWhen
-                    checkEnabled="true">
-                 <and>
-                    <with
-                          variable="activeEditorId">
-                       <equals
-                             value="org.eclipse.papyrus.infra.core.papyrusEditor">
-                       </equals>
-                    </with>
-                    <with
-                          variable="selection">
-                       <test
-                             property="org.polarsys.esf.core.diagram.esfarchitectureconcepts.propertyTester.isSBlockOrSPart"
-                             value="true">
-                       </test>
-                    </with>
-                 </and>
-               </visibleWhen>
-         </command>
-      </menuContribution>
-      <menuContribution
-            allPopups="false"
-            locationURI="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup?before=esf.general.bottom">
-         <command
-               commandId="org.polarsys.esf.core.diagram.esfarchitectureconcepts.modelExplorer.creationCommand"
-               icon="src/main/resources/icons/icon_diagram_ architectureconcepts.png"
-               label="%menucontext.diagram.esfarchitectureconcepts.creation.label"
-               style="push">
-         </command>
-      </menuContribution>
-   </extension>
-   <extension
-         point="org.eclipse.core.expressions.propertyTesters">
-      <propertyTester
-            class="org.polarsys.esf.core.diagram.esfarchitectureconcepts.tester.ESFArchitectureConceptsDiagramTester"
-            id="org.polarsys.esf.core.diagram.esfarchitectureconcepts.propertyTester"
-            namespace="org.polarsys.esf.core.diagram.esfarchitectureconcepts.propertyTester"
-            properties="isSBlockOrSPart"
-            type="org.eclipse.jface.viewers.IStructuredSelection">
-      </propertyTester>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
-      <elementTypeSet
-            clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
-            path="src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations">
-      </elementTypeSet>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
-      <elementTypeSet
-            clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
-            path="src/main/resources/elementtypes/esfarchitectureconcepts-extension.elementtypesconfigurations">
-      </elementTypeSet>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
-      <elementTypeSet
-            clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
-            path="src/main/resources/elementtypes/esfarchitectureconcepts_di.elementtypesconfigurations">
-      </elementTypeSet>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
-      <elementTypeSet
-            clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
-            path="src/main/resources/elementtypes/esfarchitectureconcepts_di-extension.elementtypesconfigurations">
-      </elementTypeSet>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.infra.properties.contexts">
-      <context
-            contextModel="src/main/resources/properties_view/esfarchitectureconcepts.ctx">
-      </context>
-   </extension>
+	<extension point="org.eclipse.papyrus.infra.architecture.models">
+		<model path="src/main/resources/architecture/architectureconcepts.architecture"/>
+	</extension>
+ 
+	<extension point="org.eclipse.papyrus.infra.core.modelListener">
+		<listener
+			name="ESFModelListener"
+			realization="org.polarsys.esf.core.diagram.esfarchitectureconcepts.listener.ESFModelListener">
+		</listener>
+	</extension>
+	
+	<extension point="org.eclipse.ui.handlers">
+		<handler
+			class="org.polarsys.esf.core.diagram.esfarchitectureconcepts.handler.CreateESFArchitectureConceptsDiagramHandler"
+			commandId="org.polarsys.esf.core.diagram.esfarchitectureconcepts.editPart.creationCommand">
+			<activeWhen>
+				<with variable="selection">
+					<test
+						property="org.polarsys.esf.core.diagram.esfarchitectureconcepts.propertyTester.isSBlockOrSPart"
+						value="true">
+ 					</test>
+				</with>
+			</activeWhen>
+		</handler>
+		
+		<handler
+			class="org.polarsys.esf.core.diagram.esfarchitectureconcepts.handler.CreateESFArchitectureConceptsDiagramHandler"
+			commandId="org.polarsys.esf.core.diagram.esfarchitectureconcepts.modelExplorer.creationCommand">
+			<activeWhen>
+				<and>
+					<with variable="selection">
+						<iterate>
+							<adapt
+									type="org.eclipse.emf.ecore.EObject">
+								<or>
+									<instanceof
+											value="org.eclipse.uml2.uml.Property">
+									</instanceof>
+									<instanceof
+											value="org.eclipse.uml2.uml.Class">
+									</instanceof>
+								</or>
+							</adapt>
+						</iterate>
+					</with>
+					<count
+							value="1">
+					</count>
+				</and>
+			</activeWhen>
+		</handler>
+	</extension>
+
+	<extension point="org.eclipse.ui.commands">
+		<command
+				description="%menucontext.diagram.esfarchitectureconcepts.creation.description"
+				id="org.polarsys.esf.core.diagram.esfarchitectureconcepts.editPart.creationCommand"
+				name="%menucontext.diagram.esfarchitectureconcepts.creation.label">
+		</command>
+		<command
+				description="%menucontext.diagram.esfarchitectureconcepts.creation.description"
+				id="org.polarsys.esf.core.diagram.esfarchitectureconcepts.modelExplorer.creationCommand"
+				name="%menucontext.diagram.esfarchitectureconcepts.creation.label">
+		</command>
+	</extension>
+	<extension point="org.eclipse.ui.commandImages">
+		<image
+				commandId="org.polarsys.esf.core.diagram.esfarchitectureconcepts.editPart.creationCommand"
+				icon="src/main/resources/icons/icon_diagram_ architectureconcepts.png">
+		</image>
+		<image
+				commandId="org.polarsys.esf.core.diagram.esfarchitectureconcepts.modelExplorer.creationCommand"
+				icon="src/main/resources/icons/icon_diagram_ architectureconcepts.png">
+		</image>
+	</extension>
+
+	<extension point="org.eclipse.ui.menus">
+		<menuContribution
+				allPopups="false"
+				locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu?after=filtersMenu">
+			<command
+					commandId="org.polarsys.esf.core.diagram.esfarchitectureconcepts.editPart.creationCommand"
+					icon="src/main/resources/icons/icon_diagram_ architectureconcepts.png"
+					label="%menucontext.diagram.esfarchitectureconcepts.creation.label"
+					style="push">
+					<visibleWhen
+						  checkEnabled="true">
+					  <and>
+						  <with
+								  variable="activeEditorId">
+							  <equals
+									  value="org.eclipse.papyrus.infra.core.papyrusEditor">
+							  </equals>
+						  </with>
+						  <with
+								  variable="selection">
+							  <test
+									  property="org.polarsys.esf.core.diagram.esfarchitectureconcepts.propertyTester.isSBlockOrSPart"
+									  value="true">
+							  </test>
+						  </with>
+					  </and>
+					</visibleWhen>
+			</command>
+		</menuContribution>
+		<menuContribution
+				allPopups="false"
+				locationURI="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup?before=esf.general.bottom">
+			<command
+					commandId="org.polarsys.esf.core.diagram.esfarchitectureconcepts.modelExplorer.creationCommand"
+					icon="src/main/resources/icons/icon_diagram_ architectureconcepts.png"
+					label="%menucontext.diagram.esfarchitectureconcepts.creation.label"
+					style="push">
+			</command>
+		</menuContribution>
+	</extension>
+	
+	<extension point="org.eclipse.core.expressions.propertyTesters">
+		<propertyTester
+				class="org.polarsys.esf.core.diagram.esfarchitectureconcepts.tester.ESFArchitectureConceptsDiagramTester"
+				id="org.polarsys.esf.core.diagram.esfarchitectureconcepts.propertyTester"
+				namespace="org.polarsys.esf.core.diagram.esfarchitectureconcepts.propertyTester"
+				properties="isSBlockOrSPart"
+				type="org.eclipse.jface.viewers.IStructuredSelection">
+		</propertyTester>
+	</extension>
+
+	<extension point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
+		<elementTypeSet
+				clientContextID="org.eclipse.papyrus.esf.context"
+				path="src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations">
+		</elementTypeSet>
+	</extension>
+
+	<extension point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
+		<elementTypeSet
+				clientContextID="org.eclipse.papyrus.esf.context"
+				path="src/main/resources/elementtypes/esfarchitectureconcepts-extension.elementtypesconfigurations">
+		</elementTypeSet>
+	</extension>
+
+	<extension point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
+		<elementTypeSet
+				clientContextID="org.eclipse.papyrus.esf.context"
+				path="src/main/resources/elementtypes/esfarchitectureconcepts_di.elementtypesconfigurations">
+		</elementTypeSet>
+	</extension>
+
+	<extension point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
+		<elementTypeSet
+				clientContextID="org.eclipse.papyrus.esf.context"
+				path="src/main/resources/elementtypes/esfarchitectureconcepts_di-extension.elementtypesconfigurations">
+		</elementTypeSet>
+	</extension>
+
+	<extension point="org.eclipse.papyrus.infra.properties.contexts">
+		<context contextModel="src/main/resources/properties_view/esfarchitectureconcepts.ctx"/>
+	</extension>
 </plugin>
diff --git a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/java/org/polarsys/esf/core/diagram/esfarchitectureconcepts/ESFArchitectureConceptsDiagramActivator.java b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/java/org/polarsys/esf/core/diagram/esfarchitectureconcepts/ESFArchitectureConceptsDiagramActivator.java
index 369246e..2af7341 100644
--- a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/java/org/polarsys/esf/core/diagram/esfarchitectureconcepts/ESFArchitectureConceptsDiagramActivator.java
+++ b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/java/org/polarsys/esf/core/diagram/esfarchitectureconcepts/ESFArchitectureConceptsDiagramActivator.java
@@ -12,6 +12,7 @@
 
 import org.eclipse.emf.common.EMFPlugin;
 import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.papyrus.infra.core.log.LogHelper;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 
@@ -32,6 +33,8 @@
     /** Keep track of the implementation singleton. */
     private static Implementation sPlugin = null;
 
+	public static LogHelper log;
+
     /**
      * Create the instance.
      */
@@ -56,7 +59,7 @@
     @Override
     public void start(final BundleContext pContext) throws Exception {
         sBundleContext = pContext;
-
+		log = new LogHelper();
     }
 
     /**
diff --git a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/java/org/polarsys/esf/core/diagram/esfarchitectureconcepts/command/CreateESFModelCommand.java b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/java/org/polarsys/esf/core/diagram/esfarchitectureconcepts/command/CreateESFModelCommand.java
new file mode 100644
index 0000000..cb22836
--- /dev/null
+++ b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/java/org/polarsys/esf/core/diagram/esfarchitectureconcepts/command/CreateESFModelCommand.java
@@ -0,0 +1,109 @@
+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST and Thales
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Ansgar Radermacher  ansgar.radermacher@cea.fr (based on similar file
+ *  							from Remi Schnekenburger)
+ *
+ *****************************************************************************/
+
+package org.polarsys.esf.core.diagram.esfarchitectureconcepts.command;
+
+import java.io.IOException;
+import java.util.Collections;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
+import org.eclipse.papyrus.infra.architecture.commands.IModelCreationCommand;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.uml.tools.model.UmlUtils;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.polarsys.esf.core.diagram.esfarchitectureconcepts.ESFArchitectureConceptsDiagramActivator;
+
+
+/**
+ * The Class CreateSysMLModelCommand.
+ */
+public class CreateESFModelCommand implements IModelCreationCommand {
+
+	@Override
+	public void createModel(final ModelSet modelSet) {
+		runAsTransaction(modelSet);
+	}
+
+	protected void runAsTransaction(final ModelSet modelSet) {
+		// Get the UML element to which the newly created diagram will be
+		// attached.
+		// Create the diagram
+		final Resource modelResource = UmlUtils.getUmlResource(modelSet);
+		TransactionalEditingDomain editingDomain = modelSet.getTransactionalEditingDomain();
+
+		URI origURI = modelResource.getURI();
+		try {
+			modelResource.setURI(URI.createURI("platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/template/esf-template.uml"));
+			modelResource.load(null);
+		}
+		catch (IOException e) {
+			ESFArchitectureConceptsDiagramActivator.log.error(e);
+			// template loading failed, fall-back to programmatic creation
+			AbstractTransactionalCommand command = new AbstractTransactionalCommand(editingDomain, "Initialize model", Collections.EMPTY_LIST) {
+
+				@Override
+				protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+					EObject model = getRootElement(modelResource);
+					attachModelToResource(model, modelResource);
+
+					return CommandResult.newOKCommandResult();
+				}
+			};
+			editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(command));
+		}
+		finally {
+			modelResource.setURI(origURI);
+		}
+	}
+
+	protected EObject getRootElement(Resource modelResource) {
+		EObject rootElement = null;
+		if (modelResource != null && modelResource.getContents() != null && modelResource.getContents().size() > 0) {
+			Object root = modelResource.getContents().get(0);
+			if (root instanceof EObject) {
+				rootElement = (EObject) root;
+			}
+		} else {
+			rootElement = createRootElement();
+		}
+		return rootElement;
+	}
+
+	protected EObject createRootElement() {
+		return UMLFactory.eINSTANCE.createModel();
+	}
+
+	protected void attachModelToResource(EObject root, Resource resource) {
+		resource.getContents().add(root);
+	}
+
+	/**
+	 * Gets the model name.
+	 *
+	 * @return the model name
+	 */
+	protected String getModelName() {
+		return "RobMoSysModel"; //$NON-NLS-1$
+	}
+}
diff --git a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/java/org/polarsys/esf/core/diagram/esfarchitectureconcepts/util/ESFArchitectureConceptsDiagramUtil.java b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/java/org/polarsys/esf/core/diagram/esfarchitectureconcepts/util/ESFArchitectureConceptsDiagramUtil.java
index fbd14c2..0b38e3a 100644
--- a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/java/org/polarsys/esf/core/diagram/esfarchitectureconcepts/util/ESFArchitectureConceptsDiagramUtil.java
+++ b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/java/org/polarsys/esf/core/diagram/esfarchitectureconcepts/util/ESFArchitectureConceptsDiagramUtil.java
@@ -12,6 +12,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.transaction.RecordingCommand;
@@ -45,7 +46,7 @@
     public static void createDiagram(final Class pClass, TransactionalEditingDomain pDomain) {
 
         // Get ESF Architecture Concept Diagram Prototype
-        final ViewPrototype vDiagramProtype = getESFArchitectureConceptsDiagramPrototype();
+        final ViewPrototype vDiagramProtype = getESFArchitectureConceptsDiagramPrototype(pDomain);
 
         RecordingCommand vCeateDiagramCmd =
             new RecordingCommand(pDomain, ESFArchitectureConceptsDiagramSet.CREATE_ESFARCHITECTURECONCEPTS_DIAGRAM) {
@@ -91,10 +92,10 @@
      *
      * @return ESFArchitectureConceptsDiagram Prototype
      */
-    private static ViewPrototype getESFArchitectureConceptsDiagramPrototype() {
+    private static ViewPrototype getESFArchitectureConceptsDiagramPrototype(TransactionalEditingDomain domain) {
         ViewPrototype vDiagramPrototype = null;
 
-        for (ViewPrototype vVP : PolicyChecker.getCurrent().getAllPrototypes()) {
+        for (ViewPrototype vVP : PolicyChecker.getFor(domain.getResourceSet()).getAllPrototypes()) {
             if (vVP.getLabel().matches(ESFArchitectureConceptsDiagramSet.ESFARCHITECTURECONCEPTS_DIAGRAM)) {
                 vDiagramPrototype = vVP;
             }
diff --git a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/architecture/architectureconcepts.architecture b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/architecture/architectureconcepts.architecture
new file mode 100644
index 0000000..0253a3d
--- /dev/null
+++ b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/architecture/architectureconcepts.architecture
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<architecture:ArchitectureDomain xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:gmfdiagrepresentation="http://www.eclipse.org/papyrus/infra/gmfdiag/representation" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" xmlns:representation="http://www.eclipse.org/papyrus/infra/core/architecture/representation" xmi:id="_CBeUoEMqEeeNE9tB5iN5zA" id="org.eclipse.papyrus.esf" name="Eclipse Safety Framework" description="Architecture domain for ESF">
+  <stakeholders xmi:type="architecture:Stakeholder" xmi:id="_SFcaQOGpEeewEL8Y1DXhbQ" id="org.eclipse.papyrus.esf.SafetyDesigner" name="Safety Designer" description="Tier 2 Expert within the Robotics Domain" concerns="_SqiO4OGqEeewEL8Y1DXhbQ"/>
+  <concerns xmi:type="architecture:Concern" xmi:id="_SqiO4OGqEeewEL8Y1DXhbQ" id="org.eclipse.papyrus.ESF-LA.concern.SafetyModeling" name="Safety modeling"/>
+  <contexts xmi:type="architecture:ArchitectureDescriptionLanguage" xmi:id="_XiGkgEMqEeeNE9tB5iN5zA" id="org.eclipse.papyrus.esf.context" name="ESF ADL" description="Extension for ESF" defaultViewpoints="_fuR0EPRYEeer9MDJI6SgXA" extensionPrefix="" creationCommandClass="org.polarsys.esf.core.diagram.esfarchitectureconcepts.command.CreateESFModelCommand">
+    <viewpoints xmi:type="architecture:ArchitectureViewpoint" xmi:id="_fuR0EPRYEeer9MDJI6SgXA" id="org.eclipse.papyrus.ESF-LA.viewpoint.SafetyModeling" name="Safety modeling view" description="The view clusters elements that are relevant to Safety Modeling" concerns="_SqiO4OGqEeewEL8Y1DXhbQ" representationKinds="_d79eQHcZEeSndfsfQOfW2A"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.common/model/notation.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.common/model/gmfdiag-common.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.services.controlmode/model/controlmode.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.services.edit/model/marker.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.types.rulebased/model/rulebased.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.elementtypesconfigurations#_tL86sLazEeSbnofizoRSMQ"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations#_4V520MF8EeiSiYNfSYinpQ"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts_di.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConceptsDI.elementTypes"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts-extension.elementtypesconfigurations#_V6IQUA37EeaHB_LaPvqtvw"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts_di-extension.elementtypesconfigurations#_IycWUJquEeaT4-l9OTA0mQ"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.emf/model/infra-emf.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_d79eQHcZEeSndfsfQOfW2A" id="org.eclipse.papyrus.esf.diagram.archconcepts" name="Architecture concepts diagram" description="Architecture concepts diagram" icon="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/icons/icon_diagram_ architectureconcepts.png" concerns="_SqiO4OGqEeewEL8Y1DXhbQ" implementationID="CompositeStructure" customStyle="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/style/architectureConceptsDiagramStyle.css" creationCommandClass="org.eclipse.papyrus.uml.diagram.composite.CreateCompositeDiagramCommand">
+      <modelRules xmi:type="representation:ModelRule" xmi:id="_IfzbAHk9EeSk0Zv84QxXew" permit="true" elementMultiplicity="1" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </modelRules>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_0YJbEak7EeSk0Zv84QxXew" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </owningRules>
+      <paletteRules xmi:type="gmfdiagrepresentation:PaletteRule" xmi:id="_J1gfEXk9EeSk0Zv84QxXew" permit="true" element="composite.group.*"/>
+      <palettes xmi:type="paletteconfiguration:PaletteConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/palette/architectureConceptsDiagram.paletteconfiguration#/"/>
+    </representationKinds>
+    <metamodel xmi:type="ecore:EPackage" href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
+    <profiles xmi:type="ecore:EPackage" href="http://www.polarsys.org/esf/0.7.0/ESFArchitectureConcepts#/"/>
+  </contexts>
+</architecture:ArchitectureDomain>
diff --git a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts-extension.elementtypesconfigurations b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts-extension.elementtypesconfigurations
index ec62c42..c595b94 100644
--- a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts-extension.elementtypesconfigurations
+++ b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts-extension.elementtypesconfigurations
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="ASCII"?>
-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:applystereotypeadvice="http://www.eclipse.org/papyrus/uml/types/applystereotypeadvice/1.1" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:stereotypematcher="http://www.eclipse.org/papyrus/uml/types/stereotypematcher/1.1" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_V6IQUA37EeaHB_LaPvqtvw" identifier="org.polarsys.esf.ESFArchitectureConcepts-Extension.elementTypes" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_bMI1IA3-EeaHB_LaPvqtvw" identifier="org.polarsys.esf.ESFArchitectureConcepts.SPart" name="SPart" hint="UML::Property">
-    <iconEntry xmi:id="_f8-lAKT7EeauS8mxc0PDbQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_spart.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_erkwcA3-EeaHB_LaPvqtvw" editHelperAdviceClassName="org.polarsys.esf.core.diagram.esfarchitectureconcepts.advice.AfterConfigureCommandEditHelperAdvice"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:applystereotypeadvice="http://www.eclipse.org/papyrus/uml/types/applystereotypeadvice/1.1" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:stereotypematcher="http://www.eclipse.org/papyrus/uml/types/stereotypematcher/1.1" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_V6IQUA37EeaHB_LaPvqtvw" identifier="org.polarsys.esf.ESFArchitectureConcepts-Extension.elementTypes" name="ESF architecture concepts EXT" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConcepts.SPart" identifier="org.polarsys.esf.ESFArchitectureConcepts.SPart" name="SPart" hint="UML::Property" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_f8-lAKT7EeauS8mxc0PDbQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_spart.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <editHelperAdviceConfiguration xmi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_erkwcA3-EeaHB_LaPvqtvw" editHelperAdviceClassName="org.polarsys.esf.core.diagram.esfarchitectureconcepts.advice.AfterConfigureCommandEditHelperAdvice"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Property"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_EXEFYA3_EeaHB_LaPvqtvw" identifier="org.polarsys.esf.ESFArchitectureConcepts.InOutputSPort" name="InOutput SPort" hint="UML::Port">
-    <iconEntry xmi:id="_E-qQ4A3_EeaHB_LaPvqtvw" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Port</specializedTypesID>
-    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_hr0Y4A3_EeaHB_LaPvqtvw">
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConcepts.InOutputSPort" identifier="org.polarsys.esf.ESFArchitectureConcepts.InOutputSPort" name="InOutput SPort" hint="UML::Port" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_E-qQ4A3_EeaHB_LaPvqtvw" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <matcherConfiguration xmi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_hr0Y4A3_EeaHB_LaPvqtvw">
       <stereotypesQualifiedNames>ESFArchitectureConcepts::SPort</stereotypesQualifiedNames>
     </matcherConfiguration>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Port"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_T1kawA3_EeaHB_LaPvqtvw" identifier="org.polarsys.esf.ESFArchitectureConcepts.InputSPort" name="Input SPort" hint="UML::Port">
-    <iconEntry xmi:id="_YtkrgA3_EeaHB_LaPvqtvw" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_input_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Port</specializedTypesID>
-    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_mBFwAA3_EeaHB_LaPvqtvw">
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConcepts.InputSPort" identifier="org.polarsys.esf.ESFArchitectureConcepts.InputSPort" name="Input SPort" hint="UML::Port" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_YtkrgA3_EeaHB_LaPvqtvw" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_input_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <matcherConfiguration xmi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_mBFwAA3_EeaHB_LaPvqtvw">
       <stereotypesQualifiedNames>ESFArchitectureConcepts::SPort</stereotypesQualifiedNames>
     </matcherConfiguration>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Port"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Wb1SYA3_EeaHB_LaPvqtvw" identifier="org.polarsys.esf.ESFArchitectureConcepts.OutputSPort" name="Output SPort" hint="UML::Port">
-    <iconEntry xmi:id="_ZE0G0A3_EeaHB_LaPvqtvw" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_output_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Port</specializedTypesID>
-    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_nh6pkA3_EeaHB_LaPvqtvw">
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConcepts.OutputSPort" identifier="org.polarsys.esf.ESFArchitectureConcepts.OutputSPort" name="Output SPort" hint="UML::Port" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ZE0G0A3_EeaHB_LaPvqtvw" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_output_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <matcherConfiguration xmi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_nh6pkA3_EeaHB_LaPvqtvw">
       <stereotypesQualifiedNames>ESFArchitectureConcepts::SPort</stereotypesQualifiedNames>
     </matcherConfiguration>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Port"/>
   </elementTypeConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_tl9kwA4BEeaHB_LaPvqtvw" identifier="org.polarsys.esf.ESFArchitectureConcepts.inoutputSPort" description="InOutput SPort" target="_EXEFYA3_EeaHB_LaPvqtvw">
-    <stereotypesToApply xmi:id="_83OvYA4BEeaHB_LaPvqtvw" stereotypeQualifiedName="ESFArchitectureConcepts::SPort" updateName="true">
+  <adviceBindingsConfigurations xmi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_tl9kwA4BEeaHB_LaPvqtvw" description="InOutput SPort" identifier="org.polarsys.esf.ESFArchitectureConcepts.inoutputSPort" target="org.polarsys.esf.ESFArchitectureConcepts.InOutputSPort">
+    <stereotypesToApply xmi:type="applystereotypeadvice:StereotypeToApply" xmi:id="_83OvYA4BEeaHB_LaPvqtvw" stereotypeQualifiedName="ESFArchitectureConcepts::SPort" updateName="true">
       <requiredProfiles>ESFArchitectureConcepts</requiredProfiles>
-      <featuresToSet xmi:id="_C6bn8A4CEeaHB_LaPvqtvw" featureName="sDirection">
-        <value xsi:type="applystereotypeadvice:ConstantValue" xmi:id="_HnAr0A4CEeaHB_LaPvqtvw">
-          <valueInstance xsi:type="uml:InstanceValue" xmi:id="_IwZ80A4CEeaHB_LaPvqtvw" name="">
-            <type xsi:type="uml:Enumeration" href="../../../../../../plugin/org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/profile/esfarchitectureconcepts.profile.uml#_sfK48MXNEeWgbp76yZjh7g"/>
-            <instance href="../../../../../../plugin/org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/profile/esfarchitectureconcepts.profile.uml#_sfK488XNEeWgbp76yZjh7g"/>
+      <featuresToSet xmi:type="applystereotypeadvice:FeatureToSet" xmi:id="_C6bn8A4CEeaHB_LaPvqtvw" featureName="sDirection">
+        <value xmi:type="applystereotypeadvice:ConstantValue" xmi:id="_HnAr0A4CEeaHB_LaPvqtvw">
+          <valueInstance xmi:type="uml:InstanceValue" xmi:id="_IwZ80A4CEeaHB_LaPvqtvw" name="">
+            <type xmi:type="uml:Enumeration" href="platform:/plugin/org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/profile/esfarchitectureconcepts.profile.uml#_sfK48MXNEeWgbp76yZjh7g"/>
+            <instance xmi:type="uml:EnumerationLiteral" href="platform:/plugin/org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/profile/esfarchitectureconcepts.profile.uml#_sfK488XNEeWgbp76yZjh7g"/>
           </valueInstance>
         </value>
       </featuresToSet>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_kyf5IA4DEeaHB_LaPvqtvw" identifier="org.polarsys.esf.ESFArchitectureConcepts.inputSPort" description="Input SPort" target="_T1kawA3_EeaHB_LaPvqtvw">
-    <stereotypesToApply xmi:id="_tCk48A4DEeaHB_LaPvqtvw" stereotypeQualifiedName="ESFArchitectureConcepts::SPort" updateName="true">
+  <adviceBindingsConfigurations xmi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_kyf5IA4DEeaHB_LaPvqtvw" description="Input SPort" identifier="org.polarsys.esf.ESFArchitectureConcepts.inputSPort" target="org.polarsys.esf.ESFArchitectureConcepts.InputSPort">
+    <stereotypesToApply xmi:type="applystereotypeadvice:StereotypeToApply" xmi:id="_tCk48A4DEeaHB_LaPvqtvw" stereotypeQualifiedName="ESFArchitectureConcepts::SPort" updateName="true">
       <requiredProfiles>ESFArchitectureConcepts</requiredProfiles>
-      <featuresToSet xmi:id="_-3_7AA4GEeaHB_LaPvqtvw" featureName="sDirection">
-        <value xsi:type="applystereotypeadvice:ConstantValue" xmi:id="_BL3bEA4HEeaHB_LaPvqtvw">
-          <valueInstance xsi:type="uml:InstanceValue" xmi:id="_B9lL4A4HEeaHB_LaPvqtvw" name="">
-            <type xsi:type="uml:Enumeration" href="../../../../../../plugin/org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/profile/esfarchitectureconcepts.profile.uml#_sfK48MXNEeWgbp76yZjh7g"/>
-            <instance href="../../../../../../plugin/org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/profile/esfarchitectureconcepts.profile.uml#_sfK48cXNEeWgbp76yZjh7g"/>
+      <featuresToSet xmi:type="applystereotypeadvice:FeatureToSet" xmi:id="_-3_7AA4GEeaHB_LaPvqtvw" featureName="sDirection">
+        <value xmi:type="applystereotypeadvice:ConstantValue" xmi:id="_BL3bEA4HEeaHB_LaPvqtvw">
+          <valueInstance xmi:type="uml:InstanceValue" xmi:id="_B9lL4A4HEeaHB_LaPvqtvw" name="">
+            <type xmi:type="uml:Enumeration" href="platform:/plugin/org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/profile/esfarchitectureconcepts.profile.uml#_sfK48MXNEeWgbp76yZjh7g"/>
+            <instance xmi:type="uml:EnumerationLiteral" href="platform:/plugin/org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/profile/esfarchitectureconcepts.profile.uml#_sfK48cXNEeWgbp76yZjh7g"/>
           </valueInstance>
         </value>
       </featuresToSet>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_mFwQwA4DEeaHB_LaPvqtvw" identifier="org.polarsys.esf.ESFArchitectureConcepts.outputSPort" description="Output SPort" target="_Wb1SYA3_EeaHB_LaPvqtvw">
-    <stereotypesToApply xmi:id="_0BRwcA4DEeaHB_LaPvqtvw" stereotypeQualifiedName="ESFArchitectureConcepts::SPort" updateName="true">
+  <adviceBindingsConfigurations xmi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_mFwQwA4DEeaHB_LaPvqtvw" description="Output SPort" identifier="org.polarsys.esf.ESFArchitectureConcepts.outputSPort" target="org.polarsys.esf.ESFArchitectureConcepts.OutputSPort">
+    <stereotypesToApply xmi:type="applystereotypeadvice:StereotypeToApply" xmi:id="_0BRwcA4DEeaHB_LaPvqtvw" stereotypeQualifiedName="ESFArchitectureConcepts::SPort" updateName="true">
       <requiredProfiles>ESFArchitectureConcepts</requiredProfiles>
-      <featuresToSet xmi:id="_U7oKQA4HEeaHB_LaPvqtvw" featureName="sDirection">
-        <value xsi:type="applystereotypeadvice:ConstantValue" xmi:id="_WyK1IA4HEeaHB_LaPvqtvw">
-          <valueInstance xsi:type="uml:InstanceValue" xmi:id="_XnRRIA4HEeaHB_LaPvqtvw" name="">
-            <type xsi:type="uml:Enumeration" href="../../../../../../plugin/org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/profile/esfarchitectureconcepts.profile.uml#_sfK48MXNEeWgbp76yZjh7g"/>
-            <instance href="../../../../../../plugin/org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/profile/esfarchitectureconcepts.profile.uml#_sfK48sXNEeWgbp76yZjh7g"/>
+      <featuresToSet xmi:type="applystereotypeadvice:FeatureToSet" xmi:id="_U7oKQA4HEeaHB_LaPvqtvw" featureName="sDirection">
+        <value xmi:type="applystereotypeadvice:ConstantValue" xmi:id="_WyK1IA4HEeaHB_LaPvqtvw">
+          <valueInstance xmi:type="uml:InstanceValue" xmi:id="_XnRRIA4HEeaHB_LaPvqtvw" name="">
+            <type xmi:type="uml:Enumeration" href="platform:/plugin/org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/profile/esfarchitectureconcepts.profile.uml#_sfK48MXNEeWgbp76yZjh7g"/>
+            <instance xmi:type="uml:EnumerationLiteral" href="platform:/plugin/org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/profile/esfarchitectureconcepts.profile.uml#_sfK48sXNEeWgbp76yZjh7g"/>
           </valueInstance>
         </value>
       </featuresToSet>
diff --git a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations
index f556e5c..732e625 100644
--- a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations
+++ b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations
@@ -1,74 +1,74 @@
-<?xml version="1.0" encoding="ASCII"?>
-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:applystereotypeadvice="http://www.eclipse.org/papyrus/uml/types/applystereotypeadvice/1.1" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:stereotypematcher="http://www.eclipse.org/papyrus/uml/types/stereotypematcher/1.1" identifier="org.polarsys.esf.ESFArchitectureConcepts.elementTypes" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConcepts.SBlock" name="SBlock" hint="UML::Class">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_sblock.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
-    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+<?xml version="1.0" encoding="UTF-8"?>
+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:applystereotypeadvice="http://www.eclipse.org/papyrus/uml/types/applystereotypeadvice/1.1" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:stereotypematcher="http://www.eclipse.org/papyrus/uml/types/stereotypematcher/1.1" xmi:id="_4V520MF8EeiSiYNfSYinpQ" identifier="org.polarsys.esf.ESFArchitectureConcepts.elementTypes" name="ESF architecture concepts" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConcepts.SBlock" identifier="org.polarsys.esf.ESFArchitectureConcepts.SBlock" name="SBlock" hint="UML::Class" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_4V520cF8EeiSiYNfSYinpQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_sblock.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <matcherConfiguration xmi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_4V520sF8EeiSiYNfSYinpQ">
       <stereotypesQualifiedNames>ESFArchitectureConcepts::SBlock</stereotypesQualifiedNames>
     </matcherConfiguration>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConcepts.SConnector" name="SConnector" hint="UML::Connector">
-    <iconEntry iconPath="/icons/full/obj16/Connector.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Connector</specializedTypesID>
-    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConcepts.SConnector" identifier="org.polarsys.esf.ESFArchitectureConcepts.SConnector" name="SConnector" hint="UML::Connector" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_4V5208F8EeiSiYNfSYinpQ" iconPath="/icons/full/obj16/Connector.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xmi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_4V521MF8EeiSiYNfSYinpQ">
       <stereotypesQualifiedNames>ESFArchitectureConcepts::SConnector</stereotypesQualifiedNames>
     </matcherConfiguration>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Connector"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConcepts.SModel" name="SModel" hint="UML::Package">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
-    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConcepts.SModel" identifier="org.polarsys.esf.ESFArchitectureConcepts.SModel" name="SModel" hint="UML::Package" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_4V521cF8EeiSiYNfSYinpQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <matcherConfiguration xmi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_4V521sF8EeiSiYNfSYinpQ">
       <stereotypesQualifiedNames>ESFArchitectureConcepts::SModel</stereotypesQualifiedNames>
     </matcherConfiguration>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConcepts.SPart" name="SPart" hint="UML::Property">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_spart.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
-    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConcepts.SPart" identifier="org.polarsys.esf.ESFArchitectureConcepts.SPart" name="SPart" hint="UML::Property" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_4V5218F8EeiSiYNfSYinpQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_spart.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <matcherConfiguration xmi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_4V522MF8EeiSiYNfSYinpQ">
       <stereotypesQualifiedNames>ESFArchitectureConcepts::SPart</stereotypesQualifiedNames>
     </matcherConfiguration>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Property"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConcepts.SPort" name="SPort" hint="UML::Port">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Port</specializedTypesID>
-    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConcepts.SPort" identifier="org.polarsys.esf.ESFArchitectureConcepts.SPort" name="SPort" hint="UML::Port" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_4V522cF8EeiSiYNfSYinpQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <matcherConfiguration xmi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_4V6d4MF8EeiSiYNfSYinpQ">
       <stereotypesQualifiedNames>ESFArchitectureConcepts::SPort</stereotypesQualifiedNames>
     </matcherConfiguration>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Port"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConcepts.SPortRole" name="SPortRole" hint="UML::Port">
-    <iconEntry iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Port</specializedTypesID>
-    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConcepts.SPortRole" identifier="org.polarsys.esf.ESFArchitectureConcepts.SPortRole" name="SPortRole" hint="UML::Port" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_4V6d4cF8EeiSiYNfSYinpQ" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xmi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_4V6d4sF8EeiSiYNfSYinpQ">
       <stereotypesQualifiedNames>ESFArchitectureConcepts::SPortRole</stereotypesQualifiedNames>
     </matcherConfiguration>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Port"/>
   </elementTypeConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" identifier="org.polarsys.esf.ESFArchitectureConcepts.sBlock" target="//@elementTypeConfigurations.0">
-    <stereotypesToApply stereotypeQualifiedName="ESFArchitectureConcepts::SBlock" updateName="true">
+  <adviceBindingsConfigurations xmi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_4V6d48F8EeiSiYNfSYinpQ" identifier="org.polarsys.esf.ESFArchitectureConcepts.sBlock" target="org.polarsys.esf.ESFArchitectureConcepts.SBlock">
+    <stereotypesToApply xmi:type="applystereotypeadvice:StereotypeToApply" xmi:id="_4V6d5MF8EeiSiYNfSYinpQ" stereotypeQualifiedName="ESFArchitectureConcepts::SBlock" updateName="true">
       <requiredProfiles>ESFArchitectureConcepts</requiredProfiles>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" identifier="org.polarsys.esf.ESFArchitectureConcepts.sConnector" target="//@elementTypeConfigurations.1">
-    <stereotypesToApply stereotypeQualifiedName="ESFArchitectureConcepts::SConnector" updateName="true">
+  <adviceBindingsConfigurations xmi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_4V6d5cF8EeiSiYNfSYinpQ" identifier="org.polarsys.esf.ESFArchitectureConcepts.sConnector" target="org.polarsys.esf.ESFArchitectureConcepts.SConnector">
+    <stereotypesToApply xmi:type="applystereotypeadvice:StereotypeToApply" xmi:id="_4V6d5sF8EeiSiYNfSYinpQ" stereotypeQualifiedName="ESFArchitectureConcepts::SConnector" updateName="true">
       <requiredProfiles>ESFArchitectureConcepts</requiredProfiles>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" identifier="org.polarsys.esf.ESFArchitectureConcepts.sModel" target="//@elementTypeConfigurations.2">
-    <stereotypesToApply stereotypeQualifiedName="ESFArchitectureConcepts::SModel" updateName="true">
+  <adviceBindingsConfigurations xmi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_4V6d58F8EeiSiYNfSYinpQ" identifier="org.polarsys.esf.ESFArchitectureConcepts.sModel" target="org.polarsys.esf.ESFArchitectureConcepts.SModel">
+    <stereotypesToApply xmi:type="applystereotypeadvice:StereotypeToApply" xmi:id="_4V6d6MF8EeiSiYNfSYinpQ" stereotypeQualifiedName="ESFArchitectureConcepts::SModel" updateName="true">
       <requiredProfiles>ESFArchitectureConcepts</requiredProfiles>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" identifier="org.polarsys.esf.ESFArchitectureConcepts.sPart" target="//@elementTypeConfigurations.3">
-    <stereotypesToApply stereotypeQualifiedName="ESFArchitectureConcepts::SPart" updateName="true">
+  <adviceBindingsConfigurations xmi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_4V6d6cF8EeiSiYNfSYinpQ" identifier="org.polarsys.esf.ESFArchitectureConcepts.sPart" target="org.polarsys.esf.ESFArchitectureConcepts.SPart">
+    <stereotypesToApply xmi:type="applystereotypeadvice:StereotypeToApply" xmi:id="_4V6d6sF8EeiSiYNfSYinpQ" stereotypeQualifiedName="ESFArchitectureConcepts::SPart" updateName="true">
       <requiredProfiles>ESFArchitectureConcepts</requiredProfiles>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" identifier="org.polarsys.esf.ESFArchitectureConcepts.sPort" target="//@elementTypeConfigurations.4">
-    <stereotypesToApply stereotypeQualifiedName="ESFArchitectureConcepts::SPort" updateName="true">
+  <adviceBindingsConfigurations xmi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_4V6d68F8EeiSiYNfSYinpQ" identifier="org.polarsys.esf.ESFArchitectureConcepts.sPort" target="org.polarsys.esf.ESFArchitectureConcepts.SPort">
+    <stereotypesToApply xmi:type="applystereotypeadvice:StereotypeToApply" xmi:id="_4V6d7MF8EeiSiYNfSYinpQ" stereotypeQualifiedName="ESFArchitectureConcepts::SPort" updateName="true">
       <requiredProfiles>ESFArchitectureConcepts</requiredProfiles>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" identifier="org.polarsys.esf.ESFArchitectureConcepts.sPortRole" target="//@elementTypeConfigurations.5">
-    <stereotypesToApply stereotypeQualifiedName="ESFArchitectureConcepts::SPortRole" updateName="true">
+  <adviceBindingsConfigurations xmi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_4V6d7cF8EeiSiYNfSYinpQ" identifier="org.polarsys.esf.ESFArchitectureConcepts.sPortRole" target="org.polarsys.esf.ESFArchitectureConcepts.SPortRole">
+    <stereotypesToApply xmi:type="applystereotypeadvice:StereotypeToApply" xmi:id="_4V6d7sF8EeiSiYNfSYinpQ" stereotypeQualifiedName="ESFArchitectureConcepts::SPortRole" updateName="true">
       <requiredProfiles>ESFArchitectureConcepts</requiredProfiles>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
diff --git a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts_di-extension.elementtypesconfigurations b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts_di-extension.elementtypesconfigurations
index 7a342af..add68c7 100644
--- a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts_di-extension.elementtypesconfigurations
+++ b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts_di-extension.elementtypesconfigurations
@@ -1,105 +1,105 @@
-<?xml version="1.0" encoding="ASCII"?>
-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmi:id="_IycWUJquEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI-Extension.elementTypes" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_IycWUZquEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPart_Property_AttributeLabel" name="SPart (Property_AttributeLabel)" hint="Property_AttributeLabel">
-    <iconEntry xmi:id="_YiQf4KT7EeauS8mxc0PDbQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_spart.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SPart</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Property_AttributeLabel</specializedTypesID>
-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_IycWUpquEeaT4-l9OTA0mQ" editHelperAdviceClassName="org.polarsys.esf.core.diagram.esfarchitectureconcepts.advice.CreateOrSelectSBlockPropertyTypeEditHelperAdvice"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_IycWUJquEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI-Extension.elementTypes" name="ESF architecture concepts EXT DI" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.SPart_Property_AttributeLabel" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPart_Property_AttributeLabel" name="SPart (Property_AttributeLabel)" hint="Property_AttributeLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_YiQf4KT7EeauS8mxc0PDbQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_spart.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <editHelperAdviceConfiguration xmi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_IycWUpquEeaT4-l9OTA0mQ" editHelperAdviceClassName="org.polarsys.esf.core.diagram.esfarchitectureconcepts.advice.CreateOrSelectSBlockPropertyTypeEditHelperAdvice"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts-extension.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.SPart"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_AttributeLabel"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_IycWU5quEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPart_Property_Shape" name="SPart (Property_Shape)" hint="Property_Shape">
-    <iconEntry xmi:id="_a1BMsKT7EeauS8mxc0PDbQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_spart.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SPart</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Property_Shape</specializedTypesID>
-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_Iyc9YJquEeaT4-l9OTA0mQ" editHelperAdviceClassName="org.polarsys.esf.core.diagram.esfarchitectureconcepts.advice.CreateOrSelectSBlockPropertyTypeEditHelperAdvice"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.SPart_Property_Shape" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPart_Property_Shape" name="SPart (Property_Shape)" hint="Property_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_a1BMsKT7EeauS8mxc0PDbQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_spart.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <editHelperAdviceConfiguration xmi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_Iyc9YJquEeaT4-l9OTA0mQ" editHelperAdviceClassName="org.polarsys.esf.core.diagram.esfarchitectureconcepts.advice.CreateOrSelectSBlockPropertyTypeEditHelperAdvice"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts-extension.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.SPart"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_Shape"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Iyc9YZquEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InputSPort_Port_AttributeLabel" name="InputSPort (Port_AttributeLabel)" hint="Port_AttributeLabel">
-    <iconEntry xmi:id="_Iyc9YpquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_input_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.InputSPort</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Port_AttributeLabel</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.InputSPort_Port_AttributeLabel" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InputSPort_Port_AttributeLabel" name="InputSPort (Port_AttributeLabel)" hint="Port_AttributeLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Iyc9YpquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_input_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts-extension.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.InputSPort"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_AttributeLabel"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Iyc9Y5quEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InputSPort_Port_BehaviorEdge" name="Input SPort (Port_BehaviorEdge)" hint="Port_BehaviorEdge">
-    <iconEntry xmi:id="_Iyc9ZJquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_input_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.InputSPort</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Port_BehaviorEdge</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.InputSPort_Port_BehaviorEdge" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InputSPort_Port_BehaviorEdge" name="Input SPort (Port_BehaviorEdge)" hint="Port_BehaviorEdge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Iyc9ZJquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_input_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts-extension.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.InputSPort"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_BehaviorEdge"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Iyc9ZZquEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InputSPort_Port_BehaviorShape" name="Input SPort (Port_BehaviorShape)" hint="Port_BehaviorShape">
-    <iconEntry xmi:id="_Iyc9ZpquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_input_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.InputSPort</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Port_BehaviorShape</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.InputSPort_Port_BehaviorShape" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InputSPort_Port_BehaviorShape" name="Input SPort (Port_BehaviorShape)" hint="Port_BehaviorShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Iyc9ZpquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_input_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts-extension.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.InputSPort"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_BehaviorShape"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Iyc9Z5quEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InputSPort_Port_Edge" name="Input SPort (Port_Edge)" hint="Port_Edge">
-    <iconEntry xmi:id="_Iyc9aJquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_input_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.InputSPort</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Port_Edge</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.InputSPort_Port_Edge" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InputSPort_Port_Edge" name="Input SPort (Port_Edge)" hint="Port_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Iyc9aJquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_input_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts-extension.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.InputSPort"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_Edge"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Iyc9aZquEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InputSPort_Port_Shape" name="Input SPort (Port_Shape)" hint="Port_Shape">
-    <iconEntry xmi:id="_Iyc9apquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_input_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.InputSPort</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Port_Shape</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.InputSPort_Port_Shape" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InputSPort_Port_Shape" name="Input SPort (Port_Shape)" hint="Port_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Iyc9apquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_input_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts-extension.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.InputSPort"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_Shape"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Iyc9a5quEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InputSPort_Port_Shape_CN" name="Input SPort (Port_Shape_CN)" hint="Port_Shape_CN">
-    <iconEntry xmi:id="_Iyc9bJquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_input_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.InputSPort</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Port_Shape_CN</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.InputSPort_Port_Shape_CN" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InputSPort_Port_Shape_CN" name="Input SPort (Port_Shape_CN)" hint="Port_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Iyc9bJquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_input_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts-extension.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.InputSPort"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_Shape_CN"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Iyc9bZquEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.OutputSPort_Port_AttributeLabel" name="Output SPort (Port_AttributeLabel)" hint="Port_AttributeLabel">
-    <iconEntry xmi:id="_Iyc9bpquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_output_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.OutputSPort</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Port_AttributeLabel</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.OutputSPort_Port_AttributeLabel" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.OutputSPort_Port_AttributeLabel" name="Output SPort (Port_AttributeLabel)" hint="Port_AttributeLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Iyc9bpquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_output_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts-extension.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.OutputSPort"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_AttributeLabel"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Iyc9b5quEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.OutputSPort_Port_BehaviorEdge" name="Output SPort (Port_BehaviorEdge)" hint="Port_BehaviorEdge">
-    <iconEntry xmi:id="_Iyc9cJquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_output_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.OutputSPort</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Port_BehaviorEdge</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.OutputSPort_Port_BehaviorEdge" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.OutputSPort_Port_BehaviorEdge" name="Output SPort (Port_BehaviorEdge)" hint="Port_BehaviorEdge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Iyc9cJquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_output_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts-extension.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.OutputSPort"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_BehaviorEdge"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Iyc9cZquEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.OutputSPort_Port_BehaviorShape" name="Output SPort (Port_BehaviorShape)" hint="Port_BehaviorShape">
-    <iconEntry xmi:id="_Iyc9cpquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_output_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.OutputSPort</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Port_BehaviorShape</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.OutputSPort_Port_BehaviorShape" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.OutputSPort_Port_BehaviorShape" name="Output SPort (Port_BehaviorShape)" hint="Port_BehaviorShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Iyc9cpquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_output_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts-extension.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.OutputSPort"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_BehaviorShape"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Iyc9c5quEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.OutputSPort_Port_Edge" name="Output SPort (Port_Edge)" hint="Port_Edge">
-    <iconEntry xmi:id="_Iyc9dJquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_output_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.OutputSPort</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Port_Edge</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.OutputSPort_Port_Edge" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.OutputSPort_Port_Edge" name="Output SPort (Port_Edge)" hint="Port_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Iyc9dJquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_output_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts-extension.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.OutputSPort"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_Edge"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Iyc9dZquEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.OutputSPort_Port_Shape" name="Output SPort (Port_Shape)" hint="Port_Shape">
-    <iconEntry xmi:id="_Iyc9dpquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_output_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.OutputSPort</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Port_Shape</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.OutputSPort_Port_Shape" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.OutputSPort_Port_Shape" name="Output SPort (Port_Shape)" hint="Port_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Iyc9dpquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_output_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts-extension.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.OutputSPort"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_Shape"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Iyc9d5quEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.OutputSPort_Port_Shape_CN" name="Output SPort (Port_Shape_CN)" hint="Port_Shape_CN">
-    <iconEntry xmi:id="_Iyc9eJquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_output_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.OutputSPort</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Port_Shape_CN</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.OutputSPort_Port_Shape_CN" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.OutputSPort_Port_Shape_CN" name="Output SPort (Port_Shape_CN)" hint="Port_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Iyc9eJquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_output_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts-extension.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.OutputSPort"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_Shape_CN"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Iyc9eZquEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InOutputSPort_Port_AttributeLabel" name="InOutput SPort (Port_AttributeLabel)" hint="Port_AttributeLabel">
-    <iconEntry xmi:id="_Iyc9epquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.InOutputSPort</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Port_AttributeLabel</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.InOutputSPort_Port_AttributeLabel" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InOutputSPort_Port_AttributeLabel" name="InOutput SPort (Port_AttributeLabel)" hint="Port_AttributeLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Iyc9epquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts-extension.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.InOutputSPort"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_AttributeLabel"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Iyc9e5quEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InOutputSPort_Port_BehaviorEdge" name="InOutput SPort (Port_BehaviorEdge)" hint="Port_BehaviorEdge">
-    <iconEntry xmi:id="_Iyc9fJquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.InOutputSPort</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Port_BehaviorEdge</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.InOutputSPort_Port_BehaviorEdge" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InOutputSPort_Port_BehaviorEdge" name="InOutput SPort (Port_BehaviorEdge)" hint="Port_BehaviorEdge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Iyc9fJquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts-extension.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.InOutputSPort"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_BehaviorEdge"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Iyc9fZquEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InOutputSPort_Port_BehaviorShape" name="InOutput SPort (Port_BehaviorShape)" hint="Port_BehaviorShape">
-    <iconEntry xmi:id="_Iyc9fpquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.InOutputSPort</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Port_BehaviorShape</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.InOutputSPort_Port_BehaviorShape" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InOutputSPort_Port_BehaviorShape" name="InOutput SPort (Port_BehaviorShape)" hint="Port_BehaviorShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Iyc9fpquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts-extension.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.InOutputSPort"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_BehaviorShape"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Iyc9f5quEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InOutputSPort_Port_Edge" name="InOutput SPort (Port_Edge)" hint="Port_Edge">
-    <iconEntry xmi:id="_Iyc9gJquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.InOutputSPort</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Port_Edge</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.InOutputSPort_Port_Edge" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InOutputSPort_Port_Edge" name="InOutput SPort (Port_Edge)" hint="Port_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Iyc9gJquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts-extension.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.InOutputSPort"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_Edge"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Iyc9gZquEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InOutputSPort_Port_Shape" name="InOutput SPort (Port_Shape)" hint="Port_Shape">
-    <iconEntry xmi:id="_Iyc9gpquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.InOutputSPort</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Port_Shape</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.InOutputSPort_Port_Shape" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InOutputSPort_Port_Shape" name="InOutput SPort (Port_Shape)" hint="Port_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Iyc9gpquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts-extension.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.InOutputSPort"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_Shape"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Iyc9g5quEeaT4-l9OTA0mQ" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InOutputSPort_Port_Shape_CN" name="InOutput SPort (Port_Shape_CN)" hint="Port_Shape_CN">
-    <iconEntry xmi:id="_Iyc9hJquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.InOutputSPort</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Port_Shape_CN</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.InOutputSPort_Port_Shape_CN" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.InOutputSPort_Port_Shape_CN" name="InOutput SPort (Port_Shape_CN)" hint="Port_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Iyc9hJquEeaT4-l9OTA0mQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts-extension.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.InOutputSPort"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_Shape_CN"/>
   </elementTypeConfigurations>
 </elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts_di.elementtypesconfigurations b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts_di.elementtypesconfigurations
index f3cb598..21107b4 100644
--- a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts_di.elementtypesconfigurations
+++ b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts_di.elementtypesconfigurations
@@ -1,196 +1,196 @@
-<?xml version="1.0" encoding="ASCII"?>
-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:applystereotypeadvice="http://www.eclipse.org/papyrus/uml/types/applystereotypeadvice/1.1" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:stereotypematcher="http://www.eclipse.org/papyrus/uml/types/stereotypematcher/1.1" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.elementTypes" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SBlock_Class_MetaclassShape" name="SBlock (Class_MetaclassShape)" hint="Class_MetaclassShape">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_sblock.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SBlock</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Class_MetaclassShape</specializedTypesID>
+<?xml version="1.0" encoding="UTF-8"?>
+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:applystereotypeadvice="http://www.eclipse.org/papyrus/uml/types/applystereotypeadvice/1.1" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:stereotypematcher="http://www.eclipse.org/papyrus/uml/types/stereotypematcher/1.1" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.elementTypes" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.elementTypes" name="ESF architecture concepts DI" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.SBlock_Class_MetaclassShape" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SBlock_Class_MetaclassShape" name="SBlock (Class_MetaclassShape)" hint="Class_MetaclassShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_9b1ZYMF9EeiSiYNfSYinpQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_sblock.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.SBlock"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_MetaclassShape"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SBlock_Class_MetaclassShape_CN" name="SBlock (Class_MetaclassShape_CN)" hint="Class_MetaclassShape_CN">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_sblock.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SBlock</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Class_MetaclassShape_CN</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.SBlock_Class_MetaclassShape_CN" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SBlock_Class_MetaclassShape_CN" name="SBlock (Class_MetaclassShape_CN)" hint="Class_MetaclassShape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_9b1ZYcF9EeiSiYNfSYinpQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_sblock.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.SBlock"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_MetaclassShape_CN"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SBlock_Class_NestedClassifierLabel" name="SBlock (Class_NestedClassifierLabel)" hint="Class_NestedClassifierLabel">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_sblock.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SBlock</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Class_NestedClassifierLabel</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.SBlock_Class_NestedClassifierLabel" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SBlock_Class_NestedClassifierLabel" name="SBlock (Class_NestedClassifierLabel)" hint="Class_NestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_9b1ZYsF9EeiSiYNfSYinpQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_sblock.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.SBlock"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_NestedClassifierLabel"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SBlock_Class_Shape" name="SBlock (Class_Shape)" hint="Class_Shape">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_sblock.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SBlock</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Class_Shape</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.SBlock_Class_Shape" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SBlock_Class_Shape" name="SBlock (Class_Shape)" hint="Class_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_9b1ZY8F9EeiSiYNfSYinpQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_sblock.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.SBlock"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_Shape"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SBlock_Class_Shape_CN" name="SBlock (Class_Shape_CN)" hint="Class_Shape_CN">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_sblock.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SBlock</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Class_Shape_CN</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.SBlock_Class_Shape_CN" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SBlock_Class_Shape_CN" name="SBlock (Class_Shape_CN)" hint="Class_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_9b1ZZMF9EeiSiYNfSYinpQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_sblock.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.SBlock"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_Shape_CN"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SConnector_Connector_Edge" name="SConnector" hint="Connector_Edge">
-    <iconEntry iconPath="/icons/full/obj16/Connector.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SConnector</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Connector_Edge</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.SConnector_Connector_Edge" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SConnector_Connector_Edge" name="SConnector" hint="Connector_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_9b1ZZcF9EeiSiYNfSYinpQ" iconPath="/icons/full/obj16/Connector.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.SConnector"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Connector_Edge"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_CompositeStructure" name="SModel (CompositeStructure)" hint="CompositeStructure">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Package_CompositeStructureDiagram</specializedTypesID>
-    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_CompositeStructure" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_CompositeStructure" name="SModel (CompositeStructure)" hint="CompositeStructure" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_9b1ZZsF9EeiSiYNfSYinpQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <matcherConfiguration xmi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_9b1ZZ8F9EeiSiYNfSYinpQ">
       <stereotypesQualifiedNames>ESFArchitectureConcepts::SModel</stereotypesQualifiedNames>
     </matcherConfiguration>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_CompositeStructureDiagram"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_Package_Shape" name="SModel (Package_Shape)" hint="Package_Shape">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SModel</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Package_Shape</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_Package_Shape" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_Package_Shape" name="SModel (Package_Shape)" hint="Package_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_9b1ZaMF9EeiSiYNfSYinpQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.SModel"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_Package_Shape_CN" name="SModel (Package_Shape_CN)" hint="Package_Shape_CN">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SModel</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Package_Shape_CN</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_Package_Shape_CN" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_Package_Shape_CN" name="SModel (Package_Shape_CN)" hint="Package_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_9b1ZacF9EeiSiYNfSYinpQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.SModel"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape_CN"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_PapyrusUMLActivityDiagram" name="SModel (PapyrusUMLActivityDiagram)" hint="PapyrusUMLActivityDiagram">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SModel</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Package_ActivityDiagram</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_PapyrusUMLActivityDiagram" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_PapyrusUMLActivityDiagram" name="SModel (PapyrusUMLActivityDiagram)" hint="PapyrusUMLActivityDiagram" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_9b1ZasF9EeiSiYNfSYinpQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.SModel"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_ActivityDiagram"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_PapyrusUMLClassDiagram" name="SModel (PapyrusUMLClassDiagram)" hint="PapyrusUMLClassDiagram">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SModel</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Package_ClassDiagram</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_PapyrusUMLClassDiagram" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_PapyrusUMLClassDiagram" name="SModel (PapyrusUMLClassDiagram)" hint="PapyrusUMLClassDiagram" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_9b1Za8F9EeiSiYNfSYinpQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.SModel"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_ClassDiagram"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_PapyrusUMLCommunicationDiagram" name="SModel (PapyrusUMLCommunicationDiagram)" hint="PapyrusUMLCommunicationDiagram">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SModel</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Package_CommunicationDiagram</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_PapyrusUMLCommunicationDiagram" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_PapyrusUMLCommunicationDiagram" name="SModel (PapyrusUMLCommunicationDiagram)" hint="PapyrusUMLCommunicationDiagram" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_9b1ZbMF9EeiSiYNfSYinpQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.SModel"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_CommunicationDiagram"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_PapyrusUMLComponentDiagram" name="SModel (PapyrusUMLComponentDiagram)" hint="PapyrusUMLComponentDiagram">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SModel</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Package_ComponentDiagram</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_PapyrusUMLComponentDiagram" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_PapyrusUMLComponentDiagram" name="SModel (PapyrusUMLComponentDiagram)" hint="PapyrusUMLComponentDiagram" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_9b1ZbcF9EeiSiYNfSYinpQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.SModel"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_ComponentDiagram"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_PapyrusUMLDeploymentDiagram" name="SModel (PapyrusUMLDeploymentDiagram)" hint="PapyrusUMLDeploymentDiagram">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SModel</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Package_DeploymentDiagram</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_PapyrusUMLDeploymentDiagram" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_PapyrusUMLDeploymentDiagram" name="SModel (PapyrusUMLDeploymentDiagram)" hint="PapyrusUMLDeploymentDiagram" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_9b1ZbsF9EeiSiYNfSYinpQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.SModel"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_DeploymentDiagram"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_PapyrusUMLInteractionOverviewDiagram" name="SModel (PapyrusUMLInteractionOverviewDiagram)" hint="PapyrusUMLInteractionOverviewDiagram">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SModel</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Package_InteractionOverviewDiagram</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_PapyrusUMLInteractionOverviewDiagram" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_PapyrusUMLInteractionOverviewDiagram" name="SModel (PapyrusUMLInteractionOverviewDiagram)" hint="PapyrusUMLInteractionOverviewDiagram" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_9b1Zb8F9EeiSiYNfSYinpQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.SModel"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_InteractionOverviewDiagram"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_PapyrusUMLProfileDiagram" name="SModel (PapyrusUMLProfileDiagram)" hint="PapyrusUMLProfileDiagram">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SModel</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Package_ProfileDiagram</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_PapyrusUMLProfileDiagram" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_PapyrusUMLProfileDiagram" name="SModel (PapyrusUMLProfileDiagram)" hint="PapyrusUMLProfileDiagram" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_9b2AcMF9EeiSiYNfSYinpQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.SModel"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_ProfileDiagram"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_PapyrusUMLSequenceDiagram" name="SModel (PapyrusUMLSequenceDiagram)" hint="PapyrusUMLSequenceDiagram">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SModel</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Package_SequenceDiagram</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_PapyrusUMLSequenceDiagram" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_PapyrusUMLSequenceDiagram" name="SModel (PapyrusUMLSequenceDiagram)" hint="PapyrusUMLSequenceDiagram" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_9b2AccF9EeiSiYNfSYinpQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.SModel"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_SequenceDiagram"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_PapyrusUMLStateMachineDiagram" name="SModel (PapyrusUMLStateMachineDiagram)" hint="PapyrusUMLStateMachineDiagram">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SModel</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Package_StateMachineDiagram</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_PapyrusUMLStateMachineDiagram" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_PapyrusUMLStateMachineDiagram" name="SModel (PapyrusUMLStateMachineDiagram)" hint="PapyrusUMLStateMachineDiagram" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_9b2AcsF9EeiSiYNfSYinpQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.SModel"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_StateMachineDiagram"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_PapyrusUMLTimingDiagram" name="SModel (PapyrusUMLTimingDiagram)" hint="PapyrusUMLTimingDiagram">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SModel</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Package_TimingDiagram</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_PapyrusUMLTimingDiagram" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_PapyrusUMLTimingDiagram" name="SModel (PapyrusUMLTimingDiagram)" hint="PapyrusUMLTimingDiagram" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_9b2Ac8F9EeiSiYNfSYinpQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.SModel"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_TimingDiagram"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_UseCase" name="SModel (UseCase)" hint="UseCase">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Package_UseCaseDiagram</specializedTypesID>
-    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_UseCase" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_UseCase" name="SModel (UseCase)" hint="UseCase" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_9b2AdMF9EeiSiYNfSYinpQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_smodel.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <matcherConfiguration xmi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_9b2AdcF9EeiSiYNfSYinpQ">
       <stereotypesQualifiedNames>ESFArchitectureConcepts::SModel</stereotypesQualifiedNames>
     </matcherConfiguration>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_UseCaseDiagram"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPart_Property_AttributeLabel" name="SPart (Property_AttributeLabel)" hint="Property_AttributeLabel">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_spart.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SPart</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Property_AttributeLabel</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.SPart_Property_AttributeLabel" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPart_Property_AttributeLabel" name="SPart (Property_AttributeLabel)" hint="Property_AttributeLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_9b2AdsF9EeiSiYNfSYinpQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_spart.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.SPart"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_AttributeLabel"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPart_Property_Edge" name="SPart (Property_Edge)" hint="Property_Edge">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_spart.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SPart</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Property_Edge</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.SPart_Property_Edge" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPart_Property_Edge" name="SPart (Property_Edge)" hint="Property_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_9b2Ad8F9EeiSiYNfSYinpQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_spart.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.SPart"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_Edge"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPart_Property_Shape" name="SPart (Property_Shape)" hint="Property_Shape">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_spart.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SPart</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Property_Shape</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.SPart_Property_Shape" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPart_Property_Shape" name="SPart (Property_Shape)" hint="Property_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_9b2AeMF9EeiSiYNfSYinpQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_spart.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.SPart"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_Shape"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPart_Property_Shape_CN" name="SPart (Property_Shape_CN)" hint="Property_Shape_CN">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_spart.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SPart</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Property_Shape_CN</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.SPart_Property_Shape_CN" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPart_Property_Shape_CN" name="SPart (Property_Shape_CN)" hint="Property_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_9b2AecF9EeiSiYNfSYinpQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_spart.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.SPart"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_Shape_CN"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPortRole_Port_AttributeLabel" name="SPortRole (Port_AttributeLabel)" hint="Port_AttributeLabel">
-    <iconEntry iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SPortRole</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Port_AttributeLabel</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.SPortRole_Port_AttributeLabel" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPortRole_Port_AttributeLabel" name="SPortRole (Port_AttributeLabel)" hint="Port_AttributeLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_9b2AesF9EeiSiYNfSYinpQ" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.SPortRole"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_AttributeLabel"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPortRole_Port_BehaviorEdge" name="SPortRole (Port_BehaviorEdge)" hint="Port_BehaviorEdge">
-    <iconEntry iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SPortRole</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Port_BehaviorEdge</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.SPortRole_Port_BehaviorEdge" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPortRole_Port_BehaviorEdge" name="SPortRole (Port_BehaviorEdge)" hint="Port_BehaviorEdge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_9b2Ae8F9EeiSiYNfSYinpQ" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.SPortRole"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_BehaviorEdge"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPortRole_Port_BehaviorShape" name="SPortRole (Port_BehaviorShape)" hint="Port_BehaviorShape">
-    <iconEntry iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SPortRole</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Port_BehaviorShape</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.SPortRole_Port_BehaviorShape" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPortRole_Port_BehaviorShape" name="SPortRole (Port_BehaviorShape)" hint="Port_BehaviorShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_9b2AfMF9EeiSiYNfSYinpQ" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.SPortRole"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_BehaviorShape"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPortRole_Port_Edge" name="SPortRole (Port_Edge)" hint="Port_Edge">
-    <iconEntry iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SPortRole</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Port_Edge</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.SPortRole_Port_Edge" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPortRole_Port_Edge" name="SPortRole (Port_Edge)" hint="Port_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_9b2AfcF9EeiSiYNfSYinpQ" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.SPortRole"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_Edge"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPortRole_Port_Shape" name="SPortRole (Port_Shape)" hint="Port_Shape">
-    <iconEntry iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SPortRole</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Port_Shape</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.SPortRole_Port_Shape" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPortRole_Port_Shape" name="SPortRole (Port_Shape)" hint="Port_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_9b2AfsF9EeiSiYNfSYinpQ" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.SPortRole"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_Shape"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPortRole_Port_Shape_CN" name="SPortRole (Port_Shape_CN)" hint="Port_Shape_CN">
-    <iconEntry iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SPortRole</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Port_Shape_CN</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.SPortRole_Port_Shape_CN" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPortRole_Port_Shape_CN" name="SPortRole (Port_Shape_CN)" hint="Port_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_9b2Af8F9EeiSiYNfSYinpQ" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.SPortRole"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_Shape_CN"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPort_Port_AttributeLabel" name="SPort (Port_AttributeLabel)" hint="Port_AttributeLabel">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SPort</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Port_AttributeLabel</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.SPort_Port_AttributeLabel" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPort_Port_AttributeLabel" name="SPort (Port_AttributeLabel)" hint="Port_AttributeLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_9b2AgMF9EeiSiYNfSYinpQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.SPort"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_AttributeLabel"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPort_Port_BehaviorEdge" name="SPort (Port_BehaviorEdge)" hint="Port_BehaviorEdge">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SPort</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Port_BehaviorEdge</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.SPort_Port_BehaviorEdge" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPort_Port_BehaviorEdge" name="SPort (Port_BehaviorEdge)" hint="Port_BehaviorEdge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_9b2AgcF9EeiSiYNfSYinpQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.SPort"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_BehaviorEdge"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPort_Port_BehaviorShape" name="SPort (Port_BehaviorShape)" hint="Port_BehaviorShape">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SPort</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Port_BehaviorShape</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.SPort_Port_BehaviorShape" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPort_Port_BehaviorShape" name="SPort (Port_BehaviorShape)" hint="Port_BehaviorShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_9b2AgsF9EeiSiYNfSYinpQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.SPort"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_BehaviorShape"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPort_Port_Edge" name="SPort (Port_Edge)" hint="Port_Edge">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SPort</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Port_Edge</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.SPort_Port_Edge" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPort_Port_Edge" name="SPort (Port_Edge)" hint="Port_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_9b2Ag8F9EeiSiYNfSYinpQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.SPort"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_Edge"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPort_Port_Shape" name="SPort (Port_Shape)" hint="Port_Shape">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SPort</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Port_Shape</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.SPort_Port_Shape" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPort_Port_Shape" name="SPort (Port_Shape)" hint="Port_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_9b2AhMF9EeiSiYNfSYinpQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.SPort"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_Shape"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPort_Port_Shape_CN" name="SPort (Port_Shape_CN)" hint="Port_Shape_CN">
-    <iconEntry iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
-    <specializedTypesID>org.polarsys.esf.ESFArchitectureConcepts.SPort</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Port_Shape_CN</specializedTypesID>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.SPort_Port_Shape_CN" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.SPort_Port_Shape_CN" name="SPort (Port_Shape_CN)" hint="Port_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_9b2AhcF9EeiSiYNfSYinpQ" iconPath="/src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png" bundleId="org.polarsys.esf.core.resources.graphical"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConcepts.SPort"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_Shape_CN"/>
   </elementTypeConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.sModel_CompositeStructure" target="//@elementTypeConfigurations.6">
-    <stereotypesToApply stereotypeQualifiedName="ESFArchitectureConcepts::SModel" updateName="true">
+  <adviceBindingsConfigurations xmi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.sModel_CompositeStructure" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.sModel_CompositeStructure" target="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_CompositeStructure">
+    <stereotypesToApply xmi:type="applystereotypeadvice:StereotypeToApply" xmi:id="_9b2AhsF9EeiSiYNfSYinpQ" stereotypeQualifiedName="ESFArchitectureConcepts::SModel" updateName="true">
       <requiredProfiles>ESFArchitectureConcepts</requiredProfiles>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.sModel_UseCase" target="//@elementTypeConfigurations.19">
-    <stereotypesToApply stereotypeQualifiedName="ESFArchitectureConcepts::SModel" updateName="true">
+  <adviceBindingsConfigurations xmi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="org.polarsys.esf.ESFArchitectureConceptsDI.sModel_UseCase" identifier="org.polarsys.esf.ESFArchitectureConceptsDI.sModel_UseCase" target="org.polarsys.esf.ESFArchitectureConceptsDI.SModel_UseCase">
+    <stereotypesToApply xmi:type="applystereotypeadvice:StereotypeToApply" xmi:id="_9b2Ah8F9EeiSiYNfSYinpQ" stereotypeQualifiedName="ESFArchitectureConcepts::SModel" updateName="true">
       <requiredProfiles>ESFArchitectureConcepts</requiredProfiles>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
diff --git a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/palette/architectureConceptsDiagram.paletteconfiguration b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/palette/architectureConceptsDiagram.paletteconfiguration
index 2bc8fac..3bc8040 100644
--- a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/palette/architectureConceptsDiagram.paletteconfiguration
+++ b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/palette/architectureConceptsDiagram.paletteconfiguration
@@ -1,28 +1,40 @@
-<?xml version="1.0" encoding="ASCII"?>
-<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7" id="org.polarsys.esf.esfarchitectureconcepts.acd.palette.model" label="ESFArchitectureConcepts ACD Palette">
-  <drawerConfigurations id="org.polarsys.esf.esfarchitectureconcepts.acd.palette.node" label="Nodes" description="Nodes">
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.polarsys.esf.esfarchitectureconcepts.acd.palette.node.InputSPort" label="Input SPort" description="Create an Input SPort">
-      <icon pluginID="org.polarsys.esf.core.resources.graphical" iconPath="src/main/resources/icons/profile/esfarchitectureconcepts/icon_input_sport.png"/>
-      <elementDescriptors elementTypeId="org.polarsys.esf.ESFArchitectureConceptsDI.InputSPort_Port_Shape"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<paletteconfiguration:PaletteConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" id="org.polarsys.esf.esfarchitectureconcepts.acd.palette.model" label="ESFArchitectureConcepts ACD Palette">
+  <drawerConfigurations xmi:type="paletteconfiguration:DrawerConfiguration" id="org.polarsys.esf.esfarchitectureconcepts.acd.palette.node" label="Nodes" description="Nodes">
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="org.polarsys.esf.esfarchitectureconcepts.acd.palette.node.InputSPort" label="Input SPort" description="Create an Input SPort" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.polarsys.esf.core.resources.graphical" iconPath="src/main/resources/icons/profile/esfarchitectureconcepts/icon_input_sport.png"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts_di-extension.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConceptsDI.InputSPort_Port_Shape"/>
+      </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.polarsys.esf.esfarchitectureconcepts.acd.palette.node.OutputSPort" label="Output SPort" description="Create an Output SPort">
-      <icon pluginID="org.polarsys.esf.core.resources.graphical" iconPath="src/main/resources/icons/profile/esfarchitectureconcepts/icon_output_sport.png"/>
-      <elementDescriptors elementTypeId="org.polarsys.esf.ESFArchitectureConceptsDI.OutputSPort_Port_Shape"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="org.polarsys.esf.esfarchitectureconcepts.acd.palette.node.OutputSPort" label="Output SPort" description="Create an Output SPort" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.polarsys.esf.core.resources.graphical" iconPath="src/main/resources/icons/profile/esfarchitectureconcepts/icon_output_sport.png"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts_di-extension.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConceptsDI.OutputSPort_Port_Shape"/>
+      </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.polarsys.esf.esfarchitectureconcepts.acd.palette.node.InOutputSPort" label="InOutput SPort" description="Create an InOutput SPort">
-      <icon pluginID="org.polarsys.esf.core.resources.graphical" iconPath="src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png"/>
-      <elementDescriptors elementTypeId="org.polarsys.esf.ESFArchitectureConceptsDI.InOutputSPort_Port_Shape"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="org.polarsys.esf.esfarchitectureconcepts.acd.palette.node.InOutputSPort" label="InOutput SPort" description="Create an InOutput SPort" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.polarsys.esf.core.resources.graphical" iconPath="src/main/resources/icons/profile/esfarchitectureconcepts/icon_inoutput_sport.png"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts_di-extension.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConceptsDI.InOutputSPort_Port_Shape"/>
+      </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.polarsys.esf.esfarchitectureconcepts.acd.palette.node.SPart" label="SPart" description="Create a SPart">
-      <icon pluginID="org.polarsys.esf.core.resources.graphical" iconPath="src/main/resources/icons/profile/esfarchitectureconcepts/icon_spart.png"/>
-      <elementDescriptors elementTypeId="org.polarsys.esf.ESFArchitectureConceptsDI.SPart_Property_Shape"/>
-      <elementDescriptors elementTypeId="org.polarsys.esf.ESFArchitectureConceptsDI.SPart_Property_AttributeLabel"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="org.polarsys.esf.esfarchitectureconcepts.acd.palette.node.SPart" label="SPart" description="Create a SPart" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.polarsys.esf.core.resources.graphical" iconPath="src/main/resources/icons/profile/esfarchitectureconcepts/icon_spart.png"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts_di-extension.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConceptsDI.SPart_Property_Shape"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts_di-extension.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConceptsDI.SPart_Property_AttributeLabel"/>
+      </elementDescriptors>
     </ownedConfigurations>
   </drawerConfigurations>
-  <drawerConfigurations id="org.polarsys.esf.esfarchitectureconcepts.acd.palette.edge" label="Edges" description="Edges">
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.polarsys.esf.esfarchitectureconcepts.acd.palette.edge.SConnector" label="SConnector" description="Create a SConnector" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Connector.gif"/>
-      <elementDescriptors elementTypeId="org.polarsys.esf.ESFArchitectureConceptsDI.SConnector_Connector_Edge"/>
+  <drawerConfigurations xmi:type="paletteconfiguration:DrawerConfiguration" id="org.polarsys.esf.esfarchitectureconcepts.acd.palette.edge" label="Edges" description="Edges">
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="org.polarsys.esf.esfarchitectureconcepts.acd.palette.edge.SConnector" label="SConnector" description="Create a SConnector" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Connector.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/elementtypes/esfarchitectureconcepts_di.elementtypesconfigurations#org.polarsys.esf.ESFArchitectureConceptsDI.SConnector_Connector_Edge"/>
+      </elementDescriptors>
     </ownedConfigurations>
   </drawerConfigurations>
 </paletteconfiguration:PaletteConfiguration>
diff --git a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/template/esf-template.di b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/template/esf-template.di
new file mode 100644
index 0000000..dacbbc8
--- /dev/null
+++ b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/template/esf-template.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.esf.context"/>
diff --git a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/template/esf-template.notation b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/template/esf-template.notation
new file mode 100644
index 0000000..bf9abab
--- /dev/null
+++ b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/template/esf-template.notation
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/template/esf-template.uml b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/template/esf-template.uml
new file mode 100644
index 0000000..a808067
--- /dev/null
+++ b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/template/esf-template.uml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_TZ2kUMGIEeivNO_K5quWpw" name="esf-template">
+  <packageImport xmi:type="uml:PackageImport" xmi:id="_UTHuoMGIEeivNO_K5quWpw">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+  <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_atvosMGIEeivNO_K5quWpw">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_atysAMGIEeivNO_K5quWpw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+      <references xmi:type="ecore:EPackage" href="http://www.polarsys.org/esf/0.7.0/ESFArchitectureConcepts#/"/>
+    </eAnnotations>
+    <appliedProfile xmi:type="uml:Profile" href="pathmap://ESFARCHITECTURECONCEPTS_PROFILE/esfarchitectureconcepts.profile.uml#_4KUNIA3QEeWIHrhJxYOO3w"/>
+  </profileApplication>
+  <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_cKVigMGIEeivNO_K5quWpw">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_cKWwoMGIEeivNO_K5quWpw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+      <references xmi:type="ecore:EPackage" href="http://www.polarsys.org/esf/0.7.0/ESFLocalAnalysis#/"/>
+    </eAnnotations>
+    <appliedProfile xmi:type="uml:Profile" href="pathmap://ESFLOCALANALYSIS_PROFILE/esflocalanalysis.profile.uml#_iswZgBi_EeWhPZtBPxjsVg"/>
+  </profileApplication>
+  <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_df1V0MGIEeivNO_K5quWpw">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_df2j8MGIEeivNO_K5quWpw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+      <references xmi:type="ecore:EPackage" href="http://www.polarsys.org/esf/0.7.0/ESFProperties#/"/>
+    </eAnnotations>
+    <appliedProfile xmi:type="uml:Profile" href="pathmap://ESFPROPERTIES_PROFILE/esfproperties.profile.uml#_qx24YBi_EeWhPZtBPxjsVg"/>
+  </profileApplication>
+  <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_ejVaMMGIEeivNO_K5quWpw">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ejWBQMGIEeivNO_K5quWpw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+      <references xmi:type="ecore:EPackage" href="http://www.polarsys.org/esf/0.7.0/ESFFMEA#/"/>
+    </eAnnotations>
+    <appliedProfile xmi:type="uml:Profile" href="pathmap://ESFFMEA_PROFILE/esffmea.profile.uml#_MvCRIG3fEeagV9MLoZdF0A"/>
+  </profileApplication>
+  <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_jjjO8MGMEeiq3vkHhMCOXA">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jjrKwMGMEeiq3vkHhMCOXA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+      <references xmi:type="ecore:EPackage" href="http://www.polarsys.org/esf/0.7.0/ESFSafetyRequirements#/"/>
+    </eAnnotations>
+    <appliedProfile xmi:type="uml:Profile" href="pathmap://ESFSAFETYREQUIREMENTS_PROFILE/esfsafetyrequirements.profile.uml#_uTXf0OhnEea18bRB26vfxg"/>
+  </profileApplication>
+</uml:Model>
diff --git a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/viewpoint/architectureConceptsDiagram.configuration b/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/viewpoint/architectureConceptsDiagram.configuration
deleted file mode 100644
index 798eafd..0000000
--- a/core/diagram/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/viewpoint/architectureConceptsDiagram.configuration
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration:PapyrusConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmi:id="_ZdB8IJqIEeWj-IiynBAdwg">
-  <viewpoints xsi:type="configuration:PapyrusViewpoint" xmi:id="_93j_gJqIEeWj-IiynBAdwg" name="Default Papyrus Viewpoint">
-    <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_CX6lQJqJEeWj-IiynBAdwg" name="ESF Architecture Diagram" icon="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/icons/icon_diagram_ architectureconcepts.png" implementationID="CompositeStructure" categories="_8EEBkJqIEeWj-IiynBAdwg" customPalette="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/palette/architectureConceptsDiagram.paletteconfiguration" customStyle="platform:/plugin/org.polarsys.esf.core.diagram.esfarchitectureconcepts/src/main/resources/style/architectureConceptsDiagramStyle.css">
-      <profiles href="http://www.polarsys.org/esf/0.7.0/ESFArchitectureConcepts#/"/>
-      <modelRules xmi:id="_MccjEMjdEeWL0PkY5hxN9w">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-        <stereotypes href="http://www.polarsys.org/esf/0.7.0/ESFArchitectureConcepts#//SBlock"/>
-      </modelRules>
-      <owningRules xmi:id="_GhK3cMjdEeWL0PkY5hxN9w">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-        <stereotypes href="http://www.polarsys.org/esf/0.7.0/ESFArchitectureConcepts#//SBlock"/>
-      </owningRules>
-      <paletteRules xmi:id="_BbQDIJzCEeWZRbhYMfGBbQ" permit="false" element="composite.group.*"/>
-    </modelKinds>
-  </viewpoints>
-  <defaultStakeholder href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmkdxhEeOqHvRyiN87hA"/>
-  <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
-  <categories xmi:id="_8EEBkJqIEeWj-IiynBAdwg" name="ESF"/>
-</configuration:PapyrusConfiguration>
diff --git a/core/importmodel/org.polarsys.esf.core.importmodel.common/.classpath b/core/importmodel/org.polarsys.esf.core.importmodel.common/.classpath
index 5eb97f7..d97031b 100644
--- a/core/importmodel/org.polarsys.esf.core.importmodel.common/.classpath
+++ b/core/importmodel/org.polarsys.esf.core.importmodel.common/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src/main/java"/>

-	<classpathentry kind="output" path="target/classes/"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="output" path="target/classes/"/>
+</classpath>
diff --git a/core/importmodel/org.polarsys.esf.core.importmodel.common/.project b/core/importmodel/org.polarsys.esf.core.importmodel.common/.project
index 6ce260d..2f3d2d2 100644
--- a/core/importmodel/org.polarsys.esf.core.importmodel.common/.project
+++ b/core/importmodel/org.polarsys.esf.core.importmodel.common/.project
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.polarsys.esf.core.importmodel.common</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.polarsys.esf.core.importmodel.common</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
+	</natures>
+</projectDescription>
diff --git a/core/importmodel/org.polarsys.esf.core.importmodel.common/.settings/org.eclipse.jdt.core.prefs b/core/importmodel/org.polarsys.esf.core.importmodel.common/.settings/org.eclipse.jdt.core.prefs
index 11f6e46..f42de36 100644
--- a/core/importmodel/org.polarsys.esf.core.importmodel.common/.settings/org.eclipse.jdt.core.prefs
+++ b/core/importmodel/org.polarsys.esf.core.importmodel.common/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7

-org.eclipse.jdt.core.compiler.compliance=1.7

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.7

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/core/importmodel/org.polarsys.esf.core.importmodel.common/build.properties b/core/importmodel/org.polarsys.esf.core.importmodel.common/build.properties
index 23ba947..aec299d 100644
--- a/core/importmodel/org.polarsys.esf.core.importmodel.common/build.properties
+++ b/core/importmodel/org.polarsys.esf.core.importmodel.common/build.properties
@@ -1,6 +1,6 @@
-source.. = src/main/java

-output.. = target/classes/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               src/main/resources/properties/

+source.. = src/main/java
+output.. = target/classes/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               src/main/resources/properties/
diff --git a/core/importmodel/org.polarsys.esf.core.importmodel.common/src/main/java/org/polarsys/esf/core/importmodel/common/commands/AbstractImportModelCommand.java b/core/importmodel/org.polarsys.esf.core.importmodel.common/src/main/java/org/polarsys/esf/core/importmodel/common/commands/AbstractImportModelCommand.java
index dc98ab5..0792056 100644
--- a/core/importmodel/org.polarsys.esf.core.importmodel.common/src/main/java/org/polarsys/esf/core/importmodel/common/commands/AbstractImportModelCommand.java
+++ b/core/importmodel/org.polarsys.esf.core.importmodel.common/src/main/java/org/polarsys/esf/core/importmodel/common/commands/AbstractImportModelCommand.java
@@ -26,10 +26,7 @@
 import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.PackageImport;
-import org.eclipse.uml2.uml.UMLFactory;
 
 /**
  * Abstract command class for import model.
diff --git a/core/importmodel/org.polarsys.esf.core.importmodel.common/src/main/java/org/polarsys/esf/core/importmodel/common/commands/UMLImportModelFromFileCommand.java b/core/importmodel/org.polarsys.esf.core.importmodel.common/src/main/java/org/polarsys/esf/core/importmodel/common/commands/UMLImportModelFromFileCommand.java
index 27bb58b..790d1a9 100644
--- a/core/importmodel/org.polarsys.esf.core.importmodel.common/src/main/java/org/polarsys/esf/core/importmodel/common/commands/UMLImportModelFromFileCommand.java
+++ b/core/importmodel/org.polarsys.esf.core.importmodel.common/src/main/java/org/polarsys/esf/core/importmodel/common/commands/UMLImportModelFromFileCommand.java
@@ -56,247 +56,243 @@
  */
 @SuppressWarnings("restriction")
 public class UMLImportModelFromFileCommand
-    extends AbstractImportModelCommand {
+		extends AbstractImportModelCommand {
 
-    /** Default title of the dialog for selecting models to import. */
-    private static final String SELECT_MODELS_TO_IMPORT_TITLE =
-        ImportModelCommonActivator.getMessages().getString("UMLImportModelFromFileCommand.dialog.title"); //$NON-NLS-1$
+	/** Default title of the dialog for selecting models to import. */
+	private static final String SELECT_MODELS_TO_IMPORT_TITLE = ImportModelCommonActivator.getMessages().getString("UMLImportModelFromFileCommand.dialog.title"); //$NON-NLS-1$
 
-    /** Default label of the command Import Models to import. */
-    private static final String IMPORT_MODELS_LABLE =
-        ImportModelCommonActivator.getMessages().getString("UMLImportModelFromFileCommand.command.label"); //$NON-NLS-1$
+	/** Default label of the command Import Models to import. */
+	private static final String IMPORT_MODELS_LABLE = ImportModelCommonActivator.getMessages().getString("UMLImportModelFromFileCommand.command.label"); //$NON-NLS-1$
 
-    /** Default description of the command Import Models to import. */
-    private static final String IMPORT_MODELS_DESCRIPTION =
-        ImportModelCommonActivator.getMessages().getString(
-            "UMLImportModelFromFileCommand.command.description"); //$NON-NLS-1$
+	/** Default description of the command Import Models to import. */
+	private static final String IMPORT_MODELS_DESCRIPTION = ImportModelCommonActivator.getMessages().getString(
+			"UMLImportModelFromFileCommand.command.description"); //$NON-NLS-1$
 
-    /** UML extension key. */
-    private static final String UML_EXTENSION_KEY = "*.uml"; //$NON-NLS-1$
+	/** UML extension key. */
+	private static final String UML_EXTENSION_KEY = "*.uml"; //$NON-NLS-1$
 
-    /** UML extension value. */
-    private static final String UML_EXTENSION_VALUE = "UML (*.uml)"; //$NON-NLS-1$
+	/** UML extension value. */
+	private static final String UML_EXTENSION_VALUE = "UML (*.uml)"; //$NON-NLS-1$
 
-    /** Underscore. */
-    private static final String UNDERSCORE = "_"; //$NON-NLS-1$
+	/** Underscore. */
+	private static final String UNDERSCORE = "_"; //$NON-NLS-1$
 
-    /**
-     * Default constructor.
-     *
-     * @param pEditingDomain The editing domain
-     * @param pSelectedElements The selected elements
-     * @param pSelection The selection
-     */
-    public UMLImportModelFromFileCommand(
-        final TransactionalEditingDomain pEditingDomain,
-        final List<EObject> pSelectedElements,
-        final List<?> pSelection) {
+	/**
+	 * Default constructor.
+	 *
+	 * @param pEditingDomain
+	 *            The editing domain
+	 * @param pSelectedElements
+	 *            The selected elements
+	 * @param pSelection
+	 *            The selection
+	 */
+	public UMLImportModelFromFileCommand(
+			final TransactionalEditingDomain pEditingDomain,
+			final List<EObject> pSelectedElements,
+			final List<?> pSelection) {
 
-        super(
-            pEditingDomain,
-            pSelectedElements,
-            new UMLImportModelRunnable(pSelection, pSelectedElements),
-            IMPORT_MODELS_LABLE,
-            IMPORT_MODELS_DESCRIPTION);
-    }
+		super(
+				pEditingDomain,
+				pSelectedElements,
+				new UMLImportModelRunnable(pSelection, pSelectedElements),
+				IMPORT_MODELS_LABLE,
+				IMPORT_MODELS_DESCRIPTION);
+	}
 
-    /**
-     * The inner class which provides the dialog and operation for importing UML models.
-     *
-     * @author $Author: ymunoz $
-     * @version $Revision: 168 $
-     */
-    private static class UMLImportModelRunnable
-        implements Runnable {
+	/**
+	 * The inner class which provides the dialog and operation for importing UML models.
+	 *
+	 * @author $Author: ymunoz $
+	 * @version $Revision: 168 $
+	 */
+	private static class UMLImportModelRunnable
+			implements Runnable {
 
-        /** The selection of elements. */
-        private Collection<?> mSelection = null;
+		/** The selection of elements. */
+		private Collection<?> mSelection = null;
 
-        /** The model where the others models will be imported. */
-        private Model mModelTarget = null;
+		/** The model where the others models will be imported. */
+		private Model mModelTarget = null;
 
-        /**
-         * Default constructor.
-         *
-         * @param pSelection The selection
-         * @param pSelectedElements The selected Elements
-         */
-        UMLImportModelRunnable(final List<?> pSelection, final List<EObject> pSelectedElements) {
-            mSelection = pSelection;
-            
-            if (pSelectedElements.isEmpty()) {
-                throw new IllegalArgumentException("Selected element is empty");
-            } else if (!(pSelectedElements.get(0) instanceof Model)) {
-                throw new IllegalArgumentException("Selected element is not a Model object");
-            } else {
-                mModelTarget = (Model) pSelectedElements.get(0);
-            }
-        }
+		/**
+		 * Default constructor.
+		 *
+		 * @param pSelection
+		 *            The selection
+		 * @param pSelectedElements
+		 *            The selected Elements
+		 */
+		UMLImportModelRunnable(final List<?> pSelection, final List<EObject> pSelectedElements) {
+			mSelection = pSelection;
 
-        /**
-         * Open dialog for selecting the UML models. And in the end, they are duplicated and imported.
-         */
-        @Override
-        public void run() {
-            Shell vShell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
-            Map<String, String> vExtensionFilters = new LinkedHashMap<String, String>();
-            vExtensionFilters.put(UML_EXTENSION_KEY, UML_EXTENSION_VALUE);
-            Collection<?> vSelection = mSelection;
-            Collection<Package> vModels =
-                PackageImportSourceDialog.open(vShell, SELECT_MODELS_TO_IMPORT_TITLE, vSelection, vExtensionFilters);
+			if (pSelectedElements.isEmpty()) {
+				throw new IllegalArgumentException("Selected element is empty");
+			} else if (!(pSelectedElements.get(0) instanceof Model)) {
+				throw new IllegalArgumentException("Selected element is not a Model object");
+			} else {
+				mModelTarget = (Model) pSelectedElements.get(0);
+			}
+		}
 
-            // Remove self-import
-            vModels = removeSelfImport(vModels);
+		/**
+		 * Open dialog for selecting the UML models. And in the end, they are duplicated and imported.
+		 */
+		@Override
+		public void run() {
+			Shell vShell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
+			Map<String, String> vExtensionFilters = new LinkedHashMap<String, String>();
+			vExtensionFilters.put(UML_EXTENSION_KEY, UML_EXTENSION_VALUE);
+			Collection<?> vSelection = mSelection;
+			Collection<Package> vModels = PackageImportSourceDialog.open(vShell, SELECT_MODELS_TO_IMPORT_TITLE, vSelection, vExtensionFilters);
 
-            if ((vModels != null) && (!vModels.isEmpty())) {
-                // Duplicate the select UML models for import
-                Collection<Package> vDuplicateModels;
-                try {
-                    vDuplicateModels = duplicateModels(vModels);
+			// Remove self-import
+			vModels = removeSelfImport(vModels);
 
-                    if (!vDuplicateModels.isEmpty()) {
-                        UMLImportModelDialog vDialog = new UMLImportModelDialog(
-                            PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
-                            vDuplicateModels);
+			if ((vModels != null) && (!vModels.isEmpty())) {
+				if (!vModels.isEmpty()) {
+					UMLImportModelDialog vDialog = new UMLImportModelDialog(
+							PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
+							vModels);
 
-                        if (Window.OK == vDialog.open()) {
-                            // Get the selected packages from UML model to import
-                            Collection<ImportSpec<Package>> vResult = vDialog.getResult();
+					if (Window.OK == vDialog.open()) {
+						// Get the selected packages from UML model to import
+						Collection<ImportSpec<Package>> vResult = vDialog.getResult();
 
-                            for (ImportSpec<Package> vResultElement : vResult) {
-                                Package vSelectedPackage = vResultElement.getElement();
-                                if (ImportAction.IMPORT == vResultElement.getAction()) {
-                                    Package vImportedPackage = importPackage(vSelectedPackage);
-                                    ApplyESFArchitectureConceptsAnnotation
-                                        .applyAnnotationOnUMLModel((Model) vImportedPackage);
-                                }
-                            }
-                        }
-                    }
-                } catch (final ModelMultiException pException) {
-                    ImportModelCommonActivator.logError(
-                        "Error during the loading of the Models", //$NON-NLS-1$
-                        pException);
-                }
-            }
-        }
+						for (ImportSpec<Package> vResultElement : vResult) {
+							Package vSelectedPackage = vResultElement.getElement();
+							if (ImportAction.IMPORT == vResultElement.getAction()) {
+								Package vImportedPackage = importPackage(vSelectedPackage);
+								ApplyESFArchitectureConceptsAnnotation
+										.applyAnnotationOnUMLModel((Model) vImportedPackage);
+							}
+						}
+					}
+				}
+			}
+		}
 
-        /**
-         * Remove the model target where the others models will be imported.
-         *
-         * @param pModels The models to import
-         * @return The models without itself (model target)
-         */
-        private Collection<Package> removeSelfImport(final Collection<Package> pModels) {
-            Collection<Package> vUpdatedModels = pModels;
-            if ((pModels != null) && (!pModels.isEmpty())) {
-                URI vModelTargetURI = EcoreUtil.getURI(mModelTarget);
-                Iterator<Package> vModels = pModels.iterator();
-                Boolean vRemoved = false;
-    
-                while (!vRemoved && vModels.hasNext()) {
-                    Package vModel = vModels.next();
-                    if (EcoreUtil.getURI(vModel).equals(vModelTargetURI)) {
-                        vUpdatedModels.remove(vModel);
-                        vRemoved = true;
-                    }
-                }
-            }
-            return vUpdatedModels;
-        }
+		/**
+		 * Remove the model target where the others models will be imported.
+		 *
+		 * @param pModels
+		 *            The models to import
+		 * @return The models without itself (model target)
+		 */
+		private Collection<Package> removeSelfImport(final Collection<Package> pModels) {
+			Collection<Package> vUpdatedModels = pModels;
+			if ((pModels != null) && (!pModels.isEmpty())) {
+				URI vModelTargetURI = EcoreUtil.getURI(mModelTarget);
+				Iterator<Package> vModels = pModels.iterator();
+				Boolean vRemoved = false;
 
-        /**
-         * Duplicate the file of each UML model.
-         *
-         * @param pModels The UML models
-         * @return The UML models of duplicate files
-         * @throws ModelMultiException This exception is thrown when an operation performed on several Models fails on
-         * one or more of these models.
-         */
-        private Collection<Package> duplicateModels(final Collection<Package> pModels) throws ModelMultiException {
-            Collection<Package> vDuplicateModels = new ArrayList<Package>();
-            for (Package vModel : pModels) {
-                // Load the model to be duplicated
-                ModelSet vModelSet = new ModelSet();
-                ModelsReader vModelsReader = new ModelsReader();
-                vModelsReader.readModel(vModelSet);
-                vModelSet.loadModels(EcoreUtil.getURI(vModel).trimFragment());
+				while (!vRemoved && vModels.hasNext()) {
+					Package vModel = vModels.next();
+					if (EcoreUtil.getURI(vModel).equals(vModelTargetURI)) {
+						vUpdatedModels.remove(vModel);
+						vRemoved = true;
+					}
+				}
+			}
+			return vUpdatedModels;
+		}
 
-                EcoreUtil.resolveAll(vModelSet);
+		/**
+		 * Duplicate the file of each UML model.
+		 *
+		 * @param pModels
+		 *            The UML models
+		 * @return The UML models of duplicate files
+		 * @throws ModelMultiException
+		 *             This exception is thrown when an operation performed on several Models fails on
+		 *             one or more of these models.
+		 */
+		private Collection<Package> duplicateModels(final Collection<Package> pModels) throws ModelMultiException {
+			Collection<Package> vDuplicateModels = new ArrayList<Package>();
+			for (Package vModel : pModels) {
+				// Load the model to be duplicated
+				ModelSet vModelSet = new ModelSet();
+				ModelsReader vModelsReader = new ModelsReader();
+				vModelsReader.readModel(vModelSet);
+				vModelSet.loadModels(EcoreUtil.getURI(vModel).trimFragment());
 
-                /*
-                 * Retrieve di resources and get its file's path without
-                 * extension for building a new path of the duplicate model
-                 */
-                Resource vDiResource = getSpecificResource(DiResourceImpl.class, vModelSet.getResources());
-                if (vDiResource != null) {
-                    URI vDiURI = vDiResource.getURI();
-                    String vDiExtension = vDiURI.fileExtension();
-                    URI vURIWithoutExtension = vDiURI.trimFileExtension();
-                    Timestamp vTimestamp = new Timestamp(GregorianCalendar.getInstance().getTime().getTime());
-                    String vNewURIString = vURIWithoutExtension.toString() + UNDERSCORE + vTimestamp.getTime();
-                    URI vNewURIWithoutExtension = URI.createURI(vNewURIString);
-                    URI vNewDiURI = vNewURIWithoutExtension.appendFileExtension(vDiExtension);
-                    try {
-                        vModelSet.saveAs(vNewDiURI);
-                    } catch (final IOException pException) {
-                        ImportModelCommonActivator.logError(
-                            "Error during the saving of the new models", pException); //$NON-NLS-1$
-                    }
+				EcoreUtil.resolveAll(vModelSet);
 
-                    /*
-                     * Retrieve the duplicate model to import
-                     */
-                    UMLResource vUMLResource =
-                        (UMLResource) getSpecificResource(UMLResourceImpl.class, vModelSet.getResources());
-                    if (vUMLResource != null) {
-                        EObject vDuplicateModel = vUMLResource.getContents().get(0);
-                        vDuplicateModels.add((Package) vDuplicateModel);
-                    }
-                }
-            }
-            return vDuplicateModels;
-        }
+				/*
+				 * Retrieve di resources and get its file's path without
+				 * extension for building a new path of the duplicate model
+				 */
+				Resource vDiResource = getSpecificResource(DiResourceImpl.class, vModelSet.getResources());
+				if (vDiResource != null) {
+					URI vDiURI = vDiResource.getURI();
+					String vDiExtension = vDiURI.fileExtension();
+					URI vURIWithoutExtension = vDiURI.trimFileExtension();
+					Timestamp vTimestamp = new Timestamp(GregorianCalendar.getInstance().getTime().getTime());
+					String vNewURIString = vURIWithoutExtension.toString() + UNDERSCORE + vTimestamp.getTime();
+					URI vNewURIWithoutExtension = URI.createURI(vNewURIString);
+					URI vNewDiURI = vNewURIWithoutExtension.appendFileExtension(vDiExtension);
+					try {
+						vModelSet.saveAs(vNewDiURI);
+					} catch (final IOException pException) {
+						ImportModelCommonActivator.logError(
+								"Error during the saving of the new models", pException); //$NON-NLS-1$
+					}
 
-        /**
-         * Creates a PackageImport in the current package, which refers to the
-         * selected package.
-         *
-         * @param pPackage The selected package
-         * @return The imported package
-         */
-        protected Package importPackage(final Package pPackage) {
-            Package vImportedPackage = null;
-            
-            if (mModelTarget != null) {
-                PackageImport vPackageImport = UMLFactory.eINSTANCE.createPackageImport();
-                
-                vImportedPackage = EMFHelper.reloadIntoContext(pPackage, mModelTarget);
-                ((Package) mModelTarget).getPackageImports().add(vPackageImport);
-                vPackageImport.setImportedPackage(vImportedPackage);
-            }
-            
-            return vImportedPackage;
-        }
+					/*
+					 * Retrieve the duplicate model to import
+					 */
+					UMLResource vUMLResource = (UMLResource) getSpecificResource(UMLResourceImpl.class, vModelSet.getResources());
+					if (vUMLResource != null) {
+						EObject vDuplicateModel = vUMLResource.getContents().get(0);
+						vDuplicateModels.add((Package) vDuplicateModel);
+					}
+				}
+			}
+			return vDuplicateModels;
+		}
 
-        /**
-         * Retrieve the resource specified from a resources' list.
-         *
-         * @param pResourceType The resource type
-         * @param pResources The list of resources
-         * @return The resource specified
-         */
-        private Resource getSpecificResource(
-            final Class<? extends Resource> pResourceType,
-            final EList<Resource> pResources) {
-            Resource vSpecificResource = null;
-            for (Resource vResource : pResources) {
-                if (vResource.getClass() == pResourceType) {
-                    vSpecificResource = vResource;
-                    break;
-                }
-            }
-            return vSpecificResource;
-        }
-    }
+		/**
+		 * Creates a PackageImport in the current package, which refers to the
+		 * selected package.
+		 *
+		 * @param pPackage
+		 *            The selected package
+		 * @return The imported package
+		 */
+		protected Package importPackage(final Package pPackage) {
+			Package vImportedPackage = null;
+
+			if (mModelTarget != null) {
+				PackageImport vPackageImport = UMLFactory.eINSTANCE.createPackageImport();
+
+				vImportedPackage = EMFHelper.reloadIntoContext(pPackage, mModelTarget);
+				((Package) mModelTarget).getPackageImports().add(vPackageImport);
+				vPackageImport.setImportedPackage(vImportedPackage);
+			}
+
+			return vImportedPackage;
+		}
+
+		/**
+		 * Retrieve the resource specified from a resources' list.
+		 *
+		 * @param pResourceType
+		 *            The resource type
+		 * @param pResources
+		 *            The list of resources
+		 * @return The resource specified
+		 */
+		private Resource getSpecificResource(
+				final Class<? extends Resource> pResourceType,
+				final EList<Resource> pResources) {
+			Resource vSpecificResource = null;
+			for (Resource vResource : pResources) {
+				if (vResource.getClass() == pResourceType) {
+					vSpecificResource = vResource;
+					break;
+				}
+			}
+			return vSpecificResource;
+		}
+	}
 }
diff --git a/core/importmodel/org.polarsys.esf.core.importmodel.common/src/main/java/org/polarsys/esf/core/importmodel/common/handlers/AbstractImportModelHandler.java b/core/importmodel/org.polarsys.esf.core.importmodel.common/src/main/java/org/polarsys/esf/core/importmodel/common/handlers/AbstractImportModelHandler.java
index fa65a75..9f88c4d 100644
--- a/core/importmodel/org.polarsys.esf.core.importmodel.common/src/main/java/org/polarsys/esf/core/importmodel/common/handlers/AbstractImportModelHandler.java
+++ b/core/importmodel/org.polarsys.esf.core.importmodel.common/src/main/java/org/polarsys/esf/core/importmodel/common/handlers/AbstractImportModelHandler.java
@@ -10,11 +10,14 @@
  ******************************************************************************/
 package org.polarsys.esf.core.importmodel.common.handlers;
 
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.expressions.IEvaluationContext;
 import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.views.modelexplorer.handler.AbstractCommandHandler;
+import org.eclipse.papyrus.infra.ui.command.AbstractCommandHandler;
 import org.eclipse.uml2.uml.Package;
 import org.eclipse.uml2.uml.PackageImport;
 import org.eclipse.uml2.uml.UMLFactory;
@@ -32,7 +35,7 @@
     /**
      * @return The GMF command instance
      */
-    protected abstract ICommand getGMFCommand();
+    protected abstract ICommand getGMFCommand(TransactionalEditingDomain domain);
 
     /**
      * Get EMF command that wraps a GMF command.
@@ -40,15 +43,25 @@
      * {@inheritDoc}
      */
     @Override
-    protected Command getCommand() {
-        ICommand vGMFCommand = getGMFCommand();
-        GMFtoEMFCommandWrapper vEMFCommand = new GMFtoEMFCommandWrapper(vGMFCommand);
+    protected Command getCommand(ExecutionEvent event) {
+        ICommand vGMFCommand = getGMFCommand(getEditingDomain(event));
+        return wrappedCommand(vGMFCommand);
+    }
 
-        if (vGMFCommand instanceof AbstractImportModelCommand) {
-            vEMFCommand.setDescription(((AbstractImportModelCommand) vGMFCommand).getDescription());
-        }
+    @Override
+    protected Command getCommand(IEvaluationContext context) {
+    	 ICommand vGMFCommand = getGMFCommand(getEditingDomain(context));
+    	 return wrappedCommand(vGMFCommand);
+        
+    }
+    
+    protected Command wrappedCommand(ICommand gmfCommand) {
+    	 GMFtoEMFCommandWrapper vEMFCommand = new GMFtoEMFCommandWrapper(gmfCommand);
 
-        return vEMFCommand;
+         if (gmfCommand instanceof AbstractImportModelCommand) {
+             vEMFCommand.setDescription(((AbstractImportModelCommand) gmfCommand).getDescription());
+         }
+         return vEMFCommand;
     }
 
     /**
diff --git a/core/importmodel/org.polarsys.esf.core.importmodel.common/src/main/java/org/polarsys/esf/core/importmodel/common/handlers/UMLImportModelHandler.java b/core/importmodel/org.polarsys.esf.core.importmodel.common/src/main/java/org/polarsys/esf/core/importmodel/common/handlers/UMLImportModelHandler.java
index d8cec03..43c9fb1 100644
--- a/core/importmodel/org.polarsys.esf.core.importmodel.common/src/main/java/org/polarsys/esf/core/importmodel/common/handlers/UMLImportModelHandler.java
+++ b/core/importmodel/org.polarsys.esf.core.importmodel.common/src/main/java/org/polarsys/esf/core/importmodel/common/handlers/UMLImportModelHandler.java
@@ -10,6 +10,7 @@
  ******************************************************************************/
 package org.polarsys.esf.core.importmodel.common.handlers;
 
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.polarsys.esf.core.importmodel.common.commands.UMLImportModelFromFileCommand;
 
@@ -33,9 +34,9 @@
      * {@inheritDoc}
      */
     @Override
-    protected ICommand getGMFCommand() {
+    protected ICommand getGMFCommand(TransactionalEditingDomain domain) {
         return new UMLImportModelFromFileCommand(
-            UMLImportModelHandler.this.getEditingDomain(),
+			domain,
             getSelectedElements(),
             getSelection());
     }
diff --git a/core/metamodel/org.polarsys.esf.core.metamodel.esfbehaviours/src/main/resources/metamodel/esfbehaviours_metamodel.di b/core/metamodel/org.polarsys.esf.core.metamodel.esfbehaviours/src/main/resources/metamodel/esfbehaviours_metamodel.di
index 8634d4c..bf9abab 100644
--- a/core/metamodel/org.polarsys.esf.core.metamodel.esfbehaviours/src/main/resources/metamodel/esfbehaviours_metamodel.di
+++ b/core/metamodel/org.polarsys.esf.core.metamodel.esfbehaviours/src/main/resources/metamodel/esfbehaviours_metamodel.di
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/core/metamodel/org.polarsys.esf.core.metamodel.esfbehaviours/src/main/resources/metamodel/esfbehaviours_metamodel.notation b/core/metamodel/org.polarsys.esf.core.metamodel.esfbehaviours/src/main/resources/metamodel/esfbehaviours_metamodel.notation
index d748434..5fc8b47 100644
--- a/core/metamodel/org.polarsys.esf.core.metamodel.esfbehaviours/src/main/resources/metamodel/esfbehaviours_metamodel.notation
+++ b/core/metamodel/org.polarsys.esf.core.metamodel.esfbehaviours/src/main/resources/metamodel/esfbehaviours_metamodel.notation
@@ -1,238 +1,238 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_5vSZQAnSEeW356xdbh3U2Q" type="PapyrusUMLClassDiagram" name="ESFBehaviours Diagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_8gsJ4AnSEeW356xdbh3U2Q" type="2005" fillColor="13420443">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__5eqoAnSEeW356xdbh3U2Q" source="PapyrusCSSForceValue">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__5fRsAnSEeW356xdbh3U2Q" key="fillColor" value="true"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_8gsw8AnSEeW356xdbh3U2Q" type="5020"/>

-    <children xmi:type="notation:DecorationNode" xmi:id="_8gsw8QnSEeW356xdbh3U2Q" type="7009">

-      <children xmi:type="notation:Shape" xmi:id="_6r6ZkAnSEeW356xdbh3U2Q" type="2008">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R_gb4AnTEeW356xdbh3U2Q" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R_gb4QnTEeW356xdbh3U2Q" key="fillColor" value="true"/>

-        </eAnnotations>

-        <children xmi:type="notation:DecorationNode" xmi:id="_6r7AoAnSEeW356xdbh3U2Q" type="5029"/>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_6r7nsAnSEeW356xdbh3U2Q" visible="false" type="7017">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_6r7nsQnSEeW356xdbh3U2Q"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_6r7nsgnSEeW356xdbh3U2Q"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_6r7nswnSEeW356xdbh3U2Q"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6r7ntAnSEeW356xdbh3U2Q"/>

-        </children>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_6r7ntQnSEeW356xdbh3U2Q" visible="false" type="7018">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_6r7ntgnSEeW356xdbh3U2Q"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_6r7ntwnSEeW356xdbh3U2Q"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_6r7nuAnSEeW356xdbh3U2Q"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6r7nuQnSEeW356xdbh3U2Q"/>

-        </children>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_6r7nugnSEeW356xdbh3U2Q" visible="false" type="7019">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_6r7nuwnSEeW356xdbh3U2Q"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_6r7nvAnSEeW356xdbh3U2Q"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_6r7nvQnSEeW356xdbh3U2Q"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6r7nvgnSEeW356xdbh3U2Q"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_xWg7UGLFEeWRk_KThWkycg" type="8510">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_xWg7UWLFEeWRk_KThWkycg" y="5"/>

-        </children>

-        <element xmi:type="uml:Class" href="esfbehaviours_metamodel.uml#_6r3WQAnSEeW356xdbh3U2Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6r6ZkQnSEeW356xdbh3U2Q" x="101" y="30" width="348" height="62"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_6_WS8AnSEeW356xdbh3U2Q" type="2008">

-        <children xmi:type="notation:DecorationNode" xmi:id="_6_W6AAnSEeW356xdbh3U2Q" type="5029"/>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_6_XhEAnSEeW356xdbh3U2Q" visible="false" type="7017">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_6_XhEQnSEeW356xdbh3U2Q"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_6_XhEgnSEeW356xdbh3U2Q"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_6_XhEwnSEeW356xdbh3U2Q"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6_XhFAnSEeW356xdbh3U2Q"/>

-        </children>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_6_XhFQnSEeW356xdbh3U2Q" visible="false" type="7018">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_6_XhFgnSEeW356xdbh3U2Q"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_6_XhFwnSEeW356xdbh3U2Q"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_6_XhGAnSEeW356xdbh3U2Q"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6_XhGQnSEeW356xdbh3U2Q"/>

-        </children>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_6_XhGgnSEeW356xdbh3U2Q" visible="false" type="7019">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_6_XhGwnSEeW356xdbh3U2Q"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_6_XhHAnSEeW356xdbh3U2Q"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_6_XhHQnSEeW356xdbh3U2Q"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6_XhHgnSEeW356xdbh3U2Q"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_xWg7UmLFEeWRk_KThWkycg" type="8510">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_xWg7U2LFEeWRk_KThWkycg" y="5"/>

-        </children>

-        <element xmi:type="uml:Class" href="esfbehaviours_metamodel.uml#_6_T2sAnSEeW356xdbh3U2Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6_WS8QnSEeW356xdbh3U2Q" x="101" y="125" height="62"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_7QDocAnSEeW356xdbh3U2Q" type="2008">

-        <children xmi:type="notation:DecorationNode" xmi:id="_7QEPgAnSEeW356xdbh3U2Q" type="5029"/>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_7QEPgQnSEeW356xdbh3U2Q" type="7017">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fmX20IFLEeWKIdAlVGN13g" source="PapyrusCSSForceValue">

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fmYd4IFLEeWKIdAlVGN13g" key="visible" value="true"/>

-          </eAnnotations>

-          <children xmi:type="notation:Shape" xmi:id="_g0WF0IFLEeWKIdAlVGN13g" type="3012">

-            <styles xmi:type="notation:StringListValueStyle" xmi:id="_k4JScIFLEeWKIdAlVGN13g" name="maskLabel">

-              <stringListValue>name</stringListValue>

-              <stringListValue>derived</stringListValue>

-              <stringListValue>multiplicity</stringListValue>

-              <stringListValue>type</stringListValue>

-            </styles>

-            <element xmi:type="uml:Property" href="esfbehaviours_metamodel.uml#_g0AHkIFLEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_g0WF0YFLEeWKIdAlVGN13g"/>

-          </children>

-          <styles xmi:type="notation:TitleStyle" xmi:id="_7QEPggnSEeW356xdbh3U2Q"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_7QEPgwnSEeW356xdbh3U2Q"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_7QEPhAnSEeW356xdbh3U2Q"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7QEPhQnSEeW356xdbh3U2Q"/>

-        </children>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_7QEPhgnSEeW356xdbh3U2Q" visible="false" type="7018">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_7QEPhwnSEeW356xdbh3U2Q"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_7QEPiAnSEeW356xdbh3U2Q"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_7QEPiQnSEeW356xdbh3U2Q"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7QEPignSEeW356xdbh3U2Q"/>

-        </children>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_7QE2kAnSEeW356xdbh3U2Q" visible="false" type="7019">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_7QE2kQnSEeW356xdbh3U2Q"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_7QE2kgnSEeW356xdbh3U2Q"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_7QE2kwnSEeW356xdbh3U2Q"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7QE2lAnSEeW356xdbh3U2Q"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_xWg7VGLFEeWRk_KThWkycg" type="8510">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_xWg7VWLFEeWRk_KThWkycg" y="5"/>

-        </children>

-        <element xmi:type="uml:Class" href="esfbehaviours_metamodel.uml#_7QBMMAnSEeW356xdbh3U2Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7QDocQnSEeW356xdbh3U2Q" x="227" y="124" width="222" height="62"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_8gsw8gnSEeW356xdbh3U2Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8gsw8wnSEeW356xdbh3U2Q"/>

-    </children>

-    <element xmi:type="uml:Model" href="esfbehaviours_metamodel.uml#_IYSU4AnREeW356xdbh3U2Q"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8gsJ4QnSEeW356xdbh3U2Q" x="249" y="284" width="556" height="269"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_RrzZYIFLEeWKIdAlVGN13g" type="2005" fillColor="8905185">

-    <children xmi:type="notation:DecorationNode" xmi:id="_Rr2csIFLEeWKIdAlVGN13g" type="5020"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_Rr3DwIFLEeWKIdAlVGN13g" type="7009">

-      <children xmi:type="notation:Shape" xmi:id="_YzqM4IFLEeWKIdAlVGN13g" type="3027">

-        <children xmi:type="notation:DecorationNode" xmi:id="_Yzqz8IFLEeWKIdAlVGN13g" type="5061"/>

-        <children xmi:type="notation:DecorationNode" xmi:id="_Yzqz8YFLEeWKIdAlVGN13g" type="8520">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Yzqz8oFLEeWKIdAlVGN13g" y="5"/>

-        </children>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_YzrbAIFLEeWKIdAlVGN13g" visible="false" type="7032">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_YzrbAYFLEeWKIdAlVGN13g"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_YzrbAoFLEeWKIdAlVGN13g"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_YzrbA4FLEeWKIdAlVGN13g"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YzrbBIFLEeWKIdAlVGN13g"/>

-        </children>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_YzrbBYFLEeWKIdAlVGN13g" visible="false" type="7033">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_YzrbBoFLEeWKIdAlVGN13g"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_YzrbB4FLEeWKIdAlVGN13g"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_YzrbCIFLEeWKIdAlVGN13g"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YzrbCYFLEeWKIdAlVGN13g"/>

-        </children>

-        <element xmi:type="uml:DataType" href="platform:/resource/org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml#_e45QgH8AEeW5YtCK2zP8qA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YzqM4YFLEeWKIdAlVGN13g" x="41" y="18" width="120" height="62"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_Rr3DwYFLEeWKIdAlVGN13g"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Rr3DwoFLEeWKIdAlVGN13g"/>

-    </children>

-    <element xmi:type="uml:Model" href="platform:/resource/org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml#_-NKksAnQEeW356xdbh3U2Q"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RrzZYYFLEeWKIdAlVGN13g" x="849" y="359" height="134"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_Tel1kIFfEeWKIdAlVGN13g" type="2005" fillColor="12621752">

-    <children xmi:type="notation:DecorationNode" xmi:id="_TemcoIFfEeWKIdAlVGN13g" type="5020"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_TemcoYFfEeWKIdAlVGN13g" type="7009">

-      <children xmi:type="notation:Shape" xmi:id="_Y_OzoIFfEeWKIdAlVGN13g" type="3010">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_gSYRIIFfEeWKIdAlVGN13g" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_gSY4MIFfEeWKIdAlVGN13g" key="fillColor" value="true"/>

-        </eAnnotations>

-        <children xmi:type="notation:DecorationNode" xmi:id="_Y_PasIFfEeWKIdAlVGN13g" type="5014"/>

-        <children xmi:type="notation:DecorationNode" xmi:id="_Y_PasYFfEeWKIdAlVGN13g" type="8518">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Y_PasoFfEeWKIdAlVGN13g" y="5"/>

-        </children>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_Y_QBwIFfEeWKIdAlVGN13g" visible="false" type="7011">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_Y_QBwYFfEeWKIdAlVGN13g"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_Y_QBwoFfEeWKIdAlVGN13g"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_Y_QBw4FfEeWKIdAlVGN13g"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y_QBxIFfEeWKIdAlVGN13g"/>

-        </children>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_Y_QBxYFfEeWKIdAlVGN13g" visible="false" type="7012">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_Y_QBxoFfEeWKIdAlVGN13g"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_Y_QBx4FfEeWKIdAlVGN13g"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_Y_QByIFfEeWKIdAlVGN13g"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y_QByYFfEeWKIdAlVGN13g"/>

-        </children>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_Y_QByoFfEeWKIdAlVGN13g" visible="false" type="7013">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_Y_QBy4FfEeWKIdAlVGN13g"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_Y_QBzIFfEeWKIdAlVGN13g"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_Y_QBzYFfEeWKIdAlVGN13g"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y_QBzoFfEeWKIdAlVGN13g"/>

-        </children>

-        <element xmi:type="uml:Class" href="platform:/resource/org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_gqod8NLoEeSb47LgOrWUpg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y_OzoYFfEeWKIdAlVGN13g" x="52" y="20" width="152" height="62"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_TemcooFfEeWKIdAlVGN13g"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Temco4FfEeWKIdAlVGN13g"/>

-    </children>

-    <element xmi:type="uml:Model" href="platform:/resource/org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_VB4SINLoEeSb47LgOrWUpg"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tel1kYFfEeWKIdAlVGN13g" x="390" y="96" width="274" height="138"/>

-  </children>

-  <styles xmi:type="notation:StringValueStyle" xmi:id="_5vSZQQnSEeW356xdbh3U2Q" name="diagram_compatibility_version" stringValue="1.1.0"/>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_5vSZQgnSEeW356xdbh3U2Q"/>

-  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_5vSZQwnSEeW356xdbh3U2Q">

-    <owner xmi:type="uml:Model" href="esfbehaviours_metamodel.uml#_IYSU4AnREeW356xdbh3U2Q"/>

-  </styles>

-  <element xmi:type="uml:Model" href="esfbehaviours_metamodel.uml#_IYSU4AnREeW356xdbh3U2Q"/>

-  <edges xmi:type="notation:Connector" xmi:id="_P60nUAnTEeW356xdbh3U2Q" type="4002" source="_7QDocAnSEeW356xdbh3U2Q" target="_6r6ZkAnSEeW356xdbh3U2Q" routing="Rectilinear">

-    <children xmi:type="notation:DecorationNode" xmi:id="_P60nUwnTEeW356xdbh3U2Q" type="6007">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_P60nVAnTEeW356xdbh3U2Q" y="40"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_P60nUQnTEeW356xdbh3U2Q"/>

-    <element xmi:type="uml:Generalization" href="esfbehaviours_metamodel.uml#_P6oaEAnTEeW356xdbh3U2Q"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_P60nUgnTEeW356xdbh3U2Q" points="[18, 0, -48, 32]$[18, -32, -48, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_P66G4AnTEeW356xdbh3U2Q" id="(0.46568627450980393,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_P66G4QnTEeW356xdbh3U2Q" id="(0.8477011494252874,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_Q0A5IAnTEeW356xdbh3U2Q" type="4002" source="_6_WS8AnSEeW356xdbh3U2Q" target="_6r6ZkAnSEeW356xdbh3U2Q" routing="Rectilinear">

-    <children xmi:type="notation:DecorationNode" xmi:id="_Q0BgMAnTEeW356xdbh3U2Q" type="6007">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Q0BgMQnTEeW356xdbh3U2Q" y="40"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_Q0A5IQnTEeW356xdbh3U2Q"/>

-    <element xmi:type="uml:Generalization" href="esfbehaviours_metamodel.uml#_Qz_rAAnTEeW356xdbh3U2Q"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Q0A5IgnTEeW356xdbh3U2Q" points="[-1, -12, 8, 78]$[-1, -65, 8, 25]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Q0I08AnTEeW356xdbh3U2Q" id="(0.51,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Q0JcAAnTEeW356xdbh3U2Q" id="(0.14655172413793102,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_YEq_8IFLEeWKIdAlVGN13g" type="4008" source="_8gsJ4AnSEeW356xdbh3U2Q" target="_RrzZYIFLEeWKIdAlVGN13g" routing="Rectilinear">

-    <children xmi:type="notation:DecorationNode" xmi:id="_YErnAIFLEeWKIdAlVGN13g" type="6026">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_YErnAYFLEeWKIdAlVGN13g" y="40"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_YErnAoFLEeWKIdAlVGN13g" type="6027">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_YErnA4FLEeWKIdAlVGN13g" y="60"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_YEq_8YFLEeWKIdAlVGN13g"/>

-    <element xmi:type="uml:Dependency" href="esfbehaviours_metamodel.uml#_YEZ6MIFLEeWKIdAlVGN13g"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YEq_8oFLEeWKIdAlVGN13g" points="[4, -4, -44, 0]$[48, -4, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YFdqIIFLEeWKIdAlVGN13g" id="(1.0,0.48698884758364314)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YFeRMIFLEeWKIdAlVGN13g" id="(0.0,0.39552238805970147)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_U7tT0IFfEeWKIdAlVGN13g" type="4008" source="_8gsJ4AnSEeW356xdbh3U2Q" target="_Tel1kIFfEeWKIdAlVGN13g" routing="Rectilinear">

-    <children xmi:type="notation:DecorationNode" xmi:id="_U7t64IFfEeWKIdAlVGN13g" type="6026">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_U7t64YFfEeWKIdAlVGN13g" y="40"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_U7t64oFfEeWKIdAlVGN13g" type="6027">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_U7t644FfEeWKIdAlVGN13g" y="60"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_U7tT0YFfEeWKIdAlVGN13g"/>

-    <element xmi:type="uml:Dependency" href="esfbehaviours_metamodel.uml#_U7iUsIFfEeWKIdAlVGN13g"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_U7tT0oFfEeWKIdAlVGN13g" points="[2, -4, 0, 129]$[-17, -125, -19, 8]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_U8JYsIFfEeWKIdAlVGN13g" id="(0.29676258992805754,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_U8JYsYFfEeWKIdAlVGN13g" id="(0.08759124087591241,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_hbZusIFfEeWKIdAlVGN13g" type="4002" source="_6r6ZkAnSEeW356xdbh3U2Q" target="_Y_OzoIFfEeWKIdAlVGN13g" routing="Rectilinear">

-    <children xmi:type="notation:DecorationNode" xmi:id="_hbZus4FfEeWKIdAlVGN13g" type="6007">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_hbaVwIFfEeWKIdAlVGN13g" y="40"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_hbZusYFfEeWKIdAlVGN13g"/>

-    <element xmi:type="uml:Generalization" href="esfbehaviours_metamodel.uml#_hbJQAIFfEeWKIdAlVGN13g"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hbZusoFfEeWKIdAlVGN13g" points="[0, -2, 0, 146]$[2, -138, 2, 10]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hb1MgIFfEeWKIdAlVGN13g" id="(0.49712643678160917,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hb1MgYFfEeWKIdAlVGN13g" id="(0.5328947368421053,1.0)"/>

-  </edges>

-</notation:Diagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_5vSZQAnSEeW356xdbh3U2Q" type="PapyrusUMLClassDiagram" name="ESFBehaviours Diagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_8gsJ4AnSEeW356xdbh3U2Q" type="2005" fillColor="13420443">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__5eqoAnSEeW356xdbh3U2Q" source="PapyrusCSSForceValue">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__5fRsAnSEeW356xdbh3U2Q" key="fillColor" value="true"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_8gsw8AnSEeW356xdbh3U2Q" type="5020"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_8gsw8QnSEeW356xdbh3U2Q" type="7009">
+      <children xmi:type="notation:Shape" xmi:id="_6r6ZkAnSEeW356xdbh3U2Q" type="2008">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R_gb4AnTEeW356xdbh3U2Q" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R_gb4QnTEeW356xdbh3U2Q" key="fillColor" value="true"/>
+        </eAnnotations>
+        <children xmi:type="notation:DecorationNode" xmi:id="_6r7AoAnSEeW356xdbh3U2Q" type="5029"/>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_6r7nsAnSEeW356xdbh3U2Q" visible="false" type="7017">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_6r7nsQnSEeW356xdbh3U2Q"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_6r7nsgnSEeW356xdbh3U2Q"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_6r7nswnSEeW356xdbh3U2Q"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6r7ntAnSEeW356xdbh3U2Q"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_6r7ntQnSEeW356xdbh3U2Q" visible="false" type="7018">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_6r7ntgnSEeW356xdbh3U2Q"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_6r7ntwnSEeW356xdbh3U2Q"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_6r7nuAnSEeW356xdbh3U2Q"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6r7nuQnSEeW356xdbh3U2Q"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_6r7nugnSEeW356xdbh3U2Q" visible="false" type="7019">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_6r7nuwnSEeW356xdbh3U2Q"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_6r7nvAnSEeW356xdbh3U2Q"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_6r7nvQnSEeW356xdbh3U2Q"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6r7nvgnSEeW356xdbh3U2Q"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_xWg7UGLFEeWRk_KThWkycg" type="8510">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_xWg7UWLFEeWRk_KThWkycg" y="5"/>
+        </children>
+        <element xmi:type="uml:Class" href="esfbehaviours_metamodel.uml#_6r3WQAnSEeW356xdbh3U2Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6r6ZkQnSEeW356xdbh3U2Q" x="101" y="30" width="348" height="62"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_6_WS8AnSEeW356xdbh3U2Q" type="2008">
+        <children xmi:type="notation:DecorationNode" xmi:id="_6_W6AAnSEeW356xdbh3U2Q" type="5029"/>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_6_XhEAnSEeW356xdbh3U2Q" visible="false" type="7017">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_6_XhEQnSEeW356xdbh3U2Q"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_6_XhEgnSEeW356xdbh3U2Q"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_6_XhEwnSEeW356xdbh3U2Q"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6_XhFAnSEeW356xdbh3U2Q"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_6_XhFQnSEeW356xdbh3U2Q" visible="false" type="7018">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_6_XhFgnSEeW356xdbh3U2Q"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_6_XhFwnSEeW356xdbh3U2Q"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_6_XhGAnSEeW356xdbh3U2Q"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6_XhGQnSEeW356xdbh3U2Q"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_6_XhGgnSEeW356xdbh3U2Q" visible="false" type="7019">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_6_XhGwnSEeW356xdbh3U2Q"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_6_XhHAnSEeW356xdbh3U2Q"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_6_XhHQnSEeW356xdbh3U2Q"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6_XhHgnSEeW356xdbh3U2Q"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_xWg7UmLFEeWRk_KThWkycg" type="8510">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_xWg7U2LFEeWRk_KThWkycg" y="5"/>
+        </children>
+        <element xmi:type="uml:Class" href="esfbehaviours_metamodel.uml#_6_T2sAnSEeW356xdbh3U2Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6_WS8QnSEeW356xdbh3U2Q" x="101" y="125" height="62"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_7QDocAnSEeW356xdbh3U2Q" type="2008">
+        <children xmi:type="notation:DecorationNode" xmi:id="_7QEPgAnSEeW356xdbh3U2Q" type="5029"/>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_7QEPgQnSEeW356xdbh3U2Q" type="7017">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fmX20IFLEeWKIdAlVGN13g" source="PapyrusCSSForceValue">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fmYd4IFLEeWKIdAlVGN13g" key="visible" value="true"/>
+          </eAnnotations>
+          <children xmi:type="notation:Shape" xmi:id="_g0WF0IFLEeWKIdAlVGN13g" type="3012">
+            <styles xmi:type="notation:StringListValueStyle" xmi:id="_k4JScIFLEeWKIdAlVGN13g" name="maskLabel">
+              <stringListValue>name</stringListValue>
+              <stringListValue>derived</stringListValue>
+              <stringListValue>multiplicity</stringListValue>
+              <stringListValue>type</stringListValue>
+            </styles>
+            <element xmi:type="uml:Property" href="esfbehaviours_metamodel.uml#_g0AHkIFLEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_g0WF0YFLEeWKIdAlVGN13g"/>
+          </children>
+          <styles xmi:type="notation:TitleStyle" xmi:id="_7QEPggnSEeW356xdbh3U2Q"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_7QEPgwnSEeW356xdbh3U2Q"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_7QEPhAnSEeW356xdbh3U2Q"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7QEPhQnSEeW356xdbh3U2Q"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_7QEPhgnSEeW356xdbh3U2Q" visible="false" type="7018">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_7QEPhwnSEeW356xdbh3U2Q"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_7QEPiAnSEeW356xdbh3U2Q"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_7QEPiQnSEeW356xdbh3U2Q"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7QEPignSEeW356xdbh3U2Q"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_7QE2kAnSEeW356xdbh3U2Q" visible="false" type="7019">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_7QE2kQnSEeW356xdbh3U2Q"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_7QE2kgnSEeW356xdbh3U2Q"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_7QE2kwnSEeW356xdbh3U2Q"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7QE2lAnSEeW356xdbh3U2Q"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_xWg7VGLFEeWRk_KThWkycg" type="8510">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_xWg7VWLFEeWRk_KThWkycg" y="5"/>
+        </children>
+        <element xmi:type="uml:Class" href="esfbehaviours_metamodel.uml#_7QBMMAnSEeW356xdbh3U2Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7QDocQnSEeW356xdbh3U2Q" x="227" y="124" width="222" height="62"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_8gsw8gnSEeW356xdbh3U2Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8gsw8wnSEeW356xdbh3U2Q"/>
+    </children>
+    <element xmi:type="uml:Model" href="esfbehaviours_metamodel.uml#_IYSU4AnREeW356xdbh3U2Q"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8gsJ4QnSEeW356xdbh3U2Q" x="249" y="284" width="556" height="269"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_RrzZYIFLEeWKIdAlVGN13g" type="2005" fillColor="8905185">
+    <children xmi:type="notation:DecorationNode" xmi:id="_Rr2csIFLEeWKIdAlVGN13g" type="5020"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_Rr3DwIFLEeWKIdAlVGN13g" type="7009">
+      <children xmi:type="notation:Shape" xmi:id="_YzqM4IFLEeWKIdAlVGN13g" type="3027">
+        <children xmi:type="notation:DecorationNode" xmi:id="_Yzqz8IFLEeWKIdAlVGN13g" type="5061"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_Yzqz8YFLEeWKIdAlVGN13g" type="8520">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Yzqz8oFLEeWKIdAlVGN13g" y="5"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_YzrbAIFLEeWKIdAlVGN13g" visible="false" type="7032">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_YzrbAYFLEeWKIdAlVGN13g"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_YzrbAoFLEeWKIdAlVGN13g"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_YzrbA4FLEeWKIdAlVGN13g"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YzrbBIFLEeWKIdAlVGN13g"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_YzrbBYFLEeWKIdAlVGN13g" visible="false" type="7033">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_YzrbBoFLEeWKIdAlVGN13g"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_YzrbB4FLEeWKIdAlVGN13g"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_YzrbCIFLEeWKIdAlVGN13g"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YzrbCYFLEeWKIdAlVGN13g"/>
+        </children>
+        <element xmi:type="uml:DataType" href="platform:/resource/org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml#_e45QgH8AEeW5YtCK2zP8qA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YzqM4YFLEeWKIdAlVGN13g" x="41" y="18" width="120" height="62"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Rr3DwYFLEeWKIdAlVGN13g"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Rr3DwoFLEeWKIdAlVGN13g"/>
+    </children>
+    <element xmi:type="uml:Model" href="platform:/resource/org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml#_-NKksAnQEeW356xdbh3U2Q"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RrzZYYFLEeWKIdAlVGN13g" x="849" y="359" height="134"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_Tel1kIFfEeWKIdAlVGN13g" type="2005" fillColor="12621752">
+    <children xmi:type="notation:DecorationNode" xmi:id="_TemcoIFfEeWKIdAlVGN13g" type="5020"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_TemcoYFfEeWKIdAlVGN13g" type="7009">
+      <children xmi:type="notation:Shape" xmi:id="_Y_OzoIFfEeWKIdAlVGN13g" type="3010">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_gSYRIIFfEeWKIdAlVGN13g" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_gSY4MIFfEeWKIdAlVGN13g" key="fillColor" value="true"/>
+        </eAnnotations>
+        <children xmi:type="notation:DecorationNode" xmi:id="_Y_PasIFfEeWKIdAlVGN13g" type="5014"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_Y_PasYFfEeWKIdAlVGN13g" type="8518">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Y_PasoFfEeWKIdAlVGN13g" y="5"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_Y_QBwIFfEeWKIdAlVGN13g" visible="false" type="7011">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_Y_QBwYFfEeWKIdAlVGN13g"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_Y_QBwoFfEeWKIdAlVGN13g"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_Y_QBw4FfEeWKIdAlVGN13g"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y_QBxIFfEeWKIdAlVGN13g"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_Y_QBxYFfEeWKIdAlVGN13g" visible="false" type="7012">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_Y_QBxoFfEeWKIdAlVGN13g"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_Y_QBx4FfEeWKIdAlVGN13g"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_Y_QByIFfEeWKIdAlVGN13g"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y_QByYFfEeWKIdAlVGN13g"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_Y_QByoFfEeWKIdAlVGN13g" visible="false" type="7013">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_Y_QBy4FfEeWKIdAlVGN13g"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_Y_QBzIFfEeWKIdAlVGN13g"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_Y_QBzYFfEeWKIdAlVGN13g"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y_QBzoFfEeWKIdAlVGN13g"/>
+        </children>
+        <element xmi:type="uml:Class" href="platform:/resource/org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_gqod8NLoEeSb47LgOrWUpg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y_OzoYFfEeWKIdAlVGN13g" x="52" y="20" width="152" height="62"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_TemcooFfEeWKIdAlVGN13g"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Temco4FfEeWKIdAlVGN13g"/>
+    </children>
+    <element xmi:type="uml:Model" href="platform:/resource/org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_VB4SINLoEeSb47LgOrWUpg"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tel1kYFfEeWKIdAlVGN13g" x="390" y="96" width="274" height="138"/>
+  </children>
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_5vSZQQnSEeW356xdbh3U2Q" name="diagram_compatibility_version" stringValue="1.1.0"/>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_5vSZQgnSEeW356xdbh3U2Q"/>
+  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_5vSZQwnSEeW356xdbh3U2Q">
+    <owner xmi:type="uml:Model" href="esfbehaviours_metamodel.uml#_IYSU4AnREeW356xdbh3U2Q"/>
+  </styles>
+  <element xmi:type="uml:Model" href="esfbehaviours_metamodel.uml#_IYSU4AnREeW356xdbh3U2Q"/>
+  <edges xmi:type="notation:Connector" xmi:id="_P60nUAnTEeW356xdbh3U2Q" type="4002" source="_7QDocAnSEeW356xdbh3U2Q" target="_6r6ZkAnSEeW356xdbh3U2Q" routing="Rectilinear">
+    <children xmi:type="notation:DecorationNode" xmi:id="_P60nUwnTEeW356xdbh3U2Q" type="6007">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_P60nVAnTEeW356xdbh3U2Q" y="40"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_P60nUQnTEeW356xdbh3U2Q"/>
+    <element xmi:type="uml:Generalization" href="esfbehaviours_metamodel.uml#_P6oaEAnTEeW356xdbh3U2Q"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_P60nUgnTEeW356xdbh3U2Q" points="[18, 0, -48, 32]$[18, -32, -48, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_P66G4AnTEeW356xdbh3U2Q" id="(0.46568627450980393,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_P66G4QnTEeW356xdbh3U2Q" id="(0.8477011494252874,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_Q0A5IAnTEeW356xdbh3U2Q" type="4002" source="_6_WS8AnSEeW356xdbh3U2Q" target="_6r6ZkAnSEeW356xdbh3U2Q" routing="Rectilinear">
+    <children xmi:type="notation:DecorationNode" xmi:id="_Q0BgMAnTEeW356xdbh3U2Q" type="6007">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Q0BgMQnTEeW356xdbh3U2Q" y="40"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Q0A5IQnTEeW356xdbh3U2Q"/>
+    <element xmi:type="uml:Generalization" href="esfbehaviours_metamodel.uml#_Qz_rAAnTEeW356xdbh3U2Q"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Q0A5IgnTEeW356xdbh3U2Q" points="[-1, -12, 8, 78]$[-1, -65, 8, 25]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Q0I08AnTEeW356xdbh3U2Q" id="(0.51,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Q0JcAAnTEeW356xdbh3U2Q" id="(0.14655172413793102,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_YEq_8IFLEeWKIdAlVGN13g" type="4008" source="_8gsJ4AnSEeW356xdbh3U2Q" target="_RrzZYIFLEeWKIdAlVGN13g" routing="Rectilinear">
+    <children xmi:type="notation:DecorationNode" xmi:id="_YErnAIFLEeWKIdAlVGN13g" type="6026">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_YErnAYFLEeWKIdAlVGN13g" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_YErnAoFLEeWKIdAlVGN13g" type="6027">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_YErnA4FLEeWKIdAlVGN13g" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_YEq_8YFLEeWKIdAlVGN13g"/>
+    <element xmi:type="uml:Dependency" href="esfbehaviours_metamodel.uml#_YEZ6MIFLEeWKIdAlVGN13g"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YEq_8oFLEeWKIdAlVGN13g" points="[4, -4, -44, 0]$[48, -4, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YFdqIIFLEeWKIdAlVGN13g" id="(1.0,0.48698884758364314)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YFeRMIFLEeWKIdAlVGN13g" id="(0.0,0.39552238805970147)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_U7tT0IFfEeWKIdAlVGN13g" type="4008" source="_8gsJ4AnSEeW356xdbh3U2Q" target="_Tel1kIFfEeWKIdAlVGN13g" routing="Rectilinear">
+    <children xmi:type="notation:DecorationNode" xmi:id="_U7t64IFfEeWKIdAlVGN13g" type="6026">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_U7t64YFfEeWKIdAlVGN13g" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_U7t64oFfEeWKIdAlVGN13g" type="6027">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_U7t644FfEeWKIdAlVGN13g" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_U7tT0YFfEeWKIdAlVGN13g"/>
+    <element xmi:type="uml:Dependency" href="esfbehaviours_metamodel.uml#_U7iUsIFfEeWKIdAlVGN13g"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_U7tT0oFfEeWKIdAlVGN13g" points="[2, -4, 0, 129]$[-17, -125, -19, 8]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_U8JYsIFfEeWKIdAlVGN13g" id="(0.29676258992805754,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_U8JYsYFfEeWKIdAlVGN13g" id="(0.08759124087591241,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_hbZusIFfEeWKIdAlVGN13g" type="4002" source="_6r6ZkAnSEeW356xdbh3U2Q" target="_Y_OzoIFfEeWKIdAlVGN13g" routing="Rectilinear">
+    <children xmi:type="notation:DecorationNode" xmi:id="_hbZus4FfEeWKIdAlVGN13g" type="6007">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_hbaVwIFfEeWKIdAlVGN13g" y="40"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_hbZusYFfEeWKIdAlVGN13g"/>
+    <element xmi:type="uml:Generalization" href="esfbehaviours_metamodel.uml#_hbJQAIFfEeWKIdAlVGN13g"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hbZusoFfEeWKIdAlVGN13g" points="[0, -2, 0, 146]$[2, -138, 2, 10]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hb1MgIFfEeWKIdAlVGN13g" id="(0.49712643678160917,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hb1MgYFfEeWKIdAlVGN13g" id="(0.5328947368421053,1.0)"/>
+  </edges>
+</notation:Diagram>
diff --git a/core/metamodel/org.polarsys.esf.core.metamodel.esfbehaviours/src/main/resources/metamodel/esfbehaviours_metamodel.uml b/core/metamodel/org.polarsys.esf.core.metamodel.esfbehaviours/src/main/resources/metamodel/esfbehaviours_metamodel.uml
index cfd3348..e4b9222 100644
--- a/core/metamodel/org.polarsys.esf.core.metamodel.esfbehaviours/src/main/resources/metamodel/esfbehaviours_metamodel.uml
+++ b/core/metamodel/org.polarsys.esf.core.metamodel.esfbehaviours/src/main/resources/metamodel/esfbehaviours_metamodel.uml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_IYSU4AnREeW356xdbh3U2Q" name="ESFBehaviours">

-  <packagedElement xmi:type="uml:Class" xmi:id="_6r3WQAnSEeW356xdbh3U2Q" name="AbstractSBehaviourObject" isAbstract="true">

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

-      <general xmi:type="uml:Class" href="../../../../../org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_gqod8NLoEeSb47LgOrWUpg"/>

-    </generalization>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_6_T2sAnSEeW356xdbh3U2Q" name="SState">

-    <generalization xmi:type="uml:Generalization" xmi:id="_Qz_rAAnTEeW356xdbh3U2Q" general="_6r3WQAnSEeW356xdbh3U2Q"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_7QBMMAnSEeW356xdbh3U2Q" name="SEvent">

-    <generalization xmi:type="uml:Generalization" xmi:id="_P6oaEAnTEeW356xdbh3U2Q" general="_6r3WQAnSEeW356xdbh3U2Q"/>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_g0AHkIFLEeWKIdAlVGN13g" name="probability">

-      <type xmi:type="uml:DataType" href="../../../../../org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml#_e45QgH8AEeW5YtCK2zP8qA"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Dependency" xmi:id="_YEZ6MIFLEeWKIdAlVGN13g" client="_IYSU4AnREeW356xdbh3U2Q">

-    <supplier xmi:type="uml:Model" href="../../../../../org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml#_-NKksAnQEeW356xdbh3U2Q"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Dependency" xmi:id="_U7iUsIFfEeWKIdAlVGN13g" client="_IYSU4AnREeW356xdbh3U2Q">

-    <supplier xmi:type="uml:Model" href="../../../../../org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_VB4SINLoEeSb47LgOrWUpg"/>

-  </packagedElement>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_IYSU4AnREeW356xdbh3U2Q" name="ESFBehaviours">
+  <packagedElement xmi:type="uml:Class" xmi:id="_6r3WQAnSEeW356xdbh3U2Q" name="AbstractSBehaviourObject" isAbstract="true">
+    <generalization xmi:type="uml:Generalization" xmi:id="_hbJQAIFfEeWKIdAlVGN13g">
+      <general xmi:type="uml:Class" href="../../../../../org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_gqod8NLoEeSb47LgOrWUpg"/>
+    </generalization>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_6_T2sAnSEeW356xdbh3U2Q" name="SState">
+    <generalization xmi:type="uml:Generalization" xmi:id="_Qz_rAAnTEeW356xdbh3U2Q" general="_6r3WQAnSEeW356xdbh3U2Q"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_7QBMMAnSEeW356xdbh3U2Q" name="SEvent">
+    <generalization xmi:type="uml:Generalization" xmi:id="_P6oaEAnTEeW356xdbh3U2Q" general="_6r3WQAnSEeW356xdbh3U2Q"/>
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_g0AHkIFLEeWKIdAlVGN13g" name="probability">
+      <type xmi:type="uml:DataType" href="../../../../../org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml#_e45QgH8AEeW5YtCK2zP8qA"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Dependency" xmi:id="_YEZ6MIFLEeWKIdAlVGN13g" client="_IYSU4AnREeW356xdbh3U2Q">
+    <supplier xmi:type="uml:Model" href="../../../../../org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml#_-NKksAnQEeW356xdbh3U2Q"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Dependency" xmi:id="_U7iUsIFfEeWKIdAlVGN13g" client="_IYSU4AnREeW356xdbh3U2Q">
+    <supplier xmi:type="uml:Model" href="../../../../../org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_VB4SINLoEeSb47LgOrWUpg"/>
+  </packagedElement>
+</uml:Model>
diff --git a/core/metamodel/org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.di b/core/metamodel/org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.di
index 8634d4c..bf9abab 100644
--- a/core/metamodel/org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.di
+++ b/core/metamodel/org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.di
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/core/metamodel/org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.notation b/core/metamodel/org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.notation
index 54dc240..20ad8f6 100644
--- a/core/metamodel/org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.notation
+++ b/core/metamodel/org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.notation
@@ -1,425 +1,425 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">

-  <notation:Diagram xmi:id="_ZuB4MNLoEeSb47LgOrWUpg" type="PapyrusUMLClassDiagram" name="ESFCore Diagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_MMIkANLpEeSb47LgOrWUpg" type="2005" fillColor="12621752">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Pn9KoNLpEeSb47LgOrWUpg" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Pn9xsNLpEeSb47LgOrWUpg" key="fillColor" value="true"/>

-      </eAnnotations>

-      <children xmi:type="notation:DecorationNode" xmi:id="_MMJyINLpEeSb47LgOrWUpg" type="5020"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_MMJyIdLpEeSb47LgOrWUpg" type="7009">

-        <children xmi:type="notation:Shape" xmi:id="_gqq6MNLoEeSb47LgOrWUpg" type="2008">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_y7CC8NkZEeSYl-mxKt-WKQ" source="PapyrusCSSForceValue">

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_y7CC8dkZEeSYl-mxKt-WKQ" key="fillColor" value="true"/>

-          </eAnnotations>

-          <children xmi:type="notation:DecorationNode" xmi:id="_gqq6MtLoEeSb47LgOrWUpg" type="5029"/>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_gqrhQNLoEeSb47LgOrWUpg" type="7017">

-            <children xmi:type="notation:Shape" xmi:id="_Mx0QIN6_EeSguJV1FrtdSQ" type="3012">

-              <element xmi:type="uml:Property" href="esfcore_metamodel.uml#_eHbhYNLoEeSb47LgOrWUpg"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_Mx0QId6_EeSguJV1FrtdSQ"/>

-            </children>

-            <children xmi:type="notation:Shape" xmi:id="_Mx0QIt6_EeSguJV1FrtdSQ" type="3012">

-              <element xmi:type="uml:Property" href="esfcore_metamodel.uml#_5PW9IN6-EeSguJV1FrtdSQ"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_Mx0QI96_EeSguJV1FrtdSQ"/>

-            </children>

-            <children xmi:type="notation:Shape" xmi:id="_Mx0QJN6_EeSguJV1FrtdSQ" type="3012">

-              <element xmi:type="uml:Property" href="esfcore_metamodel.uml#_p1Y9UNLoEeSb47LgOrWUpg"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_Mx0QJd6_EeSguJV1FrtdSQ"/>

-            </children>

-            <styles xmi:type="notation:TitleStyle" xmi:id="_gqrhQdLoEeSb47LgOrWUpg"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_gqrhQtLoEeSb47LgOrWUpg"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_gqrhQ9LoEeSb47LgOrWUpg"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gqrhRNLoEeSb47LgOrWUpg"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_gqrhRdLoEeSb47LgOrWUpg" visible="false" type="7018">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_gqrhRtLoEeSb47LgOrWUpg"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_gqrhR9LoEeSb47LgOrWUpg"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_gqrhSNLoEeSb47LgOrWUpg"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gqrhSdLoEeSb47LgOrWUpg"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_gqrhStLoEeSb47LgOrWUpg" visible="false" type="7019">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_gqrhS9LoEeSb47LgOrWUpg"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_gqrhTNLoEeSb47LgOrWUpg"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_gqrhTdLoEeSb47LgOrWUpg"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gqrhTtLoEeSb47LgOrWUpg"/>

-          </children>

-          <children xmi:type="notation:DecorationNode" xmi:id="_0FcOUHyxEeW5YtCK2zP8qA" type="8510">

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_0FcOUXyxEeW5YtCK2zP8qA" y="5"/>

-          </children>

-          <element xmi:type="uml:Class" href="esfcore_metamodel.uml#_gqod8NLoEeSb47LgOrWUpg"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gqq6MdLoEeSb47LgOrWUpg" x="298" y="23" width="337" height="96"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_00ikEN3AEeSI6eEif-R4NA" type="3010">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_52gpIN3AEeSI6eEif-R4NA" source="PapyrusCSSForceValue">

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_52hQMN3AEeSI6eEif-R4NA" key="fillColor" value="true"/>

-          </eAnnotations>

-          <children xmi:type="notation:DecorationNode" xmi:id="_00jLIN3AEeSI6eEif-R4NA" type="5014"/>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_00jLId3AEeSI6eEif-R4NA" visible="false" type="7011">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8NpfoN3AEeSI6eEif-R4NA" source="PapyrusCSSForceValue">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8Npfod3AEeSI6eEif-R4NA" key="visible" value="true"/>

-            </eAnnotations>

-            <styles xmi:type="notation:TitleStyle" xmi:id="_00jLIt3AEeSI6eEif-R4NA"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_00jLI93AEeSI6eEif-R4NA"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_00jLJN3AEeSI6eEif-R4NA"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_00jLJd3AEeSI6eEif-R4NA"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_00jLJt3AEeSI6eEif-R4NA" visible="false" type="7012">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_00jLJ93AEeSI6eEif-R4NA"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_00jLKN3AEeSI6eEif-R4NA"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_00jLKd3AEeSI6eEif-R4NA"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_00jLKt3AEeSI6eEif-R4NA"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_00jLK93AEeSI6eEif-R4NA" visible="false" type="7013">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_00jLLN3AEeSI6eEif-R4NA"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_00jLLd3AEeSI6eEif-R4NA"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_00jLLt3AEeSI6eEif-R4NA"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_00jLL93AEeSI6eEif-R4NA"/>

-          </children>

-          <children xmi:type="notation:DecorationNode" xmi:id="_0FcOUnyxEeW5YtCK2zP8qA" type="8518">

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_0FcOU3yxEeW5YtCK2zP8qA" y="5"/>

-          </children>

-          <element xmi:type="uml:Class" href="esfcore_metamodel.uml#_00gu4N3AEeSI6eEif-R4NA"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_00ikEd3AEeSI6eEif-R4NA" x="14" y="181" width="234" height="66"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_Q07OsOjPEeSQI-4c5olYjA" type="3010">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_cNr2sOjPEeSQI-4c5olYjA" source="PapyrusCSSForceValue">

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cNr2sejPEeSQI-4c5olYjA" key="fillColor" value="true"/>

-          </eAnnotations>

-          <children xmi:type="notation:DecorationNode" xmi:id="_Q071wOjPEeSQI-4c5olYjA" type="5014"/>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_Q071wejPEeSQI-4c5olYjA" visible="false" type="7011">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_Q071wujPEeSQI-4c5olYjA"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_Q071w-jPEeSQI-4c5olYjA"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_Q071xOjPEeSQI-4c5olYjA"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Q071xejPEeSQI-4c5olYjA"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_Q071xujPEeSQI-4c5olYjA" visible="false" type="7012">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_Q071x-jPEeSQI-4c5olYjA"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_Q071yOjPEeSQI-4c5olYjA"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_Q071yejPEeSQI-4c5olYjA"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Q071yujPEeSQI-4c5olYjA"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_Q071y-jPEeSQI-4c5olYjA" visible="false" type="7013">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_Q071zOjPEeSQI-4c5olYjA"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_Q071zejPEeSQI-4c5olYjA"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_Q071zujPEeSQI-4c5olYjA"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Q071z-jPEeSQI-4c5olYjA"/>

-          </children>

-          <children xmi:type="notation:DecorationNode" xmi:id="_0FcOVHyxEeW5YtCK2zP8qA" type="8518">

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_0FcOVXyxEeW5YtCK2zP8qA" y="5"/>

-          </children>

-          <element xmi:type="uml:Class" href="esfcore_metamodel.uml#_Q05ZgOjPEeSQI-4c5olYjA"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Q07OsejPEeSQI-4c5olYjA" x="355" y="178" width="221" height="72"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_HoiwoO8PEeSuEPecb1bpsg" type="3010">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UEMZAO8PEeSuEPecb1bpsg" source="PapyrusCSSForceValue">

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UEMZAe8PEeSuEPecb1bpsg" key="fillColor" value="true"/>

-          </eAnnotations>

-          <children xmi:type="notation:DecorationNode" xmi:id="_Hoiwou8PEeSuEPecb1bpsg" type="5014"/>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_Hoiwo-8PEeSuEPecb1bpsg" visible="false" type="7011">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_HoiwpO8PEeSuEPecb1bpsg"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_Hoiwpe8PEeSuEPecb1bpsg"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_Hoiwpu8PEeSuEPecb1bpsg"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Hoiwp-8PEeSuEPecb1bpsg"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_HoiwqO8PEeSuEPecb1bpsg" visible="false" type="7012">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_Hoiwqe8PEeSuEPecb1bpsg"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_Hoiwqu8PEeSuEPecb1bpsg"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_Hoiwq-8PEeSuEPecb1bpsg"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HoiwrO8PEeSuEPecb1bpsg"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_Hoiwre8PEeSuEPecb1bpsg" visible="false" type="7013">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_Hoiwru8PEeSuEPecb1bpsg"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_Hoiwr-8PEeSuEPecb1bpsg"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_HoiwsO8PEeSuEPecb1bpsg"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Hoiwse8PEeSuEPecb1bpsg"/>

-          </children>

-          <children xmi:type="notation:DecorationNode" xmi:id="_0FcOVnyxEeW5YtCK2zP8qA" type="8518">

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_0FcOV3yxEeW5YtCK2zP8qA" y="5"/>

-          </children>

-          <element xmi:type="uml:Class" href="esfcore_metamodel.uml#_Hn86wO8PEeSuEPecb1bpsg"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Hoiwoe8PEeSuEPecb1bpsg" x="683" y="176" width="220" height="77"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_T1DasHyyEeW5YtCK2zP8qA" type="3010">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_W6jMAHyyEeW5YtCK2zP8qA" source="PapyrusCSSForceValue">

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_W6jMAXyyEeW5YtCK2zP8qA" key="fillColor" value="true"/>

-          </eAnnotations>

-          <children xmi:type="notation:DecorationNode" xmi:id="_T1F28HyyEeW5YtCK2zP8qA" type="5014"/>

-          <children xmi:type="notation:DecorationNode" xmi:id="_T1F28XyyEeW5YtCK2zP8qA" type="8518">

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_T1F28nyyEeW5YtCK2zP8qA" y="5"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_T1F283yyEeW5YtCK2zP8qA" visible="false" type="7011">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_T1F29HyyEeW5YtCK2zP8qA"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_T1F29XyyEeW5YtCK2zP8qA"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_T1F29nyyEeW5YtCK2zP8qA"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T1F293yyEeW5YtCK2zP8qA"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_T1F2-HyyEeW5YtCK2zP8qA" visible="false" type="7012">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_T1F2-XyyEeW5YtCK2zP8qA"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_T1F2-nyyEeW5YtCK2zP8qA"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_T1F2-3yyEeW5YtCK2zP8qA"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T1F2_HyyEeW5YtCK2zP8qA"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_T1F2_XyyEeW5YtCK2zP8qA" visible="false" type="7013">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_T1F2_nyyEeW5YtCK2zP8qA"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_T1F2_3yyEeW5YtCK2zP8qA"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_T1F3AHyyEeW5YtCK2zP8qA"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T1F3AXyyEeW5YtCK2zP8qA"/>

-          </children>

-          <element xmi:type="uml:Class" href="esfcore_metamodel.uml#_T0muwHyyEeW5YtCK2zP8qA"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T1DasXyyEeW5YtCK2zP8qA" x="770" y="31" width="220" height="77"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_MMJyItLpEeSb47LgOrWUpg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MMJyI9LpEeSb47LgOrWUpg"/>

-      </children>

-      <element xmi:type="uml:Model" href="esfcore_metamodel.uml#_VB4SINLoEeSb47LgOrWUpg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MMIkAdLpEeSb47LgOrWUpg" x="102" y="-203" width="1047" height="417"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_Q4m6MNLpEeSb47LgOrWUpg" type="2012" bold="true" fillColor="13434879">

-      <children xmi:type="notation:DecorationNode" xmi:id="_Q4m6MdLpEeSb47LgOrWUpg" type="5038"/>

-      <element xmi:type="uml:Comment" href="esfcore_metamodel.uml#_Q4kd8NLpEeSb47LgOrWUpg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Q4m6MtLpEeSb47LgOrWUpg" x="-148" y="-224" width="221" height="86"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_EpBHkd7AEeSguJV1FrtdSQ" type="2012" bold="true" fillColor="13434879">

-      <children xmi:type="notation:DecorationNode" xmi:id="_EpBHkt7AEeSguJV1FrtdSQ" type="5038"/>

-      <element xmi:type="uml:Comment" href="esfcore_metamodel.uml#_EpBHkN7AEeSguJV1FrtdSQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EpBHk97AEeSguJV1FrtdSQ" x="-148" y="-118" width="221" height="86"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_EpKRgd7AEeSguJV1FrtdSQ" type="2012" bold="true" fillColor="13434879">

-      <children xmi:type="notation:DecorationNode" xmi:id="_EpKRgt7AEeSguJV1FrtdSQ" type="5038"/>

-      <element xmi:type="uml:Comment" href="esfcore_metamodel.uml#_EpKRgN7AEeSguJV1FrtdSQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EpKRg97AEeSguJV1FrtdSQ" x="-150" y="5" width="221" height="86"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_IFzXgd7AEeSguJV1FrtdSQ" type="2012" bold="true" fillColor="13434879">

-      <children xmi:type="notation:DecorationNode" xmi:id="_IFzXgt7AEeSguJV1FrtdSQ" type="5038"/>

-      <element xmi:type="uml:Comment" href="esfcore_metamodel.uml#_IFzXgN7AEeSguJV1FrtdSQ"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IFzXg97AEeSguJV1FrtdSQ" x="232" y="237" width="221" height="86"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_54TQAOjQEeSQI-4c5olYjA" type="2012" bold="true" fillColor="13434879">

-      <children xmi:type="notation:DecorationNode" xmi:id="_54T3EOjQEeSQI-4c5olYjA" type="5038"/>

-      <element xmi:type="uml:Comment" href="esfcore_metamodel.uml#_54Ra0OjQEeSQI-4c5olYjA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_54TQAejQEeSQI-4c5olYjA" x="468" y="241" width="208" height="80"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_Ztq-cHyzEeW5YtCK2zP8qA" type="2012" bold="true">

-      <children xmi:type="notation:DecorationNode" xmi:id="_ZtrlgHyzEeW5YtCK2zP8qA" type="5038"/>

-      <element xmi:type="uml:Comment" href="esfcore_metamodel.uml#_Ztbt4HyzEeW5YtCK2zP8qA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ztq-cXyzEeW5YtCK2zP8qA" x="1157" y="-142" width="208" height="80"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_tSGAUHyzEeW5YtCK2zP8qA" type="2012" bold="true">

-      <children xmi:type="notation:DecorationNode" xmi:id="_tSGAUnyzEeW5YtCK2zP8qA" type="5038"/>

-      <element xmi:type="uml:Comment" href="esfcore_metamodel.uml#_tR3W0HyzEeW5YtCK2zP8qA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tSGAUXyzEeW5YtCK2zP8qA" x="1153" y="-1" width="208" height="80"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_ZuB4MdLoEeSb47LgOrWUpg" name="diagram_compatibility_version" stringValue="1.1.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_ZuB4MtLoEeSb47LgOrWUpg"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_ZuB4M9LoEeSb47LgOrWUpg">

-      <owner xmi:type="uml:Model" href="esfcore_metamodel.uml#_VB4SINLoEeSb47LgOrWUpg"/>

-    </styles>

-    <element xmi:type="uml:Model" href="esfcore_metamodel.uml#_VB4SINLoEeSb47LgOrWUpg"/>

-    <edges xmi:type="notation:Connector" xmi:id="_Q4mTINLpEeSb47LgOrWUpg" type="4013" source="_Q4m6MNLpEeSb47LgOrWUpg" lineColor="0">

-      <styles xmi:type="notation:FontStyle" xmi:id="_Q4mTIdLpEeSb47LgOrWUpg"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Q4mTItLpEeSb47LgOrWUpg" points="[-1, 0, 214, -13]$[-201, 13, 14, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Q4mTI9LpEeSb47LgOrWUpg" id="(1.0,0.46511627906976744)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Q4mTJNLpEeSb47LgOrWUpg" id="(0.2994722955145119,0.0846774193548387)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_SaEF4NLpEeSb47LgOrWUpg" type="4013" source="_Q4m6MNLpEeSb47LgOrWUpg" target="_MMIkANLpEeSb47LgOrWUpg">

-      <styles xmi:type="notation:FontStyle" xmi:id="_SaEF4dLpEeSb47LgOrWUpg"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SaEF4tLpEeSb47LgOrWUpg" points="[113, 52, -201, -94]$[314, 146, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SaMBsNLpEeSb47LgOrWUpg" id="(0.9909502262443439,0.45348837209302323)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SaMowNLpEeSb47LgOrWUpg" id="(0.004595588235294118,0.03836930455635491)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_-ElzIN3AEeSI6eEif-R4NA" type="4002" source="_00ikEN3AEeSI6eEif-R4NA" target="_gqq6MNLoEeSb47LgOrWUpg">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_DFi38AhoEeW8d5NJjrKMSQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DFi38QhoEeW8d5NJjrKMSQ" key="routing" value="true"/>

-      </eAnnotations>

-      <children xmi:type="notation:DecorationNode" xmi:id="_-EmaMN3AEeSI6eEif-R4NA" type="6007">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_-EmaMd3AEeSI6eEif-R4NA" y="40"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_-ElzId3AEeSI6eEif-R4NA"/>

-      <element xmi:type="uml:Generalization" href="esfcore_metamodel.uml#_-EjW4N3AEeSI6eEif-R4NA"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-ElzIt3AEeSI6eEif-R4NA" points="[-15, 0, 0, 67]$[-15, -67, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-EwLMN3AEeSI6eEif-R4NA" id="(0.7393162393162394,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2QqHUN3BEeSI6eEif-R4NA" id="(0.03857566765578635,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_Ef8tAN3BEeSI6eEif-R4NA" type="4001" source="_00ikEN3AEeSI6eEif-R4NA" target="_Q07OsOjPEeSQI-4c5olYjA" routing="Rectilinear">

-      <children xmi:type="notation:DecorationNode" xmi:id="_Ef97IN3BEeSI6eEif-R4NA" type="6001">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ef97Id3BEeSI6eEif-R4NA" y="-20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_Ef97It3BEeSI6eEif-R4NA" type="6002">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ef97I93BEeSI6eEif-R4NA" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_Ef97JN3BEeSI6eEif-R4NA" type="6003">

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_Hva5sN3BEeSI6eEif-R4NA" name="maskLabel">

-          <stringListValue>name</stringListValue>

-          <stringListValue>derived</stringListValue>

-        </styles>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ef97Jd3BEeSI6eEif-R4NA" x="31" y="22"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_Ef97Jt3BEeSI6eEif-R4NA" type="6005">

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_IEUysN3BEeSI6eEif-R4NA" name="maskLabel">

-          <stringListValue>name</stringListValue>

-          <stringListValue>derived</stringListValue>

-        </styles>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ef-iMN3BEeSI6eEif-R4NA" x="-33" y="2"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_Ef-iMd3BEeSI6eEif-R4NA" type="6033">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ef-iMt3BEeSI6eEif-R4NA" x="-31" y="-24"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_Ef-iM93BEeSI6eEif-R4NA" type="6034">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ef-iNN3BEeSI6eEif-R4NA" x="35" y="-19"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_Ef8tAd3BEeSI6eEif-R4NA"/>

-      <element xmi:type="uml:Association" href="esfcore_metamodel.uml#_Ef4bkN3BEeSI6eEif-R4NA"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ef8tAt3BEeSI6eEif-R4NA" points="[-68, 0, -249, -3]$[-68, 72, -249, 69]$[185, 72, 4, 69]$[185, 3, 4, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EgLWgN3BEeSI6eEif-R4NA" id="(0.8034188034188035,1.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EgLWgd3BEeSI6eEif-R4NA" id="(0.12669683257918551,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_MozooN7AEeSguJV1FrtdSQ" type="4013" source="_IFzXgd7AEeSguJV1FrtdSQ" target="_Ef8tAN3BEeSI6eEif-R4NA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_Mozood7AEeSguJV1FrtdSQ"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Mozoot7AEeSguJV1FrtdSQ" points="[0, 0, 0, 121]$[0, -93, 0, 28]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NveVwN7AEeSguJV1FrtdSQ" id="(0.38009049773755654,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Mo8ykN7AEeSguJV1FrtdSQ" id="(0.29850746268656714,0.6160714285714286)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_R6Et8N7AEeSguJV1FrtdSQ" type="4013" source="_EpKRgd7AEeSguJV1FrtdSQ" target="_00ikEN3AEeSI6eEif-R4NA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_R6Et8d7AEeSguJV1FrtdSQ"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_R6Et8t7AEeSguJV1FrtdSQ" points="[0, 0, -76, -25]$[76, 25, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_R6Et897AEeSguJV1FrtdSQ" id="(1.0,0.4418604651162791)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_R6Et9N7AEeSguJV1FrtdSQ" id="(0.0,0.5606060606060606)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_UnPe0N7AEeSguJV1FrtdSQ" type="4013" source="_EpBHkd7AEeSguJV1FrtdSQ" target="_gqq6MNLoEeSb47LgOrWUpg">

-      <styles xmi:type="notation:FontStyle" xmi:id="_UnPe0d7AEeSguJV1FrtdSQ"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UnPe0t7AEeSguJV1FrtdSQ" points="[0, 0, -290, 31]$[290, -31, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VlugUN7AEeSguJV1FrtdSQ" id="(1.0,0.5)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UnPe097AEeSguJV1FrtdSQ" id="(0.026706231454005934,0.7708333333333334)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_vc4PcOjPEeSQI-4c5olYjA" type="4002" source="_Q07OsOjPEeSQI-4c5olYjA" target="_gqq6MNLoEeSb47LgOrWUpg" routing="Rectilinear">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_D6TVsAhoEeW8d5NJjrKMSQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_D6cfoAhoEeW8d5NJjrKMSQ" key="routing" value="true"/>

-      </eAnnotations>

-      <children xmi:type="notation:DecorationNode" xmi:id="_vc42gOjPEeSQI-4c5olYjA" type="6007">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_vc42gejPEeSQI-4c5olYjA" y="40"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_vc4PcejPEeSQI-4c5olYjA"/>

-      <element xmi:type="uml:Generalization" href="esfcore_metamodel.uml#_vc2aQOjPEeSQI-4c5olYjA"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vc4PcujPEeSQI-4c5olYjA" points="[1, 0, -14, 59]$[1, -59, -14, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vdD1oOjPEeSQI-4c5olYjA" id="(0.48868778280542985,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vdEcsOjPEeSQI-4c5olYjA" id="(0.5341246290801187,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_9Y8sQOjQEeSQI-4c5olYjA" type="4013" source="_54TQAOjQEeSQI-4c5olYjA" target="_Q07OsOjPEeSQI-4c5olYjA" routing="Rectilinear">

-      <styles xmi:type="notation:FontStyle" xmi:id="_9Y8sQejQEeSQI-4c5olYjA"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9Y8sQujQEeSQI-4c5olYjA" points="[-28, 0, -13, 166]$[-28, -166, -13, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9Y_vkOjQEeSQI-4c5olYjA" id="(0.6346153846153846,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__l5sAOjQEeSQI-4c5olYjA" id="(0.5565610859728507,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_YErL5O8PEeSuEPecb1bpsg" type="4001" source="_Q07OsOjPEeSQI-4c5olYjA" target="_HoiwoO8PEeSuEPecb1bpsg" routing="Rectilinear">

-      <children xmi:type="notation:DecorationNode" xmi:id="_YErL5-8PEeSuEPecb1bpsg" type="6001">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YErL6O8PEeSuEPecb1bpsg" y="-20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_YErL6e8PEeSuEPecb1bpsg" type="6002">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YErL6u8PEeSuEPecb1bpsg" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_YErL6-8PEeSuEPecb1bpsg" type="6003">

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_WNCtQAhoEeW8d5NJjrKMSQ" name="maskLabel">

-          <stringListValue>name</stringListValue>

-          <stringListValue>derived</stringListValue>

-        </styles>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YErL7O8PEeSuEPecb1bpsg" x="26" y="-10"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_YErL7e8PEeSuEPecb1bpsg" type="6005">

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_t50TMO8PEeSuEPecb1bpsg" name="maskLabel">

-          <stringListValue>name</stringListValue>

-        </styles>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YErL7u8PEeSuEPecb1bpsg" x="-2" y="23"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_YErL7-8PEeSuEPecb1bpsg" type="6033">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YErL8O8PEeSuEPecb1bpsg" x="-48" y="-23"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_YE084O8PEeSuEPecb1bpsg" type="6034">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YE084e8PEeSuEPecb1bpsg" x="-17" y="-45"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_YErL5e8PEeSuEPecb1bpsg"/>

-      <element xmi:type="uml:Association" href="esfcore_metamodel.uml#_YErL4O8PEeSuEPecb1bpsg"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YErL5u8PEeSuEPecb1bpsg" points="[119, 0, -297, -3]$[119, 69, -297, 66]$[430, 69, 14, 66]$[430, 3, 14, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YE-G0O8PEeSuEPecb1bpsg" id="(0.29411764705882354,1.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jDsBsO8QEeSuEPecb1bpsg" id="(0.6954545454545454,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_WW0z4O8YEeSuEPecb1bpsg" type="4002" source="_HoiwoO8PEeSuEPecb1bpsg" target="_gqq6MNLoEeSb47LgOrWUpg">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_KQD94AhoEeW8d5NJjrKMSQ" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KQD94QhoEeW8d5NJjrKMSQ" key="routing" value="true"/>

-      </eAnnotations>

-      <children xmi:type="notation:DecorationNode" xmi:id="_WW0z4-8YEeSuEPecb1bpsg" type="6007">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_WW0z5O8YEeSuEPecb1bpsg" y="40"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_WW0z4e8YEeSuEPecb1bpsg"/>

-      <element xmi:type="uml:Generalization" href="esfcore_metamodel.uml#_WWh48O8YEeSuEPecb1bpsg"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_WW0z4u8YEeSuEPecb1bpsg" points="[0, 39, 79, 0]$[-79, 39, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WW0z5e8YEeSuEPecb1bpsg" id="(0.2818181818181818,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WW0z5u8YEeSuEPecb1bpsg" id="(0.9910979228486647,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_f7FYYHyyEeW5YtCK2zP8qA" type="4001" source="_T1DasHyyEeW5YtCK2zP8qA" target="_gqq6MNLoEeSb47LgOrWUpg" routing="Rectilinear">

-      <children xmi:type="notation:DecorationNode" xmi:id="_f7FYY3yyEeW5YtCK2zP8qA" type="6001">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_f7FYZHyyEeW5YtCK2zP8qA" y="-20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_f7F_cHyyEeW5YtCK2zP8qA" type="6002">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_f7F_cXyyEeW5YtCK2zP8qA" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_f7F_cnyyEeW5YtCK2zP8qA" visible="false" type="6003">

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_piVmgHyyEeW5YtCK2zP8qA" name="maskLabel">

-          <stringListValue>name</stringListValue>

-          <stringListValue>derived</stringListValue>

-        </styles>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_f7F_c3yyEeW5YtCK2zP8qA" y="-20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_f7F_dHyyEeW5YtCK2zP8qA" type="6005">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HgFdwI34EeWEM8PJGngEtA" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HgFdwY34EeWEM8PJGngEtA" key="visible" value="true"/>

-        </eAnnotations>

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_oK4rYHyyEeW5YtCK2zP8qA" name="maskLabel">

-          <stringListValue>name</stringListValue>

-          <stringListValue>derived</stringListValue>

-        </styles>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_f7F_dXyyEeW5YtCK2zP8qA" x="-49" y="-17"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_f7F_dnyyEeW5YtCK2zP8qA" type="6033">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_f7F_d3yyEeW5YtCK2zP8qA" x="-8" y="10"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_f7F_eHyyEeW5YtCK2zP8qA" type="6034">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_f7F_eXyyEeW5YtCK2zP8qA" x="-1" y="15"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_f7FYYXyyEeW5YtCK2zP8qA"/>

-      <element xmi:type="uml:Association" href="esfcore_metamodel.uml#_f6wBMHyyEeW5YtCK2zP8qA"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_f7FYYnyyEeW5YtCK2zP8qA" points="[-3, -5, 206, 0]$[-179, -3, 30, 2]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f8EP0HyyEeW5YtCK2zP8qA" id="(0.0,0.6753246753246753)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f8E24HyyEeW5YtCK2zP8qA" id="(1.0,0.625)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_z2Cq8HyyEeW5YtCK2zP8qA" type="4002" source="_T1DasHyyEeW5YtCK2zP8qA" target="_gqq6MNLoEeSb47LgOrWUpg" routing="Rectilinear">

-      <children xmi:type="notation:DecorationNode" xmi:id="_z2DSAHyyEeW5YtCK2zP8qA" type="6007">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_z2DSAXyyEeW5YtCK2zP8qA" y="40"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_z2Cq8XyyEeW5YtCK2zP8qA"/>

-      <element xmi:type="uml:Generalization" href="esfcore_metamodel.uml#_z1yzUHyyEeW5YtCK2zP8qA"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_z2Cq8nyyEeW5YtCK2zP8qA" points="[0, 2, 183, 0]$[-176, 1, 7, -1]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_z218MHyyEeW5YtCK2zP8qA" id="(0.0,0.24675324675324675)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_z218MXyyEeW5YtCK2zP8qA" id="(1.0,0.28125)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_ryU2sHyzEeW5YtCK2zP8qA" type="4013" source="_Ztq-cHyzEeW5YtCK2zP8qA" target="_T1DasHyyEeW5YtCK2zP8qA">

-      <styles xmi:type="notation:FontStyle" xmi:id="_ryU2sXyzEeW5YtCK2zP8qA"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ryU2snyzEeW5YtCK2zP8qA" points="[-3, -4, 80, 0]$[-63, -4, 20, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rzBaQHyzEeW5YtCK2zP8qA" id="(0.0,0.55)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rzBaQXyzEeW5YtCK2zP8qA" id="(1.0,0.5064935064935064)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_2_47UHyzEeW5YtCK2zP8qA" type="4013" source="_tSGAUHyzEeW5YtCK2zP8qA" target="_HoiwoO8PEeSuEPecb1bpsg">

-      <styles xmi:type="notation:FontStyle" xmi:id="_2_47UXyzEeW5YtCK2zP8qA"/>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2_47UnyzEeW5YtCK2zP8qA" points="[-27, 2, 160, 0]$[-170, 1, 17, -1]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3AuBwHyzEeW5YtCK2zP8qA" id="(0.0,0.475)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3AuBwXyzEeW5YtCK2zP8qA" id="(1.0,0.42857142857142855)"/>

-    </edges>

-  </notation:Diagram>

-  <css:ModelStyleSheets xmi:id="_jM5oAN69EeSguJV1FrtdSQ"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
+  <notation:Diagram xmi:id="_ZuB4MNLoEeSb47LgOrWUpg" type="PapyrusUMLClassDiagram" name="ESFCore Diagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_MMIkANLpEeSb47LgOrWUpg" type="2005" fillColor="12621752">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Pn9KoNLpEeSb47LgOrWUpg" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Pn9xsNLpEeSb47LgOrWUpg" key="fillColor" value="true"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_MMJyINLpEeSb47LgOrWUpg" type="5020"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_MMJyIdLpEeSb47LgOrWUpg" type="7009">
+        <children xmi:type="notation:Shape" xmi:id="_gqq6MNLoEeSb47LgOrWUpg" type="2008">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_y7CC8NkZEeSYl-mxKt-WKQ" source="PapyrusCSSForceValue">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_y7CC8dkZEeSYl-mxKt-WKQ" key="fillColor" value="true"/>
+          </eAnnotations>
+          <children xmi:type="notation:DecorationNode" xmi:id="_gqq6MtLoEeSb47LgOrWUpg" type="5029"/>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_gqrhQNLoEeSb47LgOrWUpg" type="7017">
+            <children xmi:type="notation:Shape" xmi:id="_Mx0QIN6_EeSguJV1FrtdSQ" type="3012">
+              <element xmi:type="uml:Property" href="esfcore_metamodel.uml#_eHbhYNLoEeSb47LgOrWUpg"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_Mx0QId6_EeSguJV1FrtdSQ"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="_Mx0QIt6_EeSguJV1FrtdSQ" type="3012">
+              <element xmi:type="uml:Property" href="esfcore_metamodel.uml#_5PW9IN6-EeSguJV1FrtdSQ"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_Mx0QI96_EeSguJV1FrtdSQ"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="_Mx0QJN6_EeSguJV1FrtdSQ" type="3012">
+              <element xmi:type="uml:Property" href="esfcore_metamodel.uml#_p1Y9UNLoEeSb47LgOrWUpg"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_Mx0QJd6_EeSguJV1FrtdSQ"/>
+            </children>
+            <styles xmi:type="notation:TitleStyle" xmi:id="_gqrhQdLoEeSb47LgOrWUpg"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_gqrhQtLoEeSb47LgOrWUpg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_gqrhQ9LoEeSb47LgOrWUpg"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gqrhRNLoEeSb47LgOrWUpg"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_gqrhRdLoEeSb47LgOrWUpg" visible="false" type="7018">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_gqrhRtLoEeSb47LgOrWUpg"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_gqrhR9LoEeSb47LgOrWUpg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_gqrhSNLoEeSb47LgOrWUpg"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gqrhSdLoEeSb47LgOrWUpg"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_gqrhStLoEeSb47LgOrWUpg" visible="false" type="7019">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_gqrhS9LoEeSb47LgOrWUpg"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_gqrhTNLoEeSb47LgOrWUpg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_gqrhTdLoEeSb47LgOrWUpg"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gqrhTtLoEeSb47LgOrWUpg"/>
+          </children>
+          <children xmi:type="notation:DecorationNode" xmi:id="_0FcOUHyxEeW5YtCK2zP8qA" type="8510">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_0FcOUXyxEeW5YtCK2zP8qA" y="5"/>
+          </children>
+          <element xmi:type="uml:Class" href="esfcore_metamodel.uml#_gqod8NLoEeSb47LgOrWUpg"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gqq6MdLoEeSb47LgOrWUpg" x="298" y="23" width="337" height="96"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_00ikEN3AEeSI6eEif-R4NA" type="3010">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_52gpIN3AEeSI6eEif-R4NA" source="PapyrusCSSForceValue">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_52hQMN3AEeSI6eEif-R4NA" key="fillColor" value="true"/>
+          </eAnnotations>
+          <children xmi:type="notation:DecorationNode" xmi:id="_00jLIN3AEeSI6eEif-R4NA" type="5014"/>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_00jLId3AEeSI6eEif-R4NA" visible="false" type="7011">
+            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8NpfoN3AEeSI6eEif-R4NA" source="PapyrusCSSForceValue">
+              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8Npfod3AEeSI6eEif-R4NA" key="visible" value="true"/>
+            </eAnnotations>
+            <styles xmi:type="notation:TitleStyle" xmi:id="_00jLIt3AEeSI6eEif-R4NA"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_00jLI93AEeSI6eEif-R4NA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_00jLJN3AEeSI6eEif-R4NA"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_00jLJd3AEeSI6eEif-R4NA"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_00jLJt3AEeSI6eEif-R4NA" visible="false" type="7012">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_00jLJ93AEeSI6eEif-R4NA"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_00jLKN3AEeSI6eEif-R4NA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_00jLKd3AEeSI6eEif-R4NA"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_00jLKt3AEeSI6eEif-R4NA"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_00jLK93AEeSI6eEif-R4NA" visible="false" type="7013">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_00jLLN3AEeSI6eEif-R4NA"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_00jLLd3AEeSI6eEif-R4NA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_00jLLt3AEeSI6eEif-R4NA"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_00jLL93AEeSI6eEif-R4NA"/>
+          </children>
+          <children xmi:type="notation:DecorationNode" xmi:id="_0FcOUnyxEeW5YtCK2zP8qA" type="8518">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_0FcOU3yxEeW5YtCK2zP8qA" y="5"/>
+          </children>
+          <element xmi:type="uml:Class" href="esfcore_metamodel.uml#_00gu4N3AEeSI6eEif-R4NA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_00ikEd3AEeSI6eEif-R4NA" x="14" y="181" width="234" height="66"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_Q07OsOjPEeSQI-4c5olYjA" type="3010">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_cNr2sOjPEeSQI-4c5olYjA" source="PapyrusCSSForceValue">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cNr2sejPEeSQI-4c5olYjA" key="fillColor" value="true"/>
+          </eAnnotations>
+          <children xmi:type="notation:DecorationNode" xmi:id="_Q071wOjPEeSQI-4c5olYjA" type="5014"/>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_Q071wejPEeSQI-4c5olYjA" visible="false" type="7011">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_Q071wujPEeSQI-4c5olYjA"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_Q071w-jPEeSQI-4c5olYjA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_Q071xOjPEeSQI-4c5olYjA"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Q071xejPEeSQI-4c5olYjA"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_Q071xujPEeSQI-4c5olYjA" visible="false" type="7012">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_Q071x-jPEeSQI-4c5olYjA"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_Q071yOjPEeSQI-4c5olYjA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_Q071yejPEeSQI-4c5olYjA"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Q071yujPEeSQI-4c5olYjA"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_Q071y-jPEeSQI-4c5olYjA" visible="false" type="7013">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_Q071zOjPEeSQI-4c5olYjA"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_Q071zejPEeSQI-4c5olYjA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_Q071zujPEeSQI-4c5olYjA"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Q071z-jPEeSQI-4c5olYjA"/>
+          </children>
+          <children xmi:type="notation:DecorationNode" xmi:id="_0FcOVHyxEeW5YtCK2zP8qA" type="8518">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_0FcOVXyxEeW5YtCK2zP8qA" y="5"/>
+          </children>
+          <element xmi:type="uml:Class" href="esfcore_metamodel.uml#_Q05ZgOjPEeSQI-4c5olYjA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Q07OsejPEeSQI-4c5olYjA" x="355" y="178" width="221" height="72"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_HoiwoO8PEeSuEPecb1bpsg" type="3010">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UEMZAO8PEeSuEPecb1bpsg" source="PapyrusCSSForceValue">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UEMZAe8PEeSuEPecb1bpsg" key="fillColor" value="true"/>
+          </eAnnotations>
+          <children xmi:type="notation:DecorationNode" xmi:id="_Hoiwou8PEeSuEPecb1bpsg" type="5014"/>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_Hoiwo-8PEeSuEPecb1bpsg" visible="false" type="7011">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_HoiwpO8PEeSuEPecb1bpsg"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_Hoiwpe8PEeSuEPecb1bpsg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_Hoiwpu8PEeSuEPecb1bpsg"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Hoiwp-8PEeSuEPecb1bpsg"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_HoiwqO8PEeSuEPecb1bpsg" visible="false" type="7012">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_Hoiwqe8PEeSuEPecb1bpsg"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_Hoiwqu8PEeSuEPecb1bpsg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_Hoiwq-8PEeSuEPecb1bpsg"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HoiwrO8PEeSuEPecb1bpsg"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_Hoiwre8PEeSuEPecb1bpsg" visible="false" type="7013">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_Hoiwru8PEeSuEPecb1bpsg"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_Hoiwr-8PEeSuEPecb1bpsg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_HoiwsO8PEeSuEPecb1bpsg"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Hoiwse8PEeSuEPecb1bpsg"/>
+          </children>
+          <children xmi:type="notation:DecorationNode" xmi:id="_0FcOVnyxEeW5YtCK2zP8qA" type="8518">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_0FcOV3yxEeW5YtCK2zP8qA" y="5"/>
+          </children>
+          <element xmi:type="uml:Class" href="esfcore_metamodel.uml#_Hn86wO8PEeSuEPecb1bpsg"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Hoiwoe8PEeSuEPecb1bpsg" x="683" y="176" width="220" height="77"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_T1DasHyyEeW5YtCK2zP8qA" type="3010">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_W6jMAHyyEeW5YtCK2zP8qA" source="PapyrusCSSForceValue">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_W6jMAXyyEeW5YtCK2zP8qA" key="fillColor" value="true"/>
+          </eAnnotations>
+          <children xmi:type="notation:DecorationNode" xmi:id="_T1F28HyyEeW5YtCK2zP8qA" type="5014"/>
+          <children xmi:type="notation:DecorationNode" xmi:id="_T1F28XyyEeW5YtCK2zP8qA" type="8518">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_T1F28nyyEeW5YtCK2zP8qA" y="5"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_T1F283yyEeW5YtCK2zP8qA" visible="false" type="7011">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_T1F29HyyEeW5YtCK2zP8qA"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_T1F29XyyEeW5YtCK2zP8qA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_T1F29nyyEeW5YtCK2zP8qA"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T1F293yyEeW5YtCK2zP8qA"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_T1F2-HyyEeW5YtCK2zP8qA" visible="false" type="7012">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_T1F2-XyyEeW5YtCK2zP8qA"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_T1F2-nyyEeW5YtCK2zP8qA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_T1F2-3yyEeW5YtCK2zP8qA"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T1F2_HyyEeW5YtCK2zP8qA"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_T1F2_XyyEeW5YtCK2zP8qA" visible="false" type="7013">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_T1F2_nyyEeW5YtCK2zP8qA"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_T1F2_3yyEeW5YtCK2zP8qA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_T1F3AHyyEeW5YtCK2zP8qA"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T1F3AXyyEeW5YtCK2zP8qA"/>
+          </children>
+          <element xmi:type="uml:Class" href="esfcore_metamodel.uml#_T0muwHyyEeW5YtCK2zP8qA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T1DasXyyEeW5YtCK2zP8qA" x="770" y="31" width="220" height="77"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_MMJyItLpEeSb47LgOrWUpg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MMJyI9LpEeSb47LgOrWUpg"/>
+      </children>
+      <element xmi:type="uml:Model" href="esfcore_metamodel.uml#_VB4SINLoEeSb47LgOrWUpg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MMIkAdLpEeSb47LgOrWUpg" x="102" y="-203" width="1047" height="417"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_Q4m6MNLpEeSb47LgOrWUpg" type="2012" bold="true" fillColor="13434879">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Q4m6MdLpEeSb47LgOrWUpg" type="5038"/>
+      <element xmi:type="uml:Comment" href="esfcore_metamodel.uml#_Q4kd8NLpEeSb47LgOrWUpg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Q4m6MtLpEeSb47LgOrWUpg" x="-148" y="-224" width="221" height="86"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_EpBHkd7AEeSguJV1FrtdSQ" type="2012" bold="true" fillColor="13434879">
+      <children xmi:type="notation:DecorationNode" xmi:id="_EpBHkt7AEeSguJV1FrtdSQ" type="5038"/>
+      <element xmi:type="uml:Comment" href="esfcore_metamodel.uml#_EpBHkN7AEeSguJV1FrtdSQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EpBHk97AEeSguJV1FrtdSQ" x="-148" y="-118" width="221" height="86"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_EpKRgd7AEeSguJV1FrtdSQ" type="2012" bold="true" fillColor="13434879">
+      <children xmi:type="notation:DecorationNode" xmi:id="_EpKRgt7AEeSguJV1FrtdSQ" type="5038"/>
+      <element xmi:type="uml:Comment" href="esfcore_metamodel.uml#_EpKRgN7AEeSguJV1FrtdSQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EpKRg97AEeSguJV1FrtdSQ" x="-150" y="5" width="221" height="86"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_IFzXgd7AEeSguJV1FrtdSQ" type="2012" bold="true" fillColor="13434879">
+      <children xmi:type="notation:DecorationNode" xmi:id="_IFzXgt7AEeSguJV1FrtdSQ" type="5038"/>
+      <element xmi:type="uml:Comment" href="esfcore_metamodel.uml#_IFzXgN7AEeSguJV1FrtdSQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IFzXg97AEeSguJV1FrtdSQ" x="232" y="237" width="221" height="86"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_54TQAOjQEeSQI-4c5olYjA" type="2012" bold="true" fillColor="13434879">
+      <children xmi:type="notation:DecorationNode" xmi:id="_54T3EOjQEeSQI-4c5olYjA" type="5038"/>
+      <element xmi:type="uml:Comment" href="esfcore_metamodel.uml#_54Ra0OjQEeSQI-4c5olYjA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_54TQAejQEeSQI-4c5olYjA" x="468" y="241" width="208" height="80"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_Ztq-cHyzEeW5YtCK2zP8qA" type="2012" bold="true">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ZtrlgHyzEeW5YtCK2zP8qA" type="5038"/>
+      <element xmi:type="uml:Comment" href="esfcore_metamodel.uml#_Ztbt4HyzEeW5YtCK2zP8qA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ztq-cXyzEeW5YtCK2zP8qA" x="1157" y="-142" width="208" height="80"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_tSGAUHyzEeW5YtCK2zP8qA" type="2012" bold="true">
+      <children xmi:type="notation:DecorationNode" xmi:id="_tSGAUnyzEeW5YtCK2zP8qA" type="5038"/>
+      <element xmi:type="uml:Comment" href="esfcore_metamodel.uml#_tR3W0HyzEeW5YtCK2zP8qA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tSGAUXyzEeW5YtCK2zP8qA" x="1153" y="-1" width="208" height="80"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_ZuB4MdLoEeSb47LgOrWUpg" name="diagram_compatibility_version" stringValue="1.1.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_ZuB4MtLoEeSb47LgOrWUpg"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_ZuB4M9LoEeSb47LgOrWUpg">
+      <owner xmi:type="uml:Model" href="esfcore_metamodel.uml#_VB4SINLoEeSb47LgOrWUpg"/>
+    </styles>
+    <element xmi:type="uml:Model" href="esfcore_metamodel.uml#_VB4SINLoEeSb47LgOrWUpg"/>
+    <edges xmi:type="notation:Connector" xmi:id="_Q4mTINLpEeSb47LgOrWUpg" type="4013" source="_Q4m6MNLpEeSb47LgOrWUpg" lineColor="0">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Q4mTIdLpEeSb47LgOrWUpg"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Q4mTItLpEeSb47LgOrWUpg" points="[-1, 0, 214, -13]$[-201, 13, 14, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Q4mTI9LpEeSb47LgOrWUpg" id="(1.0,0.46511627906976744)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Q4mTJNLpEeSb47LgOrWUpg" id="(0.2994722955145119,0.0846774193548387)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_SaEF4NLpEeSb47LgOrWUpg" type="4013" source="_Q4m6MNLpEeSb47LgOrWUpg" target="_MMIkANLpEeSb47LgOrWUpg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_SaEF4dLpEeSb47LgOrWUpg"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SaEF4tLpEeSb47LgOrWUpg" points="[113, 52, -201, -94]$[314, 146, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SaMBsNLpEeSb47LgOrWUpg" id="(0.9909502262443439,0.45348837209302323)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SaMowNLpEeSb47LgOrWUpg" id="(0.004595588235294118,0.03836930455635491)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_-ElzIN3AEeSI6eEif-R4NA" type="4002" source="_00ikEN3AEeSI6eEif-R4NA" target="_gqq6MNLoEeSb47LgOrWUpg">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_DFi38AhoEeW8d5NJjrKMSQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DFi38QhoEeW8d5NJjrKMSQ" key="routing" value="true"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_-EmaMN3AEeSI6eEif-R4NA" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-EmaMd3AEeSI6eEif-R4NA" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_-ElzId3AEeSI6eEif-R4NA"/>
+      <element xmi:type="uml:Generalization" href="esfcore_metamodel.uml#_-EjW4N3AEeSI6eEif-R4NA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-ElzIt3AEeSI6eEif-R4NA" points="[-15, 0, 0, 67]$[-15, -67, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-EwLMN3AEeSI6eEif-R4NA" id="(0.7393162393162394,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2QqHUN3BEeSI6eEif-R4NA" id="(0.03857566765578635,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_Ef8tAN3BEeSI6eEif-R4NA" type="4001" source="_00ikEN3AEeSI6eEif-R4NA" target="_Q07OsOjPEeSQI-4c5olYjA" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Ef97IN3BEeSI6eEif-R4NA" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ef97Id3BEeSI6eEif-R4NA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Ef97It3BEeSI6eEif-R4NA" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ef97I93BEeSI6eEif-R4NA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Ef97JN3BEeSI6eEif-R4NA" type="6003">
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_Hva5sN3BEeSI6eEif-R4NA" name="maskLabel">
+          <stringListValue>name</stringListValue>
+          <stringListValue>derived</stringListValue>
+        </styles>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ef97Jd3BEeSI6eEif-R4NA" x="31" y="22"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Ef97Jt3BEeSI6eEif-R4NA" type="6005">
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_IEUysN3BEeSI6eEif-R4NA" name="maskLabel">
+          <stringListValue>name</stringListValue>
+          <stringListValue>derived</stringListValue>
+        </styles>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ef-iMN3BEeSI6eEif-R4NA" x="-33" y="2"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Ef-iMd3BEeSI6eEif-R4NA" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ef-iMt3BEeSI6eEif-R4NA" x="-31" y="-24"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Ef-iM93BEeSI6eEif-R4NA" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Ef-iNN3BEeSI6eEif-R4NA" x="35" y="-19"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_Ef8tAd3BEeSI6eEif-R4NA"/>
+      <element xmi:type="uml:Association" href="esfcore_metamodel.uml#_Ef4bkN3BEeSI6eEif-R4NA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ef8tAt3BEeSI6eEif-R4NA" points="[-68, 0, -249, -3]$[-68, 72, -249, 69]$[185, 72, 4, 69]$[185, 3, 4, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EgLWgN3BEeSI6eEif-R4NA" id="(0.8034188034188035,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EgLWgd3BEeSI6eEif-R4NA" id="(0.12669683257918551,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_MozooN7AEeSguJV1FrtdSQ" type="4013" source="_IFzXgd7AEeSguJV1FrtdSQ" target="_Ef8tAN3BEeSI6eEif-R4NA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Mozood7AEeSguJV1FrtdSQ"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Mozoot7AEeSguJV1FrtdSQ" points="[0, 0, 0, 121]$[0, -93, 0, 28]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NveVwN7AEeSguJV1FrtdSQ" id="(0.38009049773755654,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Mo8ykN7AEeSguJV1FrtdSQ" id="(0.29850746268656714,0.6160714285714286)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_R6Et8N7AEeSguJV1FrtdSQ" type="4013" source="_EpKRgd7AEeSguJV1FrtdSQ" target="_00ikEN3AEeSI6eEif-R4NA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_R6Et8d7AEeSguJV1FrtdSQ"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_R6Et8t7AEeSguJV1FrtdSQ" points="[0, 0, -76, -25]$[76, 25, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_R6Et897AEeSguJV1FrtdSQ" id="(1.0,0.4418604651162791)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_R6Et9N7AEeSguJV1FrtdSQ" id="(0.0,0.5606060606060606)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_UnPe0N7AEeSguJV1FrtdSQ" type="4013" source="_EpBHkd7AEeSguJV1FrtdSQ" target="_gqq6MNLoEeSb47LgOrWUpg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_UnPe0d7AEeSguJV1FrtdSQ"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UnPe0t7AEeSguJV1FrtdSQ" points="[0, 0, -290, 31]$[290, -31, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VlugUN7AEeSguJV1FrtdSQ" id="(1.0,0.5)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UnPe097AEeSguJV1FrtdSQ" id="(0.026706231454005934,0.7708333333333334)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_vc4PcOjPEeSQI-4c5olYjA" type="4002" source="_Q07OsOjPEeSQI-4c5olYjA" target="_gqq6MNLoEeSb47LgOrWUpg" routing="Rectilinear">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_D6TVsAhoEeW8d5NJjrKMSQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_D6cfoAhoEeW8d5NJjrKMSQ" key="routing" value="true"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_vc42gOjPEeSQI-4c5olYjA" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_vc42gejPEeSQI-4c5olYjA" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_vc4PcejPEeSQI-4c5olYjA"/>
+      <element xmi:type="uml:Generalization" href="esfcore_metamodel.uml#_vc2aQOjPEeSQI-4c5olYjA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vc4PcujPEeSQI-4c5olYjA" points="[1, 0, -14, 59]$[1, -59, -14, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vdD1oOjPEeSQI-4c5olYjA" id="(0.48868778280542985,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vdEcsOjPEeSQI-4c5olYjA" id="(0.5341246290801187,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_9Y8sQOjQEeSQI-4c5olYjA" type="4013" source="_54TQAOjQEeSQI-4c5olYjA" target="_Q07OsOjPEeSQI-4c5olYjA" routing="Rectilinear">
+      <styles xmi:type="notation:FontStyle" xmi:id="_9Y8sQejQEeSQI-4c5olYjA"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9Y8sQujQEeSQI-4c5olYjA" points="[-28, 0, -13, 166]$[-28, -166, -13, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9Y_vkOjQEeSQI-4c5olYjA" id="(0.6346153846153846,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__l5sAOjQEeSQI-4c5olYjA" id="(0.5565610859728507,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_YErL5O8PEeSuEPecb1bpsg" type="4001" source="_Q07OsOjPEeSQI-4c5olYjA" target="_HoiwoO8PEeSuEPecb1bpsg" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_YErL5-8PEeSuEPecb1bpsg" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YErL6O8PEeSuEPecb1bpsg" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YErL6e8PEeSuEPecb1bpsg" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YErL6u8PEeSuEPecb1bpsg" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YErL6-8PEeSuEPecb1bpsg" type="6003">
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_WNCtQAhoEeW8d5NJjrKMSQ" name="maskLabel">
+          <stringListValue>name</stringListValue>
+          <stringListValue>derived</stringListValue>
+        </styles>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YErL7O8PEeSuEPecb1bpsg" x="26" y="-10"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YErL7e8PEeSuEPecb1bpsg" type="6005">
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_t50TMO8PEeSuEPecb1bpsg" name="maskLabel">
+          <stringListValue>name</stringListValue>
+        </styles>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YErL7u8PEeSuEPecb1bpsg" x="-2" y="23"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YErL7-8PEeSuEPecb1bpsg" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YErL8O8PEeSuEPecb1bpsg" x="-48" y="-23"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YE084O8PEeSuEPecb1bpsg" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YE084e8PEeSuEPecb1bpsg" x="-17" y="-45"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_YErL5e8PEeSuEPecb1bpsg"/>
+      <element xmi:type="uml:Association" href="esfcore_metamodel.uml#_YErL4O8PEeSuEPecb1bpsg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YErL5u8PEeSuEPecb1bpsg" points="[119, 0, -297, -3]$[119, 69, -297, 66]$[430, 69, 14, 66]$[430, 3, 14, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YE-G0O8PEeSuEPecb1bpsg" id="(0.29411764705882354,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jDsBsO8QEeSuEPecb1bpsg" id="(0.6954545454545454,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_WW0z4O8YEeSuEPecb1bpsg" type="4002" source="_HoiwoO8PEeSuEPecb1bpsg" target="_gqq6MNLoEeSb47LgOrWUpg">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_KQD94AhoEeW8d5NJjrKMSQ" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KQD94QhoEeW8d5NJjrKMSQ" key="routing" value="true"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_WW0z4-8YEeSuEPecb1bpsg" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_WW0z5O8YEeSuEPecb1bpsg" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_WW0z4e8YEeSuEPecb1bpsg"/>
+      <element xmi:type="uml:Generalization" href="esfcore_metamodel.uml#_WWh48O8YEeSuEPecb1bpsg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_WW0z4u8YEeSuEPecb1bpsg" points="[0, 39, 79, 0]$[-79, 39, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WW0z5e8YEeSuEPecb1bpsg" id="(0.2818181818181818,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WW0z5u8YEeSuEPecb1bpsg" id="(0.9910979228486647,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_f7FYYHyyEeW5YtCK2zP8qA" type="4001" source="_T1DasHyyEeW5YtCK2zP8qA" target="_gqq6MNLoEeSb47LgOrWUpg" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_f7FYY3yyEeW5YtCK2zP8qA" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_f7FYZHyyEeW5YtCK2zP8qA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_f7F_cHyyEeW5YtCK2zP8qA" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_f7F_cXyyEeW5YtCK2zP8qA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_f7F_cnyyEeW5YtCK2zP8qA" visible="false" type="6003">
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_piVmgHyyEeW5YtCK2zP8qA" name="maskLabel">
+          <stringListValue>name</stringListValue>
+          <stringListValue>derived</stringListValue>
+        </styles>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_f7F_c3yyEeW5YtCK2zP8qA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_f7F_dHyyEeW5YtCK2zP8qA" type="6005">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HgFdwI34EeWEM8PJGngEtA" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HgFdwY34EeWEM8PJGngEtA" key="visible" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_oK4rYHyyEeW5YtCK2zP8qA" name="maskLabel">
+          <stringListValue>name</stringListValue>
+          <stringListValue>derived</stringListValue>
+        </styles>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_f7F_dXyyEeW5YtCK2zP8qA" x="-49" y="-17"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_f7F_dnyyEeW5YtCK2zP8qA" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_f7F_d3yyEeW5YtCK2zP8qA" x="-8" y="10"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_f7F_eHyyEeW5YtCK2zP8qA" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_f7F_eXyyEeW5YtCK2zP8qA" x="-1" y="15"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_f7FYYXyyEeW5YtCK2zP8qA"/>
+      <element xmi:type="uml:Association" href="esfcore_metamodel.uml#_f6wBMHyyEeW5YtCK2zP8qA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_f7FYYnyyEeW5YtCK2zP8qA" points="[-3, -5, 206, 0]$[-179, -3, 30, 2]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f8EP0HyyEeW5YtCK2zP8qA" id="(0.0,0.6753246753246753)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f8E24HyyEeW5YtCK2zP8qA" id="(1.0,0.625)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_z2Cq8HyyEeW5YtCK2zP8qA" type="4002" source="_T1DasHyyEeW5YtCK2zP8qA" target="_gqq6MNLoEeSb47LgOrWUpg" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_z2DSAHyyEeW5YtCK2zP8qA" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_z2DSAXyyEeW5YtCK2zP8qA" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_z2Cq8XyyEeW5YtCK2zP8qA"/>
+      <element xmi:type="uml:Generalization" href="esfcore_metamodel.uml#_z1yzUHyyEeW5YtCK2zP8qA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_z2Cq8nyyEeW5YtCK2zP8qA" points="[0, 2, 183, 0]$[-176, 1, 7, -1]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_z218MHyyEeW5YtCK2zP8qA" id="(0.0,0.24675324675324675)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_z218MXyyEeW5YtCK2zP8qA" id="(1.0,0.28125)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_ryU2sHyzEeW5YtCK2zP8qA" type="4013" source="_Ztq-cHyzEeW5YtCK2zP8qA" target="_T1DasHyyEeW5YtCK2zP8qA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_ryU2sXyzEeW5YtCK2zP8qA"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ryU2snyzEeW5YtCK2zP8qA" points="[-3, -4, 80, 0]$[-63, -4, 20, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rzBaQHyzEeW5YtCK2zP8qA" id="(0.0,0.55)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rzBaQXyzEeW5YtCK2zP8qA" id="(1.0,0.5064935064935064)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_2_47UHyzEeW5YtCK2zP8qA" type="4013" source="_tSGAUHyzEeW5YtCK2zP8qA" target="_HoiwoO8PEeSuEPecb1bpsg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_2_47UXyzEeW5YtCK2zP8qA"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2_47UnyzEeW5YtCK2zP8qA" points="[-27, 2, 160, 0]$[-170, 1, 17, -1]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3AuBwHyzEeW5YtCK2zP8qA" id="(0.0,0.475)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3AuBwXyzEeW5YtCK2zP8qA" id="(1.0,0.42857142857142855)"/>
+    </edges>
+  </notation:Diagram>
+  <css:ModelStyleSheets xmi:id="_jM5oAN69EeSguJV1FrtdSQ"/>
+</xmi:XMI>
diff --git a/core/metamodel/org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.notation b/core/metamodel/org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.notation
index 26c329b..5dd3329 100644
--- a/core/metamodel/org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.notation
+++ b/core/metamodel/org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.notation
@@ -1,291 +1,291 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_huVFMAnTEeW356xdbh3U2Q" type="PapyrusUMLClassDiagram" name="ESFProperties Driagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_i7xvwAnTEeW356xdbh3U2Q" type="2005" fillColor="8905185">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQuJcAnTEeW356xdbh3U2Q" source="PapyrusCSSForceValue">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQuwgAnTEeW356xdbh3U2Q" key="fillColor" value="true"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_i7yW0AnTEeW356xdbh3U2Q" type="5020"/>

-    <children xmi:type="notation:DecorationNode" xmi:id="_i7yW0QnTEeW356xdbh3U2Q" type="7009">

-      <children xmi:type="notation:Shape" xmi:id="_k2g-IAnTEeW356xdbh3U2Q" type="3027">

-        <children xmi:type="notation:DecorationNode" xmi:id="_k2iMQAnTEeW356xdbh3U2Q" type="5061"/>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_k2iMQQnTEeW356xdbh3U2Q" visible="false" type="7032">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_k2iMQgnTEeW356xdbh3U2Q"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_k2iMQwnTEeW356xdbh3U2Q"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_k2iMRAnTEeW356xdbh3U2Q"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_k2iMRQnTEeW356xdbh3U2Q"/>

-        </children>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_k2iMRgnTEeW356xdbh3U2Q" visible="false" type="7033">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_k2iMRwnTEeW356xdbh3U2Q"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_k2iMSAnTEeW356xdbh3U2Q"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_k2iMSQnTEeW356xdbh3U2Q"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_k2iMSgnTEeW356xdbh3U2Q"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_qZHSEGLKEeWRk_KThWkycg" type="8520">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_qZHSEWLKEeWRk_KThWkycg" y="5"/>

-        </children>

-        <element xmi:type="uml:DataType" href="esfproperties_metamodel.uml#_k2eh4AnTEeW356xdbh3U2Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_k2g-IQnTEeW356xdbh3U2Q" x="77" y="168" width="118" height="69"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_qLWhQA23EeWIHrhJxYOO3w" type="3027">

-        <children xmi:type="notation:DecorationNode" xmi:id="_qLXIUA23EeWIHrhJxYOO3w" type="5061"/>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_qLXIUQ23EeWIHrhJxYOO3w" visible="false" type="7032">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_qLXIUg23EeWIHrhJxYOO3w"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_qLXIUw23EeWIHrhJxYOO3w"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_qLXIVA23EeWIHrhJxYOO3w"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qLXIVQ23EeWIHrhJxYOO3w"/>

-        </children>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_qLXIVg23EeWIHrhJxYOO3w" visible="false" type="7033">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_qLXIVw23EeWIHrhJxYOO3w"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_qLXIWA23EeWIHrhJxYOO3w"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_qLXIWQ23EeWIHrhJxYOO3w"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qLXIWg23EeWIHrhJxYOO3w"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_qZHSEmLKEeWRk_KThWkycg" type="8520">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_qZHSE2LKEeWRk_KThWkycg" y="5"/>

-        </children>

-        <element xmi:type="uml:DataType" href="esfproperties_metamodel.uml#_qLS24A23EeWIHrhJxYOO3w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qLWhQQ23EeWIHrhJxYOO3w" x="369" y="168" width="118" height="69"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_207Q4A23EeWIHrhJxYOO3w" type="3027">

-        <children xmi:type="notation:DecorationNode" xmi:id="_20738A23EeWIHrhJxYOO3w" type="5061"/>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_208fAA23EeWIHrhJxYOO3w" visible="false" type="7032">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_208fAQ23EeWIHrhJxYOO3w"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_208fAg23EeWIHrhJxYOO3w"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_208fAw23EeWIHrhJxYOO3w"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_208fBA23EeWIHrhJxYOO3w"/>

-        </children>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_208fBQ23EeWIHrhJxYOO3w" visible="false" type="7033">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_208fBg23EeWIHrhJxYOO3w"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_208fBw23EeWIHrhJxYOO3w"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_208fCA23EeWIHrhJxYOO3w"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_208fCQ23EeWIHrhJxYOO3w"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_qZHSFGLKEeWRk_KThWkycg" type="8520">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_qZHSFWLKEeWRk_KThWkycg" y="5"/>

-        </children>

-        <element xmi:type="uml:DataType" href="esfproperties_metamodel.uml#_2040oA23EeWIHrhJxYOO3w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_207Q4Q23EeWIHrhJxYOO3w" x="221" y="168" width="118" height="69"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_5AeicA23EeWIHrhJxYOO3w" type="3027">

-        <children xmi:type="notation:DecorationNode" xmi:id="_5AfJgA23EeWIHrhJxYOO3w" type="5061"/>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_5AfJgQ23EeWIHrhJxYOO3w" visible="false" type="7032">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_5AfJgg23EeWIHrhJxYOO3w"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_5AfJgw23EeWIHrhJxYOO3w"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_5AfJhA23EeWIHrhJxYOO3w"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5AfJhQ23EeWIHrhJxYOO3w"/>

-        </children>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_5AfJhg23EeWIHrhJxYOO3w" visible="false" type="7033">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_5AfJhw23EeWIHrhJxYOO3w"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_5AfJiA23EeWIHrhJxYOO3w"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_5AfJiQ23EeWIHrhJxYOO3w"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5AfJig23EeWIHrhJxYOO3w"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_qZHSFmLKEeWRk_KThWkycg" type="8520">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_qZHSF2LKEeWRk_KThWkycg" y="5"/>

-        </children>

-        <element xmi:type="uml:DataType" href="esfproperties_metamodel.uml#_5Aa4EA23EeWIHrhJxYOO3w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5AeicQ23EeWIHrhJxYOO3w" x="519" y="168" width="118" height="69"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_V4M-4A28EeWIHrhJxYOO3w" type="3027">

-        <children xmi:type="notation:DecorationNode" xmi:id="_V4Nl8A28EeWIHrhJxYOO3w" type="5061"/>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_V4Nl8Q28EeWIHrhJxYOO3w" visible="false" type="7032">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_V4Nl8g28EeWIHrhJxYOO3w"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_V4Nl8w28EeWIHrhJxYOO3w"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_V4Nl9A28EeWIHrhJxYOO3w"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V4Nl9Q28EeWIHrhJxYOO3w"/>

-        </children>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_V4ONAA28EeWIHrhJxYOO3w" visible="false" type="7033">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_V4ONAQ28EeWIHrhJxYOO3w"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_V4ONAg28EeWIHrhJxYOO3w"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_V4ONAw28EeWIHrhJxYOO3w"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V4ONBA28EeWIHrhJxYOO3w"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_qZHSGGLKEeWRk_KThWkycg" type="8520">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_qZHSGWLKEeWRk_KThWkycg" y="5"/>

-        </children>

-        <element xmi:type="uml:DataType" href="esfproperties_metamodel.uml#_V4JUgA28EeWIHrhJxYOO3w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V4M-4Q28EeWIHrhJxYOO3w" x="786" y="168" width="118" height="69"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_txmc8A28EeWIHrhJxYOO3w" type="3010">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_T0j2sA29EeWIHrhJxYOO3w" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_T0j2sQ29EeWIHrhJxYOO3w" key="fillColor" value="true"/>

-        </eAnnotations>

-        <children xmi:type="notation:DecorationNode" xmi:id="_txmc8g28EeWIHrhJxYOO3w" type="5014"/>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_txnEAA28EeWIHrhJxYOO3w" visible="false" type="7011">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_txnEAQ28EeWIHrhJxYOO3w"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_txnEAg28EeWIHrhJxYOO3w"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_txnEAw28EeWIHrhJxYOO3w"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_txnEBA28EeWIHrhJxYOO3w"/>

-        </children>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_txnEBQ28EeWIHrhJxYOO3w" visible="false" type="7012">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_txnEBg28EeWIHrhJxYOO3w"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_txnEBw28EeWIHrhJxYOO3w"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_txnECA28EeWIHrhJxYOO3w"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_txnECQ28EeWIHrhJxYOO3w"/>

-        </children>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_txnECg28EeWIHrhJxYOO3w" visible="false" type="7013">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_txnECw28EeWIHrhJxYOO3w"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_txnEDA28EeWIHrhJxYOO3w"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_txnEDQ28EeWIHrhJxYOO3w"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_txnEDg28EeWIHrhJxYOO3w"/>

-        </children>

-        <children xmi:type="notation:DecorationNode" xmi:id="_qZHSGmLKEeWRk_KThWkycg" type="8518">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_qZHSG2LKEeWRk_KThWkycg" y="5"/>

-        </children>

-        <element xmi:type="uml:Class" href="esfproperties_metamodel.uml#_txjZoA28EeWIHrhJxYOO3w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_txmc8Q28EeWIHrhJxYOO3w" x="203" y="31" width="521" height="80"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_e5E2sH8AEeW5YtCK2zP8qA" type="3027">

-        <children xmi:type="notation:DecorationNode" xmi:id="_e5E2sn8AEeW5YtCK2zP8qA" type="5061"/>

-        <children xmi:type="notation:DecorationNode" xmi:id="_e5E2s38AEeW5YtCK2zP8qA" type="8520">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_e5E2tH8AEeW5YtCK2zP8qA" y="5"/>

-        </children>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_e5E2tX8AEeW5YtCK2zP8qA" visible="false" type="7032">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_e5E2tn8AEeW5YtCK2zP8qA"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_e5E2t38AEeW5YtCK2zP8qA"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_e5E2uH8AEeW5YtCK2zP8qA"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e5E2uX8AEeW5YtCK2zP8qA"/>

-        </children>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_e5FdwH8AEeW5YtCK2zP8qA" visible="false" type="7033">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_e5FdwX8AEeW5YtCK2zP8qA"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_e5Fdwn8AEeW5YtCK2zP8qA"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_e5Fdw38AEeW5YtCK2zP8qA"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e5FdxH8AEeW5YtCK2zP8qA"/>

-        </children>

-        <element xmi:type="uml:DataType" href="esfproperties_metamodel.uml#_e45QgH8AEeW5YtCK2zP8qA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e5E2sX8AEeW5YtCK2zP8qA" x="648" y="168" width="118" height="69"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_i7yW0gnTEeW356xdbh3U2Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i7yW0wnTEeW356xdbh3U2Q"/>

-    </children>

-    <element xmi:type="uml:Model" href="esfproperties_metamodel.uml#_-NKksAnQEeW356xdbh3U2Q"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i7xvwQnTEeW356xdbh3U2Q" x="56" y="218" width="962" height="322"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_PY9AcIFgEeWKIdAlVGN13g" type="2005" fillColor="12621752">

-    <children xmi:type="notation:DecorationNode" xmi:id="_PY9ngIFgEeWKIdAlVGN13g" type="5020"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_PY-OkIFgEeWKIdAlVGN13g" type="7009">

-      <children xmi:type="notation:Shape" xmi:id="_YbcUoIFgEeWKIdAlVGN13g" type="3010">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZvIxIIFgEeWKIdAlVGN13g" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZvIxIYFgEeWKIdAlVGN13g" key="fillColor" value="true"/>

-        </eAnnotations>

-        <children xmi:type="notation:DecorationNode" xmi:id="_Ybc7sIFgEeWKIdAlVGN13g" type="5014"/>

-        <children xmi:type="notation:DecorationNode" xmi:id="_Ybc7sYFgEeWKIdAlVGN13g" type="8518">

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Ybc7soFgEeWKIdAlVGN13g" y="5"/>

-        </children>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_Ybc7s4FgEeWKIdAlVGN13g" visible="false" type="7011">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_Ybc7tIFgEeWKIdAlVGN13g"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_Ybc7tYFgEeWKIdAlVGN13g"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_Ybc7toFgEeWKIdAlVGN13g"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ybc7t4FgEeWKIdAlVGN13g"/>

-        </children>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_YbdiwIFgEeWKIdAlVGN13g" visible="false" type="7012">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_YbdiwYFgEeWKIdAlVGN13g"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_YbdiwoFgEeWKIdAlVGN13g"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_Ybdiw4FgEeWKIdAlVGN13g"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YbdixIFgEeWKIdAlVGN13g"/>

-        </children>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_YbdixYFgEeWKIdAlVGN13g" visible="false" type="7013">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_YbdixoFgEeWKIdAlVGN13g"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_Ybdix4FgEeWKIdAlVGN13g"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_YbdiyIFgEeWKIdAlVGN13g"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YbdiyYFgEeWKIdAlVGN13g"/>

-        </children>

-        <element xmi:type="uml:Class" href="platform:/resource/org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_gqod8NLoEeSb47LgOrWUpg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YbcUoYFgEeWKIdAlVGN13g" x="65" y="19" width="153" height="80"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_PY-OkYFgEeWKIdAlVGN13g"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PY-OkoFgEeWKIdAlVGN13g"/>

-    </children>

-    <element xmi:type="uml:Model" href="platform:/resource/org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_VB4SINLoEeSb47LgOrWUpg"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PY9AcYFgEeWKIdAlVGN13g" x="382" y="40" width="287" height="161"/>

-  </children>

-  <styles xmi:type="notation:StringValueStyle" xmi:id="_huVFMQnTEeW356xdbh3U2Q" name="diagram_compatibility_version" stringValue="1.1.0"/>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_huVFMgnTEeW356xdbh3U2Q"/>

-  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_huVFMwnTEeW356xdbh3U2Q">

-    <owner xmi:type="uml:Model" href="esfproperties_metamodel.uml#_-NKksAnQEeW356xdbh3U2Q"/>

-  </styles>

-  <element xmi:type="uml:Model" href="esfproperties_metamodel.uml#_-NKksAnQEeW356xdbh3U2Q"/>

-  <edges xmi:type="notation:Connector" xmi:id="_sAEqYA27EeWIHrhJxYOO3w" type="4002" source="_k2g-IAnTEeW356xdbh3U2Q" target="_txmc8A28EeWIHrhJxYOO3w" routing="Rectilinear">

-    <children xmi:type="notation:DecorationNode" xmi:id="_sAFRcA27EeWIHrhJxYOO3w" type="6007">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_sAFRcQ27EeWIHrhJxYOO3w" y="40"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_sAEqYQ27EeWIHrhJxYOO3w"/>

-    <element xmi:type="uml:Generalization" href="esfproperties_metamodel.uml#_sAC1MA27EeWIHrhJxYOO3w"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sAEqYg27EeWIHrhJxYOO3w" points="[73, -26, -184, 178]$[73, -238, -184, -34]$[216, -238, -41, -34]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sAT68A27EeWIHrhJxYOO3w" id="(0.22033898305084745,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sAUiAA27EeWIHrhJxYOO3w" id="(0.0,0.4875)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_ssHRAA27EeWIHrhJxYOO3w" type="4002" source="_207Q4A23EeWIHrhJxYOO3w" target="_txmc8A28EeWIHrhJxYOO3w" routing="Rectilinear">

-    <children xmi:type="notation:DecorationNode" xmi:id="_ssH4EA27EeWIHrhJxYOO3w" type="6007">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ssH4EQ27EeWIHrhJxYOO3w" y="40"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_ssHRAQ27EeWIHrhJxYOO3w"/>

-    <element xmi:type="uml:Generalization" href="esfproperties_metamodel.uml#_ssFb0A27EeWIHrhJxYOO3w"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ssHRAg27EeWIHrhJxYOO3w" points="[42, 0, 79, 117]$[42, -57, 79, 60]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ssXvsA27EeWIHrhJxYOO3w" id="(0.16101694915254236,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ssYWwA27EeWIHrhJxYOO3w" id="(0.0,0.25)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_tUVuoA27EeWIHrhJxYOO3w" type="4002" source="_qLWhQA23EeWIHrhJxYOO3w" target="_txmc8A28EeWIHrhJxYOO3w" routing="Rectilinear">

-    <children xmi:type="notation:DecorationNode" xmi:id="_tUWVsA27EeWIHrhJxYOO3w" type="6007">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_tUW8wA27EeWIHrhJxYOO3w" y="40"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_tUVuoQ27EeWIHrhJxYOO3w"/>

-    <element xmi:type="uml:Generalization" href="esfproperties_metamodel.uml#_tUT5cA27EeWIHrhJxYOO3w"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tUVuog27EeWIHrhJxYOO3w" points="[-23, 0, -23, 57]$[-23, -57, -23, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUmNUA27EeWIHrhJxYOO3w" id="(0.6440677966101694,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aNfRUH8AEeW5YtCK2zP8qA" id="(0.46449136276391556,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_uFv9cA27EeWIHrhJxYOO3w" type="4002" source="_5AeicA23EeWIHrhJxYOO3w" target="_txmc8A28EeWIHrhJxYOO3w" routing="Rectilinear">

-    <children xmi:type="notation:DecorationNode" xmi:id="_uFwkgA27EeWIHrhJxYOO3w" type="6007">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_uFwkgQ27EeWIHrhJxYOO3w" y="40"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_uFv9cQ27EeWIHrhJxYOO3w"/>

-    <element xmi:type="uml:Generalization" href="esfproperties_metamodel.uml#_uFuIQA27EeWIHrhJxYOO3w"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uFv9cg27EeWIHrhJxYOO3w" points="[-11, 0, -32, 57]$[-11, -57, -32, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uF_OAA27EeWIHrhJxYOO3w" id="(0.5508474576271186,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uF_1EA27EeWIHrhJxYOO3w" id="(0.7715930902111324,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_VSLrQA29EeWIHrhJxYOO3w" type="4002" source="_V4M-4A28EeWIHrhJxYOO3w" target="_txmc8A28EeWIHrhJxYOO3w" routing="Rectilinear">

-    <children xmi:type="notation:DecorationNode" xmi:id="_VSMSUA29EeWIHrhJxYOO3w" type="6007">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_VSMSUQ29EeWIHrhJxYOO3w" y="40"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_VSLrQQ29EeWIHrhJxYOO3w"/>

-    <element xmi:type="uml:Generalization" href="esfproperties_metamodel.uml#_VSJ2EA29EeWIHrhJxYOO3w"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VSLrQg29EeWIHrhJxYOO3w" points="[-14, -18, 133, 175]$[-14, -228, 133, -35]$[-123, -228, 24, -35]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VSX4gA29EeWIHrhJxYOO3w" id="(0.4576271186440678,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VSX4gQ29EeWIHrhJxYOO3w" id="(1.0,0.5125)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_sf_YUH8AEeW5YtCK2zP8qA" type="4002" source="_e5E2sH8AEeW5YtCK2zP8qA" target="_txmc8A28EeWIHrhJxYOO3w" routing="Rectilinear">

-    <children xmi:type="notation:DecorationNode" xmi:id="_sf__YH8AEeW5YtCK2zP8qA" type="6007">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_sf__YX8AEeW5YtCK2zP8qA" y="40"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_sf_YUX8AEeW5YtCK2zP8qA"/>

-    <element xmi:type="uml:Generalization" href="esfproperties_metamodel.uml#_sf0ZMH8AEeW5YtCK2zP8qA"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sf_YUn8AEeW5YtCK2zP8qA" points="[13, 0, 14, 57]$[13, -57, 14, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sglOMH8AEeW5YtCK2zP8qA" id="(0.3559322033898305,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sglOMX8AEeW5YtCK2zP8qA" id="(0.9328214971209213,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_RB7wcIFgEeWKIdAlVGN13g" type="4008" source="_i7xvwAnTEeW356xdbh3U2Q" target="_PY9AcIFgEeWKIdAlVGN13g" routing="Rectilinear">

-    <children xmi:type="notation:DecorationNode" xmi:id="_RB7wc4FgEeWKIdAlVGN13g" type="6026">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_RB7wdIFgEeWKIdAlVGN13g" y="40"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_RB8XgIFgEeWKIdAlVGN13g" type="6027">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_RB8XgYFgEeWKIdAlVGN13g" y="60"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_RB7wcYFgEeWKIdAlVGN13g"/>

-    <element xmi:type="uml:Dependency" href="esfproperties_metamodel.uml#_RBhgwIFgEeWKIdAlVGN13g"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_RB7wcoFgEeWKIdAlVGN13g" points="[-4, -13, 0, 116]$[-28, -135, -24, -6]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RCfKEIFgEeWKIdAlVGN13g" id="(0.37733887733887733,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RCfKEYFgEeWKIdAlVGN13g" id="(0.1289198606271777,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Connector" xmi:id="_daHOEIFgEeWKIdAlVGN13g" type="4002" source="_txmc8A28EeWIHrhJxYOO3w" target="_YbcUoIFgEeWKIdAlVGN13g" routing="Rectilinear">

-    <children xmi:type="notation:DecorationNode" xmi:id="_daHOE4FgEeWKIdAlVGN13g" type="6007">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_daHOFIFgEeWKIdAlVGN13g" y="40"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_daHOEYFgEeWKIdAlVGN13g"/>

-    <element xmi:type="uml:Generalization" href="esfproperties_metamodel.uml#_dZs-YIFgEeWKIdAlVGN13g"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_daHOEoFgEeWKIdAlVGN13g" points="[8, -13, 0, 127]$[-2, -123, -10, 17]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_daoygIFgEeWKIdAlVGN13g" id="(0.46833013435700577,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_daoygYFgEeWKIdAlVGN13g" id="(0.4117647058823529,1.0)"/>

-  </edges>

-</notation:Diagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_huVFMAnTEeW356xdbh3U2Q" type="PapyrusUMLClassDiagram" name="ESFProperties Driagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_i7xvwAnTEeW356xdbh3U2Q" type="2005" fillColor="8905185">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kQuJcAnTEeW356xdbh3U2Q" source="PapyrusCSSForceValue">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQuwgAnTEeW356xdbh3U2Q" key="fillColor" value="true"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_i7yW0AnTEeW356xdbh3U2Q" type="5020"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_i7yW0QnTEeW356xdbh3U2Q" type="7009">
+      <children xmi:type="notation:Shape" xmi:id="_k2g-IAnTEeW356xdbh3U2Q" type="3027">
+        <children xmi:type="notation:DecorationNode" xmi:id="_k2iMQAnTEeW356xdbh3U2Q" type="5061"/>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_k2iMQQnTEeW356xdbh3U2Q" visible="false" type="7032">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_k2iMQgnTEeW356xdbh3U2Q"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_k2iMQwnTEeW356xdbh3U2Q"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_k2iMRAnTEeW356xdbh3U2Q"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_k2iMRQnTEeW356xdbh3U2Q"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_k2iMRgnTEeW356xdbh3U2Q" visible="false" type="7033">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_k2iMRwnTEeW356xdbh3U2Q"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_k2iMSAnTEeW356xdbh3U2Q"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_k2iMSQnTEeW356xdbh3U2Q"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_k2iMSgnTEeW356xdbh3U2Q"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_qZHSEGLKEeWRk_KThWkycg" type="8520">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_qZHSEWLKEeWRk_KThWkycg" y="5"/>
+        </children>
+        <element xmi:type="uml:DataType" href="esfproperties_metamodel.uml#_k2eh4AnTEeW356xdbh3U2Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_k2g-IQnTEeW356xdbh3U2Q" x="77" y="168" width="118" height="69"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_qLWhQA23EeWIHrhJxYOO3w" type="3027">
+        <children xmi:type="notation:DecorationNode" xmi:id="_qLXIUA23EeWIHrhJxYOO3w" type="5061"/>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_qLXIUQ23EeWIHrhJxYOO3w" visible="false" type="7032">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_qLXIUg23EeWIHrhJxYOO3w"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_qLXIUw23EeWIHrhJxYOO3w"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_qLXIVA23EeWIHrhJxYOO3w"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qLXIVQ23EeWIHrhJxYOO3w"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_qLXIVg23EeWIHrhJxYOO3w" visible="false" type="7033">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_qLXIVw23EeWIHrhJxYOO3w"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_qLXIWA23EeWIHrhJxYOO3w"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_qLXIWQ23EeWIHrhJxYOO3w"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qLXIWg23EeWIHrhJxYOO3w"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_qZHSEmLKEeWRk_KThWkycg" type="8520">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_qZHSE2LKEeWRk_KThWkycg" y="5"/>
+        </children>
+        <element xmi:type="uml:DataType" href="esfproperties_metamodel.uml#_qLS24A23EeWIHrhJxYOO3w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qLWhQQ23EeWIHrhJxYOO3w" x="369" y="168" width="118" height="69"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_207Q4A23EeWIHrhJxYOO3w" type="3027">
+        <children xmi:type="notation:DecorationNode" xmi:id="_20738A23EeWIHrhJxYOO3w" type="5061"/>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_208fAA23EeWIHrhJxYOO3w" visible="false" type="7032">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_208fAQ23EeWIHrhJxYOO3w"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_208fAg23EeWIHrhJxYOO3w"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_208fAw23EeWIHrhJxYOO3w"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_208fBA23EeWIHrhJxYOO3w"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_208fBQ23EeWIHrhJxYOO3w" visible="false" type="7033">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_208fBg23EeWIHrhJxYOO3w"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_208fBw23EeWIHrhJxYOO3w"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_208fCA23EeWIHrhJxYOO3w"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_208fCQ23EeWIHrhJxYOO3w"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_qZHSFGLKEeWRk_KThWkycg" type="8520">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_qZHSFWLKEeWRk_KThWkycg" y="5"/>
+        </children>
+        <element xmi:type="uml:DataType" href="esfproperties_metamodel.uml#_2040oA23EeWIHrhJxYOO3w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_207Q4Q23EeWIHrhJxYOO3w" x="221" y="168" width="118" height="69"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_5AeicA23EeWIHrhJxYOO3w" type="3027">
+        <children xmi:type="notation:DecorationNode" xmi:id="_5AfJgA23EeWIHrhJxYOO3w" type="5061"/>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_5AfJgQ23EeWIHrhJxYOO3w" visible="false" type="7032">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_5AfJgg23EeWIHrhJxYOO3w"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_5AfJgw23EeWIHrhJxYOO3w"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_5AfJhA23EeWIHrhJxYOO3w"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5AfJhQ23EeWIHrhJxYOO3w"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_5AfJhg23EeWIHrhJxYOO3w" visible="false" type="7033">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_5AfJhw23EeWIHrhJxYOO3w"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_5AfJiA23EeWIHrhJxYOO3w"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_5AfJiQ23EeWIHrhJxYOO3w"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5AfJig23EeWIHrhJxYOO3w"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_qZHSFmLKEeWRk_KThWkycg" type="8520">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_qZHSF2LKEeWRk_KThWkycg" y="5"/>
+        </children>
+        <element xmi:type="uml:DataType" href="esfproperties_metamodel.uml#_5Aa4EA23EeWIHrhJxYOO3w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5AeicQ23EeWIHrhJxYOO3w" x="519" y="168" width="118" height="69"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_V4M-4A28EeWIHrhJxYOO3w" type="3027">
+        <children xmi:type="notation:DecorationNode" xmi:id="_V4Nl8A28EeWIHrhJxYOO3w" type="5061"/>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_V4Nl8Q28EeWIHrhJxYOO3w" visible="false" type="7032">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_V4Nl8g28EeWIHrhJxYOO3w"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_V4Nl8w28EeWIHrhJxYOO3w"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_V4Nl9A28EeWIHrhJxYOO3w"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V4Nl9Q28EeWIHrhJxYOO3w"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_V4ONAA28EeWIHrhJxYOO3w" visible="false" type="7033">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_V4ONAQ28EeWIHrhJxYOO3w"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_V4ONAg28EeWIHrhJxYOO3w"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_V4ONAw28EeWIHrhJxYOO3w"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V4ONBA28EeWIHrhJxYOO3w"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_qZHSGGLKEeWRk_KThWkycg" type="8520">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_qZHSGWLKEeWRk_KThWkycg" y="5"/>
+        </children>
+        <element xmi:type="uml:DataType" href="esfproperties_metamodel.uml#_V4JUgA28EeWIHrhJxYOO3w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V4M-4Q28EeWIHrhJxYOO3w" x="786" y="168" width="118" height="69"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_txmc8A28EeWIHrhJxYOO3w" type="3010">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_T0j2sA29EeWIHrhJxYOO3w" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_T0j2sQ29EeWIHrhJxYOO3w" key="fillColor" value="true"/>
+        </eAnnotations>
+        <children xmi:type="notation:DecorationNode" xmi:id="_txmc8g28EeWIHrhJxYOO3w" type="5014"/>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_txnEAA28EeWIHrhJxYOO3w" visible="false" type="7011">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_txnEAQ28EeWIHrhJxYOO3w"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_txnEAg28EeWIHrhJxYOO3w"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_txnEAw28EeWIHrhJxYOO3w"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_txnEBA28EeWIHrhJxYOO3w"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_txnEBQ28EeWIHrhJxYOO3w" visible="false" type="7012">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_txnEBg28EeWIHrhJxYOO3w"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_txnEBw28EeWIHrhJxYOO3w"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_txnECA28EeWIHrhJxYOO3w"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_txnECQ28EeWIHrhJxYOO3w"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_txnECg28EeWIHrhJxYOO3w" visible="false" type="7013">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_txnECw28EeWIHrhJxYOO3w"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_txnEDA28EeWIHrhJxYOO3w"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_txnEDQ28EeWIHrhJxYOO3w"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_txnEDg28EeWIHrhJxYOO3w"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_qZHSGmLKEeWRk_KThWkycg" type="8518">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_qZHSG2LKEeWRk_KThWkycg" y="5"/>
+        </children>
+        <element xmi:type="uml:Class" href="esfproperties_metamodel.uml#_txjZoA28EeWIHrhJxYOO3w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_txmc8Q28EeWIHrhJxYOO3w" x="203" y="31" width="521" height="80"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_e5E2sH8AEeW5YtCK2zP8qA" type="3027">
+        <children xmi:type="notation:DecorationNode" xmi:id="_e5E2sn8AEeW5YtCK2zP8qA" type="5061"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_e5E2s38AEeW5YtCK2zP8qA" type="8520">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_e5E2tH8AEeW5YtCK2zP8qA" y="5"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_e5E2tX8AEeW5YtCK2zP8qA" visible="false" type="7032">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_e5E2tn8AEeW5YtCK2zP8qA"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_e5E2t38AEeW5YtCK2zP8qA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_e5E2uH8AEeW5YtCK2zP8qA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e5E2uX8AEeW5YtCK2zP8qA"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_e5FdwH8AEeW5YtCK2zP8qA" visible="false" type="7033">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_e5FdwX8AEeW5YtCK2zP8qA"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_e5Fdwn8AEeW5YtCK2zP8qA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_e5Fdw38AEeW5YtCK2zP8qA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e5FdxH8AEeW5YtCK2zP8qA"/>
+        </children>
+        <element xmi:type="uml:DataType" href="esfproperties_metamodel.uml#_e45QgH8AEeW5YtCK2zP8qA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e5E2sX8AEeW5YtCK2zP8qA" x="648" y="168" width="118" height="69"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_i7yW0gnTEeW356xdbh3U2Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i7yW0wnTEeW356xdbh3U2Q"/>
+    </children>
+    <element xmi:type="uml:Model" href="esfproperties_metamodel.uml#_-NKksAnQEeW356xdbh3U2Q"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i7xvwQnTEeW356xdbh3U2Q" x="56" y="218" width="962" height="322"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_PY9AcIFgEeWKIdAlVGN13g" type="2005" fillColor="12621752">
+    <children xmi:type="notation:DecorationNode" xmi:id="_PY9ngIFgEeWKIdAlVGN13g" type="5020"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_PY-OkIFgEeWKIdAlVGN13g" type="7009">
+      <children xmi:type="notation:Shape" xmi:id="_YbcUoIFgEeWKIdAlVGN13g" type="3010">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZvIxIIFgEeWKIdAlVGN13g" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZvIxIYFgEeWKIdAlVGN13g" key="fillColor" value="true"/>
+        </eAnnotations>
+        <children xmi:type="notation:DecorationNode" xmi:id="_Ybc7sIFgEeWKIdAlVGN13g" type="5014"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_Ybc7sYFgEeWKIdAlVGN13g" type="8518">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Ybc7soFgEeWKIdAlVGN13g" y="5"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_Ybc7s4FgEeWKIdAlVGN13g" visible="false" type="7011">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_Ybc7tIFgEeWKIdAlVGN13g"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_Ybc7tYFgEeWKIdAlVGN13g"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_Ybc7toFgEeWKIdAlVGN13g"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ybc7t4FgEeWKIdAlVGN13g"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_YbdiwIFgEeWKIdAlVGN13g" visible="false" type="7012">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_YbdiwYFgEeWKIdAlVGN13g"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_YbdiwoFgEeWKIdAlVGN13g"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_Ybdiw4FgEeWKIdAlVGN13g"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YbdixIFgEeWKIdAlVGN13g"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_YbdixYFgEeWKIdAlVGN13g" visible="false" type="7013">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_YbdixoFgEeWKIdAlVGN13g"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_Ybdix4FgEeWKIdAlVGN13g"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_YbdiyIFgEeWKIdAlVGN13g"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YbdiyYFgEeWKIdAlVGN13g"/>
+        </children>
+        <element xmi:type="uml:Class" href="platform:/resource/org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_gqod8NLoEeSb47LgOrWUpg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YbcUoYFgEeWKIdAlVGN13g" x="65" y="19" width="153" height="80"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_PY-OkYFgEeWKIdAlVGN13g"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PY-OkoFgEeWKIdAlVGN13g"/>
+    </children>
+    <element xmi:type="uml:Model" href="platform:/resource/org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_VB4SINLoEeSb47LgOrWUpg"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PY9AcYFgEeWKIdAlVGN13g" x="382" y="40" width="287" height="161"/>
+  </children>
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_huVFMQnTEeW356xdbh3U2Q" name="diagram_compatibility_version" stringValue="1.1.0"/>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_huVFMgnTEeW356xdbh3U2Q"/>
+  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_huVFMwnTEeW356xdbh3U2Q">
+    <owner xmi:type="uml:Model" href="esfproperties_metamodel.uml#_-NKksAnQEeW356xdbh3U2Q"/>
+  </styles>
+  <element xmi:type="uml:Model" href="esfproperties_metamodel.uml#_-NKksAnQEeW356xdbh3U2Q"/>
+  <edges xmi:type="notation:Connector" xmi:id="_sAEqYA27EeWIHrhJxYOO3w" type="4002" source="_k2g-IAnTEeW356xdbh3U2Q" target="_txmc8A28EeWIHrhJxYOO3w" routing="Rectilinear">
+    <children xmi:type="notation:DecorationNode" xmi:id="_sAFRcA27EeWIHrhJxYOO3w" type="6007">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_sAFRcQ27EeWIHrhJxYOO3w" y="40"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_sAEqYQ27EeWIHrhJxYOO3w"/>
+    <element xmi:type="uml:Generalization" href="esfproperties_metamodel.uml#_sAC1MA27EeWIHrhJxYOO3w"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sAEqYg27EeWIHrhJxYOO3w" points="[73, -26, -184, 178]$[73, -238, -184, -34]$[216, -238, -41, -34]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sAT68A27EeWIHrhJxYOO3w" id="(0.22033898305084745,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sAUiAA27EeWIHrhJxYOO3w" id="(0.0,0.4875)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_ssHRAA27EeWIHrhJxYOO3w" type="4002" source="_207Q4A23EeWIHrhJxYOO3w" target="_txmc8A28EeWIHrhJxYOO3w" routing="Rectilinear">
+    <children xmi:type="notation:DecorationNode" xmi:id="_ssH4EA27EeWIHrhJxYOO3w" type="6007">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_ssH4EQ27EeWIHrhJxYOO3w" y="40"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_ssHRAQ27EeWIHrhJxYOO3w"/>
+    <element xmi:type="uml:Generalization" href="esfproperties_metamodel.uml#_ssFb0A27EeWIHrhJxYOO3w"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ssHRAg27EeWIHrhJxYOO3w" points="[42, 0, 79, 117]$[42, -57, 79, 60]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ssXvsA27EeWIHrhJxYOO3w" id="(0.16101694915254236,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ssYWwA27EeWIHrhJxYOO3w" id="(0.0,0.25)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_tUVuoA27EeWIHrhJxYOO3w" type="4002" source="_qLWhQA23EeWIHrhJxYOO3w" target="_txmc8A28EeWIHrhJxYOO3w" routing="Rectilinear">
+    <children xmi:type="notation:DecorationNode" xmi:id="_tUWVsA27EeWIHrhJxYOO3w" type="6007">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_tUW8wA27EeWIHrhJxYOO3w" y="40"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_tUVuoQ27EeWIHrhJxYOO3w"/>
+    <element xmi:type="uml:Generalization" href="esfproperties_metamodel.uml#_tUT5cA27EeWIHrhJxYOO3w"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tUVuog27EeWIHrhJxYOO3w" points="[-23, 0, -23, 57]$[-23, -57, -23, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUmNUA27EeWIHrhJxYOO3w" id="(0.6440677966101694,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aNfRUH8AEeW5YtCK2zP8qA" id="(0.46449136276391556,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_uFv9cA27EeWIHrhJxYOO3w" type="4002" source="_5AeicA23EeWIHrhJxYOO3w" target="_txmc8A28EeWIHrhJxYOO3w" routing="Rectilinear">
+    <children xmi:type="notation:DecorationNode" xmi:id="_uFwkgA27EeWIHrhJxYOO3w" type="6007">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_uFwkgQ27EeWIHrhJxYOO3w" y="40"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_uFv9cQ27EeWIHrhJxYOO3w"/>
+    <element xmi:type="uml:Generalization" href="esfproperties_metamodel.uml#_uFuIQA27EeWIHrhJxYOO3w"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uFv9cg27EeWIHrhJxYOO3w" points="[-11, 0, -32, 57]$[-11, -57, -32, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uF_OAA27EeWIHrhJxYOO3w" id="(0.5508474576271186,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uF_1EA27EeWIHrhJxYOO3w" id="(0.7715930902111324,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_VSLrQA29EeWIHrhJxYOO3w" type="4002" source="_V4M-4A28EeWIHrhJxYOO3w" target="_txmc8A28EeWIHrhJxYOO3w" routing="Rectilinear">
+    <children xmi:type="notation:DecorationNode" xmi:id="_VSMSUA29EeWIHrhJxYOO3w" type="6007">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_VSMSUQ29EeWIHrhJxYOO3w" y="40"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_VSLrQQ29EeWIHrhJxYOO3w"/>
+    <element xmi:type="uml:Generalization" href="esfproperties_metamodel.uml#_VSJ2EA29EeWIHrhJxYOO3w"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VSLrQg29EeWIHrhJxYOO3w" points="[-14, -18, 133, 175]$[-14, -228, 133, -35]$[-123, -228, 24, -35]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VSX4gA29EeWIHrhJxYOO3w" id="(0.4576271186440678,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VSX4gQ29EeWIHrhJxYOO3w" id="(1.0,0.5125)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_sf_YUH8AEeW5YtCK2zP8qA" type="4002" source="_e5E2sH8AEeW5YtCK2zP8qA" target="_txmc8A28EeWIHrhJxYOO3w" routing="Rectilinear">
+    <children xmi:type="notation:DecorationNode" xmi:id="_sf__YH8AEeW5YtCK2zP8qA" type="6007">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_sf__YX8AEeW5YtCK2zP8qA" y="40"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_sf_YUX8AEeW5YtCK2zP8qA"/>
+    <element xmi:type="uml:Generalization" href="esfproperties_metamodel.uml#_sf0ZMH8AEeW5YtCK2zP8qA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sf_YUn8AEeW5YtCK2zP8qA" points="[13, 0, 14, 57]$[13, -57, 14, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sglOMH8AEeW5YtCK2zP8qA" id="(0.3559322033898305,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sglOMX8AEeW5YtCK2zP8qA" id="(0.9328214971209213,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_RB7wcIFgEeWKIdAlVGN13g" type="4008" source="_i7xvwAnTEeW356xdbh3U2Q" target="_PY9AcIFgEeWKIdAlVGN13g" routing="Rectilinear">
+    <children xmi:type="notation:DecorationNode" xmi:id="_RB7wc4FgEeWKIdAlVGN13g" type="6026">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_RB7wdIFgEeWKIdAlVGN13g" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_RB8XgIFgEeWKIdAlVGN13g" type="6027">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_RB8XgYFgEeWKIdAlVGN13g" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_RB7wcYFgEeWKIdAlVGN13g"/>
+    <element xmi:type="uml:Dependency" href="esfproperties_metamodel.uml#_RBhgwIFgEeWKIdAlVGN13g"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_RB7wcoFgEeWKIdAlVGN13g" points="[-4, -13, 0, 116]$[-28, -135, -24, -6]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RCfKEIFgEeWKIdAlVGN13g" id="(0.37733887733887733,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RCfKEYFgEeWKIdAlVGN13g" id="(0.1289198606271777,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_daHOEIFgEeWKIdAlVGN13g" type="4002" source="_txmc8A28EeWIHrhJxYOO3w" target="_YbcUoIFgEeWKIdAlVGN13g" routing="Rectilinear">
+    <children xmi:type="notation:DecorationNode" xmi:id="_daHOE4FgEeWKIdAlVGN13g" type="6007">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_daHOFIFgEeWKIdAlVGN13g" y="40"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_daHOEYFgEeWKIdAlVGN13g"/>
+    <element xmi:type="uml:Generalization" href="esfproperties_metamodel.uml#_dZs-YIFgEeWKIdAlVGN13g"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_daHOEoFgEeWKIdAlVGN13g" points="[8, -13, 0, 127]$[-2, -123, -10, 17]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_daoygIFgEeWKIdAlVGN13g" id="(0.46833013435700577,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_daoygYFgEeWKIdAlVGN13g" id="(0.4117647058823529,1.0)"/>
+  </edges>
+</notation:Diagram>
diff --git a/core/metamodel/org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml b/core/metamodel/org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml
index cc1e77b..8612594 100644
--- a/core/metamodel/org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml
+++ b/core/metamodel/org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_-NKksAnQEeW356xdbh3U2Q" name="ESFProperties">

-  <packagedElement xmi:type="uml:DataType" xmi:id="_k2eh4AnTEeW356xdbh3U2Q" name="SCriticality">

-    <generalization xmi:type="uml:Generalization" xmi:id="_sAC1MA27EeWIHrhJxYOO3w" general="_txjZoA28EeWIHrhJxYOO3w"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:DataType" xmi:id="_qLS24A23EeWIHrhJxYOO3w" name="SOccurence">

-    <generalization xmi:type="uml:Generalization" xmi:id="_tUT5cA27EeWIHrhJxYOO3w" general="_txjZoA28EeWIHrhJxYOO3w"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:DataType" xmi:id="_2040oA23EeWIHrhJxYOO3w" name="SSeverity">

-    <generalization xmi:type="uml:Generalization" xmi:id="_ssFb0A27EeWIHrhJxYOO3w" general="_txjZoA28EeWIHrhJxYOO3w"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:DataType" xmi:id="_5Aa4EA23EeWIHrhJxYOO3w" name="SDetectability">

-    <generalization xmi:type="uml:Generalization" xmi:id="_uFuIQA27EeWIHrhJxYOO3w" general="_txjZoA28EeWIHrhJxYOO3w"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:DataType" xmi:id="_V4JUgA28EeWIHrhJxYOO3w" name="SCost">

-    <generalization xmi:type="uml:Generalization" xmi:id="_VSJ2EA29EeWIHrhJxYOO3w" general="_txjZoA28EeWIHrhJxYOO3w"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_txjZoA28EeWIHrhJxYOO3w" name="AbstractSProperty" isAbstract="true">

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

-      <general xmi:type="uml:Class" href="esfcore_metamodel.uml#_gqod8NLoEeSb47LgOrWUpg"/>

-    </generalization>

-    <generalization xmi:type="uml:Generalization" xmi:id="_dZs-YIFgEeWKIdAlVGN13g">

-      <general xmi:type="uml:Class" href="../../../../../org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_gqod8NLoEeSb47LgOrWUpg"/>

-    </generalization>

-  </packagedElement>

-  <packagedElement xmi:type="uml:DataType" xmi:id="_e45QgH8AEeW5YtCK2zP8qA" name="SProbability">

-    <generalization xmi:type="uml:Generalization" xmi:id="_sf0ZMH8AEeW5YtCK2zP8qA" general="_txjZoA28EeWIHrhJxYOO3w"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Dependency" xmi:id="_RBhgwIFgEeWKIdAlVGN13g" client="_-NKksAnQEeW356xdbh3U2Q">

-    <supplier xmi:type="uml:Model" href="../../../../../org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_VB4SINLoEeSb47LgOrWUpg"/>

-  </packagedElement>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_-NKksAnQEeW356xdbh3U2Q" name="ESFProperties">
+  <packagedElement xmi:type="uml:DataType" xmi:id="_k2eh4AnTEeW356xdbh3U2Q" name="SCriticality">
+    <generalization xmi:type="uml:Generalization" xmi:id="_sAC1MA27EeWIHrhJxYOO3w" general="_txjZoA28EeWIHrhJxYOO3w"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:DataType" xmi:id="_qLS24A23EeWIHrhJxYOO3w" name="SOccurence">
+    <generalization xmi:type="uml:Generalization" xmi:id="_tUT5cA27EeWIHrhJxYOO3w" general="_txjZoA28EeWIHrhJxYOO3w"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:DataType" xmi:id="_2040oA23EeWIHrhJxYOO3w" name="SSeverity">
+    <generalization xmi:type="uml:Generalization" xmi:id="_ssFb0A27EeWIHrhJxYOO3w" general="_txjZoA28EeWIHrhJxYOO3w"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:DataType" xmi:id="_5Aa4EA23EeWIHrhJxYOO3w" name="SDetectability">
+    <generalization xmi:type="uml:Generalization" xmi:id="_uFuIQA27EeWIHrhJxYOO3w" general="_txjZoA28EeWIHrhJxYOO3w"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:DataType" xmi:id="_V4JUgA28EeWIHrhJxYOO3w" name="SCost">
+    <generalization xmi:type="uml:Generalization" xmi:id="_VSJ2EA29EeWIHrhJxYOO3w" general="_txjZoA28EeWIHrhJxYOO3w"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_txjZoA28EeWIHrhJxYOO3w" name="AbstractSProperty" isAbstract="true">
+    <generalization xmi:type="uml:Generalization" xmi:id="_rDEwMA53EeWvS4pMPcwguQ">
+      <general xmi:type="uml:Class" href="esfcore_metamodel.uml#_gqod8NLoEeSb47LgOrWUpg"/>
+    </generalization>
+    <generalization xmi:type="uml:Generalization" xmi:id="_dZs-YIFgEeWKIdAlVGN13g">
+      <general xmi:type="uml:Class" href="../../../../../org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_gqod8NLoEeSb47LgOrWUpg"/>
+    </generalization>
+  </packagedElement>
+  <packagedElement xmi:type="uml:DataType" xmi:id="_e45QgH8AEeW5YtCK2zP8qA" name="SProbability">
+    <generalization xmi:type="uml:Generalization" xmi:id="_sf0ZMH8AEeW5YtCK2zP8qA" general="_txjZoA28EeWIHrhJxYOO3w"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Dependency" xmi:id="_RBhgwIFgEeWKIdAlVGN13g" client="_-NKksAnQEeW356xdbh3U2Q">
+    <supplier xmi:type="uml:Model" href="../../../../../org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_VB4SINLoEeSb47LgOrWUpg"/>
+  </packagedElement>
+</uml:Model>
diff --git a/core/metamodel/org.polarsys.esf.core.metamodel.esfsafetyconcepts/src/main/resources/metamodel/esfsafetyconcepts_metamodel.di b/core/metamodel/org.polarsys.esf.core.metamodel.esfsafetyconcepts/src/main/resources/metamodel/esfsafetyconcepts_metamodel.di
index 8634d4c..bf9abab 100644
--- a/core/metamodel/org.polarsys.esf.core.metamodel.esfsafetyconcepts/src/main/resources/metamodel/esfsafetyconcepts_metamodel.di
+++ b/core/metamodel/org.polarsys.esf.core.metamodel.esfsafetyconcepts/src/main/resources/metamodel/esfsafetyconcepts_metamodel.di
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/core/metamodel/org.polarsys.esf.core.metamodel.esfsafetyconcepts/src/main/resources/metamodel/esfsafetyconcepts_metamodel.notation b/core/metamodel/org.polarsys.esf.core.metamodel.esfsafetyconcepts/src/main/resources/metamodel/esfsafetyconcepts_metamodel.notation
index 55d103f..7b6f385 100644
--- a/core/metamodel/org.polarsys.esf.core.metamodel.esfsafetyconcepts/src/main/resources/metamodel/esfsafetyconcepts_metamodel.notation
+++ b/core/metamodel/org.polarsys.esf.core.metamodel.esfsafetyconcepts/src/main/resources/metamodel/esfsafetyconcepts_metamodel.notation
@@ -1,1554 +1,1554 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">

-  <notation:Diagram xmi:id="_li4hoAnjEeW356xdbh3U2Q" type="PapyrusUMLClassDiagram" name="ESFSafetyConcepts Overview Diagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_nUXtYAnjEeW356xdbh3U2Q" type="2005" fillColor="8047085">

-      <children xmi:type="notation:DecorationNode" xmi:id="_nUYUcAnjEeW356xdbh3U2Q" type="5020"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_nUY7gAnjEeW356xdbh3U2Q" type="7009">

-        <children xmi:type="notation:Shape" xmi:id="__2pwYAnjEeW356xdbh3U2Q" type="3009" fillColor="12632256">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_cmjYQIFiEeWKIdAlVGN13g" source="PapyrusHyperLink_Page" references="__t0IAAnkEeW356xdbh3U2Q">

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cmjYQYFiEeWKIdAlVGN13g" key="tooltip_text" value="SInterations Overview Diagram"/>

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cmjYQoFiEeWKIdAlVGN13g" key="pageName" value="PapyrusHyperLink_Page"/>

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cmjYQ4FiEeWKIdAlVGN13g" key="is_default_navigation" value="true"/>

-          </eAnnotations>

-          <children xmi:type="notation:DecorationNode" xmi:id="__2qXcAnjEeW356xdbh3U2Q" type="5017"/>

-          <children xmi:type="notation:DecorationNode" xmi:id="__2qXcQnjEeW356xdbh3U2Q" type="7010">

-            <styles xmi:type="notation:TitleStyle" xmi:id="__2qXcgnjEeW356xdbh3U2Q"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="__2qXcwnjEeW356xdbh3U2Q"/>

-          </children>

-          <element xmi:type="uml:Package" href="esfsafetyconcepts_metamodel.uml#__2mtEAnjEeW356xdbh3U2Q"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="__2pwYQnjEeW356xdbh3U2Q" x="42" y="54"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_IpEBMAnkEeW356xdbh3U2Q" type="3009" fillColor="12632256">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yLuToAnyEeW356xdbh3U2Q" source="PapyrusHyperLink_Page" references="_bXP2QAnyEeW356xdbh3U2Q">

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yLuToQnyEeW356xdbh3U2Q" key="tooltip_text" value="SREcommendations Overview Diagram"/>

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yLuTognyEeW356xdbh3U2Q" key="pageName" value="PapyrusHyperLink_Page"/>

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yLuTownyEeW356xdbh3U2Q" key="is_default_navigation" value="true"/>

-          </eAnnotations>

-          <children xmi:type="notation:DecorationNode" xmi:id="_IpEoQAnkEeW356xdbh3U2Q" type="5017"/>

-          <children xmi:type="notation:DecorationNode" xmi:id="_IpEoQQnkEeW356xdbh3U2Q" type="7010">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_IpEoQgnkEeW356xdbh3U2Q"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IpEoQwnkEeW356xdbh3U2Q"/>

-          </children>

-          <element xmi:type="uml:Package" href="esfsafetyconcepts_metamodel.uml#_IpBk8AnkEeW356xdbh3U2Q"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IpEBMQnkEeW356xdbh3U2Q" x="274" y="54"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_nUY7gQnjEeW356xdbh3U2Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nUY7ggnjEeW356xdbh3U2Q"/>

-      </children>

-      <element xmi:type="uml:Model" href="esfsafetyconcepts_metamodel.uml#_yvDioAnQEeW356xdbh3U2Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nUXtYQnjEeW356xdbh3U2Q" x="25" y="312" width="546" height="241"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_EWP2EIFiEeWKIdAlVGN13g" type="2005" fillColor="8905185">

-      <children xmi:type="notation:DecorationNode" xmi:id="_EWQdIIFiEeWKIdAlVGN13g" type="5020"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_EWREMIFiEeWKIdAlVGN13g" type="7009">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_EWREMYFiEeWKIdAlVGN13g"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EWREMoFiEeWKIdAlVGN13g"/>

-      </children>

-      <element xmi:type="uml:Model" href="platform:/resource/org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml#_-NKksAnQEeW356xdbh3U2Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EWP2EYFiEeWKIdAlVGN13g" x="402" y="175" width="169"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_F5o7cIFiEeWKIdAlVGN13g" type="2005" fillColor="13420443">

-      <children xmi:type="notation:DecorationNode" xmi:id="_F5pigIFiEeWKIdAlVGN13g" type="5020"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_F5pigYFiEeWKIdAlVGN13g" type="7009">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_F5pigoFiEeWKIdAlVGN13g"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_F5pig4FiEeWKIdAlVGN13g"/>

-      </children>

-      <element xmi:type="uml:Model" href="platform:/resource/org.polarsys.esf.core.metamodel.esfbehaviours/src/main/resources/metamodel/esfbehaviours_metamodel.uml#_IYSU4AnREeW356xdbh3U2Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_F5o7cYFiEeWKIdAlVGN13g" x="211" y="175" width="169"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_ycSdwISJEeWOntSnNos8Xg" type="2005" fillColor="12621752">

-      <children xmi:type="notation:DecorationNode" xmi:id="_ycUS8ISJEeWOntSnNos8Xg" type="5020"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_ycU6AISJEeWOntSnNos8Xg" type="7009">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_ycU6AYSJEeWOntSnNos8Xg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ycU6AoSJEeWOntSnNos8Xg"/>

-      </children>

-      <element xmi:type="uml:Model" href="platform:/resource/org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_VB4SINLoEeSb47LgOrWUpg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ycSdwYSJEeWOntSnNos8Xg" x="25" y="175" width="169"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_li4hoQnjEeW356xdbh3U2Q" name="diagram_compatibility_version" stringValue="1.1.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_li4hognjEeW356xdbh3U2Q"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_li4hownjEeW356xdbh3U2Q">

-      <owner xmi:type="uml:Model" href="esfsafetyconcepts_metamodel.uml#_yvDioAnQEeW356xdbh3U2Q"/>

-    </styles>

-    <element xmi:type="uml:Model" href="esfsafetyconcepts_metamodel.uml#_yvDioAnQEeW356xdbh3U2Q"/>

-    <edges xmi:type="notation:Connector" xmi:id="_BtedAIFiEeWKIdAlVGN13g" type="4008" source="__2pwYAnjEeW356xdbh3U2Q" target="_IpEBMAnkEeW356xdbh3U2Q" routing="Rectilinear">

-      <children xmi:type="notation:DecorationNode" xmi:id="_BtfEEIFiEeWKIdAlVGN13g" type="6026">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_BtfEEYFiEeWKIdAlVGN13g" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_BtfEEoFiEeWKIdAlVGN13g" type="6027">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_BtfEE4FiEeWKIdAlVGN13g" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_BtedAYFiEeWKIdAlVGN13g"/>

-      <element xmi:type="uml:Dependency" href="esfsafetyconcepts_metamodel.uml#_BtHQoIFiEeWKIdAlVGN13g"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BtedAoFiEeWKIdAlVGN13g" points="[9, 0, -46, 0]$[41, -1, -14, -1]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Btww4IFiEeWKIdAlVGN13g" id="(1.0,0.49)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Btww4YFiEeWKIdAlVGN13g" id="(0.0,0.49)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_C1M6EIFiEeWKIdAlVGN13g" type="4008" source="_IpEBMAnkEeW356xdbh3U2Q" target="__2pwYAnjEeW356xdbh3U2Q" routing="Rectilinear">

-      <children xmi:type="notation:DecorationNode" xmi:id="_C1NhIIFiEeWKIdAlVGN13g" type="6026">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_C1NhIYFiEeWKIdAlVGN13g" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_C1NhIoFiEeWKIdAlVGN13g" type="6027">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_C1NhI4FiEeWKIdAlVGN13g" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_C1M6EYFiEeWKIdAlVGN13g"/>

-      <element xmi:type="uml:Dependency" href="esfsafetyconcepts_metamodel.uml#_C1As0IFiEeWKIdAlVGN13g"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_C1M6EoFiEeWKIdAlVGN13g" points="[-4, 0, 49, 0]$[-36, 5, 17, 5]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_C1gcEIFiEeWKIdAlVGN13g" id="(0.0,0.76)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_C1hDIIFiEeWKIdAlVGN13g" id="(1.0,0.76)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_RVabMIFiEeWKIdAlVGN13g" type="4008" source="_nUXtYAnjEeW356xdbh3U2Q" target="_F5o7cIFiEeWKIdAlVGN13g" routing="Rectilinear">

-      <children xmi:type="notation:DecorationNode" xmi:id="_RVbCQIFiEeWKIdAlVGN13g" type="6026">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_RVbCQYFiEeWKIdAlVGN13g" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_RVbCQoFiEeWKIdAlVGN13g" type="6027">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_RVbCQ4FiEeWKIdAlVGN13g" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_RVabMYFiEeWKIdAlVGN13g"/>

-      <element xmi:type="uml:Dependency" href="esfsafetyconcepts_metamodel.uml#_RVMYwIFiEeWKIdAlVGN13g"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_RVabMoFiEeWKIdAlVGN13g" points="[112, 26, 0, 63]$[112, -37, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RV3uMIFiEeWKIdAlVGN13g" id="(0.2838827838827839,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RV3uMYFiEeWKIdAlVGN13g" id="(0.47928994082840237,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_R5SkUIFiEeWKIdAlVGN13g" type="4008" source="_nUXtYAnjEeW356xdbh3U2Q" target="_EWP2EIFiEeWKIdAlVGN13g" routing="Rectilinear">

-      <children xmi:type="notation:DecorationNode" xmi:id="_R5TLYIFiEeWKIdAlVGN13g" type="6026">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_R5TLYYFiEeWKIdAlVGN13g" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_R5TLYoFiEeWKIdAlVGN13g" type="6027">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_R5TLY4FiEeWKIdAlVGN13g" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_R5SkUYFiEeWKIdAlVGN13g"/>

-      <element xmi:type="uml:Dependency" href="esfsafetyconcepts_metamodel.uml#_R4_pYIFiEeWKIdAlVGN13g"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_R5SkUoFiEeWKIdAlVGN13g" points="[18, 26, -5, 63]$[18, -37, -5, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_R5y6oIFiEeWKIdAlVGN13g" id="(0.7864583333333334,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_R5y6oYFiEeWKIdAlVGN13g" id="(0.445,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_459r0ISJEeWOntSnNos8Xg" type="4008" source="_nUXtYAnjEeW356xdbh3U2Q" target="_ycSdwISJEeWOntSnNos8Xg">

-      <children xmi:type="notation:DecorationNode" xmi:id="_45-S4ISJEeWOntSnNos8Xg" type="6026">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_45-S4YSJEeWOntSnNos8Xg" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_45-S4oSJEeWOntSnNos8Xg" type="6027">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_45-S44SJEeWOntSnNos8Xg" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_459r0YSJEeWOntSnNos8Xg"/>

-      <element xmi:type="uml:Dependency" href="esfsafetyconcepts_metamodel.uml#_45yssISJEeWOntSnNos8Xg"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_459r0oSJEeWOntSnNos8Xg" points="[-4, -2, 0, 78]$[12, -65, 16, 15]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_46bl4ISJEeWOntSnNos8Xg" id="(0.21245421245421245,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_46bl4YSJEeWOntSnNos8Xg" id="(0.6863905325443787,1.0)"/>

-    </edges>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="__t0IAAnkEeW356xdbh3U2Q" type="PapyrusUMLClassDiagram" name="SDysfunctions Overview Diagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_AwGEYAnlEeW356xdbh3U2Q" type="2007" fillColor="12632256">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xJO8sIFjEeWKIdAlVGN13g" source="PapyrusHyperLink_Page" references="_suQmMIFjEeWKIdAlVGN13g">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xJO8sYFjEeWKIdAlVGN13g" key="tooltip_text" value="SDysfunctions Diagram"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xJO8soFjEeWKIdAlVGN13g" key="pageName" value="PapyrusHyperLink_Page"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xJO8s4FjEeWKIdAlVGN13g" key="is_default_navigation" value="true"/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xJPjwIFjEeWKIdAlVGN13g" source="PapyrusHyperLink_Page" references="_li4hoAnjEeW356xdbh3U2Q">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xJPjwYFjEeWKIdAlVGN13g" key="tooltip_text" value="SafetyConcepts Overview Diagram"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xJPjwoFjEeWKIdAlVGN13g" key="pageName" value="PapyrusHyperLink_Page"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xJPjw4FjEeWKIdAlVGN13g" key="is_default_navigation" value="false"/>

-      </eAnnotations>

-      <children xmi:type="notation:DecorationNode" xmi:id="_AwH5kAnlEeW356xdbh3U2Q" type="5026"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_AwH5kQnlEeW356xdbh3U2Q" type="7016">

-        <children xmi:type="notation:Shape" xmi:id="_quYOwAnmEeW356xdbh3U2Q" type="3010">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_f_42UAnnEeW356xdbh3U2Q" source="PapyrusCSSForceValue">

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_f_5dYAnnEeW356xdbh3U2Q" key="fillColor" value="true"/>

-          </eAnnotations>

-          <children xmi:type="notation:DecorationNode" xmi:id="_quY10AnmEeW356xdbh3U2Q" type="5014"/>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_quY10QnmEeW356xdbh3U2Q" visible="false" type="7011">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_quY10gnmEeW356xdbh3U2Q"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_quY10wnmEeW356xdbh3U2Q"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_quY11AnmEeW356xdbh3U2Q"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_quY11QnmEeW356xdbh3U2Q"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_quY11gnmEeW356xdbh3U2Q" visible="false" type="7012">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_quZc4AnmEeW356xdbh3U2Q"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_quZc4QnmEeW356xdbh3U2Q"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_quZc4gnmEeW356xdbh3U2Q"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_quZc4wnmEeW356xdbh3U2Q"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_quZc5AnmEeW356xdbh3U2Q" visible="false" type="7013">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_quZc5QnmEeW356xdbh3U2Q"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_quZc5gnmEeW356xdbh3U2Q"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_quZc5wnmEeW356xdbh3U2Q"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_quZc6AnmEeW356xdbh3U2Q"/>

-          </children>

-          <children xmi:type="notation:DecorationNode" xmi:id="_MHQ4IIFeEeWKIdAlVGN13g" type="8518">

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_MHQ4IYFeEeWKIdAlVGN13g" y="5"/>

-          </children>

-          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_quWZkAnmEeW356xdbh3U2Q"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_quYOwQnmEeW356xdbh3U2Q" x="201" y="14" width="585" height="56"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_rCePcAnmEeW356xdbh3U2Q" type="3010">

-          <children xmi:type="notation:DecorationNode" xmi:id="_rCe2gAnmEeW356xdbh3U2Q" type="5014"/>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_rCe2gQnmEeW356xdbh3U2Q" visible="false" type="7011">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_rCe2ggnmEeW356xdbh3U2Q"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_rCe2gwnmEeW356xdbh3U2Q"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_rCe2hAnmEeW356xdbh3U2Q"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rCe2hQnmEeW356xdbh3U2Q"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_rCfdkAnmEeW356xdbh3U2Q" visible="false" type="7012">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_rCfdkQnmEeW356xdbh3U2Q"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_rCfdkgnmEeW356xdbh3U2Q"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_rCfdkwnmEeW356xdbh3U2Q"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rCfdlAnmEeW356xdbh3U2Q"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_rCfdlQnmEeW356xdbh3U2Q" visible="false" type="7013">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_rCfdlgnmEeW356xdbh3U2Q"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_rCfdlwnmEeW356xdbh3U2Q"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_rCfdmAnmEeW356xdbh3U2Q"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rCfdmQnmEeW356xdbh3U2Q"/>

-          </children>

-          <children xmi:type="notation:DecorationNode" xmi:id="_MHQ4IoFeEeWKIdAlVGN13g" type="8518">

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_MHQ4I4FeEeWKIdAlVGN13g" y="5"/>

-          </children>

-          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_rCbzMAnmEeW356xdbh3U2Q"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rCePcQnmEeW356xdbh3U2Q" x="14" y="103" width="127" height="50"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_rh1sAAnmEeW356xdbh3U2Q" type="3010">

-          <children xmi:type="notation:DecorationNode" xmi:id="_rh2TEAnmEeW356xdbh3U2Q" type="5014"/>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_rh2TEQnmEeW356xdbh3U2Q" visible="false" type="7011">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_rh2TEgnmEeW356xdbh3U2Q"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_rh2TEwnmEeW356xdbh3U2Q"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_rh2TFAnmEeW356xdbh3U2Q"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rh2TFQnmEeW356xdbh3U2Q"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_rh2TFgnmEeW356xdbh3U2Q" visible="false" type="7012">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_rh2TFwnmEeW356xdbh3U2Q"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_rh2TGAnmEeW356xdbh3U2Q"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_rh2TGQnmEeW356xdbh3U2Q"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rh2TGgnmEeW356xdbh3U2Q"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_rh2TGwnmEeW356xdbh3U2Q" visible="false" type="7013">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_rh26IAnmEeW356xdbh3U2Q"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_rh26IQnmEeW356xdbh3U2Q"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_rh26IgnmEeW356xdbh3U2Q"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rh26IwnmEeW356xdbh3U2Q"/>

-          </children>

-          <children xmi:type="notation:DecorationNode" xmi:id="_MHQ4JIFeEeWKIdAlVGN13g" type="8518">

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_MHQ4JYFeEeWKIdAlVGN13g" y="5"/>

-          </children>

-          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_rhzPwAnmEeW356xdbh3U2Q"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rh1sAQnmEeW356xdbh3U2Q" x="308" y="103" width="127" height="50"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_r9EPcAnmEeW356xdbh3U2Q" type="3010">

-          <children xmi:type="notation:DecorationNode" xmi:id="_r9EPcgnmEeW356xdbh3U2Q" type="5014"/>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_r9EPcwnmEeW356xdbh3U2Q" visible="false" type="7011">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_r9E2gAnmEeW356xdbh3U2Q"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_r9E2gQnmEeW356xdbh3U2Q"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_r9E2ggnmEeW356xdbh3U2Q"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_r9E2gwnmEeW356xdbh3U2Q"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_r9E2hAnmEeW356xdbh3U2Q" visible="false" type="7012">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_r9E2hQnmEeW356xdbh3U2Q"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_r9E2hgnmEeW356xdbh3U2Q"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_r9E2hwnmEeW356xdbh3U2Q"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_r9E2iAnmEeW356xdbh3U2Q"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_r9E2iQnmEeW356xdbh3U2Q" visible="false" type="7013">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_r9E2ignmEeW356xdbh3U2Q"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_r9E2iwnmEeW356xdbh3U2Q"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_r9E2jAnmEeW356xdbh3U2Q"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_r9E2jQnmEeW356xdbh3U2Q"/>

-          </children>

-          <children xmi:type="notation:DecorationNode" xmi:id="_MHQ4JoFeEeWKIdAlVGN13g" type="8518">

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_MHQ4J4FeEeWKIdAlVGN13g" y="5"/>

-          </children>

-          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_r9BzMAnmEeW356xdbh3U2Q"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_r9EPcQnmEeW356xdbh3U2Q" x="161" y="103" width="127" height="50"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_K3CtkA53EeWvS4pMPcwguQ" type="3010">

-          <children xmi:type="notation:DecorationNode" xmi:id="_K3Ctkg53EeWvS4pMPcwguQ" type="5014"/>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_K3DUoA53EeWvS4pMPcwguQ" visible="false" type="7011">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_K3DUoQ53EeWvS4pMPcwguQ"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_K3DUog53EeWvS4pMPcwguQ"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_K3DUow53EeWvS4pMPcwguQ"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K3DUpA53EeWvS4pMPcwguQ"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_K3DUpQ53EeWvS4pMPcwguQ" visible="false" type="7012">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_K3DUpg53EeWvS4pMPcwguQ"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_K3DUpw53EeWvS4pMPcwguQ"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_K3DUqA53EeWvS4pMPcwguQ"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K3DUqQ53EeWvS4pMPcwguQ"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_K3DUqg53EeWvS4pMPcwguQ" visible="false" type="7013">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_K3DUqw53EeWvS4pMPcwguQ"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_K3DUrA53EeWvS4pMPcwguQ"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_K3DUrQ53EeWvS4pMPcwguQ"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K3DUrg53EeWvS4pMPcwguQ"/>

-          </children>

-          <children xmi:type="notation:DecorationNode" xmi:id="_MHQ4KIFeEeWKIdAlVGN13g" type="8518">

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_MHQ4KYFeEeWKIdAlVGN13g" y="5"/>

-          </children>

-          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_K3ARUA53EeWvS4pMPcwguQ"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K3CtkQ53EeWvS4pMPcwguQ" x="449" y="102" width="125" height="52"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_L9CsUA53EeWvS4pMPcwguQ" type="3010">

-          <children xmi:type="notation:DecorationNode" xmi:id="_L9CsUg53EeWvS4pMPcwguQ" type="5014"/>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_L9CsUw53EeWvS4pMPcwguQ" visible="false" type="7011">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_L9CsVA53EeWvS4pMPcwguQ"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_L9CsVQ53EeWvS4pMPcwguQ"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_L9CsVg53EeWvS4pMPcwguQ"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L9CsVw53EeWvS4pMPcwguQ"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_L9DTYA53EeWvS4pMPcwguQ" visible="false" type="7012">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_L9DTYQ53EeWvS4pMPcwguQ"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_L9DTYg53EeWvS4pMPcwguQ"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_L9DTYw53EeWvS4pMPcwguQ"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L9DTZA53EeWvS4pMPcwguQ"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_L9DTZQ53EeWvS4pMPcwguQ" visible="false" type="7013">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_L9DTZg53EeWvS4pMPcwguQ"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_L9DTZw53EeWvS4pMPcwguQ"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_L9DTaA53EeWvS4pMPcwguQ"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L9DTaQ53EeWvS4pMPcwguQ"/>

-          </children>

-          <children xmi:type="notation:DecorationNode" xmi:id="_MHQ4KoFeEeWKIdAlVGN13g" type="8518">

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_MHQ4K4FeEeWKIdAlVGN13g" y="5"/>

-          </children>

-          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_L9BeMA53EeWvS4pMPcwguQ"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L9CsUQ53EeWvS4pMPcwguQ" x="876" y="102" width="125" height="52"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_wNIWQIFiEeWKIdAlVGN13g" type="3010">

-          <children xmi:type="notation:DecorationNode" xmi:id="_wNIWQoFiEeWKIdAlVGN13g" type="5014"/>

-          <children xmi:type="notation:DecorationNode" xmi:id="_wNIWQ4FiEeWKIdAlVGN13g" type="8518">

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_wNIWRIFiEeWKIdAlVGN13g" y="5"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_wNI9UIFiEeWKIdAlVGN13g" visible="false" type="7011">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_wNI9UYFiEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_wNI9UoFiEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_wNI9U4FiEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wNI9VIFiEeWKIdAlVGN13g"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_wNI9VYFiEeWKIdAlVGN13g" visible="false" type="7012">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_wNI9VoFiEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_wNI9V4FiEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_wNI9WIFiEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wNI9WYFiEeWKIdAlVGN13g"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_wNI9WoFiEeWKIdAlVGN13g" visible="false" type="7013">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_wNI9W4FiEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_wNI9XIFiEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_wNI9XYFiEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wNI9XoFiEeWKIdAlVGN13g"/>

-          </children>

-          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_wMyYAIFiEeWKIdAlVGN13g"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wNIWQYFiEeWKIdAlVGN13g" x="734" y="103" width="127" height="50"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_yUPzwIFiEeWKIdAlVGN13g" type="3010">

-          <children xmi:type="notation:DecorationNode" xmi:id="_yUQa0IFiEeWKIdAlVGN13g" type="5014"/>

-          <children xmi:type="notation:DecorationNode" xmi:id="_yUQa0YFiEeWKIdAlVGN13g" type="8518">

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_yUQa0oFiEeWKIdAlVGN13g" y="5"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_yUQa04FiEeWKIdAlVGN13g" visible="false" type="7011">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_yUQa1IFiEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_yUQa1YFiEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_yUQa1oFiEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yUQa14FiEeWKIdAlVGN13g"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_yUQa2IFiEeWKIdAlVGN13g" visible="false" type="7012">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_yUQa2YFiEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_yUQa2oFiEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_yUQa24FiEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yUQa3IFiEeWKIdAlVGN13g"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_yUQa3YFiEeWKIdAlVGN13g" visible="false" type="7013">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_yUQa3oFiEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_yUQa34FiEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_yUQa4IFiEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yUQa4YFiEeWKIdAlVGN13g"/>

-          </children>

-          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_yT7DoIFiEeWKIdAlVGN13g"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yUPzwYFiEeWKIdAlVGN13g" x="590" y="103" width="127" height="50"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_AwH5kgnlEeW356xdbh3U2Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AwH5kwnlEeW356xdbh3U2Q"/>

-      </children>

-      <element xmi:type="uml:Package" href="esfsafetyconcepts_metamodel.uml#__2mtEAnjEeW356xdbh3U2Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AwGEYQnlEeW356xdbh3U2Q" x="97" y="328" width="1039" height="215"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_MYVJAISKEeWOntSnNos8Xg" type="2005" fillColor="12621752">

-      <children xmi:type="notation:DecorationNode" xmi:id="_MYVJAoSKEeWOntSnNos8Xg" type="5020"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_MYVJA4SKEeWOntSnNos8Xg" type="7009">

-        <children xmi:type="notation:Shape" xmi:id="_OmXt4ISKEeWOntSnNos8Xg" type="3010">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9Dl-MISKEeWOntSnNos8Xg" source="PapyrusCSSForceValue">

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9Dl-MYSKEeWOntSnNos8Xg" key="fillColor" value="true"/>

-          </eAnnotations>

-          <children xmi:type="notation:DecorationNode" xmi:id="_OmYU8ISKEeWOntSnNos8Xg" type="5014"/>

-          <children xmi:type="notation:DecorationNode" xmi:id="_OmYU8YSKEeWOntSnNos8Xg" type="8518">

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_OmYU8oSKEeWOntSnNos8Xg" y="5"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_OmYU84SKEeWOntSnNos8Xg" visible="false" type="7011">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_OmYU9ISKEeWOntSnNos8Xg"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_OmYU9YSKEeWOntSnNos8Xg"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_OmYU9oSKEeWOntSnNos8Xg"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OmYU94SKEeWOntSnNos8Xg"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_OmY8AISKEeWOntSnNos8Xg" visible="false" type="7012">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_OmY8AYSKEeWOntSnNos8Xg"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_OmY8AoSKEeWOntSnNos8Xg"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_OmY8A4SKEeWOntSnNos8Xg"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OmY8BISKEeWOntSnNos8Xg"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_OmY8BYSKEeWOntSnNos8Xg" visible="false" type="7013">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_OmY8BoSKEeWOntSnNos8Xg"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_OmY8B4SKEeWOntSnNos8Xg"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_OmY8CISKEeWOntSnNos8Xg"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OmY8CYSKEeWOntSnNos8Xg"/>

-          </children>

-          <element xmi:type="uml:Class" href="platform:/resource/org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_Q05ZgOjPEeSQI-4c5olYjA"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OmXt4YSKEeWOntSnNos8Xg" x="85" y="32" width="208" height="56"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_MYVJBISKEeWOntSnNos8Xg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MYVJBYSKEeWOntSnNos8Xg"/>

-      </children>

-      <element xmi:type="uml:Model" href="platform:/resource/org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_VB4SINLoEeSb47LgOrWUpg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MYVJAYSKEeWOntSnNos8Xg" x="400" y="133" width="376" height="157"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="__t0IAQnkEeW356xdbh3U2Q" name="diagram_compatibility_version" stringValue="1.1.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="__t0IAgnkEeW356xdbh3U2Q"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="__t0IAwnkEeW356xdbh3U2Q">

-      <owner xmi:type="uml:Package" href="esfsafetyconcepts_metamodel.uml#__2mtEAnjEeW356xdbh3U2Q"/>

-    </styles>

-    <element xmi:type="uml:Package" href="esfsafetyconcepts_metamodel.uml#__2mtEAnjEeW356xdbh3U2Q"/>

-    <edges xmi:type="notation:Connector" xmi:id="_WUdS0AnnEeW356xdbh3U2Q" type="4002" source="_rh1sAAnmEeW356xdbh3U2Q" target="_quYOwAnmEeW356xdbh3U2Q" routing="Rectilinear">

-      <children xmi:type="notation:DecorationNode" xmi:id="_WUd54gnnEeW356xdbh3U2Q" type="6007">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_WUd54wnnEeW356xdbh3U2Q" y="40"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_WUd54AnnEeW356xdbh3U2Q"/>

-      <element xmi:type="uml:Generalization" href="esfsafetyconcepts_metamodel.uml#_WUbdoAnnEeW356xdbh3U2Q"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_WUd54QnnEeW356xdbh3U2Q" points="[28, 0, 130, 33]$[28, -33, 130, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_A5IaoAqgEeWCRsSxON2IdQ" id="(0.2755905511811024,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_A5JBsAqgEeWCRsSxON2IdQ" id="(0.06837606837606838,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_UQuZwA53EeWvS4pMPcwguQ" type="4002" source="_K3CtkA53EeWvS4pMPcwguQ" target="_quYOwAnmEeW356xdbh3U2Q" routing="Rectilinear">

-      <children xmi:type="notation:DecorationNode" xmi:id="_UQuZww53EeWvS4pMPcwguQ" type="6007">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UQuZxA53EeWvS4pMPcwguQ" y="40"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_UQuZwQ53EeWvS4pMPcwguQ"/>

-      <element xmi:type="uml:Generalization" href="esfsafetyconcepts_metamodel.uml#_UQtLoA53EeWvS4pMPcwguQ"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UQuZwg53EeWvS4pMPcwguQ" points="[21, 0, -182, 32]$[21, -32, -182, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UQz5UA53EeWvS4pMPcwguQ" id="(0.352,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UQz5UQ53EeWvS4pMPcwguQ" id="(0.8461538461538461,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_Uqe9kA53EeWvS4pMPcwguQ" type="4002" source="_L9CsUA53EeWvS4pMPcwguQ" target="_quYOwAnmEeW356xdbh3U2Q" routing="Rectilinear">

-      <children xmi:type="notation:DecorationNode" xmi:id="_UqfkoA53EeWvS4pMPcwguQ" type="6007">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UqfkoQ53EeWvS4pMPcwguQ" y="40"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_Uqe9kQ53EeWvS4pMPcwguQ"/>

-      <element xmi:type="uml:Generalization" href="esfsafetyconcepts_metamodel.uml#_UqchUA53EeWvS4pMPcwguQ"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Uqe9kg53EeWvS4pMPcwguQ" points="[24, 0, 212, 32]$[24, -64, 212, -32]$[-110, -64, 78, -32]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Yh4F4A53EeWvS4pMPcwguQ" id="(0.16,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UqkdIA53EeWvS4pMPcwguQ" id="(0.8666666666666667,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_LYUVMIFjEeWKIdAlVGN13g" type="4002" source="_wNIWQIFiEeWKIdAlVGN13g" target="_quYOwAnmEeW356xdbh3U2Q" routing="Rectilinear">

-      <children xmi:type="notation:DecorationNode" xmi:id="_LYU8QIFjEeWKIdAlVGN13g" type="6007">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_LYU8QYFjEeWKIdAlVGN13g" y="40"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_LYUVMYFjEeWKIdAlVGN13g"/>

-      <element xmi:type="uml:Generalization" href="esfsafetyconcepts_metamodel.uml#_LYGSwIFjEeWKIdAlVGN13g"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LYUVMoFjEeWKIdAlVGN13g" points="[-30, 0, 0, 33]$[-30, -33, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LYuk4IFjEeWKIdAlVGN13g" id="(0.5196850393700787,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LYuk4YFjEeWKIdAlVGN13g" id="(0.9726495726495726,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_MCSfQIFjEeWKIdAlVGN13g" type="4002" source="_yUPzwIFiEeWKIdAlVGN13g" target="_quYOwAnmEeW356xdbh3U2Q" routing="Rectilinear">

-      <children xmi:type="notation:DecorationNode" xmi:id="_MCSfQ4FjEeWKIdAlVGN13g" type="6007">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_MCSfRIFjEeWKIdAlVGN13g" y="40"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_MCSfQYFjEeWKIdAlVGN13g"/>

-      <element xmi:type="uml:Generalization" href="esfsafetyconcepts_metamodel.uml#_MCG5EIFjEeWKIdAlVGN13g"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MCSfQoFjEeWKIdAlVGN13g" points="[15, 0, 14, 33]$[15, -33, 14, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MCsH4IFjEeWKIdAlVGN13g" id="(0.4251968503937008,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MCsH4YFjEeWKIdAlVGN13g" id="(0.7589743589743589,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_MpJD4IFjEeWKIdAlVGN13g" type="4002" source="_r9EPcAnmEeW356xdbh3U2Q" target="_quYOwAnmEeW356xdbh3U2Q" routing="Rectilinear">

-      <children xmi:type="notation:DecorationNode" xmi:id="_MpJD44FjEeWKIdAlVGN13g" type="6007">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_MpJD5IFjEeWKIdAlVGN13g" y="40"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_MpJD4YFjEeWKIdAlVGN13g"/>

-      <element xmi:type="uml:Generalization" href="esfsafetyconcepts_metamodel.uml#_MoyekIFjEeWKIdAlVGN13g"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MpJD4oFjEeWKIdAlVGN13g" points="[22, 0, 11, 33]$[22, -33, 11, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MpkhsIFjEeWKIdAlVGN13g" id="(0.3543307086614173,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MpkhsYFjEeWKIdAlVGN13g" id="(0.02735042735042735,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_NT1msIFjEeWKIdAlVGN13g" type="4002" source="_rCePcAnmEeW356xdbh3U2Q" target="_quYOwAnmEeW356xdbh3U2Q" routing="Rectilinear">

-      <children xmi:type="notation:DecorationNode" xmi:id="_NT2NwIFjEeWKIdAlVGN13g" type="6007">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_NT2NwYFjEeWKIdAlVGN13g" y="40"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_NT1msYFjEeWKIdAlVGN13g"/>

-      <element xmi:type="uml:Generalization" href="esfsafetyconcepts_metamodel.uml#_NTirwIFjEeWKIdAlVGN13g"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NT1msoFjEeWKIdAlVGN13g" points="[20, -10, -138, 67]$[142, -78, -16, -1]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NUS5sIFjEeWKIdAlVGN13g" id="(0.5118110236220472,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NUS5sYFjEeWKIdAlVGN13g" id="(0.0,0.5178571428571429)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_8VStwISKEeWOntSnNos8Xg" type="4002" source="_quYOwAnmEeW356xdbh3U2Q" target="_OmXt4ISKEeWOntSnNos8Xg" routing="Rectilinear">

-      <children xmi:type="notation:DecorationNode" xmi:id="_8VStw4SKEeWOntSnNos8Xg" type="6007">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_8VStxISKEeWOntSnNos8Xg" y="40"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_8VStwYSKEeWOntSnNos8Xg"/>

-      <element xmi:type="uml:Generalization" href="esfsafetyconcepts_metamodel.uml#_8VEEQISKEeWOntSnNos8Xg"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8VStwoSKEeWOntSnNos8Xg" points="[-7, 0, -3, 149]$[-7, -121, -3, 28]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8VzrIISKEeWOntSnNos8Xg" id="(0.5042735042735043,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8VzrIYSKEeWOntSnNos8Xg" id="(0.4855769230769231,1.0)"/>

-    </edges>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_bXP2QAnyEeW356xdbh3U2Q" type="PapyrusUMLClassDiagram" name="SRecommendations Overview Diagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_b366YAnyEeW356xdbh3U2Q" type="2007" fillColor="12632256">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_t2tbMAnyEeW356xdbh3U2Q" source="PapyrusHyperLink_Page" references="_li4hoAnjEeW356xdbh3U2Q">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t2tbMQnyEeW356xdbh3U2Q" key="tooltip_text" value="SafetyConcepts Overview Diagram"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t2tbMgnyEeW356xdbh3U2Q" key="pageName" value="PapyrusHyperLink_Page"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t2tbMwnyEeW356xdbh3U2Q" key="is_default_navigation" value="true"/>

-      </eAnnotations>

-      <children xmi:type="notation:DecorationNode" xmi:id="_b37hcAnyEeW356xdbh3U2Q" type="5026"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_b37hcQnyEeW356xdbh3U2Q" type="7016">

-        <children xmi:type="notation:Shape" xmi:id="_dK92oAnyEeW356xdbh3U2Q" type="3010">

-          <children xmi:type="notation:DecorationNode" xmi:id="_dK-dsAnyEeW356xdbh3U2Q" type="5014"/>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_dK-dsQnyEeW356xdbh3U2Q" visible="false" type="7011">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_dK-dsgnyEeW356xdbh3U2Q"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_dK-dswnyEeW356xdbh3U2Q"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_dK-dtAnyEeW356xdbh3U2Q"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dK-dtQnyEeW356xdbh3U2Q"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_dK_EwAnyEeW356xdbh3U2Q" visible="false" type="7012">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_dK_EwQnyEeW356xdbh3U2Q"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_dK_EwgnyEeW356xdbh3U2Q"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_dK_EwwnyEeW356xdbh3U2Q"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dK_ExAnyEeW356xdbh3U2Q"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_dK_ExQnyEeW356xdbh3U2Q" visible="false" type="7013">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_dK_ExgnyEeW356xdbh3U2Q"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_dK_ExwnyEeW356xdbh3U2Q"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_dK_EyAnyEeW356xdbh3U2Q"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dK_EyQnyEeW356xdbh3U2Q"/>

-          </children>

-          <children xmi:type="notation:DecorationNode" xmi:id="_MF5mMIFeEeWKIdAlVGN13g" type="8518">

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_MF5mMYFeEeWKIdAlVGN13g" y="5"/>

-          </children>

-          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_iEHMUAnxEeW356xdbh3U2Q"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dK92oQnyEeW356xdbh3U2Q" x="82" y="129" height="67"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_K3UPAIFlEeWKIdAlVGN13g" type="3010">

-          <children xmi:type="notation:DecorationNode" xmi:id="_K3UPAoFlEeWKIdAlVGN13g" type="5014"/>

-          <children xmi:type="notation:DecorationNode" xmi:id="_K3UPA4FlEeWKIdAlVGN13g" type="8518">

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_K3UPBIFlEeWKIdAlVGN13g" y="5"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_K3UPBYFlEeWKIdAlVGN13g" visible="false" type="7011">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_K3UPBoFlEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_K3UPB4FlEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_K3UPCIFlEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K3UPCYFlEeWKIdAlVGN13g"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_K3UPCoFlEeWKIdAlVGN13g" visible="false" type="7012">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_K3UPC4FlEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_K3UPDIFlEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_K3UPDYFlEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K3UPDoFlEeWKIdAlVGN13g"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_K3UPD4FlEeWKIdAlVGN13g" visible="false" type="7013">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_K3UPEIFlEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_K3UPEYFlEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_K3UPEoFlEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K3UPE4FlEeWKIdAlVGN13g"/>

-          </children>

-          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_K29CoIFlEeWKIdAlVGN13g"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K3UPAYFlEeWKIdAlVGN13g" x="214" y="24" width="176" height="67"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_P32JoIFlEeWKIdAlVGN13g" type="3010">

-          <children xmi:type="notation:DecorationNode" xmi:id="_P32wsIFlEeWKIdAlVGN13g" type="5014"/>

-          <children xmi:type="notation:DecorationNode" xmi:id="_P32wsYFlEeWKIdAlVGN13g" type="8518">

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_P32wsoFlEeWKIdAlVGN13g" y="5"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_P32ws4FlEeWKIdAlVGN13g" type="7011">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1-ABUIFlEeWKIdAlVGN13g" source="PapyrusCSSForceValue">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1-AoYIFlEeWKIdAlVGN13g" key="visible" value="true"/>

-            </eAnnotations>

-            <children xmi:type="notation:Shape" xmi:id="_4ma1EIFlEeWKIdAlVGN13g" type="3012">

-              <styles xmi:type="notation:StringListValueStyle" xmi:id="_-c1O0IFlEeWKIdAlVGN13g" name="maskLabel">

-                <stringListValue>name</stringListValue>

-                <stringListValue>derived</stringListValue>

-                <stringListValue>multiplicity</stringListValue>

-                <stringListValue>type</stringListValue>

-              </styles>

-              <element xmi:type="uml:Property" href="esfsafetyconcepts_metamodel.uml#_4mJvUIFlEeWKIdAlVGN13g"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_4ma1EYFlEeWKIdAlVGN13g"/>

-            </children>

-            <styles xmi:type="notation:TitleStyle" xmi:id="_P32wtIFlEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_P32wtYFlEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_P32wtoFlEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P32wt4FlEeWKIdAlVGN13g"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_P32wuIFlEeWKIdAlVGN13g" visible="false" type="7012">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_P32wuYFlEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_P32wuoFlEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_P32wu4FlEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P32wvIFlEeWKIdAlVGN13g"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_P32wvYFlEeWKIdAlVGN13g" visible="false" type="7013">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_P32wvoFlEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_P32wv4FlEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_P32wwIFlEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P32wwYFlEeWKIdAlVGN13g"/>

-          </children>

-          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_P3dvIIFlEeWKIdAlVGN13g"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P32JoYFlEeWKIdAlVGN13g" x="361" y="129" width="197" height="67"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_aLN24IFlEeWKIdAlVGN13g" type="3010">

-          <children xmi:type="notation:DecorationNode" xmi:id="_aLN24oFlEeWKIdAlVGN13g" type="5014"/>

-          <children xmi:type="notation:DecorationNode" xmi:id="_aLN244FlEeWKIdAlVGN13g" type="8518">

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_aLN25IFlEeWKIdAlVGN13g" y="5"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_aLN25YFlEeWKIdAlVGN13g" visible="false" type="7011">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_aLN25oFlEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_aLN254FlEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_aLN26IFlEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aLN26YFlEeWKIdAlVGN13g"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_aLN26oFlEeWKIdAlVGN13g" visible="false" type="7012">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_aLOd8IFlEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_aLOd8YFlEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_aLOd8oFlEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aLOd84FlEeWKIdAlVGN13g"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_aLOd9IFlEeWKIdAlVGN13g" visible="false" type="7013">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_aLOd9YFlEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_aLOd9oFlEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_aLOd94FlEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aLOd-IFlEeWKIdAlVGN13g"/>

-          </children>

-          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_aKwj4IFlEeWKIdAlVGN13g"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aLN24YFlEeWKIdAlVGN13g" x="438" y="24" width="118" height="67"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_evGRwIFlEeWKIdAlVGN13g" type="3025">

-          <children xmi:type="notation:DecorationNode" xmi:id="_evGRwoFlEeWKIdAlVGN13g" type="5055"/>

-          <children xmi:type="notation:DecorationNode" xmi:id="_evGRw4FlEeWKIdAlVGN13g" type="8516">

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_evGRxIFlEeWKIdAlVGN13g" y="5"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_evGRxYFlEeWKIdAlVGN13g" type="7031">

-            <children xmi:type="notation:Shape" xmi:id="_kIGWwIFlEeWKIdAlVGN13g" type="3017">

-              <element xmi:type="uml:EnumerationLiteral" href="esfsafetyconcepts_metamodel.uml#_kH9M0IFlEeWKIdAlVGN13g"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_kIGWwYFlEeWKIdAlVGN13g"/>

-            </children>

-            <children xmi:type="notation:Shape" xmi:id="_nFXZIIFlEeWKIdAlVGN13g" type="3017">

-              <element xmi:type="uml:EnumerationLiteral" href="esfsafetyconcepts_metamodel.uml#_nFQEYIFlEeWKIdAlVGN13g"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_nFXZIYFlEeWKIdAlVGN13g"/>

-            </children>

-            <styles xmi:type="notation:TitleStyle" xmi:id="_evGRxoFlEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_evGRx4FlEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_evGRyIFlEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_evGRyYFlEeWKIdAlVGN13g"/>

-          </children>

-          <element xmi:type="uml:Enumeration" href="esfsafetyconcepts_metamodel.uml#_eu3oQIFlEeWKIdAlVGN13g"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_evGRwYFlEeWKIdAlVGN13g" x="601" y="7" width="151"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_b37hcgnyEeW356xdbh3U2Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b37hcwnyEeW356xdbh3U2Q"/>

-      </children>

-      <element xmi:type="uml:Package" href="esfsafetyconcepts_metamodel.uml#_IpBk8AnkEeW356xdbh3U2Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b366YQnyEeW356xdbh3U2Q" x="388" y="274" width="793" height="294"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_67En8ISJEeWOntSnNos8Xg" type="2005" fillColor="12621752">

-      <children xmi:type="notation:DecorationNode" xmi:id="_67FPAISJEeWOntSnNos8Xg" type="5020"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_67FPAYSJEeWOntSnNos8Xg" type="7009">

-        <children xmi:type="notation:Shape" xmi:id="_EgqpMISKEeWOntSnNos8Xg" type="3010">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_K2Mn4ISKEeWOntSnNos8Xg" source="PapyrusCSSForceValue">

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_K2Mn4YSKEeWOntSnNos8Xg" key="fillColor" value="true"/>

-          </eAnnotations>

-          <children xmi:type="notation:DecorationNode" xmi:id="_EgrQQISKEeWOntSnNos8Xg" type="5014"/>

-          <children xmi:type="notation:DecorationNode" xmi:id="_EgrQQYSKEeWOntSnNos8Xg" type="8518">

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_EgrQQoSKEeWOntSnNos8Xg" y="5"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_EgrQQ4SKEeWOntSnNos8Xg" visible="false" type="7011">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_EgrQRISKEeWOntSnNos8Xg"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_EgrQRYSKEeWOntSnNos8Xg"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_EgrQRoSKEeWOntSnNos8Xg"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EgrQR4SKEeWOntSnNos8Xg"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_Egr3UISKEeWOntSnNos8Xg" visible="false" type="7012">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_Egr3UYSKEeWOntSnNos8Xg"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_Egr3UoSKEeWOntSnNos8Xg"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_Egr3U4SKEeWOntSnNos8Xg"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Egr3VISKEeWOntSnNos8Xg"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_Egr3VYSKEeWOntSnNos8Xg" visible="false" type="7013">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_Egr3VoSKEeWOntSnNos8Xg"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_Egr3V4SKEeWOntSnNos8Xg"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_Egr3WISKEeWOntSnNos8Xg"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Egr3WYSKEeWOntSnNos8Xg"/>

-          </children>

-          <element xmi:type="uml:Class" href="platform:/resource/org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_Q05ZgOjPEeSQI-4c5olYjA"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EgqpMYSKEeWOntSnNos8Xg" x="93" y="47" width="225" height="67"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_67FPAoSJEeWOntSnNos8Xg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_67FPA4SJEeWOntSnNos8Xg"/>

-      </children>

-      <element xmi:type="uml:Model" href="platform:/resource/org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_VB4SINLoEeSb47LgOrWUpg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_67En8YSJEeWOntSnNos8Xg" x="595" y="53" width="443" height="197"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_bXP2QQnyEeW356xdbh3U2Q" name="diagram_compatibility_version" stringValue="1.1.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_bXP2QgnyEeW356xdbh3U2Q"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_bXP2QwnyEeW356xdbh3U2Q">

-      <owner xmi:type="uml:Package" href="esfsafetyconcepts_metamodel.uml#_IpBk8AnkEeW356xdbh3U2Q"/>

-    </styles>

-    <element xmi:type="uml:Package" href="esfsafetyconcepts_metamodel.uml#_IpBk8AnkEeW356xdbh3U2Q"/>

-    <edges xmi:type="notation:Connector" xmi:id="_Pcx-QIFlEeWKIdAlVGN13g" type="4002" source="_dK92oAnyEeW356xdbh3U2Q" target="_K3UPAIFlEeWKIdAlVGN13g" routing="Rectilinear">

-      <children xmi:type="notation:DecorationNode" xmi:id="_Pcx-Q4FlEeWKIdAlVGN13g" type="6007">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Pcx-RIFlEeWKIdAlVGN13g" y="40"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_Pcx-QYFlEeWKIdAlVGN13g"/>

-      <element xmi:type="uml:Generalization" href="esfsafetyconcepts_metamodel.uml#_PcmYEIFlEeWKIdAlVGN13g"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Pcx-QoFlEeWKIdAlVGN13g" points="[-52, -18, -84, 41]$[-52, -69, -84, -10]$[32, -69, 0, -10]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PdESIIFlEeWKIdAlVGN13g" id="(1.0,0.27)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PdESIYFlEeWKIdAlVGN13g" id="(0.0,0.97)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_Zk3okIFlEeWKIdAlVGN13g" type="4002" source="_P32JoIFlEeWKIdAlVGN13g" target="_K3UPAIFlEeWKIdAlVGN13g" routing="Rectilinear">

-      <children xmi:type="notation:DecorationNode" xmi:id="_Zk4PoIFlEeWKIdAlVGN13g" type="6007">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Zk4PoYFlEeWKIdAlVGN13g" y="40"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_Zk3okYFlEeWKIdAlVGN13g"/>

-      <element xmi:type="uml:Generalization" href="esfsafetyconcepts_metamodel.uml#_Zkq0QIFlEeWKIdAlVGN13g"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Zk3okoFlEeWKIdAlVGN13g" points="[0, 0, 28, 38]$[0, -61, 28, -23]$[-28, -61, 0, -23]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZlJVYIFlEeWKIdAlVGN13g" id="(0.29,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZlJVYYFlEeWKIdAlVGN13g" id="(1.0,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="__tDgkIFlEeWKIdAlVGN13g" type="4001" source="_dK92oAnyEeW356xdbh3U2Q" target="_P32JoIFlEeWKIdAlVGN13g" routing="Rectilinear">

-      <children xmi:type="notation:DecorationNode" xmi:id="__tEHoIFlEeWKIdAlVGN13g" type="6001">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="__tEHoYFlEeWKIdAlVGN13g" y="-20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="__tEHooFlEeWKIdAlVGN13g" type="6002">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="__tEHo4FlEeWKIdAlVGN13g" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="__tEHpIFlEeWKIdAlVGN13g" type="6003">

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_NtWLgIFmEeWKIdAlVGN13g" name="maskLabel">

-          <stringListValue>name</stringListValue>

-          <stringListValue>derived</stringListValue>

-        </styles>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="__tEHpYFlEeWKIdAlVGN13g" x="20" y="-21"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="__tEHpoFlEeWKIdAlVGN13g" type="6005">

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_NU8SkIFmEeWKIdAlVGN13g" name="maskLabel">

-          <stringListValue>name</stringListValue>

-          <stringListValue>derived</stringListValue>

-        </styles>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="__tEHp4FlEeWKIdAlVGN13g" x="-23" y="18"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="__tEHqIFlEeWKIdAlVGN13g" type="6033">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="__tEHqYFlEeWKIdAlVGN13g" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="__tEHqoFlEeWKIdAlVGN13g" type="6034">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="__tEusIFlEeWKIdAlVGN13g" y="-20"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="__tDgkYFlEeWKIdAlVGN13g"/>

-      <element xmi:type="uml:Association" href="esfsafetyconcepts_metamodel.uml#__slmgIFlEeWKIdAlVGN13g"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__tDgkoFlEeWKIdAlVGN13g" points="[10, 4, -196, 0]$[189, 3, -17, -1]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__tnhQIFlEeWKIdAlVGN13g" id="(1.0,0.417910447761194)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__tnhQYFlEeWKIdAlVGN13g" id="(0.0,0.4626865671641791)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_JgkRsISKEeWOntSnNos8Xg" type="4002" source="_K3UPAIFlEeWKIdAlVGN13g" target="_EgqpMISKEeWOntSnNos8Xg" routing="Rectilinear">

-      <children xmi:type="notation:DecorationNode" xmi:id="_JgkRs4SKEeWOntSnNos8Xg" type="6007">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Jgk4wISKEeWOntSnNos8Xg" y="40"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_JgkRsYSKEeWOntSnNos8Xg"/>

-      <element xmi:type="uml:Generalization" href="esfsafetyconcepts_metamodel.uml#_Jf48QISKEeWOntSnNos8Xg"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_JgkRsoSKEeWOntSnNos8Xg" points="[1, -2, 0, 152]$[-34, -149, -35, 5]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JhJggISKEeWOntSnNos8Xg" id="(0.6818181818181818,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JhJggYSKEeWOntSnNos8Xg" id="(0.1511111111111111,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_KJi9QISKEeWOntSnNos8Xg" type="4002" source="_aLN24IFlEeWKIdAlVGN13g" target="_EgqpMISKEeWOntSnNos8Xg" routing="Rectilinear">

-      <children xmi:type="notation:DecorationNode" xmi:id="_KJjkUISKEeWOntSnNos8Xg" type="6007">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_KJjkUYSKEeWOntSnNos8Xg" y="40"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_KJi9QYSKEeWOntSnNos8Xg"/>

-      <element xmi:type="uml:Generalization" href="esfsafetyconcepts_metamodel.uml#_KI9HYISKEeWOntSnNos8Xg"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KJi9QoSKEeWOntSnNos8Xg" points="[-6, -9, 0, 159]$[29, -166, 35, 2]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KKG98ISKEeWOntSnNos8Xg" id="(0.4830508474576271,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KKG98YSKEeWOntSnNos8Xg" id="(0.8488888888888889,1.0)"/>

-    </edges>

-  </notation:Diagram>

-  <css:ModelStyleSheets xmi:id="_ybi4UAnyEeW356xdbh3U2Q"/>

-  <notation:Diagram xmi:id="_suQmMIFjEeWKIdAlVGN13g" type="PapyrusUMLClassDiagram" name="SDysfunctions Diagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_0aWIIIFjEeWKIdAlVGN13g" type="2007">

-      <children xmi:type="notation:DecorationNode" xmi:id="_0aWvMIFjEeWKIdAlVGN13g" type="5026"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_0aWvMYFjEeWKIdAlVGN13g" type="7016">

-        <children xmi:type="notation:Shape" xmi:id="_YXH7sIFoEeWKIdAlVGN13g" type="3010">

-          <children xmi:type="notation:DecorationNode" xmi:id="_YXIiwIFoEeWKIdAlVGN13g" type="5014"/>

-          <children xmi:type="notation:DecorationNode" xmi:id="_YXIiwYFoEeWKIdAlVGN13g" type="8518">

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_YXIiwoFoEeWKIdAlVGN13g" y="5"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_YXIiw4FoEeWKIdAlVGN13g" visible="false" type="7011">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_YXIixIFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_YXIixYFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_YXIixoFoEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YXIix4FoEeWKIdAlVGN13g"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_YXIiyIFoEeWKIdAlVGN13g" visible="false" type="7012">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_YXIiyYFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_YXIiyoFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_YXIiy4FoEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YXIizIFoEeWKIdAlVGN13g"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_YXIizYFoEeWKIdAlVGN13g" visible="false" type="7013">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_YXIizoFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_YXIiz4FoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_YXIi0IFoEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YXIi0YFoEeWKIdAlVGN13g"/>

-          </children>

-          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_L9BeMA53EeWvS4pMPcwguQ"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YXH7sYFoEeWKIdAlVGN13g" x="34" y="188"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_Y301AIFoEeWKIdAlVGN13g" type="3010">

-          <children xmi:type="notation:DecorationNode" xmi:id="_Y301AoFoEeWKIdAlVGN13g" type="5014"/>

-          <children xmi:type="notation:DecorationNode" xmi:id="_Y301A4FoEeWKIdAlVGN13g" type="8518">

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_Y301BIFoEeWKIdAlVGN13g" y="5"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_Y31cEIFoEeWKIdAlVGN13g" visible="false" type="7011">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_Y31cEYFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_Y31cEoFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_Y31cE4FoEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y31cFIFoEeWKIdAlVGN13g"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_Y31cFYFoEeWKIdAlVGN13g" visible="false" type="7012">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_Y31cFoFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_Y31cF4FoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_Y31cGIFoEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y31cGYFoEeWKIdAlVGN13g"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_Y31cGoFoEeWKIdAlVGN13g" visible="false" type="7013">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_Y31cG4FoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_Y31cHIFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_Y31cHYFoEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y31cHoFoEeWKIdAlVGN13g"/>

-          </children>

-          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_K3ARUA53EeWvS4pMPcwguQ"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y301AYFoEeWKIdAlVGN13g" x="271" y="188" width="100"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_Z1dh8IFoEeWKIdAlVGN13g" type="3010">

-          <children xmi:type="notation:DecorationNode" xmi:id="_Z1eJAIFoEeWKIdAlVGN13g" type="5014"/>

-          <children xmi:type="notation:DecorationNode" xmi:id="_Z1eJAYFoEeWKIdAlVGN13g" type="8518">

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_Z1eJAoFoEeWKIdAlVGN13g" y="5"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_Z1eJA4FoEeWKIdAlVGN13g" visible="false" type="7011">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_Z1eJBIFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_Z1eJBYFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_Z1eJBoFoEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z1eJB4FoEeWKIdAlVGN13g"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_Z1eJCIFoEeWKIdAlVGN13g" visible="false" type="7012">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_Z1eJCYFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_Z1eJCoFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_Z1eJC4FoEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z1eJDIFoEeWKIdAlVGN13g"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_Z1ewEIFoEeWKIdAlVGN13g" visible="false" type="7013">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_Z1ewEYFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_Z1ewEoFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_Z1ewE4FoEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z1ewFIFoEeWKIdAlVGN13g"/>

-          </children>

-          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_r9BzMAnmEeW356xdbh3U2Q"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z1dh8YFoEeWKIdAlVGN13g" x="344" y="551" width="155"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_aLPksIFoEeWKIdAlVGN13g" type="3010">

-          <children xmi:type="notation:DecorationNode" xmi:id="_aLQLwIFoEeWKIdAlVGN13g" type="5014"/>

-          <children xmi:type="notation:DecorationNode" xmi:id="_aLQLwYFoEeWKIdAlVGN13g" type="8518">

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_aLQLwoFoEeWKIdAlVGN13g" y="5"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_aLQLw4FoEeWKIdAlVGN13g" visible="false" type="7011">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_aLQLxIFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_aLQLxYFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_aLQLxoFoEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aLQLx4FoEeWKIdAlVGN13g"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_aLQLyIFoEeWKIdAlVGN13g" visible="false" type="7012">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_aLQLyYFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_aLQLyoFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_aLQLy4FoEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aLQLzIFoEeWKIdAlVGN13g"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_aLQLzYFoEeWKIdAlVGN13g" visible="false" type="7013">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_aLQLzoFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_aLQLz4FoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_aLQL0IFoEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aLQL0YFoEeWKIdAlVGN13g"/>

-          </children>

-          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_rhzPwAnmEeW356xdbh3U2Q"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aLPksYFoEeWKIdAlVGN13g" x="710" y="552" width="216"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_bQf8kIFoEeWKIdAlVGN13g" type="3010">

-          <children xmi:type="notation:DecorationNode" xmi:id="_bQgjoIFoEeWKIdAlVGN13g" type="5014"/>

-          <children xmi:type="notation:DecorationNode" xmi:id="_bQgjoYFoEeWKIdAlVGN13g" type="8518">

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_bQgjooFoEeWKIdAlVGN13g" y="5"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_bQgjo4FoEeWKIdAlVGN13g" type="7011">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nGc24oFoEeWKIdAlVGN13g" source="PapyrusCSSForceValue">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nGc244FoEeWKIdAlVGN13g" key="visible" value="true"/>

-            </eAnnotations>

-            <children xmi:type="notation:Shape" xmi:id="_JixZwIFsEeWKIdAlVGN13g" type="3012">

-              <styles xmi:type="notation:StringListValueStyle" xmi:id="_J0gqAIFsEeWKIdAlVGN13g" name="maskLabel">

-                <stringListValue>name</stringListValue>

-                <stringListValue>derived</stringListValue>

-                <stringListValue>multiplicity</stringListValue>

-                <stringListValue>type</stringListValue>

-              </styles>

-              <element xmi:type="uml:Property" href="esfsafetyconcepts_metamodel.uml#_JiaNYIFsEeWKIdAlVGN13g"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_JixZwYFsEeWKIdAlVGN13g"/>

-            </children>

-            <children xmi:type="notation:Shape" xmi:id="_KtjK0IFsEeWKIdAlVGN13g" type="3012">

-              <styles xmi:type="notation:StringListValueStyle" xmi:id="_K4xjYIFsEeWKIdAlVGN13g" name="maskLabel">

-                <stringListValue>name</stringListValue>

-                <stringListValue>derived</stringListValue>

-                <stringListValue>multiplicity</stringListValue>

-                <stringListValue>type</stringListValue>

-              </styles>

-              <element xmi:type="uml:Property" href="esfsafetyconcepts_metamodel.uml#_KtLXYIFsEeWKIdAlVGN13g"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_KtjK0YFsEeWKIdAlVGN13g"/>

-            </children>

-            <styles xmi:type="notation:TitleStyle" xmi:id="_bQgjpIFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_bQgjpYFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_bQgjpoFoEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bQgjp4FoEeWKIdAlVGN13g"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_bQgjqIFoEeWKIdAlVGN13g" visible="false" type="7012">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_bQgjqYFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_bQgjqoFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_bQgjq4FoEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bQgjrIFoEeWKIdAlVGN13g"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_bQgjrYFoEeWKIdAlVGN13g" visible="false" type="7013">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_bQgjroFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_bQgjr4FoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_bQgjsIFoEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bQgjsYFoEeWKIdAlVGN13g"/>

-          </children>

-          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_wMyYAIFiEeWKIdAlVGN13g"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bQf8kYFoEeWKIdAlVGN13g" x="164" y="413" width="265"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_b9uO8IFoEeWKIdAlVGN13g" type="3010">

-          <children xmi:type="notation:DecorationNode" xmi:id="_b9u2AIFoEeWKIdAlVGN13g" type="5014"/>

-          <children xmi:type="notation:DecorationNode" xmi:id="_b9u2AYFoEeWKIdAlVGN13g" type="8518">

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_b9u2AoFoEeWKIdAlVGN13g" y="5"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_b9u2A4FoEeWKIdAlVGN13g" type="7011">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nGc24IFoEeWKIdAlVGN13g" source="PapyrusCSSForceValue">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nGc24YFoEeWKIdAlVGN13g" key="visible" value="true"/>

-            </eAnnotations>

-            <children xmi:type="notation:Shape" xmi:id="_7WUiIIFrEeWKIdAlVGN13g" type="3012">

-              <styles xmi:type="notation:StringListValueStyle" xmi:id="_-aVFsIFrEeWKIdAlVGN13g" name="maskLabel">

-                <stringListValue>name</stringListValue>

-                <stringListValue>derived</stringListValue>

-                <stringListValue>multiplicity</stringListValue>

-                <stringListValue>type</stringListValue>

-              </styles>

-              <element xmi:type="uml:Property" href="esfsafetyconcepts_metamodel.uml#_7V7gkIFrEeWKIdAlVGN13g"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_7WUiIYFrEeWKIdAlVGN13g"/>

-            </children>

-            <children xmi:type="notation:Shape" xmi:id="__8tecIFrEeWKIdAlVGN13g" type="3012">

-              <styles xmi:type="notation:StringListValueStyle" xmi:id="_ASUiEIFsEeWKIdAlVGN13g" name="maskLabel">

-                <stringListValue>name</stringListValue>

-                <stringListValue>derived</stringListValue>

-                <stringListValue>multiplicity</stringListValue>

-                <stringListValue>type</stringListValue>

-              </styles>

-              <element xmi:type="uml:Property" href="esfsafetyconcepts_metamodel.uml#__8W5IIFrEeWKIdAlVGN13g"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="__8tecYFrEeWKIdAlVGN13g"/>

-            </children>

-            <children xmi:type="notation:Shape" xmi:id="_Cmp8MIFsEeWKIdAlVGN13g" type="3012">

-              <styles xmi:type="notation:StringListValueStyle" xmi:id="_HlM50IFsEeWKIdAlVGN13g" name="maskLabel">

-                <stringListValue>name</stringListValue>

-                <stringListValue>derived</stringListValue>

-                <stringListValue>multiplicity</stringListValue>

-                <stringListValue>type</stringListValue>

-              </styles>

-              <element xmi:type="uml:Property" href="esfsafetyconcepts_metamodel.uml#_CmRhsIFsEeWKIdAlVGN13g"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_Cmp8MYFsEeWKIdAlVGN13g"/>

-            </children>

-            <styles xmi:type="notation:TitleStyle" xmi:id="_b9u2BIFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_b9u2BYFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_b9u2BoFoEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b9u2B4FoEeWKIdAlVGN13g"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_b9u2CIFoEeWKIdAlVGN13g" visible="false" type="7012">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_b9u2CYFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_b9u2CoFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_b9u2C4FoEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b9u2DIFoEeWKIdAlVGN13g"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_b9u2DYFoEeWKIdAlVGN13g" visible="false" type="7013">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_b9u2DoFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_b9u2D4FoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_b9u2EIFoEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b9u2EYFoEeWKIdAlVGN13g"/>

-          </children>

-          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_yT7DoIFiEeWKIdAlVGN13g"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b9uO8YFoEeWKIdAlVGN13g" x="405" y="23" width="227" height="125"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_cnXo4IFoEeWKIdAlVGN13g" type="3010">

-          <children xmi:type="notation:DecorationNode" xmi:id="_cnYP8IFoEeWKIdAlVGN13g" type="5014"/>

-          <children xmi:type="notation:DecorationNode" xmi:id="_cnYP8YFoEeWKIdAlVGN13g" type="8518">

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_cnYP8oFoEeWKIdAlVGN13g" y="5"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_cnYP84FoEeWKIdAlVGN13g" type="7011">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lg84sIFoEeWKIdAlVGN13g" source="PapyrusCSSForceValue">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lg84sYFoEeWKIdAlVGN13g" key="visible" value="true"/>

-            </eAnnotations>

-            <children xmi:type="notation:Shape" xmi:id="_Mvt24IFsEeWKIdAlVGN13g" type="3012">

-              <styles xmi:type="notation:StringListValueStyle" xmi:id="_NC878IFsEeWKIdAlVGN13g" name="maskLabel">

-                <stringListValue>name</stringListValue>

-                <stringListValue>derived</stringListValue>

-                <stringListValue>multiplicity</stringListValue>

-                <stringListValue>type</stringListValue>

-              </styles>

-              <element xmi:type="uml:Property" href="esfsafetyconcepts_metamodel.uml#_MvVcYIFsEeWKIdAlVGN13g"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_Mvt24YFsEeWKIdAlVGN13g"/>

-            </children>

-            <children xmi:type="notation:Shape" xmi:id="_NYJv4IFsEeWKIdAlVGN13g" type="3012">

-              <styles xmi:type="notation:StringListValueStyle" xmi:id="_NiYp8IFsEeWKIdAlVGN13g" name="maskLabel">

-                <stringListValue>name</stringListValue>

-                <stringListValue>derived</stringListValue>

-                <stringListValue>multiplicity</stringListValue>

-                <stringListValue>type</stringListValue>

-              </styles>

-              <element xmi:type="uml:Property" href="esfsafetyconcepts_metamodel.uml#_NXx8cIFsEeWKIdAlVGN13g"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_NYJv4YFsEeWKIdAlVGN13g"/>

-            </children>

-            <children xmi:type="notation:Shape" xmi:id="_N0dRYIFsEeWKIdAlVGN13g" type="3012">

-              <styles xmi:type="notation:StringListValueStyle" xmi:id="_OA-DYIFsEeWKIdAlVGN13g" name="maskLabel">

-                <stringListValue>name</stringListValue>

-                <stringListValue>derived</stringListValue>

-                <stringListValue>multiplicity</stringListValue>

-                <stringListValue>type</stringListValue>

-              </styles>

-              <element xmi:type="uml:Property" href="esfsafetyconcepts_metamodel.uml#_N0E24IFsEeWKIdAlVGN13g"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_N0dRYYFsEeWKIdAlVGN13g"/>

-            </children>

-            <children xmi:type="notation:Shape" xmi:id="_OSDMUIFsEeWKIdAlVGN13g" type="3012">

-              <styles xmi:type="notation:StringListValueStyle" xmi:id="_Or_WUIFsEeWKIdAlVGN13g" name="maskLabel">

-                <stringListValue>name</stringListValue>

-                <stringListValue>derived</stringListValue>

-                <stringListValue>multiplicity</stringListValue>

-                <stringListValue>type</stringListValue>

-              </styles>

-              <element xmi:type="uml:Property" href="esfsafetyconcepts_metamodel.uml#_ORrY4IFsEeWKIdAlVGN13g"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_OSDzYIFsEeWKIdAlVGN13g"/>

-            </children>

-            <children xmi:type="notation:Shape" xmi:id="_PFT1QIFsEeWKIdAlVGN13g" type="3012">

-              <styles xmi:type="notation:StringListValueStyle" xmi:id="_PYU34IFsEeWKIdAlVGN13g" name="maskLabel">

-                <stringListValue>name</stringListValue>

-                <stringListValue>derived</stringListValue>

-                <stringListValue>multiplicity</stringListValue>

-                <stringListValue>type</stringListValue>

-              </styles>

-              <element xmi:type="uml:Property" href="esfsafetyconcepts_metamodel.uml#_PE4XcIFsEeWKIdAlVGN13g"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_PFT1QYFsEeWKIdAlVGN13g"/>

-            </children>

-            <children xmi:type="notation:Shape" xmi:id="_PywxIIFsEeWKIdAlVGN13g" type="3012">

-              <styles xmi:type="notation:StringListValueStyle" xmi:id="_QFjxUIFsEeWKIdAlVGN13g" name="maskLabel">

-                <stringListValue>name</stringListValue>

-                <stringListValue>derived</stringListValue>

-                <stringListValue>multiplicity</stringListValue>

-                <stringListValue>type</stringListValue>

-              </styles>

-              <element xmi:type="uml:Property" href="esfsafetyconcepts_metamodel.uml#_PyWhcIFsEeWKIdAlVGN13g"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_PywxIYFsEeWKIdAlVGN13g"/>

-            </children>

-            <children xmi:type="notation:Shape" xmi:id="_RAlPIIFsEeWKIdAlVGN13g" type="3012">

-              <styles xmi:type="notation:StringListValueStyle" xmi:id="_RRBe4IFsEeWKIdAlVGN13g" name="maskLabel">

-                <stringListValue>name</stringListValue>

-                <stringListValue>derived</stringListValue>

-                <stringListValue>multiplicity</stringListValue>

-                <stringListValue>type</stringListValue>

-              </styles>

-              <element xmi:type="uml:Property" href="esfsafetyconcepts_metamodel.uml#_RALmgIFsEeWKIdAlVGN13g"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_RAlPIYFsEeWKIdAlVGN13g"/>

-            </children>

-            <styles xmi:type="notation:TitleStyle" xmi:id="_cnYP9IFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_cnYP9YFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_cnYP9oFoEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cnYP94FoEeWKIdAlVGN13g"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_cnYP-IFoEeWKIdAlVGN13g" visible="false" type="7012">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_cnYP-YFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_cnYP-oFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_cnYP-4FoEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cnYP_IFoEeWKIdAlVGN13g"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_cnY3AIFoEeWKIdAlVGN13g" visible="false" type="7013">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_cnY3AYFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_cnY3AoFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_cnY3A4FoEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cnY3BIFoEeWKIdAlVGN13g"/>

-          </children>

-          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_rCbzMAnmEeW356xdbh3U2Q"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cnXo4YFoEeWKIdAlVGN13g" x="624" y="187" width="280" height="181"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_0aWvMoFjEeWKIdAlVGN13g"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0aWvM4FjEeWKIdAlVGN13g"/>

-      </children>

-      <element xmi:type="uml:Package" href="esfsafetyconcepts_metamodel.uml#__2mtEAnjEeW356xdbh3U2Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0aWIIYFjEeWKIdAlVGN13g" x="7" y="53" width="1088" height="697"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_AMHtEIFkEeWKIdAlVGN13g" type="2007">

-      <children xmi:type="notation:DecorationNode" xmi:id="_AMIUIIFkEeWKIdAlVGN13g" type="5026"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_AMIUIYFkEeWKIdAlVGN13g" type="7016">

-        <children xmi:type="notation:Shape" xmi:id="_OgfNwIFoEeWKIdAlVGN13g" type="3010">

-          <children xmi:type="notation:DecorationNode" xmi:id="_OgfNwoFoEeWKIdAlVGN13g" type="5014"/>

-          <children xmi:type="notation:DecorationNode" xmi:id="_OgfNw4FoEeWKIdAlVGN13g" type="8518">

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_OgfNxIFoEeWKIdAlVGN13g" y="5"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_Ogf00IFoEeWKIdAlVGN13g" visible="false" type="7011">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_Ogf00YFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_Ogf00oFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_Ogf004FoEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ogf01IFoEeWKIdAlVGN13g"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_Ogf01YFoEeWKIdAlVGN13g" visible="false" type="7012">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_Ogf01oFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_Ogf014FoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_Ogf02IFoEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ogf02YFoEeWKIdAlVGN13g"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_Ogf02oFoEeWKIdAlVGN13g" visible="false" type="7013">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_Ogf024FoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_Ogf03IFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_Ogf03YFoEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ogf03oFoEeWKIdAlVGN13g"/>

-          </children>

-          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_iEHMUAnxEeW356xdbh3U2Q"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OgfNwYFoEeWKIdAlVGN13g" x="185" y="552" width="148"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_PupqAIFoEeWKIdAlVGN13g" type="3010">

-          <children xmi:type="notation:DecorationNode" xmi:id="_PupqAoFoEeWKIdAlVGN13g" type="5014"/>

-          <children xmi:type="notation:DecorationNode" xmi:id="_PupqA4FoEeWKIdAlVGN13g" type="8518">

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_PupqBIFoEeWKIdAlVGN13g" y="5"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_PupqBYFoEeWKIdAlVGN13g" visible="false" type="7011">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_PupqBoFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_PupqB4FoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_PupqCIFoEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PupqCYFoEeWKIdAlVGN13g"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_PupqCoFoEeWKIdAlVGN13g" visible="false" type="7012">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_PupqC4FoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_PupqDIFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_PupqDYFoEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PupqDoFoEeWKIdAlVGN13g"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_PupqD4FoEeWKIdAlVGN13g" visible="false" type="7013">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_PupqEIFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_PupqEYFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_PupqEoFoEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PupqE4FoEeWKIdAlVGN13g"/>

-          </children>

-          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_K29CoIFlEeWKIdAlVGN13g"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PupqAYFoEeWKIdAlVGN13g" x="185" y="299"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_Qctp4IFoEeWKIdAlVGN13g" type="3010">

-          <children xmi:type="notation:DecorationNode" xmi:id="_Qctp4oFoEeWKIdAlVGN13g" type="5014"/>

-          <children xmi:type="notation:DecorationNode" xmi:id="_Qctp44FoEeWKIdAlVGN13g" type="8518">

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_Qctp5IFoEeWKIdAlVGN13g" y="5"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_Qctp5YFoEeWKIdAlVGN13g" visible="false" type="7011">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_Qctp5oFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_Qctp54FoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_Qctp6IFoEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qctp6YFoEeWKIdAlVGN13g"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_QcuQ8IFoEeWKIdAlVGN13g" visible="false" type="7012">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_QcuQ8YFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_QcuQ8oFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_QcuQ84FoEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QcuQ9IFoEeWKIdAlVGN13g"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_QcuQ9YFoEeWKIdAlVGN13g" visible="false" type="7013">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_QcuQ9oFoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_QcuQ94FoEeWKIdAlVGN13g"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_QcuQ-IFoEeWKIdAlVGN13g"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QcuQ-YFoEeWKIdAlVGN13g"/>

-          </children>

-          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_aKwj4IFlEeWKIdAlVGN13g"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qctp4YFoEeWKIdAlVGN13g" x="185" y="166" width="148"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_AMIUIoFkEeWKIdAlVGN13g"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AMIUI4FkEeWKIdAlVGN13g"/>

-      </children>

-      <element xmi:type="uml:Package" href="esfsafetyconcepts_metamodel.uml#_IpBk8AnkEeW356xdbh3U2Q"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AMHtEYFkEeWKIdAlVGN13g" x="1105" y="53" width="374" height="697"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_suQmMYFjEeWKIdAlVGN13g" name="diagram_compatibility_version" stringValue="1.1.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_suQmMoFjEeWKIdAlVGN13g"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_suQmM4FjEeWKIdAlVGN13g">

-      <owner xmi:type="uml:Package" href="esfsafetyconcepts_metamodel.uml#__2mtEAnjEeW356xdbh3U2Q"/>

-    </styles>

-    <element xmi:type="uml:Package" href="esfsafetyconcepts_metamodel.uml#__2mtEAnjEeW356xdbh3U2Q"/>

-    <edges xmi:type="notation:Connector" xmi:id="_UW0vAIFoEeWKIdAlVGN13g" type="4002" source="_OgfNwIFoEeWKIdAlVGN13g" target="_PupqAIFoEeWKIdAlVGN13g" routing="Rectilinear">

-      <children xmi:type="notation:DecorationNode" xmi:id="_UW0vA4FoEeWKIdAlVGN13g" type="6007">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UW0vBIFoEeWKIdAlVGN13g" y="40"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_UW0vAYFoEeWKIdAlVGN13g"/>

-      <element xmi:type="uml:Generalization" href="esfsafetyconcepts_metamodel.uml#_PcmYEIFlEeWKIdAlVGN13g"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UW0vAoFoEeWKIdAlVGN13g" points="[3, -50, -9, 139]$[8, -139, -4, 50]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eViMIIFuEeWKIdAlVGN13g" id="(0.5,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eVizMIFuEeWKIdAlVGN13g" id="(0.5,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_CKnn0IFpEeWKIdAlVGN13g" type="4001" source="_YXH7sIFoEeWKIdAlVGN13g" target="_Y301AIFoEeWKIdAlVGN13g" routing="Rectilinear">

-      <children xmi:type="notation:DecorationNode" xmi:id="_CKnn04FpEeWKIdAlVGN13g" type="6001">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_CKnn1IFpEeWKIdAlVGN13g" y="-20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_CKnn1YFpEeWKIdAlVGN13g" type="6002">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_CKnn1oFpEeWKIdAlVGN13g" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_CKnn14FpEeWKIdAlVGN13g" type="6003">

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_FAQ_QIFpEeWKIdAlVGN13g" name="maskLabel">

-          <stringListValue>name</stringListValue>

-          <stringListValue>derived</stringListValue>

-        </styles>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_CKoO4IFpEeWKIdAlVGN13g" x="17" y="-20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_CKoO4YFpEeWKIdAlVGN13g" type="6005">

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_D02VAIFpEeWKIdAlVGN13g" name="maskLabel">

-          <stringListValue>name</stringListValue>

-          <stringListValue>derived</stringListValue>

-        </styles>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_CKoO4oFpEeWKIdAlVGN13g" x="-11" y="21"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_CKoO44FpEeWKIdAlVGN13g" type="6033">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_CKoO5IFpEeWKIdAlVGN13g" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_CKoO5YFpEeWKIdAlVGN13g" type="6034">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_CKoO5oFpEeWKIdAlVGN13g" y="-20"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_CKnn0YFpEeWKIdAlVGN13g"/>

-      <element xmi:type="uml:Association" href="esfsafetyconcepts_metamodel.uml#_CKJtwIFpEeWKIdAlVGN13g"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_CKnn0oFpEeWKIdAlVGN13g" points="[1, -5, -202, -4]$[197, -51, -6, -50]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CLSWMIFpEeWKIdAlVGN13g" id="(1.0,0.5)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CLS9QIFpEeWKIdAlVGN13g" id="(0.0,0.47)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_QxfxoIFpEeWKIdAlVGN13g" type="4001" source="_cnXo4IFoEeWKIdAlVGN13g" target="_Y301AIFoEeWKIdAlVGN13g" routing="Rectilinear">

-      <children xmi:type="notation:DecorationNode" xmi:id="_QxgYsIFpEeWKIdAlVGN13g" type="6001">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxgYsYFpEeWKIdAlVGN13g" y="-20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_QxgYsoFpEeWKIdAlVGN13g" type="6002">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxgYs4FpEeWKIdAlVGN13g" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_QxgYtIFpEeWKIdAlVGN13g" type="6003">

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_Sar9AIFpEeWKIdAlVGN13g" name="maskLabel">

-          <stringListValue>name</stringListValue>

-          <stringListValue>derived</stringListValue>

-        </styles>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxgYtYFpEeWKIdAlVGN13g" x="26" y="-15"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_QxgYtoFpEeWKIdAlVGN13g" type="6005">

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_S1-x4IFpEeWKIdAlVGN13g" name="maskLabel">

-          <stringListValue>name</stringListValue>

-          <stringListValue>derived</stringListValue>

-        </styles>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxgYt4FpEeWKIdAlVGN13g" x="12" y="17"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_QxgYuIFpEeWKIdAlVGN13g" type="6033">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxgYuYFpEeWKIdAlVGN13g" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_QxgYuoFpEeWKIdAlVGN13g" type="6034">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxgYu4FpEeWKIdAlVGN13g" y="-20"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_QxfxoYFpEeWKIdAlVGN13g"/>

-      <element xmi:type="uml:Association" href="esfsafetyconcepts_metamodel.uml#_Qw_bUIFpEeWKIdAlVGN13g"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxfxooFpEeWKIdAlVGN13g" points="[-40, -2, 325, 6]$[-372, -58, -7, -50]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QyHcsIFpEeWKIdAlVGN13g" id="(0.0,0.32044198895027626)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QyHcsYFpEeWKIdAlVGN13g" id="(1.0,0.57)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_pL_xoIFpEeWKIdAlVGN13g" type="4001" source="_cnXo4IFoEeWKIdAlVGN13g" target="_b9uO8IFoEeWKIdAlVGN13g" routing="Rectilinear">

-      <children xmi:type="notation:DecorationNode" xmi:id="_pL_xo4FpEeWKIdAlVGN13g" type="6001">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_pL_xpIFpEeWKIdAlVGN13g" y="-20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_pL_xpYFpEeWKIdAlVGN13g" type="6002">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_pL_xpoFpEeWKIdAlVGN13g" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_pL_xp4FpEeWKIdAlVGN13g" type="6003">

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_yZWSAIFpEeWKIdAlVGN13g" name="maskLabel">

-          <stringListValue>name</stringListValue>

-          <stringListValue>derived</stringListValue>

-        </styles>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_pL_xqIFpEeWKIdAlVGN13g" x="-12" y="68"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_pL_xqYFpEeWKIdAlVGN13g" type="6005">

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_yAUG8IFpEeWKIdAlVGN13g" name="maskLabel">

-          <stringListValue>name</stringListValue>

-          <stringListValue>derived</stringListValue>

-        </styles>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_pL_xqoFpEeWKIdAlVGN13g" x="-6" y="-14"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_pMAYsIFpEeWKIdAlVGN13g" type="6033">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_pMAYsYFpEeWKIdAlVGN13g" x="-20" y="-20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_pMAYsoFpEeWKIdAlVGN13g" type="6034">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_pMAYs4FpEeWKIdAlVGN13g" x="19" y="15"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_pL_xoYFpEeWKIdAlVGN13g"/>

-      <element xmi:type="uml:Association" href="esfsafetyconcepts_metamodel.uml#_pLeNMIFpEeWKIdAlVGN13g"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pL_xooFpEeWKIdAlVGN13g" points="[-4, 0, 196, 159]$[-4, -81, 196, 78]$[-200, -81, 0, 78]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pMsVMIFpEeWKIdAlVGN13g" id="(0.65,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pMsVMYFpEeWKIdAlVGN13g" id="(1.0,0.04)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_qQUVYIFpEeWKIdAlVGN13g" type="4001" source="_cnXo4IFoEeWKIdAlVGN13g" target="_bQf8kIFoEeWKIdAlVGN13g" routing="Rectilinear">

-      <children xmi:type="notation:DecorationNode" xmi:id="_qQUVY4FpEeWKIdAlVGN13g" type="6001">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_qQUVZIFpEeWKIdAlVGN13g" y="-20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_qQUVZYFpEeWKIdAlVGN13g" type="6002">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_qQUVZoFpEeWKIdAlVGN13g" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_qQUVZ4FpEeWKIdAlVGN13g" type="6003">

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_1887oIFpEeWKIdAlVGN13g" name="maskLabel">

-          <stringListValue>name</stringListValue>

-          <stringListValue>derived</stringListValue>

-        </styles>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_qQUVaIFpEeWKIdAlVGN13g" x="-20" y="66"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_qQUVaYFpEeWKIdAlVGN13g" type="6005">

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_xjx78IFpEeWKIdAlVGN13g" name="maskLabel">

-          <stringListValue>name</stringListValue>

-          <stringListValue>derived</stringListValue>

-        </styles>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_qQUVaoFpEeWKIdAlVGN13g" x="1" y="15"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_qQUVa4FpEeWKIdAlVGN13g" type="6033">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_qQUVbIFpEeWKIdAlVGN13g" x="-23" y="-11"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_qQU8cIFpEeWKIdAlVGN13g" type="6034">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_qQU8cYFpEeWKIdAlVGN13g" x="23" y="-30"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_qQUVYYFpEeWKIdAlVGN13g"/>

-      <element xmi:type="uml:Association" href="esfsafetyconcepts_metamodel.uml#_qP10QIFpEeWKIdAlVGN13g"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qQUVYoFpEeWKIdAlVGN13g" points="[2, 0, 240, -88]$[2, 105, 240, 17]$[-238, 105, 0, 17]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qRDVMIFpEeWKIdAlVGN13g" id="(0.15357142857142858,1.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qRDVMYFpEeWKIdAlVGN13g" id="(1.0,0.39090909090909093)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_rmuusIFpEeWKIdAlVGN13g" type="4001" source="_cnXo4IFoEeWKIdAlVGN13g" target="_aLPksIFoEeWKIdAlVGN13g" routing="Rectilinear">

-      <children xmi:type="notation:DecorationNode" xmi:id="_rmvVwIFpEeWKIdAlVGN13g" type="6001">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_rmvVwYFpEeWKIdAlVGN13g" y="-20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_rmvVwoFpEeWKIdAlVGN13g" type="6002">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_rmvVw4FpEeWKIdAlVGN13g" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_rmvVxIFpEeWKIdAlVGN13g" type="6003">

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_wWRnAIFpEeWKIdAlVGN13g" name="maskLabel">

-          <stringListValue>name</stringListValue>

-          <stringListValue>derived</stringListValue>

-        </styles>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_rmvVxYFpEeWKIdAlVGN13g" x="1" y="-44"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_rmvVxoFpEeWKIdAlVGN13g" type="6005">

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_wrfpEIFpEeWKIdAlVGN13g" name="maskLabel">

-          <stringListValue>name</stringListValue>

-          <stringListValue>derived</stringListValue>

-        </styles>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_rmvVx4FpEeWKIdAlVGN13g" x="7" y="61"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_rmvVyIFpEeWKIdAlVGN13g" type="6033">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_rmvVyYFpEeWKIdAlVGN13g" x="3" y="14"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_rmvVyoFpEeWKIdAlVGN13g" type="6034">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_rmvVy4FpEeWKIdAlVGN13g" y="-20"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_rmuusYFpEeWKIdAlVGN13g"/>

-      <element xmi:type="uml:Association" href="esfsafetyconcepts_metamodel.uml#_rmO_cIFpEeWKIdAlVGN13g"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rmuusoFpEeWKIdAlVGN13g" points="[2, 0, -49, -201]$[2, 201, -49, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rnhY4IFpEeWKIdAlVGN13g" id="(0.6642857142857143,1.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rnhY4YFpEeWKIdAlVGN13g" id="(0.46296296296296297,0.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_sWk3QIFpEeWKIdAlVGN13g" type="4001" source="_aLPksIFoEeWKIdAlVGN13g" target="_Z1dh8IFoEeWKIdAlVGN13g" routing="Rectilinear">

-      <children xmi:type="notation:DecorationNode" xmi:id="_sWleUIFpEeWKIdAlVGN13g" type="6001">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_sWleUYFpEeWKIdAlVGN13g" y="-20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_sWleUoFpEeWKIdAlVGN13g" type="6002">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_sWleU4FpEeWKIdAlVGN13g" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_sWleVIFpEeWKIdAlVGN13g" type="6003">

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_w8zbgIFpEeWKIdAlVGN13g" name="maskLabel">

-          <stringListValue>name</stringListValue>

-          <stringListValue>derived</stringListValue>

-        </styles>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_sWleVYFpEeWKIdAlVGN13g" x="24" y="-23"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_sWleVoFpEeWKIdAlVGN13g" type="6005">

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_xPg8IIFpEeWKIdAlVGN13g" name="maskLabel">

-          <stringListValue>name</stringListValue>

-          <stringListValue>derived</stringListValue>

-        </styles>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_sWleV4FpEeWKIdAlVGN13g" x="-26" y="17"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_sWleWIFpEeWKIdAlVGN13g" type="6033">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_sWleWYFpEeWKIdAlVGN13g" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_sWleWoFpEeWKIdAlVGN13g" type="6034">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_sWleW4FpEeWKIdAlVGN13g" x="10" y="-18"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_sWk3QYFpEeWKIdAlVGN13g"/>

-      <element xmi:type="uml:Association" href="esfsafetyconcepts_metamodel.uml#_sWD54IFpEeWKIdAlVGN13g"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sWk3QoFpEeWKIdAlVGN13g" points="[-24, 1, 227, -6]$[-173, 1, 78, -6]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sXgrYIFpEeWKIdAlVGN13g" id="(0.0,0.42)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sXgrYYFpEeWKIdAlVGN13g" id="(1.0,0.43)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_tDwGUIFpEeWKIdAlVGN13g" type="4001" source="_Y301AIFoEeWKIdAlVGN13g" target="_b9uO8IFoEeWKIdAlVGN13g" routing="Rectilinear">

-      <children xmi:type="notation:DecorationNode" xmi:id="_tDwGU4FpEeWKIdAlVGN13g" type="6001">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_tDwGVIFpEeWKIdAlVGN13g" y="-20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_tDwGVYFpEeWKIdAlVGN13g" type="6002">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_tDwGVoFpEeWKIdAlVGN13g" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_tDwGV4FpEeWKIdAlVGN13g" type="6003">

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_zi57EIFpEeWKIdAlVGN13g" name="maskLabel">

-          <stringListValue>name</stringListValue>

-          <stringListValue>derived</stringListValue>

-        </styles>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_tDwGWIFpEeWKIdAlVGN13g" x="2" y="37"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_tDwGWYFpEeWKIdAlVGN13g" type="6005">

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_z4QgAIFpEeWKIdAlVGN13g" name="maskLabel">

-          <stringListValue>name</stringListValue>

-          <stringListValue>derived</stringListValue>

-        </styles>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_tDwGWoFpEeWKIdAlVGN13g" x="-29" y="-16"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_tDwGW4FpEeWKIdAlVGN13g" type="6033">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_tDwGXIFpEeWKIdAlVGN13g" x="-13" y="-12"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_tDwGXYFpEeWKIdAlVGN13g" type="6034">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_tDwtYIFpEeWKIdAlVGN13g" y="13"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_tDwGUYFpEeWKIdAlVGN13g"/>

-      <element xmi:type="uml:Association" href="esfsafetyconcepts_metamodel.uml#_tDLekIFpEeWKIdAlVGN13g"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tDwGUoFpEeWKIdAlVGN13g" points="[-1, 0, -92, 154]$[-1, -86, -92, 68]$[91, -86, 0, 68]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tEjXkIFpEeWKIdAlVGN13g" id="(0.43,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tEjXkYFpEeWKIdAlVGN13g" id="(0.0,0.088)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_t7Xq0IFpEeWKIdAlVGN13g" type="4001" source="_Y301AIFoEeWKIdAlVGN13g" target="_bQf8kIFoEeWKIdAlVGN13g" routing="Rectilinear">

-      <children xmi:type="notation:DecorationNode" xmi:id="_t7Xq04FpEeWKIdAlVGN13g" type="6001">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_t7Xq1IFpEeWKIdAlVGN13g" y="-20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_t7Xq1YFpEeWKIdAlVGN13g" type="6002">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_t7Xq1oFpEeWKIdAlVGN13g" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_t7Xq14FpEeWKIdAlVGN13g" type="6003">

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_zAfKgIFpEeWKIdAlVGN13g" name="maskLabel">

-          <stringListValue>name</stringListValue>

-          <stringListValue>derived</stringListValue>

-        </styles>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_t7Xq2IFpEeWKIdAlVGN13g" x="8" y="-31"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_t7YR4IFpEeWKIdAlVGN13g" type="6005">

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_ytkOgIFpEeWKIdAlVGN13g" name="maskLabel">

-          <stringListValue>name</stringListValue>

-          <stringListValue>derived</stringListValue>

-        </styles>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_t7YR4YFpEeWKIdAlVGN13g" x="-9" y="44"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_t7YR4oFpEeWKIdAlVGN13g" type="6033">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_t7YR44FpEeWKIdAlVGN13g" x="10" y="14"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_t7YR5IFpEeWKIdAlVGN13g" type="6034">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_t7YR5YFpEeWKIdAlVGN13g" x="-8" y="-9"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_t7Xq0YFpEeWKIdAlVGN13g"/>

-      <element xmi:type="uml:Association" href="esfsafetyconcepts_metamodel.uml#_t6ycAIFpEeWKIdAlVGN13g"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_t7Xq0oFpEeWKIdAlVGN13g" points="[40, 0, -54, -125]$[40, 125, -54, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_t8RCsIFpEeWKIdAlVGN13g" id="(0.08,1.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_t8RCsYFpEeWKIdAlVGN13g" id="(0.7905759162303665,0.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_Yt2K4IFuEeWKIdAlVGN13g" type="4001" source="_OgfNwIFoEeWKIdAlVGN13g" target="_aLPksIFoEeWKIdAlVGN13g" routing="Rectilinear">

-      <children xmi:type="notation:DecorationNode" xmi:id="_Yt2K44FuEeWKIdAlVGN13g" type="6001">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yt2K5IFuEeWKIdAlVGN13g" y="-20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_Yt2K5YFuEeWKIdAlVGN13g" type="6002">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yt2K5oFuEeWKIdAlVGN13g" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_Yt2K54FuEeWKIdAlVGN13g" type="6003">

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_jjrsAIFuEeWKIdAlVGN13g" name="maskLabel">

-          <stringListValue>name</stringListValue>

-          <stringListValue>derived</stringListValue>

-        </styles>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yt2K6IFuEeWKIdAlVGN13g" x="-15" y="-12"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_Yt2K6YFuEeWKIdAlVGN13g" type="6005">

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_j2JVAIFuEeWKIdAlVGN13g" name="maskLabel">

-          <stringListValue>name</stringListValue>

-          <stringListValue>derived</stringListValue>

-        </styles>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yt2K6oFuEeWKIdAlVGN13g" x="-10" y="19"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_Yt2K64FuEeWKIdAlVGN13g" type="6033">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yt2K7IFuEeWKIdAlVGN13g" x="-23" y="15"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_Yt2K7YFuEeWKIdAlVGN13g" type="6034">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yt2K7oFuEeWKIdAlVGN13g" x="32" y="-17"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_Yt2K4YFuEeWKIdAlVGN13g"/>

-      <element xmi:type="uml:Association" href="esfsafetyconcepts_metamodel.uml#_YtBrgIFuEeWKIdAlVGN13g"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Yt2K4oFuEeWKIdAlVGN13g" points="[-11, -2, 436, 0]$[-435, -3, 12, -1]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YuttkIFuEeWKIdAlVGN13g" id="(0.0,0.44)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YuttkYFuEeWKIdAlVGN13g" id="(1.0,0.44)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_f8XAAIFuEeWKIdAlVGN13g" type="4001" source="_Qctp4IFoEeWKIdAlVGN13g" target="_cnXo4IFoEeWKIdAlVGN13g" routing="Rectilinear">

-      <children xmi:type="notation:DecorationNode" xmi:id="_f8XAA4FuEeWKIdAlVGN13g" type="6001">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_f8XABIFuEeWKIdAlVGN13g" y="-20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_f8XABYFuEeWKIdAlVGN13g" type="6002">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_f8XABoFuEeWKIdAlVGN13g" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_f8XAB4FuEeWKIdAlVGN13g" type="6003">

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_lQaTkIFuEeWKIdAlVGN13g" name="maskLabel">

-          <stringListValue>name</stringListValue>

-          <stringListValue>derived</stringListValue>

-        </styles>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_f8XACIFuEeWKIdAlVGN13g" x="-2" y="-13"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_f8XnEIFuEeWKIdAlVGN13g" type="6005">

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_kasMgIFuEeWKIdAlVGN13g" name="maskLabel">

-          <stringListValue>name</stringListValue>

-          <stringListValue>derived</stringListValue>

-        </styles>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_f8XnEYFuEeWKIdAlVGN13g" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_f8XnEoFuEeWKIdAlVGN13g" type="6033">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_f8XnE4FuEeWKIdAlVGN13g" x="-36" y="16"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_f8XnFIFuEeWKIdAlVGN13g" type="6034">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_f8XnFYFuEeWKIdAlVGN13g" x="34" y="-19"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_f8XAAYFuEeWKIdAlVGN13g"/>

-      <element xmi:type="uml:Association" href="esfsafetyconcepts_metamodel.uml#_f7ePMIFuEeWKIdAlVGN13g"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_f8XAAoFuEeWKIdAlVGN13g" points="[-7, 9, 433, 0]$[-412, -3, 28, -12]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f9XFkIFuEeWKIdAlVGN13g" id="(0.0,0.64)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f9XFkYFuEeWKIdAlVGN13g" id="(1.0,0.23756906077348067)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_gjpCcIFuEeWKIdAlVGN13g" type="4001" source="_PupqAIFoEeWKIdAlVGN13g" target="_cnXo4IFoEeWKIdAlVGN13g" routing="Rectilinear">

-      <children xmi:type="notation:DecorationNode" xmi:id="_gjpCc4FuEeWKIdAlVGN13g" type="6001">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_gjpCdIFuEeWKIdAlVGN13g" y="-20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_gjpCdYFuEeWKIdAlVGN13g" type="6002">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_gjpCdoFuEeWKIdAlVGN13g" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_gjpCd4FuEeWKIdAlVGN13g" type="6003">

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_kuKiIIFuEeWKIdAlVGN13g" name="maskLabel">

-          <stringListValue>name</stringListValue>

-          <stringListValue>derived</stringListValue>

-        </styles>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_gjpCeIFuEeWKIdAlVGN13g" x="42" y="-19"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_gjpCeYFuEeWKIdAlVGN13g" type="6005">

-        <styles xmi:type="notation:StringListValueStyle" xmi:id="_kGVtIIFuEeWKIdAlVGN13g" name="maskLabel"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_gjpCeoFuEeWKIdAlVGN13g" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_gjpCe4FuEeWKIdAlVGN13g" type="6033">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_gjpCfIFuEeWKIdAlVGN13g" x="-40" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_gjpCfYFuEeWKIdAlVGN13g" type="6034">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_gjpCfoFuEeWKIdAlVGN13g" x="47" y="-15"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_gjpCcYFuEeWKIdAlVGN13g"/>

-      <element xmi:type="uml:Association" href="esfsafetyconcepts_metamodel.uml#_giyG0IFuEeWKIdAlVGN13g"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_gjpCcoFuEeWKIdAlVGN13g" points="[-13, -1, 448, 0]$[-418, 18, 43, 19]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gkldoIFuEeWKIdAlVGN13g" id="(0.0,0.22)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gkldoYFuEeWKIdAlVGN13g" id="(1.0,0.7403314917127072)"/>

-    </edges>

-  </notation:Diagram>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
+  <notation:Diagram xmi:id="_li4hoAnjEeW356xdbh3U2Q" type="PapyrusUMLClassDiagram" name="ESFSafetyConcepts Overview Diagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_nUXtYAnjEeW356xdbh3U2Q" type="2005" fillColor="8047085">
+      <children xmi:type="notation:DecorationNode" xmi:id="_nUYUcAnjEeW356xdbh3U2Q" type="5020"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_nUY7gAnjEeW356xdbh3U2Q" type="7009">
+        <children xmi:type="notation:Shape" xmi:id="__2pwYAnjEeW356xdbh3U2Q" type="3009" fillColor="12632256">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_cmjYQIFiEeWKIdAlVGN13g" source="PapyrusHyperLink_Page" references="__t0IAAnkEeW356xdbh3U2Q">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cmjYQYFiEeWKIdAlVGN13g" key="tooltip_text" value="SInterations Overview Diagram"/>
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cmjYQoFiEeWKIdAlVGN13g" key="pageName" value="PapyrusHyperLink_Page"/>
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cmjYQ4FiEeWKIdAlVGN13g" key="is_default_navigation" value="true"/>
+          </eAnnotations>
+          <children xmi:type="notation:DecorationNode" xmi:id="__2qXcAnjEeW356xdbh3U2Q" type="5017"/>
+          <children xmi:type="notation:DecorationNode" xmi:id="__2qXcQnjEeW356xdbh3U2Q" type="7010">
+            <styles xmi:type="notation:TitleStyle" xmi:id="__2qXcgnjEeW356xdbh3U2Q"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="__2qXcwnjEeW356xdbh3U2Q"/>
+          </children>
+          <element xmi:type="uml:Package" href="esfsafetyconcepts_metamodel.uml#__2mtEAnjEeW356xdbh3U2Q"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="__2pwYQnjEeW356xdbh3U2Q" x="42" y="54"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_IpEBMAnkEeW356xdbh3U2Q" type="3009" fillColor="12632256">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yLuToAnyEeW356xdbh3U2Q" source="PapyrusHyperLink_Page" references="_bXP2QAnyEeW356xdbh3U2Q">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yLuToQnyEeW356xdbh3U2Q" key="tooltip_text" value="SREcommendations Overview Diagram"/>
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yLuTognyEeW356xdbh3U2Q" key="pageName" value="PapyrusHyperLink_Page"/>
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yLuTownyEeW356xdbh3U2Q" key="is_default_navigation" value="true"/>
+          </eAnnotations>
+          <children xmi:type="notation:DecorationNode" xmi:id="_IpEoQAnkEeW356xdbh3U2Q" type="5017"/>
+          <children xmi:type="notation:DecorationNode" xmi:id="_IpEoQQnkEeW356xdbh3U2Q" type="7010">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_IpEoQgnkEeW356xdbh3U2Q"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IpEoQwnkEeW356xdbh3U2Q"/>
+          </children>
+          <element xmi:type="uml:Package" href="esfsafetyconcepts_metamodel.uml#_IpBk8AnkEeW356xdbh3U2Q"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IpEBMQnkEeW356xdbh3U2Q" x="274" y="54"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_nUY7gQnjEeW356xdbh3U2Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nUY7ggnjEeW356xdbh3U2Q"/>
+      </children>
+      <element xmi:type="uml:Model" href="esfsafetyconcepts_metamodel.uml#_yvDioAnQEeW356xdbh3U2Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nUXtYQnjEeW356xdbh3U2Q" x="25" y="312" width="546" height="241"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_EWP2EIFiEeWKIdAlVGN13g" type="2005" fillColor="8905185">
+      <children xmi:type="notation:DecorationNode" xmi:id="_EWQdIIFiEeWKIdAlVGN13g" type="5020"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_EWREMIFiEeWKIdAlVGN13g" type="7009">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_EWREMYFiEeWKIdAlVGN13g"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EWREMoFiEeWKIdAlVGN13g"/>
+      </children>
+      <element xmi:type="uml:Model" href="platform:/resource/org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml#_-NKksAnQEeW356xdbh3U2Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EWP2EYFiEeWKIdAlVGN13g" x="402" y="175" width="169"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_F5o7cIFiEeWKIdAlVGN13g" type="2005" fillColor="13420443">
+      <children xmi:type="notation:DecorationNode" xmi:id="_F5pigIFiEeWKIdAlVGN13g" type="5020"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_F5pigYFiEeWKIdAlVGN13g" type="7009">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_F5pigoFiEeWKIdAlVGN13g"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_F5pig4FiEeWKIdAlVGN13g"/>
+      </children>
+      <element xmi:type="uml:Model" href="platform:/resource/org.polarsys.esf.core.metamodel.esfbehaviours/src/main/resources/metamodel/esfbehaviours_metamodel.uml#_IYSU4AnREeW356xdbh3U2Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_F5o7cYFiEeWKIdAlVGN13g" x="211" y="175" width="169"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_ycSdwISJEeWOntSnNos8Xg" type="2005" fillColor="12621752">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ycUS8ISJEeWOntSnNos8Xg" type="5020"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_ycU6AISJEeWOntSnNos8Xg" type="7009">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ycU6AYSJEeWOntSnNos8Xg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ycU6AoSJEeWOntSnNos8Xg"/>
+      </children>
+      <element xmi:type="uml:Model" href="platform:/resource/org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_VB4SINLoEeSb47LgOrWUpg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ycSdwYSJEeWOntSnNos8Xg" x="25" y="175" width="169"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_li4hoQnjEeW356xdbh3U2Q" name="diagram_compatibility_version" stringValue="1.1.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_li4hognjEeW356xdbh3U2Q"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_li4hownjEeW356xdbh3U2Q">
+      <owner xmi:type="uml:Model" href="esfsafetyconcepts_metamodel.uml#_yvDioAnQEeW356xdbh3U2Q"/>
+    </styles>
+    <element xmi:type="uml:Model" href="esfsafetyconcepts_metamodel.uml#_yvDioAnQEeW356xdbh3U2Q"/>
+    <edges xmi:type="notation:Connector" xmi:id="_BtedAIFiEeWKIdAlVGN13g" type="4008" source="__2pwYAnjEeW356xdbh3U2Q" target="_IpEBMAnkEeW356xdbh3U2Q" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_BtfEEIFiEeWKIdAlVGN13g" type="6026">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_BtfEEYFiEeWKIdAlVGN13g" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_BtfEEoFiEeWKIdAlVGN13g" type="6027">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_BtfEE4FiEeWKIdAlVGN13g" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_BtedAYFiEeWKIdAlVGN13g"/>
+      <element xmi:type="uml:Dependency" href="esfsafetyconcepts_metamodel.uml#_BtHQoIFiEeWKIdAlVGN13g"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BtedAoFiEeWKIdAlVGN13g" points="[9, 0, -46, 0]$[41, -1, -14, -1]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Btww4IFiEeWKIdAlVGN13g" id="(1.0,0.49)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Btww4YFiEeWKIdAlVGN13g" id="(0.0,0.49)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_C1M6EIFiEeWKIdAlVGN13g" type="4008" source="_IpEBMAnkEeW356xdbh3U2Q" target="__2pwYAnjEeW356xdbh3U2Q" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_C1NhIIFiEeWKIdAlVGN13g" type="6026">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_C1NhIYFiEeWKIdAlVGN13g" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_C1NhIoFiEeWKIdAlVGN13g" type="6027">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_C1NhI4FiEeWKIdAlVGN13g" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_C1M6EYFiEeWKIdAlVGN13g"/>
+      <element xmi:type="uml:Dependency" href="esfsafetyconcepts_metamodel.uml#_C1As0IFiEeWKIdAlVGN13g"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_C1M6EoFiEeWKIdAlVGN13g" points="[-4, 0, 49, 0]$[-36, 5, 17, 5]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_C1gcEIFiEeWKIdAlVGN13g" id="(0.0,0.76)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_C1hDIIFiEeWKIdAlVGN13g" id="(1.0,0.76)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_RVabMIFiEeWKIdAlVGN13g" type="4008" source="_nUXtYAnjEeW356xdbh3U2Q" target="_F5o7cIFiEeWKIdAlVGN13g" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_RVbCQIFiEeWKIdAlVGN13g" type="6026">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_RVbCQYFiEeWKIdAlVGN13g" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_RVbCQoFiEeWKIdAlVGN13g" type="6027">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_RVbCQ4FiEeWKIdAlVGN13g" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_RVabMYFiEeWKIdAlVGN13g"/>
+      <element xmi:type="uml:Dependency" href="esfsafetyconcepts_metamodel.uml#_RVMYwIFiEeWKIdAlVGN13g"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_RVabMoFiEeWKIdAlVGN13g" points="[112, 26, 0, 63]$[112, -37, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RV3uMIFiEeWKIdAlVGN13g" id="(0.2838827838827839,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RV3uMYFiEeWKIdAlVGN13g" id="(0.47928994082840237,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_R5SkUIFiEeWKIdAlVGN13g" type="4008" source="_nUXtYAnjEeW356xdbh3U2Q" target="_EWP2EIFiEeWKIdAlVGN13g" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_R5TLYIFiEeWKIdAlVGN13g" type="6026">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_R5TLYYFiEeWKIdAlVGN13g" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_R5TLYoFiEeWKIdAlVGN13g" type="6027">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_R5TLY4FiEeWKIdAlVGN13g" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_R5SkUYFiEeWKIdAlVGN13g"/>
+      <element xmi:type="uml:Dependency" href="esfsafetyconcepts_metamodel.uml#_R4_pYIFiEeWKIdAlVGN13g"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_R5SkUoFiEeWKIdAlVGN13g" points="[18, 26, -5, 63]$[18, -37, -5, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_R5y6oIFiEeWKIdAlVGN13g" id="(0.7864583333333334,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_R5y6oYFiEeWKIdAlVGN13g" id="(0.445,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_459r0ISJEeWOntSnNos8Xg" type="4008" source="_nUXtYAnjEeW356xdbh3U2Q" target="_ycSdwISJEeWOntSnNos8Xg">
+      <children xmi:type="notation:DecorationNode" xmi:id="_45-S4ISJEeWOntSnNos8Xg" type="6026">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_45-S4YSJEeWOntSnNos8Xg" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_45-S4oSJEeWOntSnNos8Xg" type="6027">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_45-S44SJEeWOntSnNos8Xg" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_459r0YSJEeWOntSnNos8Xg"/>
+      <element xmi:type="uml:Dependency" href="esfsafetyconcepts_metamodel.uml#_45yssISJEeWOntSnNos8Xg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_459r0oSJEeWOntSnNos8Xg" points="[-4, -2, 0, 78]$[12, -65, 16, 15]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_46bl4ISJEeWOntSnNos8Xg" id="(0.21245421245421245,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_46bl4YSJEeWOntSnNos8Xg" id="(0.6863905325443787,1.0)"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="__t0IAAnkEeW356xdbh3U2Q" type="PapyrusUMLClassDiagram" name="SDysfunctions Overview Diagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_AwGEYAnlEeW356xdbh3U2Q" type="2007" fillColor="12632256">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xJO8sIFjEeWKIdAlVGN13g" source="PapyrusHyperLink_Page" references="_suQmMIFjEeWKIdAlVGN13g">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xJO8sYFjEeWKIdAlVGN13g" key="tooltip_text" value="SDysfunctions Diagram"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xJO8soFjEeWKIdAlVGN13g" key="pageName" value="PapyrusHyperLink_Page"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xJO8s4FjEeWKIdAlVGN13g" key="is_default_navigation" value="true"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xJPjwIFjEeWKIdAlVGN13g" source="PapyrusHyperLink_Page" references="_li4hoAnjEeW356xdbh3U2Q">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xJPjwYFjEeWKIdAlVGN13g" key="tooltip_text" value="SafetyConcepts Overview Diagram"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xJPjwoFjEeWKIdAlVGN13g" key="pageName" value="PapyrusHyperLink_Page"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xJPjw4FjEeWKIdAlVGN13g" key="is_default_navigation" value="false"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_AwH5kAnlEeW356xdbh3U2Q" type="5026"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_AwH5kQnlEeW356xdbh3U2Q" type="7016">
+        <children xmi:type="notation:Shape" xmi:id="_quYOwAnmEeW356xdbh3U2Q" type="3010">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_f_42UAnnEeW356xdbh3U2Q" source="PapyrusCSSForceValue">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_f_5dYAnnEeW356xdbh3U2Q" key="fillColor" value="true"/>
+          </eAnnotations>
+          <children xmi:type="notation:DecorationNode" xmi:id="_quY10AnmEeW356xdbh3U2Q" type="5014"/>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_quY10QnmEeW356xdbh3U2Q" visible="false" type="7011">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_quY10gnmEeW356xdbh3U2Q"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_quY10wnmEeW356xdbh3U2Q"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_quY11AnmEeW356xdbh3U2Q"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_quY11QnmEeW356xdbh3U2Q"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_quY11gnmEeW356xdbh3U2Q" visible="false" type="7012">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_quZc4AnmEeW356xdbh3U2Q"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_quZc4QnmEeW356xdbh3U2Q"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_quZc4gnmEeW356xdbh3U2Q"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_quZc4wnmEeW356xdbh3U2Q"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_quZc5AnmEeW356xdbh3U2Q" visible="false" type="7013">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_quZc5QnmEeW356xdbh3U2Q"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_quZc5gnmEeW356xdbh3U2Q"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_quZc5wnmEeW356xdbh3U2Q"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_quZc6AnmEeW356xdbh3U2Q"/>
+          </children>
+          <children xmi:type="notation:DecorationNode" xmi:id="_MHQ4IIFeEeWKIdAlVGN13g" type="8518">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_MHQ4IYFeEeWKIdAlVGN13g" y="5"/>
+          </children>
+          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_quWZkAnmEeW356xdbh3U2Q"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_quYOwQnmEeW356xdbh3U2Q" x="201" y="14" width="585" height="56"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_rCePcAnmEeW356xdbh3U2Q" type="3010">
+          <children xmi:type="notation:DecorationNode" xmi:id="_rCe2gAnmEeW356xdbh3U2Q" type="5014"/>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_rCe2gQnmEeW356xdbh3U2Q" visible="false" type="7011">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_rCe2ggnmEeW356xdbh3U2Q"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_rCe2gwnmEeW356xdbh3U2Q"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_rCe2hAnmEeW356xdbh3U2Q"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rCe2hQnmEeW356xdbh3U2Q"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_rCfdkAnmEeW356xdbh3U2Q" visible="false" type="7012">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_rCfdkQnmEeW356xdbh3U2Q"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_rCfdkgnmEeW356xdbh3U2Q"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_rCfdkwnmEeW356xdbh3U2Q"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rCfdlAnmEeW356xdbh3U2Q"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_rCfdlQnmEeW356xdbh3U2Q" visible="false" type="7013">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_rCfdlgnmEeW356xdbh3U2Q"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_rCfdlwnmEeW356xdbh3U2Q"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_rCfdmAnmEeW356xdbh3U2Q"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rCfdmQnmEeW356xdbh3U2Q"/>
+          </children>
+          <children xmi:type="notation:DecorationNode" xmi:id="_MHQ4IoFeEeWKIdAlVGN13g" type="8518">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_MHQ4I4FeEeWKIdAlVGN13g" y="5"/>
+          </children>
+          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_rCbzMAnmEeW356xdbh3U2Q"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rCePcQnmEeW356xdbh3U2Q" x="14" y="103" width="127" height="50"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_rh1sAAnmEeW356xdbh3U2Q" type="3010">
+          <children xmi:type="notation:DecorationNode" xmi:id="_rh2TEAnmEeW356xdbh3U2Q" type="5014"/>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_rh2TEQnmEeW356xdbh3U2Q" visible="false" type="7011">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_rh2TEgnmEeW356xdbh3U2Q"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_rh2TEwnmEeW356xdbh3U2Q"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_rh2TFAnmEeW356xdbh3U2Q"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rh2TFQnmEeW356xdbh3U2Q"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_rh2TFgnmEeW356xdbh3U2Q" visible="false" type="7012">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_rh2TFwnmEeW356xdbh3U2Q"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_rh2TGAnmEeW356xdbh3U2Q"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_rh2TGQnmEeW356xdbh3U2Q"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rh2TGgnmEeW356xdbh3U2Q"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_rh2TGwnmEeW356xdbh3U2Q" visible="false" type="7013">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_rh26IAnmEeW356xdbh3U2Q"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_rh26IQnmEeW356xdbh3U2Q"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_rh26IgnmEeW356xdbh3U2Q"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rh26IwnmEeW356xdbh3U2Q"/>
+          </children>
+          <children xmi:type="notation:DecorationNode" xmi:id="_MHQ4JIFeEeWKIdAlVGN13g" type="8518">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_MHQ4JYFeEeWKIdAlVGN13g" y="5"/>
+          </children>
+          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_rhzPwAnmEeW356xdbh3U2Q"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rh1sAQnmEeW356xdbh3U2Q" x="308" y="103" width="127" height="50"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_r9EPcAnmEeW356xdbh3U2Q" type="3010">
+          <children xmi:type="notation:DecorationNode" xmi:id="_r9EPcgnmEeW356xdbh3U2Q" type="5014"/>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_r9EPcwnmEeW356xdbh3U2Q" visible="false" type="7011">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_r9E2gAnmEeW356xdbh3U2Q"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_r9E2gQnmEeW356xdbh3U2Q"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_r9E2ggnmEeW356xdbh3U2Q"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_r9E2gwnmEeW356xdbh3U2Q"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_r9E2hAnmEeW356xdbh3U2Q" visible="false" type="7012">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_r9E2hQnmEeW356xdbh3U2Q"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_r9E2hgnmEeW356xdbh3U2Q"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_r9E2hwnmEeW356xdbh3U2Q"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_r9E2iAnmEeW356xdbh3U2Q"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_r9E2iQnmEeW356xdbh3U2Q" visible="false" type="7013">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_r9E2ignmEeW356xdbh3U2Q"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_r9E2iwnmEeW356xdbh3U2Q"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_r9E2jAnmEeW356xdbh3U2Q"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_r9E2jQnmEeW356xdbh3U2Q"/>
+          </children>
+          <children xmi:type="notation:DecorationNode" xmi:id="_MHQ4JoFeEeWKIdAlVGN13g" type="8518">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_MHQ4J4FeEeWKIdAlVGN13g" y="5"/>
+          </children>
+          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_r9BzMAnmEeW356xdbh3U2Q"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_r9EPcQnmEeW356xdbh3U2Q" x="161" y="103" width="127" height="50"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_K3CtkA53EeWvS4pMPcwguQ" type="3010">
+          <children xmi:type="notation:DecorationNode" xmi:id="_K3Ctkg53EeWvS4pMPcwguQ" type="5014"/>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_K3DUoA53EeWvS4pMPcwguQ" visible="false" type="7011">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_K3DUoQ53EeWvS4pMPcwguQ"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_K3DUog53EeWvS4pMPcwguQ"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_K3DUow53EeWvS4pMPcwguQ"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K3DUpA53EeWvS4pMPcwguQ"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_K3DUpQ53EeWvS4pMPcwguQ" visible="false" type="7012">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_K3DUpg53EeWvS4pMPcwguQ"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_K3DUpw53EeWvS4pMPcwguQ"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_K3DUqA53EeWvS4pMPcwguQ"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K3DUqQ53EeWvS4pMPcwguQ"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_K3DUqg53EeWvS4pMPcwguQ" visible="false" type="7013">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_K3DUqw53EeWvS4pMPcwguQ"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_K3DUrA53EeWvS4pMPcwguQ"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_K3DUrQ53EeWvS4pMPcwguQ"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K3DUrg53EeWvS4pMPcwguQ"/>
+          </children>
+          <children xmi:type="notation:DecorationNode" xmi:id="_MHQ4KIFeEeWKIdAlVGN13g" type="8518">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_MHQ4KYFeEeWKIdAlVGN13g" y="5"/>
+          </children>
+          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_K3ARUA53EeWvS4pMPcwguQ"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K3CtkQ53EeWvS4pMPcwguQ" x="449" y="102" width="125" height="52"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_L9CsUA53EeWvS4pMPcwguQ" type="3010">
+          <children xmi:type="notation:DecorationNode" xmi:id="_L9CsUg53EeWvS4pMPcwguQ" type="5014"/>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_L9CsUw53EeWvS4pMPcwguQ" visible="false" type="7011">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_L9CsVA53EeWvS4pMPcwguQ"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_L9CsVQ53EeWvS4pMPcwguQ"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_L9CsVg53EeWvS4pMPcwguQ"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L9CsVw53EeWvS4pMPcwguQ"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_L9DTYA53EeWvS4pMPcwguQ" visible="false" type="7012">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_L9DTYQ53EeWvS4pMPcwguQ"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_L9DTYg53EeWvS4pMPcwguQ"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_L9DTYw53EeWvS4pMPcwguQ"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L9DTZA53EeWvS4pMPcwguQ"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_L9DTZQ53EeWvS4pMPcwguQ" visible="false" type="7013">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_L9DTZg53EeWvS4pMPcwguQ"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_L9DTZw53EeWvS4pMPcwguQ"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_L9DTaA53EeWvS4pMPcwguQ"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L9DTaQ53EeWvS4pMPcwguQ"/>
+          </children>
+          <children xmi:type="notation:DecorationNode" xmi:id="_MHQ4KoFeEeWKIdAlVGN13g" type="8518">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_MHQ4K4FeEeWKIdAlVGN13g" y="5"/>
+          </children>
+          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_L9BeMA53EeWvS4pMPcwguQ"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L9CsUQ53EeWvS4pMPcwguQ" x="876" y="102" width="125" height="52"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_wNIWQIFiEeWKIdAlVGN13g" type="3010">
+          <children xmi:type="notation:DecorationNode" xmi:id="_wNIWQoFiEeWKIdAlVGN13g" type="5014"/>
+          <children xmi:type="notation:DecorationNode" xmi:id="_wNIWQ4FiEeWKIdAlVGN13g" type="8518">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_wNIWRIFiEeWKIdAlVGN13g" y="5"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_wNI9UIFiEeWKIdAlVGN13g" visible="false" type="7011">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_wNI9UYFiEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_wNI9UoFiEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_wNI9U4FiEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wNI9VIFiEeWKIdAlVGN13g"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_wNI9VYFiEeWKIdAlVGN13g" visible="false" type="7012">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_wNI9VoFiEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_wNI9V4FiEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_wNI9WIFiEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wNI9WYFiEeWKIdAlVGN13g"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_wNI9WoFiEeWKIdAlVGN13g" visible="false" type="7013">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_wNI9W4FiEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_wNI9XIFiEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_wNI9XYFiEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wNI9XoFiEeWKIdAlVGN13g"/>
+          </children>
+          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_wMyYAIFiEeWKIdAlVGN13g"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wNIWQYFiEeWKIdAlVGN13g" x="734" y="103" width="127" height="50"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_yUPzwIFiEeWKIdAlVGN13g" type="3010">
+          <children xmi:type="notation:DecorationNode" xmi:id="_yUQa0IFiEeWKIdAlVGN13g" type="5014"/>
+          <children xmi:type="notation:DecorationNode" xmi:id="_yUQa0YFiEeWKIdAlVGN13g" type="8518">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_yUQa0oFiEeWKIdAlVGN13g" y="5"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_yUQa04FiEeWKIdAlVGN13g" visible="false" type="7011">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_yUQa1IFiEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_yUQa1YFiEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_yUQa1oFiEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yUQa14FiEeWKIdAlVGN13g"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_yUQa2IFiEeWKIdAlVGN13g" visible="false" type="7012">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_yUQa2YFiEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_yUQa2oFiEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_yUQa24FiEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yUQa3IFiEeWKIdAlVGN13g"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_yUQa3YFiEeWKIdAlVGN13g" visible="false" type="7013">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_yUQa3oFiEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_yUQa34FiEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_yUQa4IFiEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yUQa4YFiEeWKIdAlVGN13g"/>
+          </children>
+          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_yT7DoIFiEeWKIdAlVGN13g"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yUPzwYFiEeWKIdAlVGN13g" x="590" y="103" width="127" height="50"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_AwH5kgnlEeW356xdbh3U2Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AwH5kwnlEeW356xdbh3U2Q"/>
+      </children>
+      <element xmi:type="uml:Package" href="esfsafetyconcepts_metamodel.uml#__2mtEAnjEeW356xdbh3U2Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AwGEYQnlEeW356xdbh3U2Q" x="97" y="328" width="1039" height="215"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_MYVJAISKEeWOntSnNos8Xg" type="2005" fillColor="12621752">
+      <children xmi:type="notation:DecorationNode" xmi:id="_MYVJAoSKEeWOntSnNos8Xg" type="5020"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_MYVJA4SKEeWOntSnNos8Xg" type="7009">
+        <children xmi:type="notation:Shape" xmi:id="_OmXt4ISKEeWOntSnNos8Xg" type="3010">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9Dl-MISKEeWOntSnNos8Xg" source="PapyrusCSSForceValue">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9Dl-MYSKEeWOntSnNos8Xg" key="fillColor" value="true"/>
+          </eAnnotations>
+          <children xmi:type="notation:DecorationNode" xmi:id="_OmYU8ISKEeWOntSnNos8Xg" type="5014"/>
+          <children xmi:type="notation:DecorationNode" xmi:id="_OmYU8YSKEeWOntSnNos8Xg" type="8518">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_OmYU8oSKEeWOntSnNos8Xg" y="5"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_OmYU84SKEeWOntSnNos8Xg" visible="false" type="7011">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_OmYU9ISKEeWOntSnNos8Xg"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_OmYU9YSKEeWOntSnNos8Xg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_OmYU9oSKEeWOntSnNos8Xg"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OmYU94SKEeWOntSnNos8Xg"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_OmY8AISKEeWOntSnNos8Xg" visible="false" type="7012">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_OmY8AYSKEeWOntSnNos8Xg"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_OmY8AoSKEeWOntSnNos8Xg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_OmY8A4SKEeWOntSnNos8Xg"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OmY8BISKEeWOntSnNos8Xg"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_OmY8BYSKEeWOntSnNos8Xg" visible="false" type="7013">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_OmY8BoSKEeWOntSnNos8Xg"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_OmY8B4SKEeWOntSnNos8Xg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_OmY8CISKEeWOntSnNos8Xg"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OmY8CYSKEeWOntSnNos8Xg"/>
+          </children>
+          <element xmi:type="uml:Class" href="platform:/resource/org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_Q05ZgOjPEeSQI-4c5olYjA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OmXt4YSKEeWOntSnNos8Xg" x="85" y="32" width="208" height="56"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_MYVJBISKEeWOntSnNos8Xg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MYVJBYSKEeWOntSnNos8Xg"/>
+      </children>
+      <element xmi:type="uml:Model" href="platform:/resource/org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_VB4SINLoEeSb47LgOrWUpg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MYVJAYSKEeWOntSnNos8Xg" x="400" y="133" width="376" height="157"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="__t0IAQnkEeW356xdbh3U2Q" name="diagram_compatibility_version" stringValue="1.1.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="__t0IAgnkEeW356xdbh3U2Q"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="__t0IAwnkEeW356xdbh3U2Q">
+      <owner xmi:type="uml:Package" href="esfsafetyconcepts_metamodel.uml#__2mtEAnjEeW356xdbh3U2Q"/>
+    </styles>
+    <element xmi:type="uml:Package" href="esfsafetyconcepts_metamodel.uml#__2mtEAnjEeW356xdbh3U2Q"/>
+    <edges xmi:type="notation:Connector" xmi:id="_WUdS0AnnEeW356xdbh3U2Q" type="4002" source="_rh1sAAnmEeW356xdbh3U2Q" target="_quYOwAnmEeW356xdbh3U2Q" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_WUd54gnnEeW356xdbh3U2Q" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_WUd54wnnEeW356xdbh3U2Q" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_WUd54AnnEeW356xdbh3U2Q"/>
+      <element xmi:type="uml:Generalization" href="esfsafetyconcepts_metamodel.uml#_WUbdoAnnEeW356xdbh3U2Q"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_WUd54QnnEeW356xdbh3U2Q" points="[28, 0, 130, 33]$[28, -33, 130, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_A5IaoAqgEeWCRsSxON2IdQ" id="(0.2755905511811024,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_A5JBsAqgEeWCRsSxON2IdQ" id="(0.06837606837606838,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_UQuZwA53EeWvS4pMPcwguQ" type="4002" source="_K3CtkA53EeWvS4pMPcwguQ" target="_quYOwAnmEeW356xdbh3U2Q" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UQuZww53EeWvS4pMPcwguQ" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UQuZxA53EeWvS4pMPcwguQ" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_UQuZwQ53EeWvS4pMPcwguQ"/>
+      <element xmi:type="uml:Generalization" href="esfsafetyconcepts_metamodel.uml#_UQtLoA53EeWvS4pMPcwguQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UQuZwg53EeWvS4pMPcwguQ" points="[21, 0, -182, 32]$[21, -32, -182, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UQz5UA53EeWvS4pMPcwguQ" id="(0.352,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UQz5UQ53EeWvS4pMPcwguQ" id="(0.8461538461538461,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_Uqe9kA53EeWvS4pMPcwguQ" type="4002" source="_L9CsUA53EeWvS4pMPcwguQ" target="_quYOwAnmEeW356xdbh3U2Q" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UqfkoA53EeWvS4pMPcwguQ" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UqfkoQ53EeWvS4pMPcwguQ" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_Uqe9kQ53EeWvS4pMPcwguQ"/>
+      <element xmi:type="uml:Generalization" href="esfsafetyconcepts_metamodel.uml#_UqchUA53EeWvS4pMPcwguQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Uqe9kg53EeWvS4pMPcwguQ" points="[24, 0, 212, 32]$[24, -64, 212, -32]$[-110, -64, 78, -32]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Yh4F4A53EeWvS4pMPcwguQ" id="(0.16,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UqkdIA53EeWvS4pMPcwguQ" id="(0.8666666666666667,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_LYUVMIFjEeWKIdAlVGN13g" type="4002" source="_wNIWQIFiEeWKIdAlVGN13g" target="_quYOwAnmEeW356xdbh3U2Q" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_LYU8QIFjEeWKIdAlVGN13g" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_LYU8QYFjEeWKIdAlVGN13g" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_LYUVMYFjEeWKIdAlVGN13g"/>
+      <element xmi:type="uml:Generalization" href="esfsafetyconcepts_metamodel.uml#_LYGSwIFjEeWKIdAlVGN13g"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LYUVMoFjEeWKIdAlVGN13g" points="[-30, 0, 0, 33]$[-30, -33, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LYuk4IFjEeWKIdAlVGN13g" id="(0.5196850393700787,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LYuk4YFjEeWKIdAlVGN13g" id="(0.9726495726495726,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_MCSfQIFjEeWKIdAlVGN13g" type="4002" source="_yUPzwIFiEeWKIdAlVGN13g" target="_quYOwAnmEeW356xdbh3U2Q" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_MCSfQ4FjEeWKIdAlVGN13g" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_MCSfRIFjEeWKIdAlVGN13g" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_MCSfQYFjEeWKIdAlVGN13g"/>
+      <element xmi:type="uml:Generalization" href="esfsafetyconcepts_metamodel.uml#_MCG5EIFjEeWKIdAlVGN13g"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MCSfQoFjEeWKIdAlVGN13g" points="[15, 0, 14, 33]$[15, -33, 14, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MCsH4IFjEeWKIdAlVGN13g" id="(0.4251968503937008,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MCsH4YFjEeWKIdAlVGN13g" id="(0.7589743589743589,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_MpJD4IFjEeWKIdAlVGN13g" type="4002" source="_r9EPcAnmEeW356xdbh3U2Q" target="_quYOwAnmEeW356xdbh3U2Q" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_MpJD44FjEeWKIdAlVGN13g" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_MpJD5IFjEeWKIdAlVGN13g" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_MpJD4YFjEeWKIdAlVGN13g"/>
+      <element xmi:type="uml:Generalization" href="esfsafetyconcepts_metamodel.uml#_MoyekIFjEeWKIdAlVGN13g"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MpJD4oFjEeWKIdAlVGN13g" points="[22, 0, 11, 33]$[22, -33, 11, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MpkhsIFjEeWKIdAlVGN13g" id="(0.3543307086614173,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MpkhsYFjEeWKIdAlVGN13g" id="(0.02735042735042735,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_NT1msIFjEeWKIdAlVGN13g" type="4002" source="_rCePcAnmEeW356xdbh3U2Q" target="_quYOwAnmEeW356xdbh3U2Q" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_NT2NwIFjEeWKIdAlVGN13g" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_NT2NwYFjEeWKIdAlVGN13g" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_NT1msYFjEeWKIdAlVGN13g"/>
+      <element xmi:type="uml:Generalization" href="esfsafetyconcepts_metamodel.uml#_NTirwIFjEeWKIdAlVGN13g"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NT1msoFjEeWKIdAlVGN13g" points="[20, -10, -138, 67]$[142, -78, -16, -1]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NUS5sIFjEeWKIdAlVGN13g" id="(0.5118110236220472,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NUS5sYFjEeWKIdAlVGN13g" id="(0.0,0.5178571428571429)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_8VStwISKEeWOntSnNos8Xg" type="4002" source="_quYOwAnmEeW356xdbh3U2Q" target="_OmXt4ISKEeWOntSnNos8Xg" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_8VStw4SKEeWOntSnNos8Xg" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8VStxISKEeWOntSnNos8Xg" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_8VStwYSKEeWOntSnNos8Xg"/>
+      <element xmi:type="uml:Generalization" href="esfsafetyconcepts_metamodel.uml#_8VEEQISKEeWOntSnNos8Xg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8VStwoSKEeWOntSnNos8Xg" points="[-7, 0, -3, 149]$[-7, -121, -3, 28]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8VzrIISKEeWOntSnNos8Xg" id="(0.5042735042735043,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8VzrIYSKEeWOntSnNos8Xg" id="(0.4855769230769231,1.0)"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_bXP2QAnyEeW356xdbh3U2Q" type="PapyrusUMLClassDiagram" name="SRecommendations Overview Diagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_b366YAnyEeW356xdbh3U2Q" type="2007" fillColor="12632256">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_t2tbMAnyEeW356xdbh3U2Q" source="PapyrusHyperLink_Page" references="_li4hoAnjEeW356xdbh3U2Q">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t2tbMQnyEeW356xdbh3U2Q" key="tooltip_text" value="SafetyConcepts Overview Diagram"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t2tbMgnyEeW356xdbh3U2Q" key="pageName" value="PapyrusHyperLink_Page"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t2tbMwnyEeW356xdbh3U2Q" key="is_default_navigation" value="true"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_b37hcAnyEeW356xdbh3U2Q" type="5026"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_b37hcQnyEeW356xdbh3U2Q" type="7016">
+        <children xmi:type="notation:Shape" xmi:id="_dK92oAnyEeW356xdbh3U2Q" type="3010">
+          <children xmi:type="notation:DecorationNode" xmi:id="_dK-dsAnyEeW356xdbh3U2Q" type="5014"/>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_dK-dsQnyEeW356xdbh3U2Q" visible="false" type="7011">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_dK-dsgnyEeW356xdbh3U2Q"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_dK-dswnyEeW356xdbh3U2Q"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_dK-dtAnyEeW356xdbh3U2Q"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dK-dtQnyEeW356xdbh3U2Q"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_dK_EwAnyEeW356xdbh3U2Q" visible="false" type="7012">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_dK_EwQnyEeW356xdbh3U2Q"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_dK_EwgnyEeW356xdbh3U2Q"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_dK_EwwnyEeW356xdbh3U2Q"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dK_ExAnyEeW356xdbh3U2Q"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_dK_ExQnyEeW356xdbh3U2Q" visible="false" type="7013">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_dK_ExgnyEeW356xdbh3U2Q"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_dK_ExwnyEeW356xdbh3U2Q"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_dK_EyAnyEeW356xdbh3U2Q"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dK_EyQnyEeW356xdbh3U2Q"/>
+          </children>
+          <children xmi:type="notation:DecorationNode" xmi:id="_MF5mMIFeEeWKIdAlVGN13g" type="8518">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_MF5mMYFeEeWKIdAlVGN13g" y="5"/>
+          </children>
+          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_iEHMUAnxEeW356xdbh3U2Q"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dK92oQnyEeW356xdbh3U2Q" x="82" y="129" height="67"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_K3UPAIFlEeWKIdAlVGN13g" type="3010">
+          <children xmi:type="notation:DecorationNode" xmi:id="_K3UPAoFlEeWKIdAlVGN13g" type="5014"/>
+          <children xmi:type="notation:DecorationNode" xmi:id="_K3UPA4FlEeWKIdAlVGN13g" type="8518">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_K3UPBIFlEeWKIdAlVGN13g" y="5"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_K3UPBYFlEeWKIdAlVGN13g" visible="false" type="7011">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_K3UPBoFlEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_K3UPB4FlEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_K3UPCIFlEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K3UPCYFlEeWKIdAlVGN13g"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_K3UPCoFlEeWKIdAlVGN13g" visible="false" type="7012">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_K3UPC4FlEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_K3UPDIFlEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_K3UPDYFlEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K3UPDoFlEeWKIdAlVGN13g"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_K3UPD4FlEeWKIdAlVGN13g" visible="false" type="7013">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_K3UPEIFlEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_K3UPEYFlEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_K3UPEoFlEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K3UPE4FlEeWKIdAlVGN13g"/>
+          </children>
+          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_K29CoIFlEeWKIdAlVGN13g"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K3UPAYFlEeWKIdAlVGN13g" x="214" y="24" width="176" height="67"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_P32JoIFlEeWKIdAlVGN13g" type="3010">
+          <children xmi:type="notation:DecorationNode" xmi:id="_P32wsIFlEeWKIdAlVGN13g" type="5014"/>
+          <children xmi:type="notation:DecorationNode" xmi:id="_P32wsYFlEeWKIdAlVGN13g" type="8518">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_P32wsoFlEeWKIdAlVGN13g" y="5"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_P32ws4FlEeWKIdAlVGN13g" type="7011">
+            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1-ABUIFlEeWKIdAlVGN13g" source="PapyrusCSSForceValue">
+              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1-AoYIFlEeWKIdAlVGN13g" key="visible" value="true"/>
+            </eAnnotations>
+            <children xmi:type="notation:Shape" xmi:id="_4ma1EIFlEeWKIdAlVGN13g" type="3012">
+              <styles xmi:type="notation:StringListValueStyle" xmi:id="_-c1O0IFlEeWKIdAlVGN13g" name="maskLabel">
+                <stringListValue>name</stringListValue>
+                <stringListValue>derived</stringListValue>
+                <stringListValue>multiplicity</stringListValue>
+                <stringListValue>type</stringListValue>
+              </styles>
+              <element xmi:type="uml:Property" href="esfsafetyconcepts_metamodel.uml#_4mJvUIFlEeWKIdAlVGN13g"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_4ma1EYFlEeWKIdAlVGN13g"/>
+            </children>
+            <styles xmi:type="notation:TitleStyle" xmi:id="_P32wtIFlEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_P32wtYFlEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_P32wtoFlEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P32wt4FlEeWKIdAlVGN13g"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_P32wuIFlEeWKIdAlVGN13g" visible="false" type="7012">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_P32wuYFlEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_P32wuoFlEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_P32wu4FlEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P32wvIFlEeWKIdAlVGN13g"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_P32wvYFlEeWKIdAlVGN13g" visible="false" type="7013">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_P32wvoFlEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_P32wv4FlEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_P32wwIFlEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P32wwYFlEeWKIdAlVGN13g"/>
+          </children>
+          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_P3dvIIFlEeWKIdAlVGN13g"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P32JoYFlEeWKIdAlVGN13g" x="361" y="129" width="197" height="67"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_aLN24IFlEeWKIdAlVGN13g" type="3010">
+          <children xmi:type="notation:DecorationNode" xmi:id="_aLN24oFlEeWKIdAlVGN13g" type="5014"/>
+          <children xmi:type="notation:DecorationNode" xmi:id="_aLN244FlEeWKIdAlVGN13g" type="8518">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_aLN25IFlEeWKIdAlVGN13g" y="5"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_aLN25YFlEeWKIdAlVGN13g" visible="false" type="7011">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_aLN25oFlEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_aLN254FlEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_aLN26IFlEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aLN26YFlEeWKIdAlVGN13g"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_aLN26oFlEeWKIdAlVGN13g" visible="false" type="7012">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_aLOd8IFlEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_aLOd8YFlEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_aLOd8oFlEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aLOd84FlEeWKIdAlVGN13g"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_aLOd9IFlEeWKIdAlVGN13g" visible="false" type="7013">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_aLOd9YFlEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_aLOd9oFlEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_aLOd94FlEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aLOd-IFlEeWKIdAlVGN13g"/>
+          </children>
+          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_aKwj4IFlEeWKIdAlVGN13g"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aLN24YFlEeWKIdAlVGN13g" x="438" y="24" width="118" height="67"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_evGRwIFlEeWKIdAlVGN13g" type="3025">
+          <children xmi:type="notation:DecorationNode" xmi:id="_evGRwoFlEeWKIdAlVGN13g" type="5055"/>
+          <children xmi:type="notation:DecorationNode" xmi:id="_evGRw4FlEeWKIdAlVGN13g" type="8516">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_evGRxIFlEeWKIdAlVGN13g" y="5"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_evGRxYFlEeWKIdAlVGN13g" type="7031">
+            <children xmi:type="notation:Shape" xmi:id="_kIGWwIFlEeWKIdAlVGN13g" type="3017">
+              <element xmi:type="uml:EnumerationLiteral" href="esfsafetyconcepts_metamodel.uml#_kH9M0IFlEeWKIdAlVGN13g"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_kIGWwYFlEeWKIdAlVGN13g"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="_nFXZIIFlEeWKIdAlVGN13g" type="3017">
+              <element xmi:type="uml:EnumerationLiteral" href="esfsafetyconcepts_metamodel.uml#_nFQEYIFlEeWKIdAlVGN13g"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_nFXZIYFlEeWKIdAlVGN13g"/>
+            </children>
+            <styles xmi:type="notation:TitleStyle" xmi:id="_evGRxoFlEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_evGRx4FlEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_evGRyIFlEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_evGRyYFlEeWKIdAlVGN13g"/>
+          </children>
+          <element xmi:type="uml:Enumeration" href="esfsafetyconcepts_metamodel.uml#_eu3oQIFlEeWKIdAlVGN13g"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_evGRwYFlEeWKIdAlVGN13g" x="601" y="7" width="151"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_b37hcgnyEeW356xdbh3U2Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b37hcwnyEeW356xdbh3U2Q"/>
+      </children>
+      <element xmi:type="uml:Package" href="esfsafetyconcepts_metamodel.uml#_IpBk8AnkEeW356xdbh3U2Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b366YQnyEeW356xdbh3U2Q" x="388" y="274" width="793" height="294"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_67En8ISJEeWOntSnNos8Xg" type="2005" fillColor="12621752">
+      <children xmi:type="notation:DecorationNode" xmi:id="_67FPAISJEeWOntSnNos8Xg" type="5020"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_67FPAYSJEeWOntSnNos8Xg" type="7009">
+        <children xmi:type="notation:Shape" xmi:id="_EgqpMISKEeWOntSnNos8Xg" type="3010">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_K2Mn4ISKEeWOntSnNos8Xg" source="PapyrusCSSForceValue">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_K2Mn4YSKEeWOntSnNos8Xg" key="fillColor" value="true"/>
+          </eAnnotations>
+          <children xmi:type="notation:DecorationNode" xmi:id="_EgrQQISKEeWOntSnNos8Xg" type="5014"/>
+          <children xmi:type="notation:DecorationNode" xmi:id="_EgrQQYSKEeWOntSnNos8Xg" type="8518">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_EgrQQoSKEeWOntSnNos8Xg" y="5"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_EgrQQ4SKEeWOntSnNos8Xg" visible="false" type="7011">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_EgrQRISKEeWOntSnNos8Xg"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_EgrQRYSKEeWOntSnNos8Xg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_EgrQRoSKEeWOntSnNos8Xg"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EgrQR4SKEeWOntSnNos8Xg"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_Egr3UISKEeWOntSnNos8Xg" visible="false" type="7012">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_Egr3UYSKEeWOntSnNos8Xg"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_Egr3UoSKEeWOntSnNos8Xg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_Egr3U4SKEeWOntSnNos8Xg"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Egr3VISKEeWOntSnNos8Xg"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_Egr3VYSKEeWOntSnNos8Xg" visible="false" type="7013">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_Egr3VoSKEeWOntSnNos8Xg"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_Egr3V4SKEeWOntSnNos8Xg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_Egr3WISKEeWOntSnNos8Xg"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Egr3WYSKEeWOntSnNos8Xg"/>
+          </children>
+          <element xmi:type="uml:Class" href="platform:/resource/org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_Q05ZgOjPEeSQI-4c5olYjA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EgqpMYSKEeWOntSnNos8Xg" x="93" y="47" width="225" height="67"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_67FPAoSJEeWOntSnNos8Xg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_67FPA4SJEeWOntSnNos8Xg"/>
+      </children>
+      <element xmi:type="uml:Model" href="platform:/resource/org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_VB4SINLoEeSb47LgOrWUpg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_67En8YSJEeWOntSnNos8Xg" x="595" y="53" width="443" height="197"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_bXP2QQnyEeW356xdbh3U2Q" name="diagram_compatibility_version" stringValue="1.1.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_bXP2QgnyEeW356xdbh3U2Q"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_bXP2QwnyEeW356xdbh3U2Q">
+      <owner xmi:type="uml:Package" href="esfsafetyconcepts_metamodel.uml#_IpBk8AnkEeW356xdbh3U2Q"/>
+    </styles>
+    <element xmi:type="uml:Package" href="esfsafetyconcepts_metamodel.uml#_IpBk8AnkEeW356xdbh3U2Q"/>
+    <edges xmi:type="notation:Connector" xmi:id="_Pcx-QIFlEeWKIdAlVGN13g" type="4002" source="_dK92oAnyEeW356xdbh3U2Q" target="_K3UPAIFlEeWKIdAlVGN13g" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Pcx-Q4FlEeWKIdAlVGN13g" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Pcx-RIFlEeWKIdAlVGN13g" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_Pcx-QYFlEeWKIdAlVGN13g"/>
+      <element xmi:type="uml:Generalization" href="esfsafetyconcepts_metamodel.uml#_PcmYEIFlEeWKIdAlVGN13g"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Pcx-QoFlEeWKIdAlVGN13g" points="[-52, -18, -84, 41]$[-52, -69, -84, -10]$[32, -69, 0, -10]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PdESIIFlEeWKIdAlVGN13g" id="(1.0,0.27)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PdESIYFlEeWKIdAlVGN13g" id="(0.0,0.97)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_Zk3okIFlEeWKIdAlVGN13g" type="4002" source="_P32JoIFlEeWKIdAlVGN13g" target="_K3UPAIFlEeWKIdAlVGN13g" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Zk4PoIFlEeWKIdAlVGN13g" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Zk4PoYFlEeWKIdAlVGN13g" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_Zk3okYFlEeWKIdAlVGN13g"/>
+      <element xmi:type="uml:Generalization" href="esfsafetyconcepts_metamodel.uml#_Zkq0QIFlEeWKIdAlVGN13g"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Zk3okoFlEeWKIdAlVGN13g" points="[0, 0, 28, 38]$[0, -61, 28, -23]$[-28, -61, 0, -23]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZlJVYIFlEeWKIdAlVGN13g" id="(0.29,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZlJVYYFlEeWKIdAlVGN13g" id="(1.0,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="__tDgkIFlEeWKIdAlVGN13g" type="4001" source="_dK92oAnyEeW356xdbh3U2Q" target="_P32JoIFlEeWKIdAlVGN13g" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="__tEHoIFlEeWKIdAlVGN13g" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__tEHoYFlEeWKIdAlVGN13g" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__tEHooFlEeWKIdAlVGN13g" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__tEHo4FlEeWKIdAlVGN13g" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__tEHpIFlEeWKIdAlVGN13g" type="6003">
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_NtWLgIFmEeWKIdAlVGN13g" name="maskLabel">
+          <stringListValue>name</stringListValue>
+          <stringListValue>derived</stringListValue>
+        </styles>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__tEHpYFlEeWKIdAlVGN13g" x="20" y="-21"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__tEHpoFlEeWKIdAlVGN13g" type="6005">
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_NU8SkIFmEeWKIdAlVGN13g" name="maskLabel">
+          <stringListValue>name</stringListValue>
+          <stringListValue>derived</stringListValue>
+        </styles>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__tEHp4FlEeWKIdAlVGN13g" x="-23" y="18"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__tEHqIFlEeWKIdAlVGN13g" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__tEHqYFlEeWKIdAlVGN13g" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__tEHqoFlEeWKIdAlVGN13g" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__tEusIFlEeWKIdAlVGN13g" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="__tDgkYFlEeWKIdAlVGN13g"/>
+      <element xmi:type="uml:Association" href="esfsafetyconcepts_metamodel.uml#__slmgIFlEeWKIdAlVGN13g"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__tDgkoFlEeWKIdAlVGN13g" points="[10, 4, -196, 0]$[189, 3, -17, -1]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__tnhQIFlEeWKIdAlVGN13g" id="(1.0,0.417910447761194)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__tnhQYFlEeWKIdAlVGN13g" id="(0.0,0.4626865671641791)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_JgkRsISKEeWOntSnNos8Xg" type="4002" source="_K3UPAIFlEeWKIdAlVGN13g" target="_EgqpMISKEeWOntSnNos8Xg" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_JgkRs4SKEeWOntSnNos8Xg" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Jgk4wISKEeWOntSnNos8Xg" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_JgkRsYSKEeWOntSnNos8Xg"/>
+      <element xmi:type="uml:Generalization" href="esfsafetyconcepts_metamodel.uml#_Jf48QISKEeWOntSnNos8Xg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_JgkRsoSKEeWOntSnNos8Xg" points="[1, -2, 0, 152]$[-34, -149, -35, 5]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JhJggISKEeWOntSnNos8Xg" id="(0.6818181818181818,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JhJggYSKEeWOntSnNos8Xg" id="(0.1511111111111111,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_KJi9QISKEeWOntSnNos8Xg" type="4002" source="_aLN24IFlEeWKIdAlVGN13g" target="_EgqpMISKEeWOntSnNos8Xg" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_KJjkUISKEeWOntSnNos8Xg" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_KJjkUYSKEeWOntSnNos8Xg" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_KJi9QYSKEeWOntSnNos8Xg"/>
+      <element xmi:type="uml:Generalization" href="esfsafetyconcepts_metamodel.uml#_KI9HYISKEeWOntSnNos8Xg"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KJi9QoSKEeWOntSnNos8Xg" points="[-6, -9, 0, 159]$[29, -166, 35, 2]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KKG98ISKEeWOntSnNos8Xg" id="(0.4830508474576271,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KKG98YSKEeWOntSnNos8Xg" id="(0.8488888888888889,1.0)"/>
+    </edges>
+  </notation:Diagram>
+  <css:ModelStyleSheets xmi:id="_ybi4UAnyEeW356xdbh3U2Q"/>
+  <notation:Diagram xmi:id="_suQmMIFjEeWKIdAlVGN13g" type="PapyrusUMLClassDiagram" name="SDysfunctions Diagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_0aWIIIFjEeWKIdAlVGN13g" type="2007">
+      <children xmi:type="notation:DecorationNode" xmi:id="_0aWvMIFjEeWKIdAlVGN13g" type="5026"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_0aWvMYFjEeWKIdAlVGN13g" type="7016">
+        <children xmi:type="notation:Shape" xmi:id="_YXH7sIFoEeWKIdAlVGN13g" type="3010">
+          <children xmi:type="notation:DecorationNode" xmi:id="_YXIiwIFoEeWKIdAlVGN13g" type="5014"/>
+          <children xmi:type="notation:DecorationNode" xmi:id="_YXIiwYFoEeWKIdAlVGN13g" type="8518">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_YXIiwoFoEeWKIdAlVGN13g" y="5"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_YXIiw4FoEeWKIdAlVGN13g" visible="false" type="7011">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_YXIixIFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_YXIixYFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_YXIixoFoEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YXIix4FoEeWKIdAlVGN13g"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_YXIiyIFoEeWKIdAlVGN13g" visible="false" type="7012">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_YXIiyYFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_YXIiyoFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_YXIiy4FoEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YXIizIFoEeWKIdAlVGN13g"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_YXIizYFoEeWKIdAlVGN13g" visible="false" type="7013">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_YXIizoFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_YXIiz4FoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_YXIi0IFoEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YXIi0YFoEeWKIdAlVGN13g"/>
+          </children>
+          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_L9BeMA53EeWvS4pMPcwguQ"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YXH7sYFoEeWKIdAlVGN13g" x="34" y="188"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_Y301AIFoEeWKIdAlVGN13g" type="3010">
+          <children xmi:type="notation:DecorationNode" xmi:id="_Y301AoFoEeWKIdAlVGN13g" type="5014"/>
+          <children xmi:type="notation:DecorationNode" xmi:id="_Y301A4FoEeWKIdAlVGN13g" type="8518">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_Y301BIFoEeWKIdAlVGN13g" y="5"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_Y31cEIFoEeWKIdAlVGN13g" visible="false" type="7011">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_Y31cEYFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_Y31cEoFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_Y31cE4FoEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y31cFIFoEeWKIdAlVGN13g"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_Y31cFYFoEeWKIdAlVGN13g" visible="false" type="7012">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_Y31cFoFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_Y31cF4FoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_Y31cGIFoEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y31cGYFoEeWKIdAlVGN13g"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_Y31cGoFoEeWKIdAlVGN13g" visible="false" type="7013">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_Y31cG4FoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_Y31cHIFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_Y31cHYFoEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y31cHoFoEeWKIdAlVGN13g"/>
+          </children>
+          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_K3ARUA53EeWvS4pMPcwguQ"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y301AYFoEeWKIdAlVGN13g" x="271" y="188" width="100"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_Z1dh8IFoEeWKIdAlVGN13g" type="3010">
+          <children xmi:type="notation:DecorationNode" xmi:id="_Z1eJAIFoEeWKIdAlVGN13g" type="5014"/>
+          <children xmi:type="notation:DecorationNode" xmi:id="_Z1eJAYFoEeWKIdAlVGN13g" type="8518">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_Z1eJAoFoEeWKIdAlVGN13g" y="5"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_Z1eJA4FoEeWKIdAlVGN13g" visible="false" type="7011">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_Z1eJBIFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_Z1eJBYFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_Z1eJBoFoEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z1eJB4FoEeWKIdAlVGN13g"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_Z1eJCIFoEeWKIdAlVGN13g" visible="false" type="7012">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_Z1eJCYFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_Z1eJCoFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_Z1eJC4FoEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z1eJDIFoEeWKIdAlVGN13g"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_Z1ewEIFoEeWKIdAlVGN13g" visible="false" type="7013">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_Z1ewEYFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_Z1ewEoFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_Z1ewE4FoEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z1ewFIFoEeWKIdAlVGN13g"/>
+          </children>
+          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_r9BzMAnmEeW356xdbh3U2Q"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z1dh8YFoEeWKIdAlVGN13g" x="344" y="551" width="155"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_aLPksIFoEeWKIdAlVGN13g" type="3010">
+          <children xmi:type="notation:DecorationNode" xmi:id="_aLQLwIFoEeWKIdAlVGN13g" type="5014"/>
+          <children xmi:type="notation:DecorationNode" xmi:id="_aLQLwYFoEeWKIdAlVGN13g" type="8518">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_aLQLwoFoEeWKIdAlVGN13g" y="5"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_aLQLw4FoEeWKIdAlVGN13g" visible="false" type="7011">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_aLQLxIFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_aLQLxYFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_aLQLxoFoEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aLQLx4FoEeWKIdAlVGN13g"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_aLQLyIFoEeWKIdAlVGN13g" visible="false" type="7012">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_aLQLyYFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_aLQLyoFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_aLQLy4FoEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aLQLzIFoEeWKIdAlVGN13g"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_aLQLzYFoEeWKIdAlVGN13g" visible="false" type="7013">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_aLQLzoFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_aLQLz4FoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_aLQL0IFoEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aLQL0YFoEeWKIdAlVGN13g"/>
+          </children>
+          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_rhzPwAnmEeW356xdbh3U2Q"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aLPksYFoEeWKIdAlVGN13g" x="710" y="552" width="216"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_bQf8kIFoEeWKIdAlVGN13g" type="3010">
+          <children xmi:type="notation:DecorationNode" xmi:id="_bQgjoIFoEeWKIdAlVGN13g" type="5014"/>
+          <children xmi:type="notation:DecorationNode" xmi:id="_bQgjoYFoEeWKIdAlVGN13g" type="8518">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_bQgjooFoEeWKIdAlVGN13g" y="5"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_bQgjo4FoEeWKIdAlVGN13g" type="7011">
+            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nGc24oFoEeWKIdAlVGN13g" source="PapyrusCSSForceValue">
+              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nGc244FoEeWKIdAlVGN13g" key="visible" value="true"/>
+            </eAnnotations>
+            <children xmi:type="notation:Shape" xmi:id="_JixZwIFsEeWKIdAlVGN13g" type="3012">
+              <styles xmi:type="notation:StringListValueStyle" xmi:id="_J0gqAIFsEeWKIdAlVGN13g" name="maskLabel">
+                <stringListValue>name</stringListValue>
+                <stringListValue>derived</stringListValue>
+                <stringListValue>multiplicity</stringListValue>
+                <stringListValue>type</stringListValue>
+              </styles>
+              <element xmi:type="uml:Property" href="esfsafetyconcepts_metamodel.uml#_JiaNYIFsEeWKIdAlVGN13g"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_JixZwYFsEeWKIdAlVGN13g"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="_KtjK0IFsEeWKIdAlVGN13g" type="3012">
+              <styles xmi:type="notation:StringListValueStyle" xmi:id="_K4xjYIFsEeWKIdAlVGN13g" name="maskLabel">
+                <stringListValue>name</stringListValue>
+                <stringListValue>derived</stringListValue>
+                <stringListValue>multiplicity</stringListValue>
+                <stringListValue>type</stringListValue>
+              </styles>
+              <element xmi:type="uml:Property" href="esfsafetyconcepts_metamodel.uml#_KtLXYIFsEeWKIdAlVGN13g"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_KtjK0YFsEeWKIdAlVGN13g"/>
+            </children>
+            <styles xmi:type="notation:TitleStyle" xmi:id="_bQgjpIFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_bQgjpYFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_bQgjpoFoEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bQgjp4FoEeWKIdAlVGN13g"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_bQgjqIFoEeWKIdAlVGN13g" visible="false" type="7012">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_bQgjqYFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_bQgjqoFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_bQgjq4FoEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bQgjrIFoEeWKIdAlVGN13g"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_bQgjrYFoEeWKIdAlVGN13g" visible="false" type="7013">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_bQgjroFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_bQgjr4FoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_bQgjsIFoEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bQgjsYFoEeWKIdAlVGN13g"/>
+          </children>
+          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_wMyYAIFiEeWKIdAlVGN13g"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bQf8kYFoEeWKIdAlVGN13g" x="164" y="413" width="265"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_b9uO8IFoEeWKIdAlVGN13g" type="3010">
+          <children xmi:type="notation:DecorationNode" xmi:id="_b9u2AIFoEeWKIdAlVGN13g" type="5014"/>
+          <children xmi:type="notation:DecorationNode" xmi:id="_b9u2AYFoEeWKIdAlVGN13g" type="8518">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_b9u2AoFoEeWKIdAlVGN13g" y="5"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_b9u2A4FoEeWKIdAlVGN13g" type="7011">
+            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nGc24IFoEeWKIdAlVGN13g" source="PapyrusCSSForceValue">
+              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nGc24YFoEeWKIdAlVGN13g" key="visible" value="true"/>
+            </eAnnotations>
+            <children xmi:type="notation:Shape" xmi:id="_7WUiIIFrEeWKIdAlVGN13g" type="3012">
+              <styles xmi:type="notation:StringListValueStyle" xmi:id="_-aVFsIFrEeWKIdAlVGN13g" name="maskLabel">
+                <stringListValue>name</stringListValue>
+                <stringListValue>derived</stringListValue>
+                <stringListValue>multiplicity</stringListValue>
+                <stringListValue>type</stringListValue>
+              </styles>
+              <element xmi:type="uml:Property" href="esfsafetyconcepts_metamodel.uml#_7V7gkIFrEeWKIdAlVGN13g"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_7WUiIYFrEeWKIdAlVGN13g"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="__8tecIFrEeWKIdAlVGN13g" type="3012">
+              <styles xmi:type="notation:StringListValueStyle" xmi:id="_ASUiEIFsEeWKIdAlVGN13g" name="maskLabel">
+                <stringListValue>name</stringListValue>
+                <stringListValue>derived</stringListValue>
+                <stringListValue>multiplicity</stringListValue>
+                <stringListValue>type</stringListValue>
+              </styles>
+              <element xmi:type="uml:Property" href="esfsafetyconcepts_metamodel.uml#__8W5IIFrEeWKIdAlVGN13g"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="__8tecYFrEeWKIdAlVGN13g"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="_Cmp8MIFsEeWKIdAlVGN13g" type="3012">
+              <styles xmi:type="notation:StringListValueStyle" xmi:id="_HlM50IFsEeWKIdAlVGN13g" name="maskLabel">
+                <stringListValue>name</stringListValue>
+                <stringListValue>derived</stringListValue>
+                <stringListValue>multiplicity</stringListValue>
+                <stringListValue>type</stringListValue>
+              </styles>
+              <element xmi:type="uml:Property" href="esfsafetyconcepts_metamodel.uml#_CmRhsIFsEeWKIdAlVGN13g"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_Cmp8MYFsEeWKIdAlVGN13g"/>
+            </children>
+            <styles xmi:type="notation:TitleStyle" xmi:id="_b9u2BIFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_b9u2BYFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_b9u2BoFoEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b9u2B4FoEeWKIdAlVGN13g"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_b9u2CIFoEeWKIdAlVGN13g" visible="false" type="7012">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_b9u2CYFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_b9u2CoFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_b9u2C4FoEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b9u2DIFoEeWKIdAlVGN13g"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_b9u2DYFoEeWKIdAlVGN13g" visible="false" type="7013">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_b9u2DoFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_b9u2D4FoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_b9u2EIFoEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b9u2EYFoEeWKIdAlVGN13g"/>
+          </children>
+          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_yT7DoIFiEeWKIdAlVGN13g"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b9uO8YFoEeWKIdAlVGN13g" x="405" y="23" width="227" height="125"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_cnXo4IFoEeWKIdAlVGN13g" type="3010">
+          <children xmi:type="notation:DecorationNode" xmi:id="_cnYP8IFoEeWKIdAlVGN13g" type="5014"/>
+          <children xmi:type="notation:DecorationNode" xmi:id="_cnYP8YFoEeWKIdAlVGN13g" type="8518">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_cnYP8oFoEeWKIdAlVGN13g" y="5"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_cnYP84FoEeWKIdAlVGN13g" type="7011">
+            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lg84sIFoEeWKIdAlVGN13g" source="PapyrusCSSForceValue">
+              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lg84sYFoEeWKIdAlVGN13g" key="visible" value="true"/>
+            </eAnnotations>
+            <children xmi:type="notation:Shape" xmi:id="_Mvt24IFsEeWKIdAlVGN13g" type="3012">
+              <styles xmi:type="notation:StringListValueStyle" xmi:id="_NC878IFsEeWKIdAlVGN13g" name="maskLabel">
+                <stringListValue>name</stringListValue>
+                <stringListValue>derived</stringListValue>
+                <stringListValue>multiplicity</stringListValue>
+                <stringListValue>type</stringListValue>
+              </styles>
+              <element xmi:type="uml:Property" href="esfsafetyconcepts_metamodel.uml#_MvVcYIFsEeWKIdAlVGN13g"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_Mvt24YFsEeWKIdAlVGN13g"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="_NYJv4IFsEeWKIdAlVGN13g" type="3012">
+              <styles xmi:type="notation:StringListValueStyle" xmi:id="_NiYp8IFsEeWKIdAlVGN13g" name="maskLabel">
+                <stringListValue>name</stringListValue>
+                <stringListValue>derived</stringListValue>
+                <stringListValue>multiplicity</stringListValue>
+                <stringListValue>type</stringListValue>
+              </styles>
+              <element xmi:type="uml:Property" href="esfsafetyconcepts_metamodel.uml#_NXx8cIFsEeWKIdAlVGN13g"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_NYJv4YFsEeWKIdAlVGN13g"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="_N0dRYIFsEeWKIdAlVGN13g" type="3012">
+              <styles xmi:type="notation:StringListValueStyle" xmi:id="_OA-DYIFsEeWKIdAlVGN13g" name="maskLabel">
+                <stringListValue>name</stringListValue>
+                <stringListValue>derived</stringListValue>
+                <stringListValue>multiplicity</stringListValue>
+                <stringListValue>type</stringListValue>
+              </styles>
+              <element xmi:type="uml:Property" href="esfsafetyconcepts_metamodel.uml#_N0E24IFsEeWKIdAlVGN13g"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_N0dRYYFsEeWKIdAlVGN13g"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="_OSDMUIFsEeWKIdAlVGN13g" type="3012">
+              <styles xmi:type="notation:StringListValueStyle" xmi:id="_Or_WUIFsEeWKIdAlVGN13g" name="maskLabel">
+                <stringListValue>name</stringListValue>
+                <stringListValue>derived</stringListValue>
+                <stringListValue>multiplicity</stringListValue>
+                <stringListValue>type</stringListValue>
+              </styles>
+              <element xmi:type="uml:Property" href="esfsafetyconcepts_metamodel.uml#_ORrY4IFsEeWKIdAlVGN13g"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_OSDzYIFsEeWKIdAlVGN13g"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="_PFT1QIFsEeWKIdAlVGN13g" type="3012">
+              <styles xmi:type="notation:StringListValueStyle" xmi:id="_PYU34IFsEeWKIdAlVGN13g" name="maskLabel">
+                <stringListValue>name</stringListValue>
+                <stringListValue>derived</stringListValue>
+                <stringListValue>multiplicity</stringListValue>
+                <stringListValue>type</stringListValue>
+              </styles>
+              <element xmi:type="uml:Property" href="esfsafetyconcepts_metamodel.uml#_PE4XcIFsEeWKIdAlVGN13g"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_PFT1QYFsEeWKIdAlVGN13g"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="_PywxIIFsEeWKIdAlVGN13g" type="3012">
+              <styles xmi:type="notation:StringListValueStyle" xmi:id="_QFjxUIFsEeWKIdAlVGN13g" name="maskLabel">
+                <stringListValue>name</stringListValue>
+                <stringListValue>derived</stringListValue>
+                <stringListValue>multiplicity</stringListValue>
+                <stringListValue>type</stringListValue>
+              </styles>
+              <element xmi:type="uml:Property" href="esfsafetyconcepts_metamodel.uml#_PyWhcIFsEeWKIdAlVGN13g"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_PywxIYFsEeWKIdAlVGN13g"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="_RAlPIIFsEeWKIdAlVGN13g" type="3012">
+              <styles xmi:type="notation:StringListValueStyle" xmi:id="_RRBe4IFsEeWKIdAlVGN13g" name="maskLabel">
+                <stringListValue>name</stringListValue>
+                <stringListValue>derived</stringListValue>
+                <stringListValue>multiplicity</stringListValue>
+                <stringListValue>type</stringListValue>
+              </styles>
+              <element xmi:type="uml:Property" href="esfsafetyconcepts_metamodel.uml#_RALmgIFsEeWKIdAlVGN13g"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_RAlPIYFsEeWKIdAlVGN13g"/>
+            </children>
+            <styles xmi:type="notation:TitleStyle" xmi:id="_cnYP9IFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_cnYP9YFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_cnYP9oFoEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cnYP94FoEeWKIdAlVGN13g"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_cnYP-IFoEeWKIdAlVGN13g" visible="false" type="7012">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_cnYP-YFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_cnYP-oFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_cnYP-4FoEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cnYP_IFoEeWKIdAlVGN13g"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_cnY3AIFoEeWKIdAlVGN13g" visible="false" type="7013">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_cnY3AYFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_cnY3AoFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_cnY3A4FoEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cnY3BIFoEeWKIdAlVGN13g"/>
+          </children>
+          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_rCbzMAnmEeW356xdbh3U2Q"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cnXo4YFoEeWKIdAlVGN13g" x="624" y="187" width="280" height="181"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_0aWvMoFjEeWKIdAlVGN13g"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0aWvM4FjEeWKIdAlVGN13g"/>
+      </children>
+      <element xmi:type="uml:Package" href="esfsafetyconcepts_metamodel.uml#__2mtEAnjEeW356xdbh3U2Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0aWIIYFjEeWKIdAlVGN13g" x="7" y="53" width="1088" height="697"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_AMHtEIFkEeWKIdAlVGN13g" type="2007">
+      <children xmi:type="notation:DecorationNode" xmi:id="_AMIUIIFkEeWKIdAlVGN13g" type="5026"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_AMIUIYFkEeWKIdAlVGN13g" type="7016">
+        <children xmi:type="notation:Shape" xmi:id="_OgfNwIFoEeWKIdAlVGN13g" type="3010">
+          <children xmi:type="notation:DecorationNode" xmi:id="_OgfNwoFoEeWKIdAlVGN13g" type="5014"/>
+          <children xmi:type="notation:DecorationNode" xmi:id="_OgfNw4FoEeWKIdAlVGN13g" type="8518">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_OgfNxIFoEeWKIdAlVGN13g" y="5"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_Ogf00IFoEeWKIdAlVGN13g" visible="false" type="7011">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_Ogf00YFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_Ogf00oFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_Ogf004FoEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ogf01IFoEeWKIdAlVGN13g"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_Ogf01YFoEeWKIdAlVGN13g" visible="false" type="7012">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_Ogf01oFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_Ogf014FoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_Ogf02IFoEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ogf02YFoEeWKIdAlVGN13g"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_Ogf02oFoEeWKIdAlVGN13g" visible="false" type="7013">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_Ogf024FoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_Ogf03IFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_Ogf03YFoEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ogf03oFoEeWKIdAlVGN13g"/>
+          </children>
+          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_iEHMUAnxEeW356xdbh3U2Q"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OgfNwYFoEeWKIdAlVGN13g" x="185" y="552" width="148"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_PupqAIFoEeWKIdAlVGN13g" type="3010">
+          <children xmi:type="notation:DecorationNode" xmi:id="_PupqAoFoEeWKIdAlVGN13g" type="5014"/>
+          <children xmi:type="notation:DecorationNode" xmi:id="_PupqA4FoEeWKIdAlVGN13g" type="8518">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_PupqBIFoEeWKIdAlVGN13g" y="5"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_PupqBYFoEeWKIdAlVGN13g" visible="false" type="7011">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_PupqBoFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_PupqB4FoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_PupqCIFoEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PupqCYFoEeWKIdAlVGN13g"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_PupqCoFoEeWKIdAlVGN13g" visible="false" type="7012">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_PupqC4FoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_PupqDIFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_PupqDYFoEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PupqDoFoEeWKIdAlVGN13g"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_PupqD4FoEeWKIdAlVGN13g" visible="false" type="7013">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_PupqEIFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_PupqEYFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_PupqEoFoEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PupqE4FoEeWKIdAlVGN13g"/>
+          </children>
+          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_K29CoIFlEeWKIdAlVGN13g"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PupqAYFoEeWKIdAlVGN13g" x="185" y="299"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_Qctp4IFoEeWKIdAlVGN13g" type="3010">
+          <children xmi:type="notation:DecorationNode" xmi:id="_Qctp4oFoEeWKIdAlVGN13g" type="5014"/>
+          <children xmi:type="notation:DecorationNode" xmi:id="_Qctp44FoEeWKIdAlVGN13g" type="8518">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_Qctp5IFoEeWKIdAlVGN13g" y="5"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_Qctp5YFoEeWKIdAlVGN13g" visible="false" type="7011">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_Qctp5oFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_Qctp54FoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_Qctp6IFoEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qctp6YFoEeWKIdAlVGN13g"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_QcuQ8IFoEeWKIdAlVGN13g" visible="false" type="7012">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_QcuQ8YFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_QcuQ8oFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_QcuQ84FoEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QcuQ9IFoEeWKIdAlVGN13g"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_QcuQ9YFoEeWKIdAlVGN13g" visible="false" type="7013">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_QcuQ9oFoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_QcuQ94FoEeWKIdAlVGN13g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_QcuQ-IFoEeWKIdAlVGN13g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QcuQ-YFoEeWKIdAlVGN13g"/>
+          </children>
+          <element xmi:type="uml:Class" href="esfsafetyconcepts_metamodel.uml#_aKwj4IFlEeWKIdAlVGN13g"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qctp4YFoEeWKIdAlVGN13g" x="185" y="166" width="148"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_AMIUIoFkEeWKIdAlVGN13g"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AMIUI4FkEeWKIdAlVGN13g"/>
+      </children>
+      <element xmi:type="uml:Package" href="esfsafetyconcepts_metamodel.uml#_IpBk8AnkEeW356xdbh3U2Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AMHtEYFkEeWKIdAlVGN13g" x="1105" y="53" width="374" height="697"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_suQmMYFjEeWKIdAlVGN13g" name="diagram_compatibility_version" stringValue="1.1.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_suQmMoFjEeWKIdAlVGN13g"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_suQmM4FjEeWKIdAlVGN13g">
+      <owner xmi:type="uml:Package" href="esfsafetyconcepts_metamodel.uml#__2mtEAnjEeW356xdbh3U2Q"/>
+    </styles>
+    <element xmi:type="uml:Package" href="esfsafetyconcepts_metamodel.uml#__2mtEAnjEeW356xdbh3U2Q"/>
+    <edges xmi:type="notation:Connector" xmi:id="_UW0vAIFoEeWKIdAlVGN13g" type="4002" source="_OgfNwIFoEeWKIdAlVGN13g" target="_PupqAIFoEeWKIdAlVGN13g" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UW0vA4FoEeWKIdAlVGN13g" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UW0vBIFoEeWKIdAlVGN13g" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_UW0vAYFoEeWKIdAlVGN13g"/>
+      <element xmi:type="uml:Generalization" href="esfsafetyconcepts_metamodel.uml#_PcmYEIFlEeWKIdAlVGN13g"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UW0vAoFoEeWKIdAlVGN13g" points="[3, -50, -9, 139]$[8, -139, -4, 50]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eViMIIFuEeWKIdAlVGN13g" id="(0.5,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eVizMIFuEeWKIdAlVGN13g" id="(0.5,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_CKnn0IFpEeWKIdAlVGN13g" type="4001" source="_YXH7sIFoEeWKIdAlVGN13g" target="_Y301AIFoEeWKIdAlVGN13g" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_CKnn04FpEeWKIdAlVGN13g" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CKnn1IFpEeWKIdAlVGN13g" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_CKnn1YFpEeWKIdAlVGN13g" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CKnn1oFpEeWKIdAlVGN13g" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_CKnn14FpEeWKIdAlVGN13g" type="6003">
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_FAQ_QIFpEeWKIdAlVGN13g" name="maskLabel">
+          <stringListValue>name</stringListValue>
+          <stringListValue>derived</stringListValue>
+        </styles>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CKoO4IFpEeWKIdAlVGN13g" x="17" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_CKoO4YFpEeWKIdAlVGN13g" type="6005">
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_D02VAIFpEeWKIdAlVGN13g" name="maskLabel">
+          <stringListValue>name</stringListValue>
+          <stringListValue>derived</stringListValue>
+        </styles>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CKoO4oFpEeWKIdAlVGN13g" x="-11" y="21"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_CKoO44FpEeWKIdAlVGN13g" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CKoO5IFpEeWKIdAlVGN13g" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_CKoO5YFpEeWKIdAlVGN13g" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CKoO5oFpEeWKIdAlVGN13g" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_CKnn0YFpEeWKIdAlVGN13g"/>
+      <element xmi:type="uml:Association" href="esfsafetyconcepts_metamodel.uml#_CKJtwIFpEeWKIdAlVGN13g"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_CKnn0oFpEeWKIdAlVGN13g" points="[1, -5, -202, -4]$[197, -51, -6, -50]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CLSWMIFpEeWKIdAlVGN13g" id="(1.0,0.5)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CLS9QIFpEeWKIdAlVGN13g" id="(0.0,0.47)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_QxfxoIFpEeWKIdAlVGN13g" type="4001" source="_cnXo4IFoEeWKIdAlVGN13g" target="_Y301AIFoEeWKIdAlVGN13g" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_QxgYsIFpEeWKIdAlVGN13g" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxgYsYFpEeWKIdAlVGN13g" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_QxgYsoFpEeWKIdAlVGN13g" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxgYs4FpEeWKIdAlVGN13g" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_QxgYtIFpEeWKIdAlVGN13g" type="6003">
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_Sar9AIFpEeWKIdAlVGN13g" name="maskLabel">
+          <stringListValue>name</stringListValue>
+          <stringListValue>derived</stringListValue>
+        </styles>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxgYtYFpEeWKIdAlVGN13g" x="26" y="-15"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_QxgYtoFpEeWKIdAlVGN13g" type="6005">
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_S1-x4IFpEeWKIdAlVGN13g" name="maskLabel">
+          <stringListValue>name</stringListValue>
+          <stringListValue>derived</stringListValue>
+        </styles>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxgYt4FpEeWKIdAlVGN13g" x="12" y="17"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_QxgYuIFpEeWKIdAlVGN13g" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxgYuYFpEeWKIdAlVGN13g" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_QxgYuoFpEeWKIdAlVGN13g" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QxgYu4FpEeWKIdAlVGN13g" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_QxfxoYFpEeWKIdAlVGN13g"/>
+      <element xmi:type="uml:Association" href="esfsafetyconcepts_metamodel.uml#_Qw_bUIFpEeWKIdAlVGN13g"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QxfxooFpEeWKIdAlVGN13g" points="[-40, -2, 325, 6]$[-372, -58, -7, -50]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QyHcsIFpEeWKIdAlVGN13g" id="(0.0,0.32044198895027626)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QyHcsYFpEeWKIdAlVGN13g" id="(1.0,0.57)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_pL_xoIFpEeWKIdAlVGN13g" type="4001" source="_cnXo4IFoEeWKIdAlVGN13g" target="_b9uO8IFoEeWKIdAlVGN13g" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_pL_xo4FpEeWKIdAlVGN13g" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_pL_xpIFpEeWKIdAlVGN13g" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_pL_xpYFpEeWKIdAlVGN13g" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_pL_xpoFpEeWKIdAlVGN13g" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_pL_xp4FpEeWKIdAlVGN13g" type="6003">
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_yZWSAIFpEeWKIdAlVGN13g" name="maskLabel">
+          <stringListValue>name</stringListValue>
+          <stringListValue>derived</stringListValue>
+        </styles>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_pL_xqIFpEeWKIdAlVGN13g" x="-12" y="68"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_pL_xqYFpEeWKIdAlVGN13g" type="6005">
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_yAUG8IFpEeWKIdAlVGN13g" name="maskLabel">
+          <stringListValue>name</stringListValue>
+          <stringListValue>derived</stringListValue>
+        </styles>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_pL_xqoFpEeWKIdAlVGN13g" x="-6" y="-14"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_pMAYsIFpEeWKIdAlVGN13g" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_pMAYsYFpEeWKIdAlVGN13g" x="-20" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_pMAYsoFpEeWKIdAlVGN13g" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_pMAYs4FpEeWKIdAlVGN13g" x="19" y="15"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_pL_xoYFpEeWKIdAlVGN13g"/>
+      <element xmi:type="uml:Association" href="esfsafetyconcepts_metamodel.uml#_pLeNMIFpEeWKIdAlVGN13g"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pL_xooFpEeWKIdAlVGN13g" points="[-4, 0, 196, 159]$[-4, -81, 196, 78]$[-200, -81, 0, 78]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pMsVMIFpEeWKIdAlVGN13g" id="(0.65,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pMsVMYFpEeWKIdAlVGN13g" id="(1.0,0.04)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_qQUVYIFpEeWKIdAlVGN13g" type="4001" source="_cnXo4IFoEeWKIdAlVGN13g" target="_bQf8kIFoEeWKIdAlVGN13g" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_qQUVY4FpEeWKIdAlVGN13g" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qQUVZIFpEeWKIdAlVGN13g" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_qQUVZYFpEeWKIdAlVGN13g" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qQUVZoFpEeWKIdAlVGN13g" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_qQUVZ4FpEeWKIdAlVGN13g" type="6003">
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_1887oIFpEeWKIdAlVGN13g" name="maskLabel">
+          <stringListValue>name</stringListValue>
+          <stringListValue>derived</stringListValue>
+        </styles>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qQUVaIFpEeWKIdAlVGN13g" x="-20" y="66"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_qQUVaYFpEeWKIdAlVGN13g" type="6005">
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_xjx78IFpEeWKIdAlVGN13g" name="maskLabel">
+          <stringListValue>name</stringListValue>
+          <stringListValue>derived</stringListValue>
+        </styles>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qQUVaoFpEeWKIdAlVGN13g" x="1" y="15"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_qQUVa4FpEeWKIdAlVGN13g" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qQUVbIFpEeWKIdAlVGN13g" x="-23" y="-11"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_qQU8cIFpEeWKIdAlVGN13g" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qQU8cYFpEeWKIdAlVGN13g" x="23" y="-30"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_qQUVYYFpEeWKIdAlVGN13g"/>
+      <element xmi:type="uml:Association" href="esfsafetyconcepts_metamodel.uml#_qP10QIFpEeWKIdAlVGN13g"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qQUVYoFpEeWKIdAlVGN13g" points="[2, 0, 240, -88]$[2, 105, 240, 17]$[-238, 105, 0, 17]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qRDVMIFpEeWKIdAlVGN13g" id="(0.15357142857142858,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qRDVMYFpEeWKIdAlVGN13g" id="(1.0,0.39090909090909093)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_rmuusIFpEeWKIdAlVGN13g" type="4001" source="_cnXo4IFoEeWKIdAlVGN13g" target="_aLPksIFoEeWKIdAlVGN13g" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_rmvVwIFpEeWKIdAlVGN13g" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_rmvVwYFpEeWKIdAlVGN13g" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_rmvVwoFpEeWKIdAlVGN13g" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_rmvVw4FpEeWKIdAlVGN13g" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_rmvVxIFpEeWKIdAlVGN13g" type="6003">
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_wWRnAIFpEeWKIdAlVGN13g" name="maskLabel">
+          <stringListValue>name</stringListValue>
+          <stringListValue>derived</stringListValue>
+        </styles>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_rmvVxYFpEeWKIdAlVGN13g" x="1" y="-44"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_rmvVxoFpEeWKIdAlVGN13g" type="6005">
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_wrfpEIFpEeWKIdAlVGN13g" name="maskLabel">
+          <stringListValue>name</stringListValue>
+          <stringListValue>derived</stringListValue>
+        </styles>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_rmvVx4FpEeWKIdAlVGN13g" x="7" y="61"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_rmvVyIFpEeWKIdAlVGN13g" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_rmvVyYFpEeWKIdAlVGN13g" x="3" y="14"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_rmvVyoFpEeWKIdAlVGN13g" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_rmvVy4FpEeWKIdAlVGN13g" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_rmuusYFpEeWKIdAlVGN13g"/>
+      <element xmi:type="uml:Association" href="esfsafetyconcepts_metamodel.uml#_rmO_cIFpEeWKIdAlVGN13g"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rmuusoFpEeWKIdAlVGN13g" points="[2, 0, -49, -201]$[2, 201, -49, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rnhY4IFpEeWKIdAlVGN13g" id="(0.6642857142857143,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rnhY4YFpEeWKIdAlVGN13g" id="(0.46296296296296297,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_sWk3QIFpEeWKIdAlVGN13g" type="4001" source="_aLPksIFoEeWKIdAlVGN13g" target="_Z1dh8IFoEeWKIdAlVGN13g" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_sWleUIFpEeWKIdAlVGN13g" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_sWleUYFpEeWKIdAlVGN13g" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_sWleUoFpEeWKIdAlVGN13g" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_sWleU4FpEeWKIdAlVGN13g" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_sWleVIFpEeWKIdAlVGN13g" type="6003">
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_w8zbgIFpEeWKIdAlVGN13g" name="maskLabel">
+          <stringListValue>name</stringListValue>
+          <stringListValue>derived</stringListValue>
+        </styles>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_sWleVYFpEeWKIdAlVGN13g" x="24" y="-23"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_sWleVoFpEeWKIdAlVGN13g" type="6005">
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_xPg8IIFpEeWKIdAlVGN13g" name="maskLabel">
+          <stringListValue>name</stringListValue>
+          <stringListValue>derived</stringListValue>
+        </styles>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_sWleV4FpEeWKIdAlVGN13g" x="-26" y="17"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_sWleWIFpEeWKIdAlVGN13g" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_sWleWYFpEeWKIdAlVGN13g" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_sWleWoFpEeWKIdAlVGN13g" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_sWleW4FpEeWKIdAlVGN13g" x="10" y="-18"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_sWk3QYFpEeWKIdAlVGN13g"/>
+      <element xmi:type="uml:Association" href="esfsafetyconcepts_metamodel.uml#_sWD54IFpEeWKIdAlVGN13g"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sWk3QoFpEeWKIdAlVGN13g" points="[-24, 1, 227, -6]$[-173, 1, 78, -6]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sXgrYIFpEeWKIdAlVGN13g" id="(0.0,0.42)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sXgrYYFpEeWKIdAlVGN13g" id="(1.0,0.43)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_tDwGUIFpEeWKIdAlVGN13g" type="4001" source="_Y301AIFoEeWKIdAlVGN13g" target="_b9uO8IFoEeWKIdAlVGN13g" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_tDwGU4FpEeWKIdAlVGN13g" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_tDwGVIFpEeWKIdAlVGN13g" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_tDwGVYFpEeWKIdAlVGN13g" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_tDwGVoFpEeWKIdAlVGN13g" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_tDwGV4FpEeWKIdAlVGN13g" type="6003">
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_zi57EIFpEeWKIdAlVGN13g" name="maskLabel">
+          <stringListValue>name</stringListValue>
+          <stringListValue>derived</stringListValue>
+        </styles>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_tDwGWIFpEeWKIdAlVGN13g" x="2" y="37"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_tDwGWYFpEeWKIdAlVGN13g" type="6005">
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_z4QgAIFpEeWKIdAlVGN13g" name="maskLabel">
+          <stringListValue>name</stringListValue>
+          <stringListValue>derived</stringListValue>
+        </styles>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_tDwGWoFpEeWKIdAlVGN13g" x="-29" y="-16"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_tDwGW4FpEeWKIdAlVGN13g" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_tDwGXIFpEeWKIdAlVGN13g" x="-13" y="-12"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_tDwGXYFpEeWKIdAlVGN13g" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_tDwtYIFpEeWKIdAlVGN13g" y="13"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_tDwGUYFpEeWKIdAlVGN13g"/>
+      <element xmi:type="uml:Association" href="esfsafetyconcepts_metamodel.uml#_tDLekIFpEeWKIdAlVGN13g"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tDwGUoFpEeWKIdAlVGN13g" points="[-1, 0, -92, 154]$[-1, -86, -92, 68]$[91, -86, 0, 68]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tEjXkIFpEeWKIdAlVGN13g" id="(0.43,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tEjXkYFpEeWKIdAlVGN13g" id="(0.0,0.088)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_t7Xq0IFpEeWKIdAlVGN13g" type="4001" source="_Y301AIFoEeWKIdAlVGN13g" target="_bQf8kIFoEeWKIdAlVGN13g" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_t7Xq04FpEeWKIdAlVGN13g" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_t7Xq1IFpEeWKIdAlVGN13g" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_t7Xq1YFpEeWKIdAlVGN13g" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_t7Xq1oFpEeWKIdAlVGN13g" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_t7Xq14FpEeWKIdAlVGN13g" type="6003">
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_zAfKgIFpEeWKIdAlVGN13g" name="maskLabel">
+          <stringListValue>name</stringListValue>
+          <stringListValue>derived</stringListValue>
+        </styles>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_t7Xq2IFpEeWKIdAlVGN13g" x="8" y="-31"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_t7YR4IFpEeWKIdAlVGN13g" type="6005">
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_ytkOgIFpEeWKIdAlVGN13g" name="maskLabel">
+          <stringListValue>name</stringListValue>
+          <stringListValue>derived</stringListValue>
+        </styles>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_t7YR4YFpEeWKIdAlVGN13g" x="-9" y="44"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_t7YR4oFpEeWKIdAlVGN13g" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_t7YR44FpEeWKIdAlVGN13g" x="10" y="14"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_t7YR5IFpEeWKIdAlVGN13g" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_t7YR5YFpEeWKIdAlVGN13g" x="-8" y="-9"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_t7Xq0YFpEeWKIdAlVGN13g"/>
+      <element xmi:type="uml:Association" href="esfsafetyconcepts_metamodel.uml#_t6ycAIFpEeWKIdAlVGN13g"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_t7Xq0oFpEeWKIdAlVGN13g" points="[40, 0, -54, -125]$[40, 125, -54, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_t8RCsIFpEeWKIdAlVGN13g" id="(0.08,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_t8RCsYFpEeWKIdAlVGN13g" id="(0.7905759162303665,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_Yt2K4IFuEeWKIdAlVGN13g" type="4001" source="_OgfNwIFoEeWKIdAlVGN13g" target="_aLPksIFoEeWKIdAlVGN13g" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Yt2K44FuEeWKIdAlVGN13g" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yt2K5IFuEeWKIdAlVGN13g" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Yt2K5YFuEeWKIdAlVGN13g" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yt2K5oFuEeWKIdAlVGN13g" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Yt2K54FuEeWKIdAlVGN13g" type="6003">
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_jjrsAIFuEeWKIdAlVGN13g" name="maskLabel">
+          <stringListValue>name</stringListValue>
+          <stringListValue>derived</stringListValue>
+        </styles>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yt2K6IFuEeWKIdAlVGN13g" x="-15" y="-12"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Yt2K6YFuEeWKIdAlVGN13g" type="6005">
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_j2JVAIFuEeWKIdAlVGN13g" name="maskLabel">
+          <stringListValue>name</stringListValue>
+          <stringListValue>derived</stringListValue>
+        </styles>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yt2K6oFuEeWKIdAlVGN13g" x="-10" y="19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Yt2K64FuEeWKIdAlVGN13g" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yt2K7IFuEeWKIdAlVGN13g" x="-23" y="15"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Yt2K7YFuEeWKIdAlVGN13g" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Yt2K7oFuEeWKIdAlVGN13g" x="32" y="-17"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_Yt2K4YFuEeWKIdAlVGN13g"/>
+      <element xmi:type="uml:Association" href="esfsafetyconcepts_metamodel.uml#_YtBrgIFuEeWKIdAlVGN13g"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Yt2K4oFuEeWKIdAlVGN13g" points="[-11, -2, 436, 0]$[-435, -3, 12, -1]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YuttkIFuEeWKIdAlVGN13g" id="(0.0,0.44)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YuttkYFuEeWKIdAlVGN13g" id="(1.0,0.44)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_f8XAAIFuEeWKIdAlVGN13g" type="4001" source="_Qctp4IFoEeWKIdAlVGN13g" target="_cnXo4IFoEeWKIdAlVGN13g" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_f8XAA4FuEeWKIdAlVGN13g" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_f8XABIFuEeWKIdAlVGN13g" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_f8XABYFuEeWKIdAlVGN13g" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_f8XABoFuEeWKIdAlVGN13g" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_f8XAB4FuEeWKIdAlVGN13g" type="6003">
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_lQaTkIFuEeWKIdAlVGN13g" name="maskLabel">
+          <stringListValue>name</stringListValue>
+          <stringListValue>derived</stringListValue>
+        </styles>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_f8XACIFuEeWKIdAlVGN13g" x="-2" y="-13"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_f8XnEIFuEeWKIdAlVGN13g" type="6005">
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_kasMgIFuEeWKIdAlVGN13g" name="maskLabel">
+          <stringListValue>name</stringListValue>
+          <stringListValue>derived</stringListValue>
+        </styles>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_f8XnEYFuEeWKIdAlVGN13g" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_f8XnEoFuEeWKIdAlVGN13g" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_f8XnE4FuEeWKIdAlVGN13g" x="-36" y="16"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_f8XnFIFuEeWKIdAlVGN13g" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_f8XnFYFuEeWKIdAlVGN13g" x="34" y="-19"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_f8XAAYFuEeWKIdAlVGN13g"/>
+      <element xmi:type="uml:Association" href="esfsafetyconcepts_metamodel.uml#_f7ePMIFuEeWKIdAlVGN13g"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_f8XAAoFuEeWKIdAlVGN13g" points="[-7, 9, 433, 0]$[-412, -3, 28, -12]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f9XFkIFuEeWKIdAlVGN13g" id="(0.0,0.64)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f9XFkYFuEeWKIdAlVGN13g" id="(1.0,0.23756906077348067)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_gjpCcIFuEeWKIdAlVGN13g" type="4001" source="_PupqAIFoEeWKIdAlVGN13g" target="_cnXo4IFoEeWKIdAlVGN13g" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_gjpCc4FuEeWKIdAlVGN13g" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_gjpCdIFuEeWKIdAlVGN13g" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_gjpCdYFuEeWKIdAlVGN13g" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_gjpCdoFuEeWKIdAlVGN13g" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_gjpCd4FuEeWKIdAlVGN13g" type="6003">
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_kuKiIIFuEeWKIdAlVGN13g" name="maskLabel">
+          <stringListValue>name</stringListValue>
+          <stringListValue>derived</stringListValue>
+        </styles>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_gjpCeIFuEeWKIdAlVGN13g" x="42" y="-19"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_gjpCeYFuEeWKIdAlVGN13g" type="6005">
+        <styles xmi:type="notation:StringListValueStyle" xmi:id="_kGVtIIFuEeWKIdAlVGN13g" name="maskLabel"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_gjpCeoFuEeWKIdAlVGN13g" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_gjpCe4FuEeWKIdAlVGN13g" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_gjpCfIFuEeWKIdAlVGN13g" x="-40" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_gjpCfYFuEeWKIdAlVGN13g" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_gjpCfoFuEeWKIdAlVGN13g" x="47" y="-15"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_gjpCcYFuEeWKIdAlVGN13g"/>
+      <element xmi:type="uml:Association" href="esfsafetyconcepts_metamodel.uml#_giyG0IFuEeWKIdAlVGN13g"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_gjpCcoFuEeWKIdAlVGN13g" points="[-13, -1, 448, 0]$[-418, 18, 43, 19]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gkldoIFuEeWKIdAlVGN13g" id="(0.0,0.22)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gkldoYFuEeWKIdAlVGN13g" id="(1.0,0.7403314917127072)"/>
+    </edges>
+  </notation:Diagram>
+</xmi:XMI>
diff --git a/core/metamodel/org.polarsys.esf.core.metamodel.esfsafetyconcepts/src/main/resources/metamodel/esfsafetyconcepts_metamodel.uml b/core/metamodel/org.polarsys.esf.core.metamodel.esfsafetyconcepts/src/main/resources/metamodel/esfsafetyconcepts_metamodel.uml
index 1a75e04..167fe3c 100644
--- a/core/metamodel/org.polarsys.esf.core.metamodel.esfsafetyconcepts/src/main/resources/metamodel/esfsafetyconcepts_metamodel.uml
+++ b/core/metamodel/org.polarsys.esf.core.metamodel.esfsafetyconcepts/src/main/resources/metamodel/esfsafetyconcepts_metamodel.uml
@@ -1,260 +1,260 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_yvDioAnQEeW356xdbh3U2Q" name="ESFSafetyConcepts">

-  <packagedElement xmi:type="uml:Package" xmi:id="__2mtEAnjEeW356xdbh3U2Q" name="SDysfunctions">

-    <packagedElement xmi:type="uml:Class" xmi:id="_quWZkAnmEeW356xdbh3U2Q" name="AbstractSDysfunctionObject" isAbstract="true">

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

-        <general xmi:type="uml:Class" href="esfcore_metamodel.uml#_Q05ZgOjPEeSQI-4c5olYjA"/>

-      </generalization>

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

-        <general xmi:type="uml:Class" href="../../../../../org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_Q05ZgOjPEeSQI-4c5olYjA"/>

-      </generalization>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="_rCbzMAnmEeW356xdbh3U2Q" name="SFailureEvent">

-      <generalization xmi:type="uml:Generalization" xmi:id="_NTirwIFjEeWKIdAlVGN13g" general="_quWZkAnmEeW356xdbh3U2Q"/>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_RALmgIFsEeWKIdAlVGN13g" name="fearedEvent">

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

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_QxACYoFpEeWKIdAlVGN13g" name="sRisk" type="_K3ARUA53EeWvS4pMPcwguQ" association="_Qw_bUIFpEeWKIdAlVGN13g">

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

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

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_pLe0QoFpEeWKIdAlVGN13g" name="sEffectsList" type="_yT7DoIFiEeWKIdAlVGN13g" association="_pLeNMIFpEeWKIdAlVGN13g">

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

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

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_qP2bUoFpEeWKIdAlVGN13g" name="sCausesList" type="_wMyYAIFiEeWKIdAlVGN13g" association="_qP10QIFpEeWKIdAlVGN13g">

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

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

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_rmPmgoFpEeWKIdAlVGN13g" name="sFailureMode" type="_rhzPwAnmEeW356xdbh3U2Q" association="_rmO_cIFpEeWKIdAlVGN13g">

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

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

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_MvVcYIFsEeWKIdAlVGN13g" name="occurence">

-        <type xmi:type="uml:DataType" href="../../../../../org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml#_qLS24A23EeWIHrhJxYOO3w"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_NXx8cIFsEeWKIdAlVGN13g" name="cost">

-        <type xmi:type="uml:DataType" href="../../../../../org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml#_V4JUgA28EeWIHrhJxYOO3w"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_N0E24IFsEeWKIdAlVGN13g" name="criticality">

-        <type xmi:type="uml:DataType" href="../../../../../org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml#_k2eh4AnTEeW356xdbh3U2Q"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_ORrY4IFsEeWKIdAlVGN13g" name="severity">

-        <type xmi:type="uml:DataType" href="../../../../../org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml#_2040oA23EeWIHrhJxYOO3w"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_PE4XcIFsEeWKIdAlVGN13g" name="detectability">

-        <type xmi:type="uml:DataType" href="../../../../../org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml#_5Aa4EA23EeWIHrhJxYOO3w"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_PyWhcIFsEeWKIdAlVGN13g" name="probability">

-        <type xmi:type="uml:DataType" href="../../../../../org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml#_e45QgH8AEeW5YtCK2zP8qA"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_f7fdUIFuEeWKIdAlVGN13g" name="sDetectionsList" type="_aKwj4IFlEeWKIdAlVGN13g" association="_f7ePMIFuEeWKIdAlVGN13g">

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

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

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_gizU8oFuEeWKIdAlVGN13g" name="sRecommendationsList" type="_K29CoIFlEeWKIdAlVGN13g" association="_giyG0IFuEeWKIdAlVGN13g">

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

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

-      </ownedAttribute>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="_rhzPwAnmEeW356xdbh3U2Q" name="SFailureMode">

-      <generalization xmi:type="uml:Generalization" xmi:id="_WUbdoAnnEeW356xdbh3U2Q" general="_quWZkAnmEeW356xdbh3U2Q"/>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_rmRbsIFpEeWKIdAlVGN13g" name="sFailureEvent" type="_rCbzMAnmEeW356xdbh3U2Q" association="_rmO_cIFpEeWKIdAlVGN13g">

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

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

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_sWD544FpEeWKIdAlVGN13g" name="sFailureState" type="_r9BzMAnmEeW356xdbh3U2Q" association="_sWD54IFpEeWKIdAlVGN13g">

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

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

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_YtDgsIFuEeWKIdAlVGN13g" name="sBarrier" type="_iEHMUAnxEeW356xdbh3U2Q" association="_YtBrgIFuEeWKIdAlVGN13g">

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

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

-      </ownedAttribute>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="_r9BzMAnmEeW356xdbh3U2Q" name="SFailureState">

-      <generalization xmi:type="uml:Generalization" xmi:id="_MoyekIFjEeWKIdAlVGN13g" general="_quWZkAnmEeW356xdbh3U2Q"/>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_sWEg8IFpEeWKIdAlVGN13g" name="sFailureMode" type="_rhzPwAnmEeW356xdbh3U2Q" association="_sWD54IFpEeWKIdAlVGN13g">

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

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

-      </ownedAttribute>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="_K3ARUA53EeWvS4pMPcwguQ" name="SRisk">

-      <generalization xmi:type="uml:Generalization" xmi:id="_UQtLoA53EeWvS4pMPcwguQ" general="_quWZkAnmEeW356xdbh3U2Q"/>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_CKK74oFpEeWKIdAlVGN13g" name="sHazard" type="_L9BeMA53EeWvS4pMPcwguQ" association="_CKJtwIFpEeWKIdAlVGN13g">

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

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

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_QxB3kIFpEeWKIdAlVGN13g" name="sFailureEvent" type="_rCbzMAnmEeW356xdbh3U2Q" association="_Qw_bUIFpEeWKIdAlVGN13g">

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

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

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_tDMssYFpEeWKIdAlVGN13g" name="sEffectsList" type="_yT7DoIFiEeWKIdAlVGN13g" association="_tDLekIFpEeWKIdAlVGN13g">

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

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

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_t6zDEoFpEeWKIdAlVGN13g" name="sCausesList" type="_wMyYAIFiEeWKIdAlVGN13g" association="_t6ycAIFpEeWKIdAlVGN13g">

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

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

-      </ownedAttribute>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="_L9BeMA53EeWvS4pMPcwguQ" name="SHazard">

-      <generalization xmi:type="uml:Generalization" xmi:id="_UqchUA53EeWvS4pMPcwguQ" general="_quWZkAnmEeW356xdbh3U2Q"/>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_CKK74YFpEeWKIdAlVGN13g" name="sRisk" type="_K3ARUA53EeWvS4pMPcwguQ" association="_CKJtwIFpEeWKIdAlVGN13g">

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

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

-      </ownedAttribute>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Dependency" xmi:id="_BtHQoIFiEeWKIdAlVGN13g" client="__2mtEAnjEeW356xdbh3U2Q" supplier="_IpBk8AnkEeW356xdbh3U2Q"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_wMyYAIFiEeWKIdAlVGN13g" name="SCause">

-      <generalization xmi:type="uml:Generalization" xmi:id="_LYGSwIFjEeWKIdAlVGN13g" general="_quWZkAnmEeW356xdbh3U2Q"/>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_qP3CYIFpEeWKIdAlVGN13g" name="sFailureEventsList" type="_rCbzMAnmEeW356xdbh3U2Q" association="_qP10QIFpEeWKIdAlVGN13g">

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

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

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_t6zDE4FpEeWKIdAlVGN13g" name="sRisksList" type="_K3ARUA53EeWvS4pMPcwguQ" association="_t6ycAIFpEeWKIdAlVGN13g">

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

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

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_JiaNYIFsEeWKIdAlVGN13g" name="occurence">

-        <type xmi:type="uml:DataType" href="../../../../../org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml#_qLS24A23EeWIHrhJxYOO3w"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_KtLXYIFsEeWKIdAlVGN13g" name="detectability">

-        <type xmi:type="uml:DataType" href="../../../../../org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml#_5Aa4EA23EeWIHrhJxYOO3w"/>

-      </ownedAttribute>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="_yT7DoIFiEeWKIdAlVGN13g" name="SEffect">

-      <generalization xmi:type="uml:Generalization" xmi:id="_MCG5EIFjEeWKIdAlVGN13g" general="_quWZkAnmEeW356xdbh3U2Q"/>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_pLgCYIFpEeWKIdAlVGN13g" name="sFailureEventsList" type="_rCbzMAnmEeW356xdbh3U2Q" association="_pLeNMIFpEeWKIdAlVGN13g">

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

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

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_tDNTwIFpEeWKIdAlVGN13g" name="sRisksList" type="_K3ARUA53EeWvS4pMPcwguQ" association="_tDLekIFpEeWKIdAlVGN13g">

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

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

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_7V7gkIFrEeWKIdAlVGN13g" name="severity">

-        <type xmi:type="uml:DataType" href="../../../../../org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml#_2040oA23EeWIHrhJxYOO3w"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="__8W5IIFrEeWKIdAlVGN13g" name="cost">

-        <type xmi:type="uml:DataType" href="../../../../../org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml#_V4JUgA28EeWIHrhJxYOO3w"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_CmRhsIFsEeWKIdAlVGN13g" name="criticality">

-        <type xmi:type="uml:DataType" href="../../../../../org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml#_k2eh4AnTEeW356xdbh3U2Q"/>

-      </ownedAttribute>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_CKJtwIFpEeWKIdAlVGN13g" memberEnd="_CKK74YFpEeWKIdAlVGN13g _CKK74oFpEeWKIdAlVGN13g">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CKKU0IFpEeWKIdAlVGN13g" source="org.eclipse.papyrus">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CKK74IFpEeWKIdAlVGN13g" key="nature" value="UML_Nature"/>

-      </eAnnotations>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_Qw_bUIFpEeWKIdAlVGN13g" memberEnd="_QxACYoFpEeWKIdAlVGN13g _QxB3kIFpEeWKIdAlVGN13g">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QxACYIFpEeWKIdAlVGN13g" source="org.eclipse.papyrus">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QxACYYFpEeWKIdAlVGN13g" key="nature" value="UML_Nature"/>

-      </eAnnotations>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_pLeNMIFpEeWKIdAlVGN13g" memberEnd="_pLe0QoFpEeWKIdAlVGN13g _pLgCYIFpEeWKIdAlVGN13g">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pLe0QIFpEeWKIdAlVGN13g" source="org.eclipse.papyrus">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pLe0QYFpEeWKIdAlVGN13g" key="nature" value="UML_Nature"/>

-      </eAnnotations>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_qP10QIFpEeWKIdAlVGN13g" memberEnd="_qP2bUoFpEeWKIdAlVGN13g _qP3CYIFpEeWKIdAlVGN13g">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qP2bUIFpEeWKIdAlVGN13g" source="org.eclipse.papyrus">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qP2bUYFpEeWKIdAlVGN13g" key="nature" value="UML_Nature"/>

-      </eAnnotations>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_rmO_cIFpEeWKIdAlVGN13g" memberEnd="_rmPmgoFpEeWKIdAlVGN13g _rmRbsIFpEeWKIdAlVGN13g">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rmPmgIFpEeWKIdAlVGN13g" source="org.eclipse.papyrus">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rmPmgYFpEeWKIdAlVGN13g" key="nature" value="UML_Nature"/>

-      </eAnnotations>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_sWD54IFpEeWKIdAlVGN13g" memberEnd="_sWD544FpEeWKIdAlVGN13g _sWEg8IFpEeWKIdAlVGN13g">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sWD54YFpEeWKIdAlVGN13g" source="org.eclipse.papyrus">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_sWD54oFpEeWKIdAlVGN13g" key="nature" value="UML_Nature"/>

-      </eAnnotations>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_tDLekIFpEeWKIdAlVGN13g" memberEnd="_tDMssYFpEeWKIdAlVGN13g _tDNTwIFpEeWKIdAlVGN13g">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tDMFoIFpEeWKIdAlVGN13g" source="org.eclipse.papyrus">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tDMssIFpEeWKIdAlVGN13g" key="nature" value="UML_Nature"/>

-      </eAnnotations>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_t6ycAIFpEeWKIdAlVGN13g" memberEnd="_t6zDEoFpEeWKIdAlVGN13g _t6zDE4FpEeWKIdAlVGN13g">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_t6zDEIFpEeWKIdAlVGN13g" source="org.eclipse.papyrus">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t6zDEYFpEeWKIdAlVGN13g" key="nature" value="UML_Nature"/>

-      </eAnnotations>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_YtBrgIFuEeWKIdAlVGN13g" memberEnd="_YtC5oYFuEeWKIdAlVGN13g _YtDgsIFuEeWKIdAlVGN13g">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YtCSkIFuEeWKIdAlVGN13g" source="org.eclipse.papyrus">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YtC5oIFuEeWKIdAlVGN13g" key="nature" value="UML_Nature"/>

-      </eAnnotations>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_f7ePMIFuEeWKIdAlVGN13g" memberEnd="_f7e2QoFuEeWKIdAlVGN13g _f7fdUIFuEeWKIdAlVGN13g">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_f7e2QIFuEeWKIdAlVGN13g" source="org.eclipse.papyrus">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_f7e2QYFuEeWKIdAlVGN13g" key="nature" value="UML_Nature"/>

-      </eAnnotations>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_giyG0IFuEeWKIdAlVGN13g" memberEnd="_gizU8YFuEeWKIdAlVGN13g _gizU8oFuEeWKIdAlVGN13g">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_giyt4IFuEeWKIdAlVGN13g" source="org.eclipse.papyrus">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_gizU8IFuEeWKIdAlVGN13g" key="nature" value="UML_Nature"/>

-      </eAnnotations>

-      <ownedEnd xmi:type="uml:Property" xmi:id="_gizU8YFuEeWKIdAlVGN13g" name="sFailureEventsList" type="_rCbzMAnmEeW356xdbh3U2Q" association="_giyG0IFuEeWKIdAlVGN13g">

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

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

-      </ownedEnd>

-    </packagedElement>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Package" xmi:id="_IpBk8AnkEeW356xdbh3U2Q" name="SRecommendations">

-    <packagedElement xmi:type="uml:Class" xmi:id="_iEHMUAnxEeW356xdbh3U2Q" name="SBarrier">

-      <generalization xmi:type="uml:Generalization" xmi:id="_PcmYEIFlEeWKIdAlVGN13g" general="_K29CoIFlEeWKIdAlVGN13g"/>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="__sp38IFlEeWKIdAlVGN13g" name="sActionsList" type="_P3dvIIFlEeWKIdAlVGN13g" association="__slmgIFlEeWKIdAlVGN13g">

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

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

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_YtC5oYFuEeWKIdAlVGN13g" name="sFailureModesList" type="_rhzPwAnmEeW356xdbh3U2Q" association="_YtBrgIFuEeWKIdAlVGN13g">

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

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

-      </ownedAttribute>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Dependency" xmi:id="_C1As0IFiEeWKIdAlVGN13g" client="_IpBk8AnkEeW356xdbh3U2Q" supplier="__2mtEAnjEeW356xdbh3U2Q"/>

-    <packagedElement xmi:type="uml:Class" xmi:id="_K29CoIFlEeWKIdAlVGN13g" name="SRecommendation">

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

-        <general xmi:type="uml:Class" href="../../../../../org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_Q05ZgOjPEeSQI-4c5olYjA"/>

-      </generalization>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="_P3dvIIFlEeWKIdAlVGN13g" name="SAction">

-      <generalization xmi:type="uml:Generalization" xmi:id="_Zkq0QIFlEeWKIdAlVGN13g" general="_K29CoIFlEeWKIdAlVGN13g"/>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_4mJvUIFlEeWKIdAlVGN13g" name="kind" type="_eu3oQIFlEeWKIdAlVGN13g"/>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="__sqfAIFlEeWKIdAlVGN13g" name="sBarriersList" type="_iEHMUAnxEeW356xdbh3U2Q" association="__slmgIFlEeWKIdAlVGN13g">

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

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

-      </ownedAttribute>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="_aKwj4IFlEeWKIdAlVGN13g" name="SDetection">

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

-        <general xmi:type="uml:Class" href="../../../../../org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_Q05ZgOjPEeSQI-4c5olYjA"/>

-      </generalization>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="_f7e2QoFuEeWKIdAlVGN13g" name="sFailureEventsList" type="_rCbzMAnmEeW356xdbh3U2Q" association="_f7ePMIFuEeWKIdAlVGN13g">

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

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

-      </ownedAttribute>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Enumeration" xmi:id="_eu3oQIFlEeWKIdAlVGN13g" name="SActionKind">

-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_kH9M0IFlEeWKIdAlVGN13g" name="PreventiveAction"/>

-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_nFQEYIFlEeWKIdAlVGN13g" name="CorrectiveAction"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="__slmgIFlEeWKIdAlVGN13g" memberEnd="__sp38IFlEeWKIdAlVGN13g __sqfAIFlEeWKIdAlVGN13g">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__snbsIFlEeWKIdAlVGN13g" source="org.eclipse.papyrus">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__snbsYFlEeWKIdAlVGN13g" key="nature" value="UML_Nature"/>

-      </eAnnotations>

-    </packagedElement>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Dependency" xmi:id="_RVMYwIFiEeWKIdAlVGN13g" client="_yvDioAnQEeW356xdbh3U2Q">

-    <supplier xmi:type="uml:Model" href="../../../../../org.polarsys.esf.core.metamodel.esfbehaviours/src/main/resources/metamodel/esfbehaviours_metamodel.uml#_IYSU4AnREeW356xdbh3U2Q"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Dependency" xmi:id="_R4_pYIFiEeWKIdAlVGN13g" client="_yvDioAnQEeW356xdbh3U2Q">

-    <supplier xmi:type="uml:Model" href="../../../../../org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml#_-NKksAnQEeW356xdbh3U2Q"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Dependency" xmi:id="_45yssISJEeWOntSnNos8Xg" client="_yvDioAnQEeW356xdbh3U2Q">

-    <supplier xmi:type="uml:Model" href="../../../../../org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_VB4SINLoEeSb47LgOrWUpg"/>

-  </packagedElement>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_yvDioAnQEeW356xdbh3U2Q" name="ESFSafetyConcepts">
+  <packagedElement xmi:type="uml:Package" xmi:id="__2mtEAnjEeW356xdbh3U2Q" name="SDysfunctions">
+    <packagedElement xmi:type="uml:Class" xmi:id="_quWZkAnmEeW356xdbh3U2Q" name="AbstractSDysfunctionObject" isAbstract="true">
+      <generalization xmi:type="uml:Generalization" xmi:id="_A_AYMAnnEeW356xdbh3U2Q">
+        <general xmi:type="uml:Class" href="esfcore_metamodel.uml#_Q05ZgOjPEeSQI-4c5olYjA"/>
+      </generalization>
+      <generalization xmi:type="uml:Generalization" xmi:id="_8VEEQISKEeWOntSnNos8Xg">
+        <general xmi:type="uml:Class" href="../../../../../org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_Q05ZgOjPEeSQI-4c5olYjA"/>
+      </generalization>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_rCbzMAnmEeW356xdbh3U2Q" name="SFailureEvent">
+      <generalization xmi:type="uml:Generalization" xmi:id="_NTirwIFjEeWKIdAlVGN13g" general="_quWZkAnmEeW356xdbh3U2Q"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_RALmgIFsEeWKIdAlVGN13g" name="fearedEvent">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_QxACYoFpEeWKIdAlVGN13g" name="sRisk" type="_K3ARUA53EeWvS4pMPcwguQ" association="_Qw_bUIFpEeWKIdAlVGN13g">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XIpg8IFpEeWKIdAlVGN13g"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XIr9MIFpEeWKIdAlVGN13g" value="1"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_pLe0QoFpEeWKIdAlVGN13g" name="sEffectsList" type="_yT7DoIFiEeWKIdAlVGN13g" association="_pLeNMIFpEeWKIdAlVGN13g">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YN1tII37EeWEM8PJGngEtA" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YN4wcI37EeWEM8PJGngEtA" value="*"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_qP2bUoFpEeWKIdAlVGN13g" name="sCausesList" type="_wMyYAIFiEeWKIdAlVGN13g" association="_qP10QIFpEeWKIdAlVGN13g">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_oGb9gI37EeWEM8PJGngEtA" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oGfA0I37EeWEM8PJGngEtA" value="*"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_rmPmgoFpEeWKIdAlVGN13g" name="sFailureMode" type="_rhzPwAnmEeW356xdbh3U2Q" association="_rmO_cIFpEeWKIdAlVGN13g">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_lpGdMIFqEeWKIdAlVGN13g"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lpHEQIFqEeWKIdAlVGN13g" value="1"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_MvVcYIFsEeWKIdAlVGN13g" name="occurence">
+        <type xmi:type="uml:DataType" href="../../../../../org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml#_qLS24A23EeWIHrhJxYOO3w"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_NXx8cIFsEeWKIdAlVGN13g" name="cost">
+        <type xmi:type="uml:DataType" href="../../../../../org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml#_V4JUgA28EeWIHrhJxYOO3w"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_N0E24IFsEeWKIdAlVGN13g" name="criticality">
+        <type xmi:type="uml:DataType" href="../../../../../org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml#_k2eh4AnTEeW356xdbh3U2Q"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_ORrY4IFsEeWKIdAlVGN13g" name="severity">
+        <type xmi:type="uml:DataType" href="../../../../../org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml#_2040oA23EeWIHrhJxYOO3w"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_PE4XcIFsEeWKIdAlVGN13g" name="detectability">
+        <type xmi:type="uml:DataType" href="../../../../../org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml#_5Aa4EA23EeWIHrhJxYOO3w"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_PyWhcIFsEeWKIdAlVGN13g" name="probability">
+        <type xmi:type="uml:DataType" href="../../../../../org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml#_e45QgH8AEeW5YtCK2zP8qA"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_f7fdUIFuEeWKIdAlVGN13g" name="sDetectionsList" type="_aKwj4IFlEeWKIdAlVGN13g" association="_f7ePMIFuEeWKIdAlVGN13g">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_KLPfoI38EeWEM8PJGngEtA" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KLRU0I38EeWEM8PJGngEtA" value="*"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_gizU8oFuEeWKIdAlVGN13g" name="sRecommendationsList" type="_K29CoIFlEeWKIdAlVGN13g" association="_giyG0IFuEeWKIdAlVGN13g">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_TXDP4IFvEeWKIdAlVGN13g"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TXFsIIFvEeWKIdAlVGN13g" value="*"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_rhzPwAnmEeW356xdbh3U2Q" name="SFailureMode">
+      <generalization xmi:type="uml:Generalization" xmi:id="_WUbdoAnnEeW356xdbh3U2Q" general="_quWZkAnmEeW356xdbh3U2Q"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_rmRbsIFpEeWKIdAlVGN13g" name="sFailureEvent" type="_rCbzMAnmEeW356xdbh3U2Q" association="_rmO_cIFpEeWKIdAlVGN13g">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mO__kIFqEeWKIdAlVGN13g" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mPBNsIFqEeWKIdAlVGN13g" value="1"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_sWD544FpEeWKIdAlVGN13g" name="sFailureState" type="_r9BzMAnmEeW356xdbh3U2Q" association="_sWD54IFpEeWKIdAlVGN13g">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gVBfAIFrEeWKIdAlVGN13g" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gVDUMIFrEeWKIdAlVGN13g" value="1"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_YtDgsIFuEeWKIdAlVGN13g" name="sBarrier" type="_iEHMUAnxEeW356xdbh3U2Q" association="_YtBrgIFuEeWKIdAlVGN13g">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YC1CgIFvEeWKIdAlVGN13g"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YC2QoIFvEeWKIdAlVGN13g" value="1"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_r9BzMAnmEeW356xdbh3U2Q" name="SFailureState">
+      <generalization xmi:type="uml:Generalization" xmi:id="_MoyekIFjEeWKIdAlVGN13g" general="_quWZkAnmEeW356xdbh3U2Q"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_sWEg8IFpEeWKIdAlVGN13g" name="sFailureMode" type="_rhzPwAnmEeW356xdbh3U2Q" association="_sWD54IFpEeWKIdAlVGN13g">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hOonkIFrEeWKIdAlVGN13g"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hOqcwIFrEeWKIdAlVGN13g" value="1"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_K3ARUA53EeWvS4pMPcwguQ" name="SRisk">
+      <generalization xmi:type="uml:Generalization" xmi:id="_UQtLoA53EeWvS4pMPcwguQ" general="_quWZkAnmEeW356xdbh3U2Q"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_CKK74oFpEeWKIdAlVGN13g" name="sHazard" type="_L9BeMA53EeWvS4pMPcwguQ" association="_CKJtwIFpEeWKIdAlVGN13g">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_KM3nAIFpEeWKIdAlVGN13g"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KM6DQIFpEeWKIdAlVGN13g" value="1"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_QxB3kIFpEeWKIdAlVGN13g" name="sFailureEvent" type="_rCbzMAnmEeW356xdbh3U2Q" association="_Qw_bUIFpEeWKIdAlVGN13g">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_V4PB8IFpEeWKIdAlVGN13g"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_V4Q3IIFpEeWKIdAlVGN13g" value="1"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_tDMssYFpEeWKIdAlVGN13g" name="sEffectsList" type="_yT7DoIFiEeWKIdAlVGN13g" association="_tDLekIFpEeWKIdAlVGN13g">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Lk_bEIFqEeWKIdAlVGN13g"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LlApMIFqEeWKIdAlVGN13g" value="*"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_t6zDEoFpEeWKIdAlVGN13g" name="sCausesList" type="_wMyYAIFiEeWKIdAlVGN13g" association="_t6ycAIFpEeWKIdAlVGN13g">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_CN-oYIFqEeWKIdAlVGN13g"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_COAdkIFqEeWKIdAlVGN13g" value="*"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_L9BeMA53EeWvS4pMPcwguQ" name="SHazard">
+      <generalization xmi:type="uml:Generalization" xmi:id="_UqchUA53EeWvS4pMPcwguQ" general="_quWZkAnmEeW356xdbh3U2Q"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_CKK74YFpEeWKIdAlVGN13g" name="sRisk" type="_K3ARUA53EeWvS4pMPcwguQ" association="_CKJtwIFpEeWKIdAlVGN13g">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_JuoL0IFpEeWKIdAlVGN13g"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JuqoEIFpEeWKIdAlVGN13g" value="1"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Dependency" xmi:id="_BtHQoIFiEeWKIdAlVGN13g" client="__2mtEAnjEeW356xdbh3U2Q" supplier="_IpBk8AnkEeW356xdbh3U2Q"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_wMyYAIFiEeWKIdAlVGN13g" name="SCause">
+      <generalization xmi:type="uml:Generalization" xmi:id="_LYGSwIFjEeWKIdAlVGN13g" general="_quWZkAnmEeW356xdbh3U2Q"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_qP3CYIFpEeWKIdAlVGN13g" name="sFailureEventsList" type="_rCbzMAnmEeW356xdbh3U2Q" association="_qP10QIFpEeWKIdAlVGN13g">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_o07bMI37EeWEM8PJGngEtA" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_o09QYI37EeWEM8PJGngEtA" value="*"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_t6zDE4FpEeWKIdAlVGN13g" name="sRisksList" type="_K3ARUA53EeWvS4pMPcwguQ" association="_t6ycAIFpEeWKIdAlVGN13g">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_GColwIFqEeWKIdAlVGN13g"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GCqa8IFqEeWKIdAlVGN13g" value="*"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_JiaNYIFsEeWKIdAlVGN13g" name="occurence">
+        <type xmi:type="uml:DataType" href="../../../../../org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml#_qLS24A23EeWIHrhJxYOO3w"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_KtLXYIFsEeWKIdAlVGN13g" name="detectability">
+        <type xmi:type="uml:DataType" href="../../../../../org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml#_5Aa4EA23EeWIHrhJxYOO3w"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_yT7DoIFiEeWKIdAlVGN13g" name="SEffect">
+      <generalization xmi:type="uml:Generalization" xmi:id="_MCG5EIFjEeWKIdAlVGN13g" general="_quWZkAnmEeW356xdbh3U2Q"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_pLgCYIFpEeWKIdAlVGN13g" name="sFailureEventsList" type="_rCbzMAnmEeW356xdbh3U2Q" association="_pLeNMIFpEeWKIdAlVGN13g">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_cgspcI37EeWEM8PJGngEtA" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cgt3kI37EeWEM8PJGngEtA" value="*"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_tDNTwIFpEeWKIdAlVGN13g" name="sRisksList" type="_K3ARUA53EeWvS4pMPcwguQ" association="_tDLekIFpEeWKIdAlVGN13g">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_MEpLgIFqEeWKIdAlVGN13g"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MEpykIFqEeWKIdAlVGN13g" value="*"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_7V7gkIFrEeWKIdAlVGN13g" name="severity">
+        <type xmi:type="uml:DataType" href="../../../../../org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml#_2040oA23EeWIHrhJxYOO3w"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="__8W5IIFrEeWKIdAlVGN13g" name="cost">
+        <type xmi:type="uml:DataType" href="../../../../../org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml#_V4JUgA28EeWIHrhJxYOO3w"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_CmRhsIFsEeWKIdAlVGN13g" name="criticality">
+        <type xmi:type="uml:DataType" href="../../../../../org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml#_k2eh4AnTEeW356xdbh3U2Q"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_CKJtwIFpEeWKIdAlVGN13g" memberEnd="_CKK74YFpEeWKIdAlVGN13g _CKK74oFpEeWKIdAlVGN13g">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CKKU0IFpEeWKIdAlVGN13g" source="org.eclipse.papyrus">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CKK74IFpEeWKIdAlVGN13g" key="nature" value="UML_Nature"/>
+      </eAnnotations>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_Qw_bUIFpEeWKIdAlVGN13g" memberEnd="_QxACYoFpEeWKIdAlVGN13g _QxB3kIFpEeWKIdAlVGN13g">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QxACYIFpEeWKIdAlVGN13g" source="org.eclipse.papyrus">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QxACYYFpEeWKIdAlVGN13g" key="nature" value="UML_Nature"/>
+      </eAnnotations>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_pLeNMIFpEeWKIdAlVGN13g" memberEnd="_pLe0QoFpEeWKIdAlVGN13g _pLgCYIFpEeWKIdAlVGN13g">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pLe0QIFpEeWKIdAlVGN13g" source="org.eclipse.papyrus">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pLe0QYFpEeWKIdAlVGN13g" key="nature" value="UML_Nature"/>
+      </eAnnotations>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_qP10QIFpEeWKIdAlVGN13g" memberEnd="_qP2bUoFpEeWKIdAlVGN13g _qP3CYIFpEeWKIdAlVGN13g">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qP2bUIFpEeWKIdAlVGN13g" source="org.eclipse.papyrus">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qP2bUYFpEeWKIdAlVGN13g" key="nature" value="UML_Nature"/>
+      </eAnnotations>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_rmO_cIFpEeWKIdAlVGN13g" memberEnd="_rmPmgoFpEeWKIdAlVGN13g _rmRbsIFpEeWKIdAlVGN13g">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rmPmgIFpEeWKIdAlVGN13g" source="org.eclipse.papyrus">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rmPmgYFpEeWKIdAlVGN13g" key="nature" value="UML_Nature"/>
+      </eAnnotations>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_sWD54IFpEeWKIdAlVGN13g" memberEnd="_sWD544FpEeWKIdAlVGN13g _sWEg8IFpEeWKIdAlVGN13g">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sWD54YFpEeWKIdAlVGN13g" source="org.eclipse.papyrus">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_sWD54oFpEeWKIdAlVGN13g" key="nature" value="UML_Nature"/>
+      </eAnnotations>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_tDLekIFpEeWKIdAlVGN13g" memberEnd="_tDMssYFpEeWKIdAlVGN13g _tDNTwIFpEeWKIdAlVGN13g">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tDMFoIFpEeWKIdAlVGN13g" source="org.eclipse.papyrus">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tDMssIFpEeWKIdAlVGN13g" key="nature" value="UML_Nature"/>
+      </eAnnotations>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_t6ycAIFpEeWKIdAlVGN13g" memberEnd="_t6zDEoFpEeWKIdAlVGN13g _t6zDE4FpEeWKIdAlVGN13g">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_t6zDEIFpEeWKIdAlVGN13g" source="org.eclipse.papyrus">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t6zDEYFpEeWKIdAlVGN13g" key="nature" value="UML_Nature"/>
+      </eAnnotations>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_YtBrgIFuEeWKIdAlVGN13g" memberEnd="_YtC5oYFuEeWKIdAlVGN13g _YtDgsIFuEeWKIdAlVGN13g">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YtCSkIFuEeWKIdAlVGN13g" source="org.eclipse.papyrus">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YtC5oIFuEeWKIdAlVGN13g" key="nature" value="UML_Nature"/>
+      </eAnnotations>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_f7ePMIFuEeWKIdAlVGN13g" memberEnd="_f7e2QoFuEeWKIdAlVGN13g _f7fdUIFuEeWKIdAlVGN13g">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_f7e2QIFuEeWKIdAlVGN13g" source="org.eclipse.papyrus">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_f7e2QYFuEeWKIdAlVGN13g" key="nature" value="UML_Nature"/>
+      </eAnnotations>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_giyG0IFuEeWKIdAlVGN13g" memberEnd="_gizU8YFuEeWKIdAlVGN13g _gizU8oFuEeWKIdAlVGN13g">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_giyt4IFuEeWKIdAlVGN13g" source="org.eclipse.papyrus">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_gizU8IFuEeWKIdAlVGN13g" key="nature" value="UML_Nature"/>
+      </eAnnotations>
+      <ownedEnd xmi:type="uml:Property" xmi:id="_gizU8YFuEeWKIdAlVGN13g" name="sFailureEventsList" type="_rCbzMAnmEeW356xdbh3U2Q" association="_giyG0IFuEeWKIdAlVGN13g">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_SGzwAIFvEeWKIdAlVGN13g"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SG2MQIFvEeWKIdAlVGN13g" value="*"/>
+      </ownedEnd>
+    </packagedElement>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Package" xmi:id="_IpBk8AnkEeW356xdbh3U2Q" name="SRecommendations">
+    <packagedElement xmi:type="uml:Class" xmi:id="_iEHMUAnxEeW356xdbh3U2Q" name="SBarrier">
+      <generalization xmi:type="uml:Generalization" xmi:id="_PcmYEIFlEeWKIdAlVGN13g" general="_K29CoIFlEeWKIdAlVGN13g"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="__sp38IFlEeWKIdAlVGN13g" name="sActionsList" type="_P3dvIIFlEeWKIdAlVGN13g" association="__slmgIFlEeWKIdAlVGN13g">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_MdiwgIFmEeWKIdAlVGN13g"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Mdlz0IFmEeWKIdAlVGN13g" value="*"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_YtC5oYFuEeWKIdAlVGN13g" name="sFailureModesList" type="_rhzPwAnmEeW356xdbh3U2Q" association="_YtBrgIFuEeWKIdAlVGN13g">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_cKSnIIFvEeWKIdAlVGN13g"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cKT1QIFvEeWKIdAlVGN13g" value="*"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Dependency" xmi:id="_C1As0IFiEeWKIdAlVGN13g" client="_IpBk8AnkEeW356xdbh3U2Q" supplier="__2mtEAnjEeW356xdbh3U2Q"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_K29CoIFlEeWKIdAlVGN13g" name="SRecommendation">
+      <generalization xmi:type="uml:Generalization" xmi:id="_Jf48QISKEeWOntSnNos8Xg">
+        <general xmi:type="uml:Class" href="../../../../../org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_Q05ZgOjPEeSQI-4c5olYjA"/>
+      </generalization>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_P3dvIIFlEeWKIdAlVGN13g" name="SAction">
+      <generalization xmi:type="uml:Generalization" xmi:id="_Zkq0QIFlEeWKIdAlVGN13g" general="_K29CoIFlEeWKIdAlVGN13g"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_4mJvUIFlEeWKIdAlVGN13g" name="kind" type="_eu3oQIFlEeWKIdAlVGN13g"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="__sqfAIFlEeWKIdAlVGN13g" name="sBarriersList" type="_iEHMUAnxEeW356xdbh3U2Q" association="__slmgIFlEeWKIdAlVGN13g">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Pj6rkIFmEeWKIdAlVGN13g"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Pj9H0IFmEeWKIdAlVGN13g" value="*"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_aKwj4IFlEeWKIdAlVGN13g" name="SDetection">
+      <generalization xmi:type="uml:Generalization" xmi:id="_KI9HYISKEeWOntSnNos8Xg">
+        <general xmi:type="uml:Class" href="../../../../../org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_Q05ZgOjPEeSQI-4c5olYjA"/>
+      </generalization>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_f7e2QoFuEeWKIdAlVGN13g" name="sFailureEventsList" type="_rCbzMAnmEeW356xdbh3U2Q" association="_f7ePMIFuEeWKIdAlVGN13g">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LzHcYI38EeWEM8PJGngEtA" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LzJRkI38EeWEM8PJGngEtA" value="*"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Enumeration" xmi:id="_eu3oQIFlEeWKIdAlVGN13g" name="SActionKind">
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_kH9M0IFlEeWKIdAlVGN13g" name="PreventiveAction"/>
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_nFQEYIFlEeWKIdAlVGN13g" name="CorrectiveAction"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="__slmgIFlEeWKIdAlVGN13g" memberEnd="__sp38IFlEeWKIdAlVGN13g __sqfAIFlEeWKIdAlVGN13g">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__snbsIFlEeWKIdAlVGN13g" source="org.eclipse.papyrus">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__snbsYFlEeWKIdAlVGN13g" key="nature" value="UML_Nature"/>
+      </eAnnotations>
+    </packagedElement>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Dependency" xmi:id="_RVMYwIFiEeWKIdAlVGN13g" client="_yvDioAnQEeW356xdbh3U2Q">
+    <supplier xmi:type="uml:Model" href="../../../../../org.polarsys.esf.core.metamodel.esfbehaviours/src/main/resources/metamodel/esfbehaviours_metamodel.uml#_IYSU4AnREeW356xdbh3U2Q"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Dependency" xmi:id="_R4_pYIFiEeWKIdAlVGN13g" client="_yvDioAnQEeW356xdbh3U2Q">
+    <supplier xmi:type="uml:Model" href="../../../../../org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml#_-NKksAnQEeW356xdbh3U2Q"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Dependency" xmi:id="_45yssISJEeWOntSnNos8Xg" client="_yvDioAnQEeW356xdbh3U2Q">
+    <supplier xmi:type="uml:Model" href="../../../../../org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_VB4SINLoEeSb47LgOrWUpg"/>
+  </packagedElement>
+</uml:Model>
diff --git a/core/org.polarsys.esf.core.common.ui/src/main/resources/properties/plugin.properties b/core/org.polarsys.esf.core.common.ui/src/main/resources/properties/plugin.properties
index cd4d18d..566c394 100644
--- a/core/org.polarsys.esf.core.common.ui/src/main/resources/properties/plugin.properties
+++ b/core/org.polarsys.esf.core.common.ui/src/main/resources/properties/plugin.properties
@@ -1,6 +1,6 @@
-#Properties file for org.polarsys.esf.core.common.ui

-Bundle-Vendor = Polarsys

-Bundle-Name = ESF Common UI

-

-toolbar.esf.label = ESF toolbar

+#Properties file for org.polarsys.esf.core.common.ui
+Bundle-Vendor = Polarsys
+Bundle-Name = ESF Common UI
+
+toolbar.esf.label = ESF toolbar
 command.help = Help content
\ No newline at end of file
diff --git a/core/org.polarsys.esf.core.common/META-INF/MANIFEST.MF b/core/org.polarsys.esf.core.common/META-INF/MANIFEST.MF
index 1ff0dad..d21be84 100644
--- a/core/org.polarsys.esf.core.common/META-INF/MANIFEST.MF
+++ b/core/org.polarsys.esf.core.common/META-INF/MANIFEST.MF
@@ -12,8 +12,7 @@
  org.eclipse.core.runtime;bundle-version="3.11.1";visibility:=reexport,
  org.apache.commons.io;bundle-version="2.2.0";visibility:=reexport,
  org.apache.commons.lang3;bundle-version="3.1.0";visibility:=reexport,
- org.eclipse.uml2.uml;bundle-version="5.1.0";visibility:=reexport,
- org.jdom;bundle-version="1.1.1"
+ org.eclipse.uml2.uml;bundle-version="5.1.0";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Export-Package: org.polarsys.esf.core.common.adapter,
diff --git a/core/org.polarsys.esf.core.doc/build.properties b/core/org.polarsys.esf.core.doc/build.properties
index 40cb4aa..43c35d8 100644
--- a/core/org.polarsys.esf.core.doc/build.properties
+++ b/core/org.polarsys.esf.core.doc/build.properties
@@ -3,3 +3,4 @@
                about.html,\
                src/main/resources/,\
                plugin.xml
+src.includes = src/
diff --git a/core/org.polarsys.esf.core.doc/src/main/resources/help/html/usermanual/UserManual.html b/core/org.polarsys.esf.core.doc/src/main/resources/help/html/usermanual/UserManual.html
index 48861e4..88a7c03 100644
--- a/core/org.polarsys.esf.core.doc/src/main/resources/help/html/usermanual/UserManual.html
+++ b/core/org.polarsys.esf.core.doc/src/main/resources/help/html/usermanual/UserManual.html
@@ -26,15 +26,14 @@
     <div id="proj">
         <h1>Create an ESF Project</h1>
         <p>Click "New > Project..." either from the "Project Explorer" or the "File" menu.</p>
-        <p><img src="./images/Fig_1_1_NewProject.png" alt="New Project Menu" height="125px">
-        <p>From the "New Project" dialog, select "ESF Project" and click "Next >".</p>
-        <img src="./images/Fig_1_2_CreateESFProject.png" alt="Create ESF Project"  height="300px">
+        <p>From the "New Project" dialog, select "Papyrus Project" and click "Next >".</p>
+        <p>Choose "Eclipse Safety Framework" as architecture context.</p>
+        	<img src="./images/Fig_1_1_ESFNewProject.png" alt="Create Papyrus Project"  height="500px">
         <p>Name the project as "RecoverySystemESF" and the model file as "recoverySystemESF", then click "Next >".</p>
-        <img src="./images/Fig_1_3_ESFProjectSettingsPage1.png" alt="ESF Project Settings Page 1" height="300px">
-        <p>Name the root model element as "RecoverySystemESF" and click "Finish".</p>
-        <img src="./images/Fig_1_4_ESFProjectSettingsPage2.png" alt="ESF Project Settings Page 2" height="400px">
+        <p>Select the initial diagrams of your model.</p>
+        	<img src="./images/Fig_1_2_ESFSelectDiagrams.png" alt="Select diagrams" height="450px">
         <p>The ESF project will be created and opened in the Papyrus perspective.</p>
-        <img src="./images/Fig_1_5_ESFProjectCreated.png" alt="ESF Project Created" height="300px">
+        	<img src="./images/Fig_1_3_ESFProjectCreated.png" alt="ESF Project Created" height="400px">
     </div>
 
     <div id="arch">
diff --git a/core/org.polarsys.esf.core.doc/src/main/resources/help/html/usermanual/images/Fig_1_1_ESFNewProject.png b/core/org.polarsys.esf.core.doc/src/main/resources/help/html/usermanual/images/Fig_1_1_ESFNewProject.png
new file mode 100644
index 0000000..49f15ba
--- /dev/null
+++ b/core/org.polarsys.esf.core.doc/src/main/resources/help/html/usermanual/images/Fig_1_1_ESFNewProject.png
Binary files differ
diff --git a/core/org.polarsys.esf.core.doc/src/main/resources/help/html/usermanual/images/Fig_1_1_NewProject.png b/core/org.polarsys.esf.core.doc/src/main/resources/help/html/usermanual/images/Fig_1_1_NewProject.png
deleted file mode 100644
index 30b765a..0000000
--- a/core/org.polarsys.esf.core.doc/src/main/resources/help/html/usermanual/images/Fig_1_1_NewProject.png
+++ /dev/null
Binary files differ
diff --git a/core/org.polarsys.esf.core.doc/src/main/resources/help/html/usermanual/images/Fig_1_2_CreateESFProject.png b/core/org.polarsys.esf.core.doc/src/main/resources/help/html/usermanual/images/Fig_1_2_CreateESFProject.png
deleted file mode 100644
index bb911d1..0000000
--- a/core/org.polarsys.esf.core.doc/src/main/resources/help/html/usermanual/images/Fig_1_2_CreateESFProject.png
+++ /dev/null
Binary files differ
diff --git a/core/org.polarsys.esf.core.doc/src/main/resources/help/html/usermanual/images/Fig_1_2_ESFSelectDiagrams.png b/core/org.polarsys.esf.core.doc/src/main/resources/help/html/usermanual/images/Fig_1_2_ESFSelectDiagrams.png
new file mode 100644
index 0000000..75ad654
--- /dev/null
+++ b/core/org.polarsys.esf.core.doc/src/main/resources/help/html/usermanual/images/Fig_1_2_ESFSelectDiagrams.png
Binary files differ
diff --git a/core/org.polarsys.esf.core.doc/src/main/resources/help/html/usermanual/images/Fig_1_5_ESFProjectCreated.png b/core/org.polarsys.esf.core.doc/src/main/resources/help/html/usermanual/images/Fig_1_3_ESFProjectCreated.png
similarity index 100%
rename from core/org.polarsys.esf.core.doc/src/main/resources/help/html/usermanual/images/Fig_1_5_ESFProjectCreated.png
rename to core/org.polarsys.esf.core.doc/src/main/resources/help/html/usermanual/images/Fig_1_3_ESFProjectCreated.png
Binary files differ
diff --git a/core/org.polarsys.esf.core.doc/src/main/resources/help/html/usermanual/images/Fig_1_3_ESFProjectSettingsPage1.png b/core/org.polarsys.esf.core.doc/src/main/resources/help/html/usermanual/images/Fig_1_3_ESFProjectSettingsPage1.png
deleted file mode 100644
index a0817b2..0000000
--- a/core/org.polarsys.esf.core.doc/src/main/resources/help/html/usermanual/images/Fig_1_3_ESFProjectSettingsPage1.png
+++ /dev/null
Binary files differ
diff --git a/core/org.polarsys.esf.core.doc/src/main/resources/help/html/usermanual/images/Fig_1_4_ESFProjectSettingsPage2.png b/core/org.polarsys.esf.core.doc/src/main/resources/help/html/usermanual/images/Fig_1_4_ESFProjectSettingsPage2.png
deleted file mode 100644
index 54cb978..0000000
--- a/core/org.polarsys.esf.core.doc/src/main/resources/help/html/usermanual/images/Fig_1_4_ESFProjectSettingsPage2.png
+++ /dev/null
Binary files differ
diff --git a/core/org.polarsys.esf.core.help/src/main/resources/examples/readme.txt b/core/org.polarsys.esf.core.help/src/main/resources/examples/readme.txt
index f91da09..b99d56f 100644
--- a/core/org.polarsys.esf.core.help/src/main/resources/examples/readme.txt
+++ b/core/org.polarsys.esf.core.help/src/main/resources/examples/readme.txt
@@ -1,2 +1,2 @@
-The examples must be stored here.

+The examples must be stored here.
 This empty files must be deleted once the first example will be published.
\ No newline at end of file
diff --git a/core/org.polarsys.esf.core.rcp/build.properties b/core/org.polarsys.esf.core.rcp/build.properties
index 52daeef..d60e765 100644
--- a/core/org.polarsys.esf.core.rcp/build.properties
+++ b/core/org.polarsys.esf.core.rcp/build.properties
@@ -1,8 +1,8 @@
-output.. = target/classes/

-bin.includes = plugin.xml,\

-               META-INF/,\

-               .,\

-               splash.bmp,\

-               plugin_customization.ini,\

-               src/main/resources/

-source.. = src/main/java

+output.. = target/classes/
+bin.includes = plugin.xml,\
+               META-INF/,\
+               .,\
+               splash.bmp,\
+               plugin_customization.ini,\
+               src/main/resources/
+source.. = src/main/java
diff --git a/core/org.polarsys.esf.core.utils/META-INF/MANIFEST.MF b/core/org.polarsys.esf.core.utils/META-INF/MANIFEST.MF
index 3c058bc..22c87e7 100644
--- a/core/org.polarsys.esf.core.utils/META-INF/MANIFEST.MF
+++ b/core/org.polarsys.esf.core.utils/META-INF/MANIFEST.MF
@@ -22,7 +22,11 @@
  org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0",
  org.eclipse.emf.ecore;bundle-version="2.11.1",
  org.polarsys.esf.core.common;visibility:=reexport,
- org.eclipse.emf.common.ui;bundle-version="2.10.0"
+ org.eclipse.emf.common.ui;bundle-version="2.10.0",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="3.0.0",
+ org.eclipse.papyrus.infra.core.architecture;bundle-version="2.0.0",
+ org.eclipse.papyrus.infra.architecture;bundle-version="2.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Export-Package: org.polarsys.esf.core.utils
+Import-Package: org.eclipse.papyrus.infra.architecture.representation
diff --git a/core/org.polarsys.esf.core.utils/src/main/java/org/polarsys/esf/core/utils/ESFTablesUtil.java b/core/org.polarsys.esf.core.utils/src/main/java/org/polarsys/esf/core/utils/ESFTablesUtil.java
index c81c4bd..6f5676f 100644
--- a/core/org.polarsys.esf.core.utils/src/main/java/org/polarsys/esf/core/utils/ESFTablesUtil.java
+++ b/core/org.polarsys.esf.core.utils/src/main/java/org/polarsys/esf/core/utils/ESFTablesUtil.java
@@ -38,14 +38,14 @@
      * @param pTableID The Table ID
      * @return The Table ViewPrototype
      */
-    public static ViewPrototype getViewPrototype(final String pTableID) {
-        Collection<ViewPrototype> vPrototypes = PolicyChecker.getCurrent().getAllPrototypes();
+    public static ViewPrototype getViewPrototype(final String pTableID, final Element pRootElement) {
+        Collection<ViewPrototype> vPrototypes = PolicyChecker.getFor(pRootElement).getAllPrototypes();
         ViewPrototype vTable = null;
         String vPotentialTableID = null;
         Iterator<ViewPrototype> vIterator = vPrototypes.iterator();
         while (vTable == null && vIterator.hasNext()) {
             ViewPrototype vPotentialPrototype = vIterator.next();
-            vPotentialTableID = vPotentialPrototype.getConfiguration().getImplementationID();
+            vPotentialTableID = vPotentialPrototype.getRepresentationKind().getImplementationID();
             if (pTableID.equals(vPotentialTableID)) {
                 vTable = vPotentialPrototype;
             }
@@ -62,7 +62,7 @@
      * @param pRootElement The element where should be created the table.
      */
     public static void createTable(final String pTableID, final String pTableName, final Element pRootElement) {
-        ViewPrototype vTable = getViewPrototype(pTableID);
+        ViewPrototype vTable = getViewPrototype(pTableID, pRootElement);
         if (vTable != null) {
             vTable.instantiateOn(pRootElement, pTableName + vTable.getViewCountOn(pRootElement));
         }
diff --git a/core/org.polarsys.esf.core.wizard.ui/.checkstyle b/core/org.polarsys.esf.core.wizard.ui/.checkstyle
deleted file mode 100644
index 227a385..0000000
--- a/core/org.polarsys.esf.core.wizard.ui/.checkstyle
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <fileset name="all" enabled="true" check-config-name="Checkstyle ESF" local="false">
-    <file-match-pattern match-pattern="." include-pattern="true"/>
-  </fileset>
-</fileset-config>
diff --git a/core/org.polarsys.esf.core.wizard.ui/.classpath b/core/org.polarsys.esf.core.wizard.ui/.classpath
deleted file mode 100644
index 5eb97f7..0000000
--- a/core/org.polarsys.esf.core.wizard.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src/main/java"/>

-	<classpathentry kind="output" path="target/classes/"/>

-</classpath>

diff --git a/core/org.polarsys.esf.core.wizard.ui/.project b/core/org.polarsys.esf.core.wizard.ui/.project
deleted file mode 100644
index b87c2aa..0000000
--- a/core/org.polarsys.esf.core.wizard.ui/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.polarsys.esf.core.wizard.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
-	</natures>
-</projectDescription>
diff --git a/core/org.polarsys.esf.core.wizard.ui/.settings/org.eclipse.jdt.core.prefs b/core/org.polarsys.esf.core.wizard.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 11f6e46..0000000
--- a/core/org.polarsys.esf.core.wizard.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7

-org.eclipse.jdt.core.compiler.compliance=1.7

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.7

diff --git a/core/org.polarsys.esf.core.wizard.ui/META-INF/MANIFEST.MF b/core/org.polarsys.esf.core.wizard.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 9b9692a..0000000
--- a/core/org.polarsys.esf.core.wizard.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,29 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-Vendor: %Bundle-Vendor
-Bundle-SymbolicName: org.polarsys.esf.core.wizard.ui;singleton:=true
-Bundle-Version: 0.7.0.qualifier
-Bundle-Activator: org.polarsys.esf.core.wizard.ui.WizardUIActivator$Implementation
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime;bundle-version="3.11.1",
- org.eclipse.emf.common;bundle-version="2.11.0",
- org.eclipse.emf.common.ui;bundle-version="2.10.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.2",
- org.eclipse.papyrus.infra.core;bundle-version="1.1.2",
- org.eclipse.emf.ecore;bundle-version="2.11.1",
- org.eclipse.uml2.uml;bundle-version="5.1.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.2",
- org.polarsys.esf.core.utils;bundle-version="0.7.0";visibility:=reexport,
- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.1.2",
- org.eclipse.ui.workbench;bundle-version="3.107.0",
- org.eclipse.jface;bundle-version="3.11.0",
- org.eclipse.ui.ide;bundle-version="3.11.0",
- org.polarsys.esf.core.profile.esfarchitectureconcepts;bundle-version="0.7.0";visibility:=reexport,
- org.polarsys.esf.core.common;bundle-version="0.7.0";visibility:=reexport,
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.2",
- org.polarsys.esf.core.diagram.esfarchitectureconcepts;bundle-version="0.7.0";visibility:=reexport,
- org.polarsys.esf.core.profile.esfsafetyconcepts
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Bundle-ActivationPolicy: lazy
-Bundle-Localization: src/main/resources/properties/plugin
diff --git a/core/org.polarsys.esf.core.wizard.ui/build.properties b/core/org.polarsys.esf.core.wizard.ui/build.properties
deleted file mode 100644
index 54e41d1..0000000
--- a/core/org.polarsys.esf.core.wizard.ui/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/main/java/

-output.. = target/classes/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               src/main/resources/

diff --git a/core/org.polarsys.esf.core.wizard.ui/plugin.xml b/core/org.polarsys.esf.core.wizard.ui/plugin.xml
deleted file mode 100644
index fc07c03..0000000
--- a/core/org.polarsys.esf.core.wizard.ui/plugin.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-   <extension
-         point="org.eclipse.papyrus.infra.ui.papyrusDiagram">
-      <diagramCategory
-            class="org.polarsys.esf.core.wizard.ui.commands.ESFModelCreationCommand"
-            description="%DiagramCategory-Description"
-            icon="platform:/plugin/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/logos/icon_esf_32x32.png"
-            id="ESF"
-            label="%DiagramCategory-Label">
-      </diagramCategory>
-   </extension>
-   <extension
-         point="org.eclipse.ui.newWizards">
-      <category
-            id="org.polarsys.esf.core.wizard.ui.category"
-            name="%category.wizard.esf">
-      </category>
-      <wizard
-            category="org.polarsys.esf.core.wizard.ui.category"
-            class="org.polarsys.esf.core.wizard.ui.wizards.CreateESFModelWizard"
-            finalPerspective="org.eclipse.papyrus.infra.core.perspective"
-            icon="platform:/plugin/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/logos/icon_esf_32x32.png"
-            id="org.polarsys.esf.core.wizard.ui.esfmodelcreation"
-            name="%wizard.new.model.name">
-         <selection
-               class="org.eclipse.core.resources.IResource">
-         </selection>
-      </wizard>
-      <wizard
-            category="org.polarsys.esf.core.wizard.ui.category"
-            class="org.polarsys.esf.core.wizard.ui.wizards.CreateESFProjectWizard"
-            finalPerspective="org.eclipse.papyrus.infra.core.perspective"
-            icon="platform:/plugin/org.polarsys.esf.core.resources.graphical/src/main/resources/icons/files/icon_project_open.png"
-            id="org.polarsys.esf.core.wizard.ui.esfprojectcreation"
-            name="%wizard.new.project.name"
-            project="true">
-         <description>
-            %wizard.new.project.description
-         </description>
-      </wizard>
-   </extension>
-
-</plugin>
diff --git a/core/org.polarsys.esf.core.wizard.ui/pom.xml b/core/org.polarsys.esf.core.wizard.ui/pom.xml
deleted file mode 100644
index 5bb0718..0000000
--- a/core/org.polarsys.esf.core.wizard.ui/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  
-  <parent>
-    <groupId>org.polarsys.esf</groupId>
-    <artifactId>esf-infra.core</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-  </parent>
-
-  <groupId>org.polarsys.esf</groupId>
-  <artifactId>org.polarsys.esf.core.wizard.ui</artifactId>
-  <packaging>eclipse-plugin</packaging>
-   
-</project>
diff --git a/core/org.polarsys.esf.core.wizard.ui/src/main/java/org/polarsys/esf/core/wizard/ui/WizardUIActivator.java b/core/org.polarsys.esf.core.wizard.ui/src/main/java/org/polarsys/esf/core/wizard/ui/WizardUIActivator.java
deleted file mode 100644
index f09f613..0000000
--- a/core/org.polarsys.esf.core.wizard.ui/src/main/java/org/polarsys/esf/core/wizard/ui/WizardUIActivator.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 ALL4TEC & CEA LIST.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     ALL4TEC & CEA LIST - initial API and implementation
- ******************************************************************************/
-package org.polarsys.esf.core.wizard.ui;
-
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.EMFPlugin;
-import org.eclipse.emf.common.ui.EclipseUIPlugin;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.polarsys.esf.core.common.messages.Messages;
-
-/**
- * The activator class controls the plug-in life cycle.
- *
- * @author  $Author: ymunoz $
- * @version $Revision: 168 $
- */
-public class WizardUIActivator
-    extends EMFPlugin
-    implements BundleActivator {
-
-    /** The plug-in ID. */
-    public static final String PLUGIN_ID = "org.polarsys.esf.core.wizard.ui"; //$NON-NLS-1$
-
-    /** Keep track of the encapsulating singleton. */
-    public static final WizardUIActivator INSTANCE = new WizardUIActivator();
-
-    /** Execution context for the bundle. */
-    private static BundleContext sBundleContext = null;
-
-    /** Keep track of the implementation singleton. */
-    private static Implementation sPlugin = null;
-
-    /** Messages class used to find localised string. */
-    private static Messages sMessages = new Messages(ResourceBundle.getBundle(Messages.BUNDLE_NAME));
-
-    /**
-     * Create the instance.
-     */
-    public WizardUIActivator() {
-        super(new ResourceLocator[] {});
-    }
-
-    /**
-     * Get BundlexContext.
-     *
-     * @return BundleContext
-     */
-    static BundleContext getContext() {
-        return sBundleContext;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void start(final BundleContext pContext) throws Exception {
-        sBundleContext = pContext;
-
-        // Create the plugin implementation manually
-        sPlugin = new Implementation();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void stop(final BundleContext pContext) throws Exception {
-        sBundleContext = null;
-    }
-
-    /**
-     * Returns the singleton instance of the Eclipse plugin.
-     *
-     * @return The singleton instance.
-     */
-    @Override
-    public ResourceLocator getPluginResourceLocator() {
-        return sPlugin;
-    }
-
-    /**
-     * Returns the singleton instance of the Eclipse plugin.
-     *
-     * @return The singleton instance.
-     */
-    public static Implementation getPlugin() {
-        return sPlugin;
-    }
-
-    /**
-     * @return The messages class used to return localised string
-     */
-    public static Messages getMessages() {
-        return sMessages;
-    }
-
-    /**
-     * Create an Error status with the data given in parameter and log it.
-     *
-     * @param pMessage The message to log
-     * @param pException The exception to log
-     */
-    public static void logError(final String pMessage, final Exception pException) {
-        // Create the Error status
-        IStatus vStatus = new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR, pMessage, pException);
-
-        // Log it
-        INSTANCE.log(vStatus);
-    }
-
-    /**
-     * Create a Warning status with the data given in parameter and log it.
-     *
-     * @param pMessage The message to log
-     * @param pException The exception to log
-     */
-    public static void logWarning(final String pMessage, final Exception pException) {
-        // Create the Warning status
-        IStatus vStatus = new Status(IStatus.WARNING, PLUGIN_ID, IStatus.WARNING, pMessage, pException);
-
-        // Log it
-        INSTANCE.log(vStatus);
-    }
-
-    /**
-     * Create an Info status with the data given in parameter and log it.
-     *
-     * @param pMessage The message to log
-     * @param pException The exception to log
-     */
-    public static void logInfo(final String pMessage, final Exception pException) {
-        // Create the Info status
-        IStatus vStatus = new Status(IStatus.INFO, PLUGIN_ID, IStatus.INFO, pMessage, pException);
-
-        // Log it
-        INSTANCE.log(vStatus);
-    }
-
-    /**
-     * The actual implementation of the Eclipse <b>UIPlugin</b>.
-     */
-    public static class Implementation
-        extends EclipseUIPlugin {
-
-        /** The key of the file used in the creation wizard for ESF project. */
-        public static final String ICON_WIZARD_PROJECT = "image.new.project"; //$NON-NLS-1$
-
-        /** Icons folder. */
-        private static final String ICONS_FOLDER = "src/main/resources/icons/"; //$NON-NLS-1$
-
-        /**
-         * Creates an instance.
-         */
-        public Implementation() {
-            super();
-
-            // Remember the static instance
-            sPlugin = this;
-        }
-
-        /**
-         * {@inheritDoc}
-         */
-        @Override
-        protected void initializeImageRegistry(final ImageRegistry pRegistry) {
-            super.initializeImageRegistry(pRegistry);
-
-            pRegistry.put(
-                ICON_WIZARD_PROJECT,
-                imageDescriptorFromPlugin(getSymbolicName(),
-                ICONS_FOLDER + "wizards/wizard_project.gif")); //$NON-NLS-1$
-        }
-    }
-}
diff --git a/core/org.polarsys.esf.core.wizard.ui/src/main/java/org/polarsys/esf/core/wizard/ui/commands/ESFModelCreationCommand.java b/core/org.polarsys.esf.core.wizard.ui/src/main/java/org/polarsys/esf/core/wizard/ui/commands/ESFModelCreationCommand.java
deleted file mode 100644
index a628589..0000000
--- a/core/org.polarsys.esf.core.wizard.ui/src/main/java/org/polarsys/esf/core/wizard/ui/commands/ESFModelCreationCommand.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 ALL4TEC & CEA LIST.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     ALL4TEC & CEA LIST - initial API and implementation
- ******************************************************************************/
-package org.polarsys.esf.core.wizard.ui.commands;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.papyrus.uml.diagram.common.commands.ModelCreationCommandBase;
-import org.eclipse.papyrus.uml.tools.utils.PackageUtil;
-import org.eclipse.uml2.uml.Model;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.Profile;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.util.UMLUtil;
-import org.polarsys.esf.core.profile.esfarchitectureconcepts.set.ESFArchitectureConceptsSet;
-import org.polarsys.esf.core.profile.esfsafetyconcepts.set.ESFSafetyConceptsSet;
-import org.polarsys.esf.core.utils.ModelUtil;
-import org.polarsys.esf.core.wizard.ui.WizardUIActivator;
-import org.polarsys.esf.esfsafetyconcepts.impl.ESFSafetyConceptsPackage;
-
-/**
- * Class dedicated to create a ESF Model.
- *
- * @author $Author: ymunoz $
- * @version $Revision: 168 $
- */
-public class ESFModelCreationCommand
-    extends ModelCreationCommandBase {
-
-    /** Command ID used by DiagramCategory for creation of an ESF Model. */
-    public static final String DIAGRAMCATEGORY_ID = "ESF"; //$NON-NLS-1$
-
-    /** Label of the command to create a Safety Artifacts package. */
-    private static final String COMMAND_LABEL_CREATE_SAFETY_ARTIFACTS_PACKAGE =
-        "ESFModelCreationCommand: Create Safety Artifacts package"; //$NON-NLS-1$
-
-    /** Default name of the Safety Artifacts package. */
-    private static final String SAFETY_ARTIFACTS_PACKAGE_DEFAULT_NAME =
-        WizardUIActivator.getMessages().getString("ESFModelCreationCommand.init.safetyartifacts.name"); //$NON-NLS-1$
-
-    /** Default name of the ESFModel. */
-    private static final String ESFMODEL_DEFAULT_NAME =
-        WizardUIActivator.getMessages().getString("ESFModelCreationCommand.init.esfmodel.name"); //$NON-NLS-1$
-
-    /**
-     * Default constructor.
-     */
-    public ESFModelCreationCommand() {
-        super();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected EObject createRootElement() {
-        return UMLFactory.eINSTANCE.createModel();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected void initializeModel(final EObject pOwner) {
-        super.initializeModel(pOwner);
-
-        // Ensure that the given object is a model
-        if (pOwner instanceof Model) {
-            final Model vModel = (Model) pOwner;
-
-            // Set the default model properties
-            vModel.setName(ESFMODEL_DEFAULT_NAME);
-
-            // Apply the needed profiles on the model
-            initializeModelProfiles(vModel);
-
-            // Create Safety Artifacts (SA) package
-            TransactionalEditingDomain vDomain = ModelUtil.getTransactionalEditingDomain(vModel);
-            RecordingCommand vCreateSAPackageCmd =
-                new RecordingCommand(vDomain, COMMAND_LABEL_CREATE_SAFETY_ARTIFACTS_PACKAGE) {
-
-                    @Override
-                    protected void doExecute() {
-                        Package vSafetyArtifacts = vModel.createNestedPackage(SAFETY_ARTIFACTS_PACKAGE_DEFAULT_NAME);
-                        UMLUtil.StereotypeApplicationHelper.getInstance(vSafetyArtifacts).applyStereotype(
-                            vSafetyArtifacts,
-                            ESFSafetyConceptsPackage.eINSTANCE.getSSafetyArtifacts());
-                    }
-                };
-
-            // Verify if command can be executed
-            if (vCreateSAPackageCmd.canExecute()) {
-                // Execute command
-                vDomain.getCommandStack().execute(vCreateSAPackageCmd);
-            }
-        }
-    }
-
-    /**
-     * Apply the needed profiles to the given model element,
-     * to initialise it for ESF.
-     *
-     * @param pModel The model to initialise
-     */
-    private void initializeModelProfiles(final Model pModel) {
-        // Retrieve ESFArchitectureConcepts profile and apply it
-        Profile vESFArchiConceptsProfile = (Profile) PackageUtil
-            .loadPackage(URI.createURI(ESFArchitectureConceptsSet.PROFILE_PATH), pModel.eResource().getResourceSet());
-
-        if (vESFArchiConceptsProfile != null) {
-            PackageUtil.applyProfile(pModel, vESFArchiConceptsProfile, true);
-        }
-
-        // Retrieve ESFSafetyConcepts profile and apply it
-        Profile vESFSafetyConceptsProfile = (Profile) PackageUtil
-            .loadPackage(URI.createURI(ESFSafetyConceptsSet.PROFILE_PATH), pModel.eResource().getResourceSet());
-
-        if (vESFSafetyConceptsProfile != null) {
-            PackageUtil.applyProfile(pModel, vESFSafetyConceptsProfile, true);
-        }
-    }
-
-}
diff --git a/core/org.polarsys.esf.core.wizard.ui/src/main/java/org/polarsys/esf/core/wizard/ui/wizards/CreateESFModelWizard.java b/core/org.polarsys.esf.core.wizard.ui/src/main/java/org/polarsys/esf/core/wizard/ui/wizards/CreateESFModelWizard.java
deleted file mode 100644
index 8e43248..0000000
--- a/core/org.polarsys.esf.core.wizard.ui/src/main/java/org/polarsys/esf/core/wizard/ui/wizards/CreateESFModelWizard.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 ALL4TEC & CEA LIST.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     ALL4TEC & CEA LIST - initial API and implementation
- ******************************************************************************/
-package org.polarsys.esf.core.wizard.ui.wizards;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramCategoryPage;
-import org.eclipse.papyrus.uml.diagram.wizards.wizards.CreateModelWizard;
-import org.eclipse.ui.IWorkbench;
-import org.polarsys.esf.core.wizard.ui.commands.ESFModelCreationCommand;
-
-/**
- * Wizard dedicated to create a ESF model.
- *
- * @author  $Author: ymunoz $
- * @version $Revision: 168 $
- */
-public class CreateESFModelWizard
-    extends CreateModelWizard {
-
-    /** Window Title used by ESF Wizard for creation of a new ESF Model. */
-    public static final String WINDOW_TITLE = "New ESF Model"; //$NON-NLS-1$
-
-    /** Model Name used by ESF Wizard for creation of a new ESF Model. */
-    public static final String MODEL_NAME = "ESF Model"; //$NON-NLS-1$
-
-    /**
-     * Instantiates a new new ESF model wizard.
-     */
-    public CreateESFModelWizard() {
-        super();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void init(final IWorkbench pWorkbench, final IStructuredSelection pSelection) {
-        super.init(pWorkbench, pSelection);
-        setWindowTitle(WINDOW_TITLE);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getModelKindName() {
-        return MODEL_NAME;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected String[] getDiagramCategoryIds() {
-        return new String[] {ESFModelCreationCommand.DIAGRAMCATEGORY_ID};
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected SelectDiagramCategoryPage createSelectDiagramCategoryPage() {
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected void saveDiagramCategorySettings() {
-    }
-}
diff --git a/core/org.polarsys.esf.core.wizard.ui/src/main/java/org/polarsys/esf/core/wizard/ui/wizards/CreateESFProjectWizard.java b/core/org.polarsys.esf.core.wizard.ui/src/main/java/org/polarsys/esf/core/wizard/ui/wizards/CreateESFProjectWizard.java
deleted file mode 100644
index 448dc92..0000000
--- a/core/org.polarsys.esf.core.wizard.ui/src/main/java/org/polarsys/esf/core/wizard/ui/wizards/CreateESFProjectWizard.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 ALL4TEC & CEA LIST.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     ALL4TEC & CEA LIST - initial API and implementation
- ******************************************************************************/
-package org.polarsys.esf.core.wizard.ui.wizards;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramCategoryPage;
-import org.eclipse.papyrus.uml.diagram.wizards.wizards.NewPapyrusProjectWizard;
-import org.eclipse.ui.IWorkbench;
-import org.polarsys.esf.core.wizard.ui.WizardUIActivator;
-import org.polarsys.esf.core.wizard.ui.WizardUIActivator.Implementation;
-import org.polarsys.esf.core.wizard.ui.commands.ESFModelCreationCommand;
-
-/**
- * Wizard dedicated to create a ESF project.
- *
- * @author  $Author: ymunoz $
- * @version $Revision: 168 $
- */
-public class CreateESFProjectWizard
-    extends NewPapyrusProjectWizard {
-
-    /** Window title. */
-    public static final String WINDOW_TITLE =
-        WizardUIActivator.getMessages().getString("CreateESFProjectWizard.title"); //$NON-NLS-1$
-
-    /** Project title used for creation of a new ESF Project. */
-    public static final String PROJECT_PAGE_TITLE =
-        WizardUIActivator.getMessages().getString("CreateESFProjectWizard.projectpage.title"); //$NON-NLS-1$
-
-    /** Project description for creation of a new ESF Project. */
-    public static final String PROJECT_PAGE_DESCRIPTION =
-        WizardUIActivator.getMessages().getString("CreateESFProjectWizard.projectpage.description"); //$NON-NLS-1$
-
-    /**
-     * Default constructor.
-     */
-    public CreateESFProjectWizard() {
-        super();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void init(final IWorkbench pWorkbench, final IStructuredSelection pSelection) {
-        // Call the parent method for general initialisation
-        super.init(pWorkbench, pSelection);
-
-        // Set the window title
-        setWindowTitle(WINDOW_TITLE);
-
-        // Override the page creation title and description
-        // NB: Until the refactor of the method createNewProjectCreationPage, this must be done here
-        getMyProjectPage().setTitle(PROJECT_PAGE_TITLE);
-        getMyProjectPage().setDescription(PROJECT_PAGE_DESCRIPTION);
-
-        // Set the default page image
-        setDefaultPageImageDescriptor(WizardUIActivator.getPlugin().getImageRegistry()
-            .getDescriptor(Implementation.ICON_WIZARD_PROJECT));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected SelectDiagramCategoryPage createSelectDiagramCategoryPage() {
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected void saveDiagramCategorySettings() {
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected String[] getDiagramCategoryIds() {
-        return new String[] {ESFModelCreationCommand.DIAGRAMCATEGORY_ID};
-    }
-}
diff --git a/core/org.polarsys.esf.core.wizard.ui/src/main/resources/icons/wizards/wizard_project.gif b/core/org.polarsys.esf.core.wizard.ui/src/main/resources/icons/wizards/wizard_project.gif
deleted file mode 100644
index 122cab2..0000000
--- a/core/org.polarsys.esf.core.wizard.ui/src/main/resources/icons/wizards/wizard_project.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.polarsys.esf.core.wizard.ui/src/main/resources/properties/nls/messages.properties b/core/org.polarsys.esf.core.wizard.ui/src/main/resources/properties/nls/messages.properties
deleted file mode 100644
index 05f6552..0000000
--- a/core/org.polarsys.esf.core.wizard.ui/src/main/resources/properties/nls/messages.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-CreateESFProjectWizard.title = ESF project
-CreateESFProjectWizard.projectpage.title = ESF project
-CreateESFProjectWizard.projectpage.description = Create a new ESF project
-
-ESFModelCreationCommand.init.esfmodel.name = ESFModel
-ESFModelCreationCommand.init.safetyartifacts.name = SafetyArtifacts
diff --git a/core/org.polarsys.esf.core.wizard.ui/src/main/resources/properties/plugin.properties b/core/org.polarsys.esf.core.wizard.ui/src/main/resources/properties/plugin.properties
deleted file mode 100644
index a8c40c3..0000000
--- a/core/org.polarsys.esf.core.wizard.ui/src/main/resources/properties/plugin.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-#Properties file for org.polarsys.esf.core.wizard.ui
-Bundle-Vendor = PolarSys
-Bundle-Name = ESF Wizard UI
-
-category.wizard.esf = Eclipse Safety Framework (ESF)
-
-wizard.new.project.name = ESF Project
-wizard.new.project.description = Create a new ESF project.
-wizard.new.model.name = ESF Model
-wizard.new.model.description = Create a new ESF model.
-
-WizardModel-Name = ESF Model
-WizardProject-Name = ESF Project
-
-DiagramCategory-Label = ESF Model
-DiagramCategory-Description = ESF Model diagrams
diff --git a/core/profile/org.polarsys.esf.core.profile.esfarchitectureconcepts.application/META-INF/MANIFEST.MF b/core/profile/org.polarsys.esf.core.profile.esfarchitectureconcepts.application/META-INF/MANIFEST.MF
index b3a9ef9..69b698f 100644
--- a/core/profile/org.polarsys.esf.core.profile.esfarchitectureconcepts.application/META-INF/MANIFEST.MF
+++ b/core/profile/org.polarsys.esf.core.profile.esfarchitectureconcepts.application/META-INF/MANIFEST.MF
@@ -13,7 +13,10 @@
  org.eclipse.emf.transaction;bundle-version="1.9.0",
  org.polarsys.esf.core.utils;bundle-version="0.7.0";visibility:=reexport,
  org.eclipse.gef;bundle-version="3.11.0",
- org.eclipse.papyrus.uml.tools;bundle-version="2.0.0"
+ org.eclipse.papyrus.uml.tools;bundle-version="2.0.0",
+ org.eclipse.papyrus.uml.decoratormodel;bundle-version="2.1.0",
+ org.eclipse.papyrus.infra.emf.readonly;bundle-version="3.0.0",
+ com.google.guava;bundle-version="21.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: src/main/resources/properties/plugin
diff --git a/core/profile/org.polarsys.esf.core.profile.esfarchitectureconcepts.application/src/main/java/org/polarsys/esf/core/profile/esfarchitectureconcepts/application/ApplyESFArchitectureConceptsAnnotation.java b/core/profile/org.polarsys.esf.core.profile.esfarchitectureconcepts.application/src/main/java/org/polarsys/esf/core/profile/esfarchitectureconcepts/application/ApplyESFArchitectureConceptsAnnotation.java
index eb4069c..d6e46a4 100644
--- a/core/profile/org.polarsys.esf.core.profile.esfarchitectureconcepts.application/src/main/java/org/polarsys/esf/core/profile/esfarchitectureconcepts/application/ApplyESFArchitectureConceptsAnnotation.java
+++ b/core/profile/org.polarsys.esf.core.profile.esfarchitectureconcepts.application/src/main/java/org/polarsys/esf/core/profile/esfarchitectureconcepts/application/ApplyESFArchitectureConceptsAnnotation.java
@@ -15,11 +15,19 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.lang3.StringUtils;
 import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.transaction.RecordingCommand;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.ReadOnlyAxis;
+import org.eclipse.papyrus.infra.emf.readonly.ReadOnlyManager;
+import org.eclipse.papyrus.uml.decoratormodel.helper.DecoratorModelUtils;
+import org.eclipse.papyrus.uml.decoratormodel.internal.commands.CreateDecoratorModelCommand;
+import org.eclipse.papyrus.uml.decoratormodel.internal.commands.SaveDecoratorModelCommand;
 import org.eclipse.papyrus.uml.tools.utils.PackageUtil;
+import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;
 import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.Comment;
 import org.eclipse.uml2.uml.Connector;
@@ -33,7 +41,6 @@
 import org.polarsys.esf.core.profile.esfarchitectureconcepts.set.ESFArchitectureConceptsSet;
 import org.polarsys.esf.core.utils.ModelUtil;
 import org.polarsys.esf.esfarchitectureconcepts.SDirection;
-import org.polarsys.esf.esfarchitectureconcepts.impl.ESFArchitectureConceptsPackage;
 import org.polarsys.esf.esfarchitectureconcepts.impl.SBlock;
 import org.polarsys.esf.esfarchitectureconcepts.impl.SConnector;
 import org.polarsys.esf.esfarchitectureconcepts.impl.SModel;
@@ -48,193 +55,216 @@
  */
 public final class ApplyESFArchitectureConceptsAnnotation {
 
-    /** Label of the command to apply annotation on the UML model. */
-    private static final String CMD_LABEL_APPLY_ANNOTATION_ON_UML_MODEL =
-        "ApplyESFArchitectureConceptsAnnotation: Apply Annotation on the UML model"; //$NON-NLS-1$
+	/** Label of the command to apply annotation on the UML model. */
+	private static final String CMD_LABEL_APPLY_ANNOTATION_ON_UML_MODEL = "ApplyESFArchitectureConceptsAnnotation: Apply Annotation on the UML model"; //$NON-NLS-1$
 
-    /** Key words for Output port. */
-    private static final String[] OUTPUT = {"out", "output"}; //$NON-NLS-1$ //$NON-NLS-2$
+	/** Key words for Output port. */
+	private static final String[] OUTPUT = { "out", "output" }; //$NON-NLS-1$ //$NON-NLS-2$
 
-    /** Key words for Input port. */
-    private static final String[] INPUT = {"in", "input"}; //$NON-NLS-1$ //$NON-NLS-2$
+	/** Key words for Input port. */
+	private static final String[] INPUT = { "in", "input" }; //$NON-NLS-1$ //$NON-NLS-2$
 
-    /** Regular expression used to verify if a line contains more than one word. */
-    private static final String REGEX_MORE_THAN_ONE_WORD = "(\\w)(\\s)(\\w)"; //$NON-NLS-1$
+	/** Regular expression used to verify if a line contains more than one word. */
+	private static final String REGEX_MORE_THAN_ONE_WORD = "(\\w)(\\s)(\\w)"; //$NON-NLS-1$
 
-    /**
-     * Default constructor.
-     */
-    private ApplyESFArchitectureConceptsAnnotation() {
-    }
+	/**
+	 * Default constructor.
+	 */
+	private ApplyESFArchitectureConceptsAnnotation() {
+	}
 
-    /**
-     * Verify if the ESFArchitectureConcepts profile is applied to this model.
-     *
-     * @param pModel The model
-     * @return True or false
-     */
-    public static Boolean isProfileApplied(final Model pModel) {
-        return pModel.isProfileApplied(getProfile(pModel));
-    }
+	/**
+	 * Verify if the ESFArchitectureConcepts profile is applied to this model.
+	 *
+	 * @param pModel
+	 *            The model
+	 * @return True or false
+	 */
+	public static Boolean isProfileApplied(final Model pModel) {
+		return pModel.isProfileApplied(getProfile(pModel));
+	}
 
-    /**
-     * Retrieve the ESFArchitectureConcepts profile.
-     *
-     * @param pModel The model
-     * @return The ESFArchitectureConcepts profile
-     */
-    public static Profile getProfile(final Model pModel) {
-        Profile vESFArchiConceptsProfile = (Profile) PackageUtil
-            .loadPackage(URI.createURI(ESFArchitectureConceptsSet.PROFILE_PATH), pModel.eResource().getResourceSet());
-        return  vESFArchiConceptsProfile;
-    }
+	/**
+	 * Retrieve the ESFArchitectureConcepts profile.
+	 *
+	 * @param pModel
+	 *            The model
+	 * @return The ESFArchitectureConcepts profile
+	 */
+	public static Profile getProfile(final Model pModel) {
+		Profile vESFArchiConceptsProfile = (Profile) PackageUtil
+				.loadPackage(URI.createURI(ESFArchitectureConceptsSet.PROFILE_PATH), pModel.eResource().getResourceSet());
+		return vESFArchiConceptsProfile;
+	}
 
-    /**
-     * Apply the ESFArchitectureConcepts profile to this model.
-     *
-     * @param pModel The model
-     */
-    public static void applyProfile(final Model pModel) {
-        // Retrieve the ESFArchitectureConcepts profile and apply it
-        Profile vESFArchiConceptsProfile = getProfile(pModel);
+	/**
+	 * Apply the ESFArchitectureConcepts profile to this model.
+	 *
+	 * @param pModel
+	 *            The model
+	 */
+	public static void applyProfile(final Model pModel, final Model userModel, final URI profileAppURI) {
+		// Retrieve the ESFArchitectureConcepts profile and apply it
+		Profile vESFArchiConceptsProfile = getProfile(pModel);
 
-        if (vESFArchiConceptsProfile != null) {
-            PackageUtil.applyProfile(pModel, vESFArchiConceptsProfile, true);
-        }
-    }
+		if (vESFArchiConceptsProfile != null) {
+			ResourceSet rs = pModel.eResource().getResourceSet();
+			Resource decoratorResource = rs.getResource(profileAppURI, false);
+			org.eclipse.uml2.uml.Package decoratorModel = DecoratorModelUtils.getDecoratorModel(decoratorResource);
 
-    /**
-     * Apply ESFArchitectureConcepts' annotation on the UML model.
-     *
-     * @param pModel The UML model object {@link Model}
-     */
-    public static void applyAnnotationOnUMLModel(final Model pModel) {
+			// create decorator package on user model in order to trigger the "external profile" application dialog
+			DecoratorModelUtils.getDecoratorPackage(decoratorModel, userModel, true);
+			org.eclipse.uml2.uml.Package decoratorPModel = DecoratorModelUtils.getDecoratorPackage(decoratorModel, pModel, true);
+			PackageUtil.applyProfile(decoratorPModel, vESFArchiConceptsProfile, true);
+		}
+	}
 
-        TransactionalEditingDomain vDomain = ModelUtil.getTransactionalEditingDomain(pModel);
+	/**
+	 * Apply ESFArchitectureConcepts' annotation on the UML model.
+	 *
+	 * @param pModel
+	 *            The UML model object {@link Model}
+	 */
+	@SuppressWarnings({ "nls", "restriction" })
+	public static void applyAnnotationOnUMLModel(final Model pModel) {
 
-        RecordingCommand vApplyAnnotationCmd = new RecordingCommand(vDomain, CMD_LABEL_APPLY_ANNOTATION_ON_UML_MODEL) {
+		TransactionalEditingDomain vDomain = ModelUtil.getTransactionalEditingDomain(pModel);
+        Model vESFModel = ModelUtil.getWorkingModel();
+		String newPath = vESFModel.eResource().getURI().toString().replace(".uml", ".profileapp.uml");
+		final URI profileAppURI = URI.createURI(newPath, false);
 
-            /**
-             * ESFArchitectureConcepts' application annotation on the UML model.
-             */
-            @Override
-            protected void doExecute() {
-                if (!isProfileApplied(pModel)) {
-                    applyProfile(pModel);
-                }
-                // Apply the SModel stereotype on the UML model object "Model"
-                if (UMLUtil.getStereotypeApplication(pModel, SModel.class) == null) {
-                    UMLUtil.StereotypeApplicationHelper.getInstance(pModel)
-                        .applyStereotype(pModel, ESFArchitectureConceptsPackage.eINSTANCE.getSModel());
-                }
-                // Walk through the Model and apply the ESFArchitectureConcepts' annotation
-                walkThroughModelAndApplyAnnotation(pModel);
-            }
+		RecordingCommand vApplyAnnotationCmd = new RecordingCommand(vDomain, CMD_LABEL_APPLY_ANNOTATION_ON_UML_MODEL) {
 
-        };
+			/**
+			 * ESFArchitectureConcepts' application annotation on the UML model.
+			 */
+			@Override
+			protected void doExecute() {
 
-        try {
-            vDomain.getCommandStack().execute(vApplyAnnotationCmd);
-        } catch (final IllegalArgumentException pException) {
-            ESFArchitectureConceptsProfileApplicationActivator.logError(
-                "Error during the application of the ESFArchitectureConcepts annotation on the model", //$NON-NLS-1$
-                pException);
-        }
-    }
+				if (!isProfileApplied(pModel)) {
+					applyProfile(pModel, vESFModel, profileAppURI);
+				}
 
-    /**
-     * Walk the Model and apply the ESFArchitectureConcepts' annotation.
-     *
-     * @param pModel the UML model object {@link Model}
-     */
-    private static void walkThroughModelAndApplyAnnotation(final Model pModel) {
-        for (Element vElement : pModel.allOwnedElements()) {
-            // Apply the SBlock stereotype on the UML model object "Class"
-            if ((vElement instanceof Class) && (UMLUtil.getStereotypeApplication(vElement, SBlock.class) == null)) {
-                UMLUtil.StereotypeApplicationHelper.getInstance(vElement)
-                    .applyStereotype(vElement, ESFArchitectureConceptsPackage.eINSTANCE.getSBlock());
+				// Apply the SModel stereotype on the UML model object "Model"
+				if (UMLUtil.getStereotypeApplication(pModel, SModel.class) == null) {
+					StereotypeUtil.apply(pModel, SModel.class);
+				}
 
-                // Apply the SPort stereotype on the UML model object "Port"
-            } else if ((vElement instanceof Port)
-                && (UMLUtil.getStereotypeApplication(vElement, SPort.class) == null)) {
-                UMLUtil.StereotypeApplicationHelper.getInstance(vElement)
-                    .applyStereotype(vElement, ESFArchitectureConceptsPackage.eINSTANCE.getSPort());
-                Port vPort = (Port) vElement;
-                SDirection vPortDirection = findPortDirection(vPort);
+				// Walk through the Model and apply the ESFArchitectureConcepts' annotation
+				walkThroughModelAndApplyAnnotation(pModel);	
+			}
+		};
 
-                // If the port direction is not default direction
-                if (SDirection.INOUT != vPortDirection) {
-                    // Set the port direction
-                    SPort vSPort = UMLUtil.getStereotypeApplication(vPort, SPort.class);
-                    vSPort.setSDirection(vPortDirection);
-                }
+		try {
+			// Command cmd = DecoratorModelUtils.createSeparateProfileApplicationsCommand(profileApplications, URI.createFileURI(newPath), pModel.getName());
+			CreateDecoratorModelCommand cmd = new CreateDecoratorModelCommand(vDomain, profileAppURI, vESFModel.getName());
 
-                // Apply the SConnector stereotype on the UML model object "Connector"
-            } else if ((vElement instanceof Connector)
-                && (UMLUtil.getStereotypeApplication(vElement, SConnector.class) == null)) {
-                UMLUtil.StereotypeApplicationHelper.getInstance(vElement)
-                    .applyStereotype(vElement, ESFArchitectureConceptsPackage.eINSTANCE.getSConnector());
+			vDomain.getCommandStack().execute(cmd);
+			vDomain.getCommandStack().execute(vApplyAnnotationCmd);
+			
+			ReadOnlyManager.getReadOnlyHandler(vDomain).makeWritable(ReadOnlyAxis.anyAxis(), pModel);
 
-                // Apply the SPart stereotype on the UML model object "Property" typed by a Class
-            } else if ((vElement instanceof Property)
-                && (UMLUtil.getStereotypeApplication(vElement, SPart.class) == null)) {
-                Type vType = ((Property) vElement).getType();
-                if ((vType != null) && (vType instanceof Class)) {
-                    UMLUtil.StereotypeApplicationHelper.getInstance(vElement)
-                        .applyStereotype(vElement, ESFArchitectureConceptsPackage.eINSTANCE.getSPart());
-                }
-            }
-        }
-    }
+			if (vDomain.getResourceSet() instanceof ModelSet) {
+				SaveDecoratorModelCommand saveCmd = new SaveDecoratorModelCommand((ModelSet) vDomain.getResourceSet(), profileAppURI);
+				vDomain.getCommandStack().execute(saveCmd);
+			}
+		}
+		catch (final IllegalArgumentException pException) {
+			ESFArchitectureConceptsProfileApplicationActivator.logError(
+					"Error during the application of the ESFArchitectureConcepts annotation on the model", //$NON-NLS-1$
+					pException);
+		}
+	}
 
-    /**
-     * Find port direction from comments.
-     *
-     * @param pPort The UML model object {@link Port}
-     * @return The SDirection
-     */
-    private static SDirection findPortDirection(final Port pPort) {
-        List<Comment> vCommentsList = pPort.getOwnedComments();
-        SDirection vSDirection = SDirection.INOUT;
+	/**
+	 * Walk the Model and apply the ESFArchitectureConcepts' annotation.
+	 *
+	 * @param pModel
+	 *            the UML model object {@link Model}
+	 */
+	private static void walkThroughModelAndApplyAnnotation(final Model pModel) {
+		for (Element vElement : pModel.allOwnedElements()) {
+			// Apply the SBlock stereotype on the UML model object "Class"
+			if ((vElement instanceof Class) && (UMLUtil.getStereotypeApplication(vElement, SBlock.class) == null)) {
+				StereotypeUtil.apply(vElement, SBlock.class);
 
-        Iterator<Comment> vIterator = vCommentsList.iterator();
-        while (SDirection.INOUT == vSDirection && vIterator.hasNext()) {
-            Comment vComment = vIterator.next();
+				// Apply the SPort stereotype on the UML model object "Port"
+			} else if ((vElement instanceof Port)
+					&& (UMLUtil.getStereotypeApplication(vElement, SPort.class) == null)) {
+				Port vPort = (Port) vElement;
+				SPort vSPort = StereotypeUtil.applyApp(vPort, SPort.class);
+				SDirection vPortDirection = findPortDirection(vPort);
 
-            String vBody = vComment.getBody();
-            Pattern vMoreThanOneWord = Pattern.compile(REGEX_MORE_THAN_ONE_WORD);
-            Matcher vMatcher = vMoreThanOneWord.matcher(vBody);
+				// If the port direction is not default direction
+				if (SDirection.INOUT != vPortDirection) {
+					// Set the port direction
+					vSPort.setSDirection(vPortDirection);
+				}
 
-            // Verify if the first line of the comment contains the only one word
-            if (!vMatcher.find()) {
-                boolean vFind = false;
-                int vIndex = 0;
+				// Apply the SConnector stereotype on the UML model object "Connector"
+			} else if ((vElement instanceof Connector)
+					&& (UMLUtil.getStereotypeApplication(vElement, SConnector.class) == null)) {
+				StereotypeUtil.apply(vElement, SConnector.class);
+				// Apply the SPart stereotype on the UML model object "Property" typed by a Class
+			} else if ((vElement instanceof Property)
+					&& (UMLUtil.getStereotypeApplication(vElement, SPart.class) == null)) {
+				Type vType = ((Property) vElement).getType();
+				if ((vType != null) && (vType instanceof Class)) {
+					StereotypeUtil.apply(vElement, SPart.class);
+				}
+			}
+		}
+	}
 
-                // Verify if the comment contains "in" or "input" substring
-                while ((!vFind) && (INPUT.length > vIndex)) {
-                    String vInput = INPUT[vIndex];
-                    if (StringUtils.lowerCase(vBody).contains(vInput)) {
-                        vSDirection = SDirection.IN;
-                        vFind = true;
-                    }
-                    vIndex++;
-                }
+	/**
+	 * Find port direction from comments.
+	 *
+	 * @param pPort
+	 *            The UML model object {@link Port}
+	 * @return The SDirection
+	 */
+	private static SDirection findPortDirection(final Port pPort) {
+		List<Comment> vCommentsList = pPort.getOwnedComments();
+		SDirection vSDirection = SDirection.INOUT;
 
-                if (vSDirection.equals(SDirection.INOUT)) {
-                    vIndex = 0;
-                    // Verify if the comment contains "out" or "output" substring
-                    while ((!vFind) && (OUTPUT.length > vIndex)) {
-                        String vOutput = OUTPUT[vIndex];
-                        if (StringUtils.lowerCase(vBody).contains(vOutput)) {
-                            vSDirection = SDirection.OUT;
-                            vFind = true;
-                        }
-                        vIndex++;
-                    }
-                }
-            }
-        }
+		Iterator<Comment> vIterator = vCommentsList.iterator();
+		while (SDirection.INOUT == vSDirection && vIterator.hasNext()) {
+			Comment vComment = vIterator.next();
 
-        return vSDirection;
-    }
+			String vBody = vComment.getBody();
+			Pattern vMoreThanOneWord = Pattern.compile(REGEX_MORE_THAN_ONE_WORD);
+			Matcher vMatcher = vMoreThanOneWord.matcher(vBody);
+
+			// Verify if the first line of the comment contains the only one word
+			if (!vMatcher.find()) {
+				boolean vFind = false;
+				int vIndex = 0;
+
+				// Verify if the comment contains "in" or "input" substring
+				while ((!vFind) && (INPUT.length > vIndex)) {
+					String vInput = INPUT[vIndex];
+					if (vBody.toLowerCase().contains(vInput)) {
+						vSDirection = SDirection.IN;
+						vFind = true;
+					}
+					vIndex++;
+				}
+
+				if (vSDirection.equals(SDirection.INOUT)) {
+					vIndex = 0;
+					// Verify if the comment contains "out" or "output" substring
+					while ((!vFind) && (OUTPUT.length > vIndex)) {
+						String vOutput = OUTPUT[vIndex];
+						if (vBody.toLowerCase().contains(vOutput)) {
+							vSDirection = SDirection.OUT;
+							vFind = true;
+						}
+						vIndex++;
+					}
+				}
+			}
+		}
+
+		return vSDirection;
+	}
 }
diff --git a/core/profile/org.polarsys.esf.core.profile.esfbehaviours/src/main/resources/models/profile/esfbehaviours.profile.notation b/core/profile/org.polarsys.esf.core.profile.esfbehaviours/src/main/resources/models/profile/esfbehaviours.profile.notation
index 52724b6..83d8c33 100644
--- a/core/profile/org.polarsys.esf.core.profile.esfbehaviours/src/main/resources/models/profile/esfbehaviours.profile.notation
+++ b/core/profile/org.polarsys.esf.core.profile.esfbehaviours/src/main/resources/models/profile/esfbehaviours.profile.notation
@@ -1,300 +1,300 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">

-  <notation:Diagram xmi:id="_GBr0EBNMEeWOCLsnVbWZoA" type="PapyrusUMLProfileDiagram" name="ESFBehaviours ProfileDiagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_UmAJoBUvEeWsuO0tI_iXIw" type="1030" fillColor="13420443">

-      <children xmi:type="notation:DecorationNode" xmi:id="_UmAJohUvEeWsuO0tI_iXIw" type="1047"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_UmAJoxUvEeWsuO0tI_iXIw" type="1042">

-        <children xmi:type="notation:Shape" xmi:id="_ZxeI8BUvEeWsuO0tI_iXIw" type="1023">

-          <children xmi:type="notation:DecorationNode" xmi:id="_ZxeI8hUvEeWsuO0tI_iXIw" type="1046"/>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_ZxeI8xUvEeWsuO0tI_iXIw" visible="false" type="1052">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_ZxeI9BUvEeWsuO0tI_iXIw"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_ZxeI9RUvEeWsuO0tI_iXIw"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_ZxeI9hUvEeWsuO0tI_iXIw"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZxeI9xUvEeWsuO0tI_iXIw"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_ZxeI-BUvEeWsuO0tI_iXIw" visible="false" type="1053">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_ZxeI-RUvEeWsuO0tI_iXIw"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_ZxeI-hUvEeWsuO0tI_iXIw"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_ZxeI-xUvEeWsuO0tI_iXIw"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZxeI_BUvEeWsuO0tI_iXIw"/>

-          </children>

-          <element xmi:type="uml:Stereotype" href="esfbehaviours.profile.uml#_C-KJMBUvEeWsuO0tI_iXIw"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZxeI8RUvEeWsuO0tI_iXIw" x="281" y="173"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_anoU4BUvEeWsuO0tI_iXIw" type="1023">

-          <children xmi:type="notation:DecorationNode" xmi:id="_anoU4hUvEeWsuO0tI_iXIw" type="1046"/>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_anoU4xUvEeWsuO0tI_iXIw" type="1052">

-            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jMYG0JUYEeWNjpcwd8yD9A" source="PapyrusCSSForceValue">

-              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jMYt4JUYEeWNjpcwd8yD9A" key="visible" value="true"/>

-            </eAnnotations>

-            <children xmi:type="notation:Shape" xmi:id="_SBw_gJUZEeWNjpcwd8yD9A" type="3002">

-              <styles xmi:type="notation:StringListValueStyle" xmi:id="_To1U8L3fEeWaFrysrt8vfg" name="maskLabel">

-                <stringListValue>multiplicity</stringListValue>

-                <stringListValue>name</stringListValue>

-                <stringListValue>type</stringListValue>

-                <stringListValue>derived</stringListValue>

-              </styles>

-              <element xmi:type="uml:Property" href="esfbehaviours.profile.uml#_xfrNUJUYEeWNjpcwd8yD9A"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_SBw_gZUZEeWNjpcwd8yD9A"/>

-            </children>

-            <styles xmi:type="notation:TitleStyle" xmi:id="_anoU5BUvEeWsuO0tI_iXIw"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_anoU5RUvEeWsuO0tI_iXIw"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_anoU5hUvEeWsuO0tI_iXIw"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_anxe0BUvEeWsuO0tI_iXIw"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_anxe0RUvEeWsuO0tI_iXIw" visible="false" type="1053">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_anxe0hUvEeWsuO0tI_iXIw"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_anxe0xUvEeWsuO0tI_iXIw"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_anxe1BUvEeWsuO0tI_iXIw"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_anxe1RUvEeWsuO0tI_iXIw"/>

-          </children>

-          <element xmi:type="uml:Stereotype" href="esfbehaviours.profile.uml#_AverIBUvEeWsuO0tI_iXIw"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_anoU4RUvEeWsuO0tI_iXIw" x="31" y="173" height="93"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_a-iZABUvEeWsuO0tI_iXIw" type="1023">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_i2lTUBUvEeWsuO0tI_iXIw" source="PapyrusCSSForceValue">

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_i2lTURUvEeWsuO0tI_iXIw" key="fillColor" value="true"/>

-          </eAnnotations>

-          <children xmi:type="notation:DecorationNode" xmi:id="_a-iZAhUvEeWsuO0tI_iXIw" type="1046"/>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_a-iZAxUvEeWsuO0tI_iXIw" visible="false" type="1052">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_a-iZBBUvEeWsuO0tI_iXIw"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_a-iZBRUvEeWsuO0tI_iXIw"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_a-iZBhUvEeWsuO0tI_iXIw"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_a-iZBxUvEeWsuO0tI_iXIw"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_a-iZCBUvEeWsuO0tI_iXIw" visible="false" type="1053">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_a-iZCRUvEeWsuO0tI_iXIw"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_a-iZChUvEeWsuO0tI_iXIw"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_a-iZCxUvEeWsuO0tI_iXIw"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_a-iZDBUvEeWsuO0tI_iXIw"/>

-          </children>

-          <element xmi:type="uml:Stereotype" href="esfbehaviours.profile.uml#_wpNyMBUuEeWsuO0tI_iXIw"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_a-iZARUvEeWsuO0tI_iXIw" x="127" y="14" width="230" height="100"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_NvP24JUYEeWNjpcwd8yD9A" type="3028" fillColor="10265827">

-          <children xmi:type="notation:DecorationNode" xmi:id="_NvRFAJUYEeWNjpcwd8yD9A" type="5062"/>

-          <children xmi:type="notation:DecorationNode" xmi:id="_NvdSQJUYEeWNjpcwd8yD9A" type="StereotypeLabel">

-            <styles xmi:type="notation:StringValueStyle" xmi:id="_NvdSQZUYEeWNjpcwd8yD9A" name="stereotype" stringValue="StandardProfile::Metaclass"/>

-            <element xmi:type="uml:Stereotype" href="pathmap://UML_PROFILES/Standard.profile.uml#Metaclass"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NvdSQpUYEeWNjpcwd8yD9A"/>

-          </children>

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

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NvP24ZUYEeWNjpcwd8yD9A" x="170" y="309" width="175"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_Nvix0JUYEeWNjpcwd8yD9A" type="StereotypeComment">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_Nvix0ZUYEeWNjpcwd8yD9A" showTitle="true"/>

-          <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Nvix05UYEeWNjpcwd8yD9A" name="BASE_ELEMENT">

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

-          </styles>

-          <element xsi:nil="true"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Nvix0pUYEeWNjpcwd8yD9A" x="200"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_UmAJpBUvEeWsuO0tI_iXIw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UmAJpRUvEeWsuO0tI_iXIw"/>

-      </children>

-      <element xmi:type="uml:Profile" href="esfbehaviours.profile.uml#_A_JHQBNMEeWOCLsnVbWZoA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UmAJoRUvEeWsuO0tI_iXIw" x="305" y="257" width="479" height="456"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_rpN6gJQLEeWTbJ02p3oubQ" type="1030" fillColor="12621752">

-      <children xmi:type="notation:DecorationNode" xmi:id="_rpOhkJQLEeWTbJ02p3oubQ" type="1047"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_rpOhkZQLEeWTbJ02p3oubQ" type="1042">

-        <children xmi:type="notation:Shape" xmi:id="_1ja50JQLEeWTbJ02p3oubQ" type="1023">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6fP6oJQLEeWTbJ02p3oubQ" source="PapyrusCSSForceValue">

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6fQhsJQLEeWTbJ02p3oubQ" key="fillColor" value="true"/>

-          </eAnnotations>

-          <children xmi:type="notation:DecorationNode" xmi:id="_1jbg4JQLEeWTbJ02p3oubQ" type="1046"/>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_1jbg4ZQLEeWTbJ02p3oubQ" visible="false" type="1052">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_1jbg4pQLEeWTbJ02p3oubQ"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_1jbg45QLEeWTbJ02p3oubQ"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_1jbg5JQLEeWTbJ02p3oubQ"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1jbg5ZQLEeWTbJ02p3oubQ"/>

-          </children>

-          <children xmi:type="notation:BasicCompartment" xmi:id="_1jbg5pQLEeWTbJ02p3oubQ" visible="false" type="1053">

-            <styles xmi:type="notation:TitleStyle" xmi:id="_1jbg55QLEeWTbJ02p3oubQ"/>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_1jbg6JQLEeWTbJ02p3oubQ"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_1jbg6ZQLEeWTbJ02p3oubQ"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1jbg6pQLEeWTbJ02p3oubQ"/>

-          </children>

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

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1ja50ZQLEeWTbJ02p3oubQ" x="75" y="22" width="140" height="82"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_rpOhkpQLEeWTbJ02p3oubQ"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rpOhk5QLEeWTbJ02p3oubQ"/>

-      </children>

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

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rpN6gZQLEeWTbJ02p3oubQ" x="438" y="30" width="263" height="207"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_rpXrg5QLEeWTbJ02p3oubQ" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_rpXrhJQLEeWTbJ02p3oubQ" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_rpXrhpQLEeWTbJ02p3oubQ" name="BASE_ELEMENT">

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

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rpXrhZQLEeWTbJ02p3oubQ" x="200"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_Bmr9zJQUEeWTbJ02p3oubQ" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_Bmr9zZQUEeWTbJ02p3oubQ" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Bmr9z5QUEeWTbJ02p3oubQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Profile" href="esfbehaviours.profile.uml#_A_JHQBNMEeWOCLsnVbWZoA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Bmr9zpQUEeWTbJ02p3oubQ" x="505" y="257"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_GBr0ERNMEeWOCLsnVbWZoA" name="diagram_compatibility_version" stringValue="1.1.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_GBr0EhNMEeWOCLsnVbWZoA"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_GBr0ExNMEeWOCLsnVbWZoA">

-      <owner xmi:type="uml:Profile" href="esfbehaviours.profile.uml#_A_JHQBNMEeWOCLsnVbWZoA"/>

-    </styles>

-    <element xmi:type="uml:Profile" href="esfbehaviours.profile.uml#_A_JHQBNMEeWOCLsnVbWZoA"/>

-    <edges xmi:type="notation:Connector" xmi:id="_OUd6IBUvEeWsuO0tI_iXIw" type="4002" source="_anoU4BUvEeWsuO0tI_iXIw" target="_a-iZABUvEeWsuO0tI_iXIw" routing="Rectilinear">

-      <children xmi:type="notation:DecorationNode" xmi:id="_OUd6IxUvEeWsuO0tI_iXIw" visible="false" type="6007">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_OUd6JBUvEeWsuO0tI_iXIw" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_OUd6IRUvEeWsuO0tI_iXIw"/>

-      <element xmi:type="uml:Generalization" href="esfbehaviours.profile.uml#_OTuTQBUvEeWsuO0tI_iXIw"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OUd6IhUvEeWsuO0tI_iXIw" points="[21, 0, 0, 59]$[21, -59, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_V91B4JUYEeWNjpcwd8yD9A" id="(0.57,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pT4G4BUvEeWsuO0tI_iXIw" id="(0.13478260869565217,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_OxnwMRUvEeWsuO0tI_iXIw" type="4002" source="_ZxeI8BUvEeWsuO0tI_iXIw" target="_a-iZABUvEeWsuO0tI_iXIw" routing="Rectilinear">

-      <children xmi:type="notation:DecorationNode" xmi:id="_OxnwNBUvEeWsuO0tI_iXIw" visible="false" type="6007">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_OxnwNRUvEeWsuO0tI_iXIw" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_OxnwMhUvEeWsuO0tI_iXIw"/>

-      <element xmi:type="uml:Generalization" href="esfbehaviours.profile.uml#_OxnwMBUvEeWsuO0tI_iXIw"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OxnwMxUvEeWsuO0tI_iXIw" points="[33, 0, 0, 59]$[33, -59, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OxxhMBUvEeWsuO0tI_iXIw" id="(0.01,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OxxhMRUvEeWsuO0tI_iXIw" id="(0.8173913043478261,1.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_rpXrh5QLEeWTbJ02p3oubQ" type="StereotypeCommentLink" source="_rpN6gJQLEeWTbJ02p3oubQ" target="_rpXrg5QLEeWTbJ02p3oubQ">

-      <styles xmi:type="notation:FontStyle" xmi:id="_rpXriJQLEeWTbJ02p3oubQ"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_rpYSkJQLEeWTbJ02p3oubQ" name="BASE_ELEMENT">

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

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rpXriZQLEeWTbJ02p3oubQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rpXripQLEeWTbJ02p3oubQ"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rpXri5QLEeWTbJ02p3oubQ"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_Bmr90JQUEeWTbJ02p3oubQ" type="StereotypeCommentLink" source="_UmAJoBUvEeWsuO0tI_iXIw" target="_Bmr9zJQUEeWTbJ02p3oubQ">

-      <styles xmi:type="notation:FontStyle" xmi:id="_Bmr90ZQUEeWTbJ02p3oubQ"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Bmr91ZQUEeWTbJ02p3oubQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Profile" href="esfbehaviours.profile.uml#_A_JHQBNMEeWOCLsnVbWZoA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Bmr90pQUEeWTbJ02p3oubQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Bmr905QUEeWTbJ02p3oubQ"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Bmr91JQUEeWTbJ02p3oubQ"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_Nvix1JUYEeWNjpcwd8yD9A" type="StereotypeCommentLink" source="_NvP24JUYEeWNjpcwd8yD9A" target="_Nvix0JUYEeWNjpcwd8yD9A">

-      <styles xmi:type="notation:FontStyle" xmi:id="_Nvix1ZUYEeWNjpcwd8yD9A"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_NvjY4pUYEeWNjpcwd8yD9A" name="BASE_ELEMENT">

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

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Nvix1pUYEeWNjpcwd8yD9A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NvjY4JUYEeWNjpcwd8yD9A"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NvjY4ZUYEeWNjpcwd8yD9A"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_Qqh8QJUYEeWNjpcwd8yD9A" type="1013" source="_ZxeI8BUvEeWsuO0tI_iXIw" target="_NvP24JUYEeWNjpcwd8yD9A" routing="Rectilinear">

-      <styles xmi:type="notation:FontStyle" xmi:id="_Qqh8QZUYEeWNjpcwd8yD9A"/>

-      <element xmi:type="uml:Extension" href="esfbehaviours.profile.uml#_QqFQUJUYEeWNjpcwd8yD9A"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Qqh8QpUYEeWNjpcwd8yD9A" points="[-40, 23, 156, -96]$[-194, 94, 2, -25]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Qq-BIJUYEeWNjpcwd8yD9A" id="(0.39,1.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Qq-oMJUYEeWNjpcwd8yD9A" id="(0.8571428571428571,0.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_Rkb_wJUYEeWNjpcwd8yD9A" type="1013" source="_anoU4BUvEeWsuO0tI_iXIw" target="_NvP24JUYEeWNjpcwd8yD9A" routing="Rectilinear">

-      <styles xmi:type="notation:FontStyle" xmi:id="_Rkb_wZUYEeWNjpcwd8yD9A"/>

-      <element xmi:type="uml:Extension" href="esfbehaviours.profile.uml#_RkK6AJUYEeWNjpcwd8yD9A"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Rkb_wpUYEeWNjpcwd8yD9A" points="[15, 17, -76, -82]$[93, 88, 2, -11]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Rkx-AJUYEeWNjpcwd8yD9A" id="(0.7899543378995434,1.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Rkx-AZUYEeWNjpcwd8yD9A" id="(0.19428571428571428,0.0)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_owhPYJUZEeWNjpcwd8yD9A" type="4002" source="_a-iZABUvEeWsuO0tI_iXIw" target="_1ja50JQLEeWTbJ02p3oubQ" routing="Rectilinear">

-      <children xmi:type="notation:DecorationNode" xmi:id="_owh2cJUZEeWNjpcwd8yD9A" visible="false" type="6007">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_owidgJUZEeWNjpcwd8yD9A" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_owhPYZUZEeWNjpcwd8yD9A"/>

-      <element xmi:type="uml:Generalization" href="esfbehaviours.profile.uml#_owQJoJUZEeWNjpcwd8yD9A"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_owhPYpUZEeWNjpcwd8yD9A" points="[-3, -11, 34, 140]$[-18, -130, 19, 21]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ow64AJUZEeWNjpcwd8yD9A" id="(0.691304347826087,0.0)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ow64AZUZEeWNjpcwd8yD9A" id="(0.5571428571428572,1.0)"/>

-    </edges>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_zfpqUCCTEeWTgM-gIHMuxg" type="PapyrusUMLClassDiagram" name="Overview PackageDiagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_0THuoCCTEeWTgM-gIHMuxg" type="2007">

-      <children xmi:type="notation:DecorationNode" xmi:id="_0TIVsCCTEeWTgM-gIHMuxg" type="5026"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_0TIVsSCTEeWTgM-gIHMuxg" type="7016">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_0TIVsiCTEeWTgM-gIHMuxg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0TIVsyCTEeWTgM-gIHMuxg"/>

-      </children>

-      <element xmi:type="uml:Profile" href="esfbehaviours.profile.uml#_A_JHQBNMEeWOCLsnVbWZoA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0THuoSCTEeWTgM-gIHMuxg" x="240" y="175"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_BmtL8JQUEeWTbJ02p3oubQ" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_BmtL8ZQUEeWTbJ02p3oubQ" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BmtL85QUEeWTbJ02p3oubQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Profile" href="esfbehaviours.profile.uml#_A_JHQBNMEeWOCLsnVbWZoA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BmtL8pQUEeWTbJ02p3oubQ" x="440" y="166"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_t8zHAJUZEeWNjpcwd8yD9A" type="2007">

-      <children xmi:type="notation:DecorationNode" xmi:id="_t8zuEJUZEeWNjpcwd8yD9A" type="5026"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_t8zuEZUZEeWNjpcwd8yD9A" type="7016">

-        <styles xmi:type="notation:TitleStyle" xmi:id="_t8zuEpUZEeWNjpcwd8yD9A"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t8zuE5UZEeWNjpcwd8yD9A"/>

-      </children>

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

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t8zHAZUZEeWNjpcwd8yD9A" x="530" y="175"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_t86bw5UZEeWNjpcwd8yD9A" type="StereotypeComment">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_t86bxJUZEeWNjpcwd8yD9A" showTitle="true"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_t86bxpUZEeWNjpcwd8yD9A" name="BASE_ELEMENT">

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

-      </styles>

-      <element xsi:nil="true"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t86bxZUZEeWNjpcwd8yD9A" x="200"/>

-    </children>

-    <styles xmi:type="notation:StringValueStyle" xmi:id="_zfpqUSCTEeWTgM-gIHMuxg" name="diagram_compatibility_version" stringValue="1.1.0"/>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_zfpqUiCTEeWTgM-gIHMuxg"/>

-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_zfpqUyCTEeWTgM-gIHMuxg">

-      <owner xmi:type="uml:Profile" href="esfbehaviours.profile.uml#_A_JHQBNMEeWOCLsnVbWZoA"/>

-      <configuration xmi:type="configuration:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmpNxhEeOqHvRyiN87hA"/>

-    </styles>

-    <element xmi:type="uml:Profile" href="esfbehaviours.profile.uml#_A_JHQBNMEeWOCLsnVbWZoA"/>

-    <edges xmi:type="notation:Connector" xmi:id="_BmtL9JQUEeWTbJ02p3oubQ" type="StereotypeCommentLink" source="_0THuoCCTEeWTgM-gIHMuxg" target="_BmtL8JQUEeWTbJ02p3oubQ">

-      <styles xmi:type="notation:FontStyle" xmi:id="_BmtL9ZQUEeWTbJ02p3oubQ"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BmtL-ZQUEeWTbJ02p3oubQ" name="BASE_ELEMENT">

-        <eObjectValue xmi:type="uml:Profile" href="esfbehaviours.profile.uml#_A_JHQBNMEeWOCLsnVbWZoA"/>

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BmtL9pQUEeWTbJ02p3oubQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BmtL95QUEeWTbJ02p3oubQ"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BmtL-JQUEeWTbJ02p3oubQ"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_t86bx5UZEeWNjpcwd8yD9A" type="StereotypeCommentLink" source="_t8zHAJUZEeWNjpcwd8yD9A" target="_t86bw5UZEeWNjpcwd8yD9A">

-      <styles xmi:type="notation:FontStyle" xmi:id="_t86byJUZEeWNjpcwd8yD9A"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_t86bzJUZEeWNjpcwd8yD9A" name="BASE_ELEMENT">

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

-      </styles>

-      <element xsi:nil="true"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_t86byZUZEeWNjpcwd8yD9A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_t86bypUZEeWNjpcwd8yD9A"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_t86by5UZEeWNjpcwd8yD9A"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_u0du0JUZEeWNjpcwd8yD9A" type="4008" source="_0THuoCCTEeWTgM-gIHMuxg" target="_t8zHAJUZEeWNjpcwd8yD9A">

-      <children xmi:type="notation:DecorationNode" xmi:id="_u0du05UZEeWNjpcwd8yD9A" type="6026">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_u0du1JUZEeWNjpcwd8yD9A" y="40"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_u0du1ZUZEeWNjpcwd8yD9A" type="6027">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_u0du1pUZEeWNjpcwd8yD9A" y="60"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_u0du0ZUZEeWNjpcwd8yD9A"/>

-      <element xmi:type="uml:Dependency" href="esfbehaviours.profile.uml#_u0IXoJUZEeWNjpcwd8yD9A"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_u0du0pUZEeWNjpcwd8yD9A" points="[34, 5, -190, 16]$[324, 21, 100, 32]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_u0tmcJUZEeWNjpcwd8yD9A" id="(1.0,0.7)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_u0tmcZUZEeWNjpcwd8yD9A" id="(0.0,0.63)"/>

-    </edges>

-  </notation:Diagram>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
+  <notation:Diagram xmi:id="_GBr0EBNMEeWOCLsnVbWZoA" type="PapyrusUMLProfileDiagram" name="ESFBehaviours ProfileDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_UmAJoBUvEeWsuO0tI_iXIw" type="1030" fillColor="13420443">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UmAJohUvEeWsuO0tI_iXIw" type="1047"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UmAJoxUvEeWsuO0tI_iXIw" type="1042">
+        <children xmi:type="notation:Shape" xmi:id="_ZxeI8BUvEeWsuO0tI_iXIw" type="1023">
+          <children xmi:type="notation:DecorationNode" xmi:id="_ZxeI8hUvEeWsuO0tI_iXIw" type="1046"/>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_ZxeI8xUvEeWsuO0tI_iXIw" visible="false" type="1052">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_ZxeI9BUvEeWsuO0tI_iXIw"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_ZxeI9RUvEeWsuO0tI_iXIw"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_ZxeI9hUvEeWsuO0tI_iXIw"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZxeI9xUvEeWsuO0tI_iXIw"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_ZxeI-BUvEeWsuO0tI_iXIw" visible="false" type="1053">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_ZxeI-RUvEeWsuO0tI_iXIw"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_ZxeI-hUvEeWsuO0tI_iXIw"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_ZxeI-xUvEeWsuO0tI_iXIw"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZxeI_BUvEeWsuO0tI_iXIw"/>
+          </children>
+          <element xmi:type="uml:Stereotype" href="esfbehaviours.profile.uml#_C-KJMBUvEeWsuO0tI_iXIw"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZxeI8RUvEeWsuO0tI_iXIw" x="281" y="173"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_anoU4BUvEeWsuO0tI_iXIw" type="1023">
+          <children xmi:type="notation:DecorationNode" xmi:id="_anoU4hUvEeWsuO0tI_iXIw" type="1046"/>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_anoU4xUvEeWsuO0tI_iXIw" type="1052">
+            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jMYG0JUYEeWNjpcwd8yD9A" source="PapyrusCSSForceValue">
+              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jMYt4JUYEeWNjpcwd8yD9A" key="visible" value="true"/>
+            </eAnnotations>
+            <children xmi:type="notation:Shape" xmi:id="_SBw_gJUZEeWNjpcwd8yD9A" type="3002">
+              <styles xmi:type="notation:StringListValueStyle" xmi:id="_To1U8L3fEeWaFrysrt8vfg" name="maskLabel">
+                <stringListValue>multiplicity</stringListValue>
+                <stringListValue>name</stringListValue>
+                <stringListValue>type</stringListValue>
+                <stringListValue>derived</stringListValue>
+              </styles>
+              <element xmi:type="uml:Property" href="esfbehaviours.profile.uml#_xfrNUJUYEeWNjpcwd8yD9A"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_SBw_gZUZEeWNjpcwd8yD9A"/>
+            </children>
+            <styles xmi:type="notation:TitleStyle" xmi:id="_anoU5BUvEeWsuO0tI_iXIw"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_anoU5RUvEeWsuO0tI_iXIw"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_anoU5hUvEeWsuO0tI_iXIw"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_anxe0BUvEeWsuO0tI_iXIw"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_anxe0RUvEeWsuO0tI_iXIw" visible="false" type="1053">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_anxe0hUvEeWsuO0tI_iXIw"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_anxe0xUvEeWsuO0tI_iXIw"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_anxe1BUvEeWsuO0tI_iXIw"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_anxe1RUvEeWsuO0tI_iXIw"/>
+          </children>
+          <element xmi:type="uml:Stereotype" href="esfbehaviours.profile.uml#_AverIBUvEeWsuO0tI_iXIw"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_anoU4RUvEeWsuO0tI_iXIw" x="31" y="173" height="93"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_a-iZABUvEeWsuO0tI_iXIw" type="1023">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_i2lTUBUvEeWsuO0tI_iXIw" source="PapyrusCSSForceValue">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_i2lTURUvEeWsuO0tI_iXIw" key="fillColor" value="true"/>
+          </eAnnotations>
+          <children xmi:type="notation:DecorationNode" xmi:id="_a-iZAhUvEeWsuO0tI_iXIw" type="1046"/>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_a-iZAxUvEeWsuO0tI_iXIw" visible="false" type="1052">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_a-iZBBUvEeWsuO0tI_iXIw"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_a-iZBRUvEeWsuO0tI_iXIw"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_a-iZBhUvEeWsuO0tI_iXIw"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_a-iZBxUvEeWsuO0tI_iXIw"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_a-iZCBUvEeWsuO0tI_iXIw" visible="false" type="1053">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_a-iZCRUvEeWsuO0tI_iXIw"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_a-iZChUvEeWsuO0tI_iXIw"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_a-iZCxUvEeWsuO0tI_iXIw"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_a-iZDBUvEeWsuO0tI_iXIw"/>
+          </children>
+          <element xmi:type="uml:Stereotype" href="esfbehaviours.profile.uml#_wpNyMBUuEeWsuO0tI_iXIw"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_a-iZARUvEeWsuO0tI_iXIw" x="127" y="14" width="230" height="100"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_NvP24JUYEeWNjpcwd8yD9A" type="3028" fillColor="10265827">
+          <children xmi:type="notation:DecorationNode" xmi:id="_NvRFAJUYEeWNjpcwd8yD9A" type="5062"/>
+          <children xmi:type="notation:DecorationNode" xmi:id="_NvdSQJUYEeWNjpcwd8yD9A" type="StereotypeLabel">
+            <styles xmi:type="notation:StringValueStyle" xmi:id="_NvdSQZUYEeWNjpcwd8yD9A" name="stereotype" stringValue="StandardProfile::Metaclass"/>
+            <element xmi:type="uml:Stereotype" href="pathmap://UML_PROFILES/Standard.profile.uml#Metaclass"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NvdSQpUYEeWNjpcwd8yD9A"/>
+          </children>
+          <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Classifier"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NvP24ZUYEeWNjpcwd8yD9A" x="170" y="309" width="175"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_Nvix0JUYEeWNjpcwd8yD9A" type="StereotypeComment">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_Nvix0ZUYEeWNjpcwd8yD9A" showTitle="true"/>
+          <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Nvix05UYEeWNjpcwd8yD9A" name="BASE_ELEMENT">
+            <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Classifier"/>
+          </styles>
+          <element xsi:nil="true"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Nvix0pUYEeWNjpcwd8yD9A" x="200"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UmAJpBUvEeWsuO0tI_iXIw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UmAJpRUvEeWsuO0tI_iXIw"/>
+      </children>
+      <element xmi:type="uml:Profile" href="esfbehaviours.profile.uml#_A_JHQBNMEeWOCLsnVbWZoA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UmAJoRUvEeWsuO0tI_iXIw" x="305" y="257" width="479" height="456"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_rpN6gJQLEeWTbJ02p3oubQ" type="1030" fillColor="12621752">
+      <children xmi:type="notation:DecorationNode" xmi:id="_rpOhkJQLEeWTbJ02p3oubQ" type="1047"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_rpOhkZQLEeWTbJ02p3oubQ" type="1042">
+        <children xmi:type="notation:Shape" xmi:id="_1ja50JQLEeWTbJ02p3oubQ" type="1023">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6fP6oJQLEeWTbJ02p3oubQ" source="PapyrusCSSForceValue">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6fQhsJQLEeWTbJ02p3oubQ" key="fillColor" value="true"/>
+          </eAnnotations>
+          <children xmi:type="notation:DecorationNode" xmi:id="_1jbg4JQLEeWTbJ02p3oubQ" type="1046"/>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_1jbg4ZQLEeWTbJ02p3oubQ" visible="false" type="1052">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_1jbg4pQLEeWTbJ02p3oubQ"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_1jbg45QLEeWTbJ02p3oubQ"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_1jbg5JQLEeWTbJ02p3oubQ"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1jbg5ZQLEeWTbJ02p3oubQ"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_1jbg5pQLEeWTbJ02p3oubQ" visible="false" type="1053">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_1jbg55QLEeWTbJ02p3oubQ"/>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_1jbg6JQLEeWTbJ02p3oubQ"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_1jbg6ZQLEeWTbJ02p3oubQ"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1jbg6pQLEeWTbJ02p3oubQ"/>
+          </children>
+          <element xmi:type="uml:Stereotype" href="platform:/resource/org.polarsys.esf.core.profile.esfcore/src/main/resources/models/profile/esfcore.profile.uml#_CzxxEA3PEeWIHrhJxYOO3w"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1ja50ZQLEeWTbJ02p3oubQ" x="75" y="22" width="140" height="82"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_rpOhkpQLEeWTbJ02p3oubQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rpOhk5QLEeWTbJ02p3oubQ"/>
+      </children>
+      <element xmi:type="uml:Profile" href="platform:/resource/org.polarsys.esf.core.profile.esfcore/src/main/resources/models/profile/esfcore.profile.uml#_5CO-gA3OEeWIHrhJxYOO3w"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rpN6gZQLEeWTbJ02p3oubQ" x="438" y="30" width="263" height="207"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_rpXrg5QLEeWTbJ02p3oubQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_rpXrhJQLEeWTbJ02p3oubQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_rpXrhpQLEeWTbJ02p3oubQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Profile" href="platform:/resource/org.polarsys.esf.core.profile.esfcore/src/main/resources/models/profile/esfcore.profile.uml#_5CO-gA3OEeWIHrhJxYOO3w"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rpXrhZQLEeWTbJ02p3oubQ" x="200"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_Bmr9zJQUEeWTbJ02p3oubQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Bmr9zZQUEeWTbJ02p3oubQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Bmr9z5QUEeWTbJ02p3oubQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Profile" href="esfbehaviours.profile.uml#_A_JHQBNMEeWOCLsnVbWZoA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Bmr9zpQUEeWTbJ02p3oubQ" x="505" y="257"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_GBr0ERNMEeWOCLsnVbWZoA" name="diagram_compatibility_version" stringValue="1.1.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_GBr0EhNMEeWOCLsnVbWZoA"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_GBr0ExNMEeWOCLsnVbWZoA">
+      <owner xmi:type="uml:Profile" href="esfbehaviours.profile.uml#_A_JHQBNMEeWOCLsnVbWZoA"/>
+    </styles>
+    <element xmi:type="uml:Profile" href="esfbehaviours.profile.uml#_A_JHQBNMEeWOCLsnVbWZoA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_OUd6IBUvEeWsuO0tI_iXIw" type="4002" source="_anoU4BUvEeWsuO0tI_iXIw" target="_a-iZABUvEeWsuO0tI_iXIw" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_OUd6IxUvEeWsuO0tI_iXIw" visible="false" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_OUd6JBUvEeWsuO0tI_iXIw" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_OUd6IRUvEeWsuO0tI_iXIw"/>
+      <element xmi:type="uml:Generalization" href="esfbehaviours.profile.uml#_OTuTQBUvEeWsuO0tI_iXIw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OUd6IhUvEeWsuO0tI_iXIw" points="[21, 0, 0, 59]$[21, -59, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_V91B4JUYEeWNjpcwd8yD9A" id="(0.57,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pT4G4BUvEeWsuO0tI_iXIw" id="(0.13478260869565217,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_OxnwMRUvEeWsuO0tI_iXIw" type="4002" source="_ZxeI8BUvEeWsuO0tI_iXIw" target="_a-iZABUvEeWsuO0tI_iXIw" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_OxnwNBUvEeWsuO0tI_iXIw" visible="false" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_OxnwNRUvEeWsuO0tI_iXIw" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_OxnwMhUvEeWsuO0tI_iXIw"/>
+      <element xmi:type="uml:Generalization" href="esfbehaviours.profile.uml#_OxnwMBUvEeWsuO0tI_iXIw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OxnwMxUvEeWsuO0tI_iXIw" points="[33, 0, 0, 59]$[33, -59, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OxxhMBUvEeWsuO0tI_iXIw" id="(0.01,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OxxhMRUvEeWsuO0tI_iXIw" id="(0.8173913043478261,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_rpXrh5QLEeWTbJ02p3oubQ" type="StereotypeCommentLink" source="_rpN6gJQLEeWTbJ02p3oubQ" target="_rpXrg5QLEeWTbJ02p3oubQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_rpXriJQLEeWTbJ02p3oubQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_rpYSkJQLEeWTbJ02p3oubQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Profile" href="platform:/resource/org.polarsys.esf.core.profile.esfcore/src/main/resources/models/profile/esfcore.profile.uml#_5CO-gA3OEeWIHrhJxYOO3w"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rpXriZQLEeWTbJ02p3oubQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rpXripQLEeWTbJ02p3oubQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rpXri5QLEeWTbJ02p3oubQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_Bmr90JQUEeWTbJ02p3oubQ" type="StereotypeCommentLink" source="_UmAJoBUvEeWsuO0tI_iXIw" target="_Bmr9zJQUEeWTbJ02p3oubQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Bmr90ZQUEeWTbJ02p3oubQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Bmr91ZQUEeWTbJ02p3oubQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Profile" href="esfbehaviours.profile.uml#_A_JHQBNMEeWOCLsnVbWZoA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Bmr90pQUEeWTbJ02p3oubQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Bmr905QUEeWTbJ02p3oubQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Bmr91JQUEeWTbJ02p3oubQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_Nvix1JUYEeWNjpcwd8yD9A" type="StereotypeCommentLink" source="_NvP24JUYEeWNjpcwd8yD9A" target="_Nvix0JUYEeWNjpcwd8yD9A">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Nvix1ZUYEeWNjpcwd8yD9A"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_NvjY4pUYEeWNjpcwd8yD9A" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Classifier"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Nvix1pUYEeWNjpcwd8yD9A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NvjY4JUYEeWNjpcwd8yD9A"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NvjY4ZUYEeWNjpcwd8yD9A"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_Qqh8QJUYEeWNjpcwd8yD9A" type="1013" source="_ZxeI8BUvEeWsuO0tI_iXIw" target="_NvP24JUYEeWNjpcwd8yD9A" routing="Rectilinear">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Qqh8QZUYEeWNjpcwd8yD9A"/>
+      <element xmi:type="uml:Extension" href="esfbehaviours.profile.uml#_QqFQUJUYEeWNjpcwd8yD9A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Qqh8QpUYEeWNjpcwd8yD9A" points="[-40, 23, 156, -96]$[-194, 94, 2, -25]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Qq-BIJUYEeWNjpcwd8yD9A" id="(0.39,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Qq-oMJUYEeWNjpcwd8yD9A" id="(0.8571428571428571,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_Rkb_wJUYEeWNjpcwd8yD9A" type="1013" source="_anoU4BUvEeWsuO0tI_iXIw" target="_NvP24JUYEeWNjpcwd8yD9A" routing="Rectilinear">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Rkb_wZUYEeWNjpcwd8yD9A"/>
+      <element xmi:type="uml:Extension" href="esfbehaviours.profile.uml#_RkK6AJUYEeWNjpcwd8yD9A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Rkb_wpUYEeWNjpcwd8yD9A" points="[15, 17, -76, -82]$[93, 88, 2, -11]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Rkx-AJUYEeWNjpcwd8yD9A" id="(0.7899543378995434,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Rkx-AZUYEeWNjpcwd8yD9A" id="(0.19428571428571428,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_owhPYJUZEeWNjpcwd8yD9A" type="4002" source="_a-iZABUvEeWsuO0tI_iXIw" target="_1ja50JQLEeWTbJ02p3oubQ" routing="Rectilinear">
+      <children xmi:type="notation:DecorationNode" xmi:id="_owh2cJUZEeWNjpcwd8yD9A" visible="false" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_owidgJUZEeWNjpcwd8yD9A" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_owhPYZUZEeWNjpcwd8yD9A"/>
+      <element xmi:type="uml:Generalization" href="esfbehaviours.profile.uml#_owQJoJUZEeWNjpcwd8yD9A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_owhPYpUZEeWNjpcwd8yD9A" points="[-3, -11, 34, 140]$[-18, -130, 19, 21]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ow64AJUZEeWNjpcwd8yD9A" id="(0.691304347826087,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ow64AZUZEeWNjpcwd8yD9A" id="(0.5571428571428572,1.0)"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_zfpqUCCTEeWTgM-gIHMuxg" type="PapyrusUMLClassDiagram" name="Overview PackageDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_0THuoCCTEeWTgM-gIHMuxg" type="2007">
+      <children xmi:type="notation:DecorationNode" xmi:id="_0TIVsCCTEeWTgM-gIHMuxg" type="5026"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_0TIVsSCTEeWTgM-gIHMuxg" type="7016">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_0TIVsiCTEeWTgM-gIHMuxg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0TIVsyCTEeWTgM-gIHMuxg"/>
+      </children>
+      <element xmi:type="uml:Profile" href="esfbehaviours.profile.uml#_A_JHQBNMEeWOCLsnVbWZoA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0THuoSCTEeWTgM-gIHMuxg" x="240" y="175"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_BmtL8JQUEeWTbJ02p3oubQ" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_BmtL8ZQUEeWTbJ02p3oubQ" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BmtL85QUEeWTbJ02p3oubQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Profile" href="esfbehaviours.profile.uml#_A_JHQBNMEeWOCLsnVbWZoA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BmtL8pQUEeWTbJ02p3oubQ" x="440" y="166"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_t8zHAJUZEeWNjpcwd8yD9A" type="2007">
+      <children xmi:type="notation:DecorationNode" xmi:id="_t8zuEJUZEeWNjpcwd8yD9A" type="5026"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_t8zuEZUZEeWNjpcwd8yD9A" type="7016">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_t8zuEpUZEeWNjpcwd8yD9A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t8zuE5UZEeWNjpcwd8yD9A"/>
+      </children>
+      <element xmi:type="uml:Profile" href="platform:/resource/org.polarsys.esf.core.profile.esfcore/src/main/resources/models/profile/esfcore.profile.uml#_5CO-gA3OEeWIHrhJxYOO3w"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t8zHAZUZEeWNjpcwd8yD9A" x="530" y="175"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_t86bw5UZEeWNjpcwd8yD9A" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_t86bxJUZEeWNjpcwd8yD9A" showTitle="true"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_t86bxpUZEeWNjpcwd8yD9A" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Profile" href="platform:/resource/org.polarsys.esf.core.profile.esfcore/src/main/resources/models/profile/esfcore.profile.uml#_5CO-gA3OEeWIHrhJxYOO3w"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t86bxZUZEeWNjpcwd8yD9A" x="200"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_zfpqUSCTEeWTgM-gIHMuxg" name="diagram_compatibility_version" stringValue="1.1.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_zfpqUiCTEeWTgM-gIHMuxg"/>
+    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_zfpqUyCTEeWTgM-gIHMuxg">
+      <owner xmi:type="uml:Profile" href="esfbehaviours.profile.uml#_A_JHQBNMEeWOCLsnVbWZoA"/>
+      <configuration xmi:type="configuration:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmpNxhEeOqHvRyiN87hA"/>
+    </styles>
+    <element xmi:type="uml:Profile" href="esfbehaviours.profile.uml#_A_JHQBNMEeWOCLsnVbWZoA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_BmtL9JQUEeWTbJ02p3oubQ" type="StereotypeCommentLink" source="_0THuoCCTEeWTgM-gIHMuxg" target="_BmtL8JQUEeWTbJ02p3oubQ">
+      <styles xmi:type="notation:FontStyle" xmi:id="_BmtL9ZQUEeWTbJ02p3oubQ"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BmtL-ZQUEeWTbJ02p3oubQ" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Profile" href="esfbehaviours.profile.uml#_A_JHQBNMEeWOCLsnVbWZoA"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BmtL9pQUEeWTbJ02p3oubQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BmtL95QUEeWTbJ02p3oubQ"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BmtL-JQUEeWTbJ02p3oubQ"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_t86bx5UZEeWNjpcwd8yD9A" type="StereotypeCommentLink" source="_t8zHAJUZEeWNjpcwd8yD9A" target="_t86bw5UZEeWNjpcwd8yD9A">
+      <styles xmi:type="notation:FontStyle" xmi:id="_t86byJUZEeWNjpcwd8yD9A"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_t86bzJUZEeWNjpcwd8yD9A" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:Profile" href="platform:/resource/org.polarsys.esf.core.profile.esfcore/src/main/resources/models/profile/esfcore.profile.uml#_5CO-gA3OEeWIHrhJxYOO3w"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_t86byZUZEeWNjpcwd8yD9A" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_t86bypUZEeWNjpcwd8yD9A"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_t86by5UZEeWNjpcwd8yD9A"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_u0du0JUZEeWNjpcwd8yD9A" type="4008" source="_0THuoCCTEeWTgM-gIHMuxg" target="_t8zHAJUZEeWNjpcwd8yD9A">
+      <children xmi:type="notation:DecorationNode" xmi:id="_u0du05UZEeWNjpcwd8yD9A" type="6026">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_u0du1JUZEeWNjpcwd8yD9A" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_u0du1ZUZEeWNjpcwd8yD9A" type="6027">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_u0du1pUZEeWNjpcwd8yD9A" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_u0du0ZUZEeWNjpcwd8yD9A"/>
+      <element xmi:type="uml:Dependency" href="esfbehaviours.profile.uml#_u0IXoJUZEeWNjpcwd8yD9A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_u0du0pUZEeWNjpcwd8yD9A" points="[34, 5, -190, 16]$[324, 21, 100, 32]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_u0tmcJUZEeWNjpcwd8yD9A" id="(1.0,0.7)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_u0tmcZUZEeWNjpcwd8yD9A" id="(0.0,0.63)"/>
+    </edges>
+  </notation:Diagram>
+</xmi:XMI>
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 9e41438..ceeb0f6 100644
--- a/core/profile/org.polarsys.esf.core.profile.esfcore/plugin.xml
+++ b/core/profile/org.polarsys.esf.core.profile.esfcore/plugin.xml
@@ -14,4 +14,11 @@
             genModel="src/main/resources/models/genmodel/esfcore.genmodel"/>
    </extension>
 
+   <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>
 </plugin>
diff --git a/core/releng/org.polarsys.esf.core.releng/feature.xml b/core/releng/org.polarsys.esf.core.releng/feature.xml
index 76417fd..9f3e3ac 100644
--- a/core/releng/org.polarsys.esf.core.releng/feature.xml
+++ b/core/releng/org.polarsys.esf.core.releng/feature.xml
@@ -3,8 +3,7 @@
       id="org.polarsys.esf.core.releng"
       label="%featureName"
       version="0.7.0.qualifier"
-      provider-name="%providerName"
-      plugin="org.polarsys.esf.core.releng.branding">
+      provider-name="%providerName">
 
    <description>
       %description
@@ -34,7 +33,6 @@
       <import plugin="org.eclipse.core.resources" version="3.10.1" match="greaterOrEqual"/>
       <import plugin="org.apache.commons.io" version="2.2.0" match="greaterOrEqual"/>
       <import plugin="org.apache.commons.lang3" version="3.1.0" match="greaterOrEqual"/>
-      <import plugin="org.jdom" version="1.1.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.transaction" version="1.4.0" match="greaterOrEqual"/>
       <import plugin="org.polarsys.esf.core.common" version="0.7.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.edit.ui" version="2.10.0" match="greaterOrEqual"/>
@@ -173,13 +171,6 @@
          unpack="false"/>
 
    <plugin
-         id="org.polarsys.esf.core.wizard.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.polarsys.esf.core.diagram.esfarchitectureconcepts"
          download-size="0"
          install-size="0"