Bug 515649: [BPMN] architecture framework migration
  first migration step :
  - create architecture plugin
  - migrate elementtypes, newchild, palette and diagramExpansion to new
    elementtypes framework
  - bundle.properties / Manifest uniformization

Change-Id: Iea8a3aaa1e5d6b699c923cd87206d60dd999e7fe
Signed-off-by: Géry Deloge <gery.deloge@cea.fr>
diff --git a/org.eclipse.papyrus.bpmn.architecture/.classpath b/org.eclipse.papyrus.bpmn.architecture/.classpath
new file mode 100644
index 0000000..4e89763
--- /dev/null
+++ b/org.eclipse.papyrus.bpmn.architecture/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="target"/>
+</classpath>
diff --git a/org.eclipse.papyrus.bpmn.architecture/.project b/org.eclipse.papyrus.bpmn.architecture/.project
new file mode 100644
index 0000000..6d2e7b6
--- /dev/null
+++ b/org.eclipse.papyrus.bpmn.architecture/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.bpmn.architecture</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>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.eclipse.papyrus.bpmn.architecture/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.papyrus.bpmn.architecture/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..0c68a61
--- /dev/null
+++ b/org.eclipse.papyrus.bpmn.architecture/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/org.eclipse.papyrus.bpmn.architecture/META-INF/MANIFEST.MF b/org.eclipse.papyrus.bpmn.architecture/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..2dbf791
--- /dev/null
+++ b/org.eclipse.papyrus.bpmn.architecture/META-INF/MANIFEST.MF
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-Vendor: %Bundle-Vendor
+Bundle-SymbolicName: org.eclipse.papyrus.bpmn.architecture;singleton:=true
+Bundle-Version: 0.9.0.qualifier
+Bundle-Activator: org.eclipse.papyrus.bpmn.architecture.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.architecture
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.papyrus.bpmn.architecture/OSGI-INF/l10n/bundle.properties b/org.eclipse.papyrus.bpmn.architecture/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000..b84761b
--- /dev/null
+++ b/org.eclipse.papyrus.bpmn.architecture/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,2 @@
+Bundle-Name = BPMN architecture framework plugin
+Bundle-Vendor = Eclipse Modeling Project
\ No newline at end of file
diff --git a/org.eclipse.papyrus.bpmn.architecture/about.html b/org.eclipse.papyrus.bpmn.architecture/about.html
new file mode 100644
index 0000000..d35d5ae
--- /dev/null
+++ b/org.eclipse.papyrus.bpmn.architecture/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/org.eclipse.papyrus.bpmn.architecture/build.properties b/org.eclipse.papyrus.bpmn.architecture/build.properties
new file mode 100644
index 0000000..4521583
--- /dev/null
+++ b/org.eclipse.papyrus.bpmn.architecture/build.properties
@@ -0,0 +1,8 @@
+source.. = src/
+output.. = target/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               model/,\
+               OSGI-INF/
+src.includes = about.html
diff --git a/org.eclipse.papyrus.bpmn.architecture/model/bpmn.architecture b/org.eclipse.papyrus.bpmn.architecture/model/bpmn.architecture
new file mode 100644
index 0000000..11760d8
--- /dev/null
+++ b/org.eclipse.papyrus.bpmn.architecture/model/bpmn.architecture
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<architecture:ArchitectureDomain xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" xmlns:gmfdiagrepresentation="http://www.eclipse.org/papyrus/infra/gmfdiag/representation" xmi:id="BPMN engineering" name="BPMN engineering" description="">
+  <stakeholders xmi:id="org.eclipse.papyrus.bpmn.stakeholder" id="org.eclipse.papyrus.bpmn.stakeholder" name="BPMN modeler" concerns="org.eclipse.papyrus.bpmn.concern"/>
+  <concerns xmi:id="org.eclipse.papyrus.bpmn.concern" id="org.eclipse.papyrus.bpmn.concern" name="Process modeling"/>
+  <contexts xsi:type="architecture:ArchitectureDescriptionLanguage" xmi:id="org.eclipse.papyrus.bpmn.descriptionLanguage" id="org.eclipse.papyrus.bpmn.descriptionLanguage" name="BPMN" description="" icon="" extensionPrefix="" creationCommandClass="org.eclipse.papyrus.bpmn.diagram.common.commands.CreateBpmnModelCommand">
+    <viewpoints xmi:id="org.eclipse.papyrus.bpmn.viewpoint" id="org.eclipse.papyrus.bpmn.viewpoint" name="BPMN" concerns="org.eclipse.papyrus.bpmn.concern" representationKinds="org.eclipse.papyrus.bpmn.diagram.process org.eclipse.papyrus.bpmn.diagram.collaboration"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/StandardProfile.elementtypesconfigurations#_jfoLkGT_EeSEqNuV3JpFCA"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types.ui/model/uml-advice.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.elementTypesSet"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/customBpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.customElementTypeSet"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.elementTypesSet"/>
+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/customBpmndi.elementtypesconfigurations#org.eclipse.papyrus.custombpmndi.elementTypesSet"/>
+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="org.eclipse.papyrus.bpmn.diagram.process" id="org.eclipse.papyrus.bpmn.diagram.process" name="Process" icon="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/icons/Processdi.png" concerns="org.eclipse.papyrus.bpmn.concern" implementationID="PapyrusUMLActivityDiagram" customStyle="" creationCommandClass="org.eclipse.papyrus.uml.diagram.activity.CreateActivityDiagramCommand">
+      <modelRules xmi:id="_v0H6wCXaEeeyrfXuGghKkA">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity"/>
+        <stereotypes href="http://www.omg.org/spec/BPMNProfile/20121112/#//BPMNProcess"/>
+      </modelRules>
+      <owningRules xmi:id="_3hdZ4CXaEeeyrfXuGghKkA">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+        <newModelPath xmi:id="_DTdBQCXbEeeyrfXuGghKkA" creationType="org.eclipse.papyrus.bpmn.BPMNProcess_Activity">
+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+        </newModelPath>
+      </owningRules>
+      <owningRules xmi:id="_4LJQECXaEeeyrfXuGghKkA">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity"/>
+        <stereotypes href="http://www.omg.org/spec/BPMNProfile/20121112/#//BPMNProcess"/>
+        <newModelPath xmi:id="_OCTwoCXbEeeyrfXuGghKkA" creationType="org.eclipse.papyrus.bpmn.BPMNProcess_Activity">
+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
+        </newModelPath>
+      </owningRules>
+      <childRules xmi:id="_TAb3gCXbEeeyrfXuGghKkA"/>
+      <paletteRules xmi:id="_Vm3XYGJZEeeUTrvZuD2-tQ" permit="false" element="activity.*"/>
+      <paletteRules xmi:id="_YHFRYGJZEeeUTrvZuD2-tQ" permit="false" element="bpmn.collaboration.*"/>
+    </representationKinds>
+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="org.eclipse.papyrus.bpmn.diagram.collaboration" id="org.eclipse.papyrus.bpmn.diagram.collaboration" name="Collaboration" icon="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/icons/Collaborationdi.png" concerns="org.eclipse.papyrus.bpmn.concern" implementationID="PapyrusUMLActivityDiagram" customStyle="" creationCommandClass="org.eclipse.papyrus.uml.diagram.activity.CreateActivityDiagramCommand">
+      <modelRules xmi:id="_ehpQ4CXbEeeyrfXuGghKkA">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Collaboration"/>
+        <stereotypes href="http://www.omg.org/spec/BPMNProfile/20121112/#//BPMNCollaboration"/>
+      </modelRules>
+      <owningRules xmi:id="_jgctMCXbEeeyrfXuGghKkA">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+        <newModelPath xmi:id="_ld8UoCXbEeeyrfXuGghKkA" creationType="org.eclipse.papyrus.bpmn.BPMNCollaboration_Collaboration">
+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+        </newModelPath>
+      </owningRules>
+      <owningRules xmi:id="_kN0JgCXbEeeyrfXuGghKkA">
+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Collaboration"/>
+        <newModelPath xmi:id="_uVaEkCXbEeeyrfXuGghKkA" creationType="org.eclipse.papyrus.bpmn.BPMNCollaboration_Collaboration">
+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
+        </newModelPath>
+      </owningRules>
+      <childRules xmi:id="_0n9nwCXbEeeyrfXuGghKkA"/>
+      <paletteRules xmi:id="_1anMsCXbEeeyrfXuGghKkA" permit="false" element="activity.*"/>
+      <paletteRules xmi:id="_17yAECXbEeeyrfXuGghKkA" permit="false" element="bpmn.process.*"/>
+    </representationKinds>
+    <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
+    <profiles href="http://www.omg.org/spec/BPMNProfile/20121112/#/"/>
+  </contexts>
+</architecture:ArchitectureDomain>
diff --git a/org.eclipse.papyrus.bpmn.architecture/plugin.xml b/org.eclipse.papyrus.bpmn.architecture/plugin.xml
new file mode 100644
index 0000000..df26f2c
--- /dev/null
+++ b/org.eclipse.papyrus.bpmn.architecture/plugin.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.papyrus.infra.architecture.models">
+      <model
+            path="model/bpmn.architecture">
+      </model>
+   </extension>
+
+</plugin>
diff --git a/org.eclipse.papyrus.bpmn.architecture/pom.xml b/org.eclipse.papyrus.bpmn.architecture/pom.xml
new file mode 100644
index 0000000..6c71d50
--- /dev/null
+++ b/org.eclipse.papyrus.bpmn.architecture/pom.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.papyrus.bpmn</groupId>
+		<artifactId>org.eclipse.papyrus.bpmn.parent</artifactId>
+		<version>0.9.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.bpmn.architecture</artifactId>
+	<packaging>eclipse-plugin</packaging>
+</project>
\ No newline at end of file
diff --git a/org.eclipse.papyrus.bpmn.architecture/src/org/eclipse/papyrus/bpmn/architecture/Activator.java b/org.eclipse.papyrus.bpmn.architecture/src/org/eclipse/papyrus/bpmn/architecture/Activator.java
new file mode 100644
index 0000000..4991c1b
--- /dev/null
+++ b/org.eclipse.papyrus.bpmn.architecture/src/org/eclipse/papyrus/bpmn/architecture/Activator.java
@@ -0,0 +1,61 @@
+/*****************************************************************************
+ * Copyright (c) 2017 CEA.
+ * <p>
+ * 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
+ * <p>
+ * Contributors:
+ * Géry Deloge (CEATech AQUI) gery.deloge@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.bpmn.architecture;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.bpmn.architecture"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+}
diff --git a/org.eclipse.papyrus.bpmn.diagram.collaboration/META-INF/MANIFEST.MF b/org.eclipse.papyrus.bpmn.diagram.collaboration/META-INF/MANIFEST.MF
index 2d0fecf..4d28363 100755
--- a/org.eclipse.papyrus.bpmn.diagram.collaboration/META-INF/MANIFEST.MF
+++ b/org.eclipse.papyrus.bpmn.diagram.collaboration/META-INF/MANIFEST.MF
@@ -1,4 +1,10 @@
 Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-Vendor: %Bundle-Vendor
+Bundle-SymbolicName: org.eclipse.papyrus.bpmn.diagram.collaboration;singleton:=true
+Bundle-Version: 0.9.0.qualifier
+Bundle-Activator: org.eclipse.papyrus.bpmn.diagram.collaboration.Activator
 Export-Package: org.eclipse.papyrus.bpmn.diagram.collaboration
 Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
  org.eclipse.core.runtime,
@@ -10,11 +16,5 @@
  org.eclipse.gmf.runtime.diagram.core,
  org.eclipse.papyrus.uml.diagram.activity,
  org.eclipse.gmf.runtime.diagram.ui
-Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 0.9.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.bpmn.diagram.collaboration.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.bpmn.diagram.collaboration;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/org.eclipse.papyrus.bpmn.diagram.collaboration/model/bpmnDiagramExpansion.xmi b/org.eclipse.papyrus.bpmn.diagram.collaboration/model/bpmnDiagramExpansion.xmi
index d841d6d..d89c7ab 100755
--- a/org.eclipse.papyrus.bpmn.diagram.collaboration/model/bpmnDiagramExpansion.xmi
+++ b/org.eclipse.papyrus.bpmn.diagram.collaboration/model/bpmnDiagramExpansion.xmi
@@ -1,39 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <expansionmodel:DiagramExpansion
-    xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:expansionmodel="http:///expansionmodel.ecore"
-    xmi:id="_BOX98NnkEeSFtu511b-yaw"
-    ID="BPMN Collaboration Diagram">
-  <usages xmi:id="_rC19oNnoEeSqwOe5_frWm1"
-      diagramType="BPMN Collaboration Diagram"
-      representations="//@usages.0/@gmftRepresentations.0"
-      name="BPMN Collaboration Diagram Context">
-    <gmftRepresentations
-        editPartQualifiedName="org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityEditPart"
-        name="reuse activity"
-        viewFactory="org.eclipse.papyrus.bpmn.diagram.collaboration.ActivityViewFactory"
-        inducedRepresentations="//@libraries.1/@representations.0"
-        reusedID="2001"/>
-  </usages>
-  <libraries
-      name="newRepresentation">
-    <representations
-        xsi:type="expansionmodel:Representation"
-        editPartQualifiedName="org.eclipse.papyrus.bpmn.diagram.common.edit.part.LaneEditPart"
-        name="Lane overloads activity partition"
-        viewFactory="org.eclipse.papyrus.bpmn.diagram.common.factory.LaneViewFactory"
-        graphicalElementType="org.eclipse.papyrus.custombpmndi.Lane_Partition"/>
-  </libraries>
-  <libraries
-      name="reusedCompartment">
-    <representations
-        xsi:type="expansionmodel:InducedRepresentation"
-        editPartQualifiedName="org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityActivityContentCompartmentEditPart"
-        name="compartment of activity"
-        viewFactory="org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.CompartmentViewFactory"
-        hint="7004"
-        children="//@libraries.0/@representations.0"/>
-  </libraries>
+		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.2"
+		xmlns:expansionmodel="http:///expansionmodel.ecore"
+		xmi:id="_BOX98NnkEeSFtu511b-yaw"
+		ID="BPMN Collaboration Diagram">
+	<usages xmi:id="_rC19oNnoEeSqwOe5_frWm1"
+			diagramType="BPMN Collaboration Diagram"
+			representations="//@usages.0/@gmftRepresentations.0"
+			name="BPMN Collaboration Diagram Context">
+		<gmftRepresentations
+				editPartQualifiedName="org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityEditPart"
+				name="reuse activity"
+				viewFactory="org.eclipse.papyrus.bpmn.diagram.collaboration.ActivityViewFactory"
+				inducedRepresentations="//@libraries.1/@representations.0"
+				reusedID="2001"/>
+	</usages>
+	<libraries
+			name="newRepresentation">
+		<representations
+			xsi:type="expansionmodel:Representation"
+			editPartQualifiedName="org.eclipse.papyrus.bpmn.diagram.common.edit.part.LaneEditPart"
+			name="Lane overloads activity partition"
+			viewFactory="org.eclipse.papyrus.bpmn.diagram.common.factory.LaneViewFactory">
+			<graphicalElementTypeRef
+					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+					href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/customBpmndi.elementtypesconfigurations#org.eclipse.papyrus.custombpmndi.Lane_Partition"/>
+		</representations>
+	</libraries>
+	<libraries
+			name="reusedCompartment">
+		<representations
+				xsi:type="expansionmodel:InducedRepresentation"
+				editPartQualifiedName="org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityActivityContentCompartmentEditPart"
+				name="compartment of activity"
+				viewFactory="org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.CompartmentViewFactory"
+				hint="7004"
+				children="//@libraries.0/@representations.0"/>
+	</libraries>
 </expansionmodel:DiagramExpansion>
diff --git a/org.eclipse.papyrus.bpmn.diagram.collaboration/model/collaboration.paletteConfiguration b/org.eclipse.papyrus.bpmn.diagram.collaboration/model/collaboration.paletteConfiguration
index 60765b1..95da570 100755
--- a/org.eclipse.papyrus.bpmn.diagram.collaboration/model/collaboration.paletteConfiguration
+++ b/org.eclipse.papyrus.bpmn.diagram.collaboration/model/collaboration.paletteConfiguration
@@ -1,422 +1,153 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<paletteconfiguration:PaletteConfiguration
-		xmi:version="2.0"
-		xmlns:xmi="http://www.omg.org/XMI"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7"
-		id="org.eclipse.papyrus.bpmn.collaboration.palette"
-		label="BPMN Collaboration Palette Model"
-		description="Palette configuration for BPMN Collaboration Diagram">
-	<drawerConfigurations
-			id="bpmn.collaboration.connectors"
-			label="Connectors"
-			description="Drawer Configuration for BPMN Collaboration Diagram Connectors">
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.collaboration.sequenceFlow.tool"
-				label="Sequence Flow"
-				description="Sequence Flow (Control Flow)"
-				kind="ConnectionTool">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/SequenceFlow.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.SequenceFlow_ControlFlow_4004"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><paletteconfiguration:PaletteConfiguration xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" description="Palette configuration for BPMN Collaboration Diagram" id="org.eclipse.papyrus.bpmn.collaboration.palette" label="BPMN Collaboration Palette Model" xmi:version="2.0">
+	<drawerConfigurations description="Drawer Configuration for BPMN Collaboration Diagram Connectors" id="bpmn.collaboration.connectors" label="Connectors">
+		<ownedConfigurations description="Sequence Flow (Control Flow)" id="bpmn.collaboration.sequenceFlow.tool" kind="ConnectionTool" label="Sequence Flow" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/SequenceFlow.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.SequenceFlow_ControlFlow_4004" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.collaboration.dataAssociation.tool"
-				label="Data Association "
-				description="Data Association (Object Flow)"
-				kind="ConnectionTool">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/DataAssociation.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.DataAssociation_ObjectFlow_4003"/>
+		<ownedConfigurations description="Data Association (Object Flow)" id="bpmn.collaboration.dataAssociation.tool" kind="ConnectionTool" label="Data Association " xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/DataAssociation.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.DataAssociation_ObjectFlow_4003" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 		</ownedConfigurations>
 	</drawerConfigurations>
-	<drawerConfigurations
-			id="bpmn.collaboration.tasks"
-			label="Tasks"
-			description="Drawer Configuration for BPMN Collaboration Diagram Tasks">
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.collaboration.macrotask.tool"
-				label="Call Activity"
-				description="Call Activity (Call Behavior Action)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/CallBehaviorAction.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.custombpmndi.CallActivity_CallBehaviorAction"/>
+	<drawerConfigurations description="Drawer Configuration for BPMN Collaboration Diagram Tasks" id="bpmn.collaboration.tasks" label="Tasks">
+		<ownedConfigurations description="Call Activity (Call Behavior Action)" id="bpmn.collaboration.macrotask.tool" label="Call Activity" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/CallBehaviorAction.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/customBpmndi.elementtypesconfigurations#org.eclipse.papyrus.custombpmndi.CallActivity_CallBehaviorAction" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.collaboration.task.tool"
-				label="Task"
-				description="Task (Opaque Action)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/Task.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.custombpmndi.Task_Action_3007"/>
+		<ownedConfigurations description="Task (Opaque Action)" id="bpmn.collaboration.task.tool" label="Task" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/Task.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/customBpmndi.elementtypesconfigurations#org.eclipse.papyrus.custombpmndi.Task_Action_3007" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.collaboration.manualTask.tool"
-				label="Manual Task"
-				description="Manual Task (Opaque Action)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/ManualTask.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.ManualTask_OpaqueAction_3007"/>
+		<ownedConfigurations description="Manual Task (Opaque Action)" id="bpmn.collaboration.manualTask.tool" label="Manual Task" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/ManualTask.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.ManualTask_OpaqueAction_3007" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.collaboration.userTask.tool"
-				label="User Task"
-				description="User Task (Opaque Action)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/UserTask.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.UserTask_OpaqueAction_3007"/>
+		<ownedConfigurations description="User Task (Opaque Action)" id="bpmn.collaboration.userTask.tool" label="User Task" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/UserTask.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.UserTask_OpaqueAction_3007" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.collaboration.scriptTask.tool"
-				label="Script Task"
-				description="Script Task (Opaque Action)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/ScriptTask.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.ScriptTask_OpaqueAction_3007"/>
+		<ownedConfigurations description="Script Task (Opaque Action)" id="bpmn.collaboration.scriptTask.tool" label="Script Task" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/ScriptTask.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.ScriptTask_OpaqueAction_3007" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.collaboration.businessRuleTask.tool"
-				label="Business Rule Task"
-				description="Business Rule Task (Opaque Action)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/BusinessRuleTask.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.BusinessRuleTask_OpaqueAction_3007"/>
+		<ownedConfigurations description="Business Rule Task (Opaque Action)" id="bpmn.collaboration.businessRuleTask.tool" label="Business Rule Task" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/BusinessRuleTask.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.BusinessRuleTask_OpaqueAction_3007" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.collaboration.sendTask.tool"
-				label="Send Task"
-				description="Send Task (Call Operation Action)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/SendTask.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.SendTask_CallOperationAction_3010"/>
+		<ownedConfigurations description="Send Task (Call Operation Action)" id="bpmn.collaboration.sendTask.tool" label="Send Task" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/SendTask.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.SendTask_CallOperationAction_3010" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.collaboration.serviceTask.tool"
-				label="Service Task"
-				description="Service Task (Call Operation Action)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/ServiceTask.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.ServiceTask_CallOperationAction_3010"/>
+		<ownedConfigurations description="Service Task (Call Operation Action)" id="bpmn.collaboration.serviceTask.tool" label="Service Task" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/ServiceTask.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.ServiceTask_CallOperationAction_3010" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 		</ownedConfigurations>
 	</drawerConfigurations>
-	<drawerConfigurations
-			id="bpmn.collaboration.gateways"
-			label="Gateways"
-			description="Drawer Configuration for BPMN Collaboration Diagram Gateways">
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.collaboration.inclusiveGateway.forkNode.tool"
-				label="Inclusive Gateway (Fork node)"
-				description="Inclusive Gateway (Fork node)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/InclusiveGatewayFork.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.InclusiveGateway_ForkNode_3040"/>
+	<drawerConfigurations description="Drawer Configuration for BPMN Collaboration Diagram Gateways" id="bpmn.collaboration.gateways" label="Gateways">
+		<ownedConfigurations description="Inclusive Gateway (Fork node)" id="bpmn.collaboration.inclusiveGateway.forkNode.tool" label="Inclusive Gateway (Fork node)" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/InclusiveGatewayFork.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.InclusiveGateway_ForkNode_3040" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.collaboration.inclusiveGateway.joinNode.tool"
-				label="Inclusive Gateway (Join node)"
-				description="Inclusive Gateway (Join node)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/InclusiveGatewayJoin.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.InclusiveGateway_JoinNode_3041"/>
+		<ownedConfigurations description="Inclusive Gateway (Join node)" id="bpmn.collaboration.inclusiveGateway.joinNode.tool" label="Inclusive Gateway (Join node)" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/InclusiveGatewayJoin.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.InclusiveGateway_JoinNode_3041" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.collaboration.exclusiveGateway.decisionNode.tool"
-				label="Exclusive Gateway (Decision node)"
-				description="Exclusive Gateway (Decision node)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/ExclusiveGatewayFork.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.ExclusiveGateway_DecisionNode_3038"/>
+		<ownedConfigurations description="Exclusive Gateway (Decision node)" id="bpmn.collaboration.exclusiveGateway.decisionNode.tool" label="Exclusive Gateway (Decision node)" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/ExclusiveGatewayFork.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.ExclusiveGateway_DecisionNode_3038" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.collaboration.exclusiveGateway.mergeNode.tool"
-				label="Exclusive Gateway (Merge Node)"
-				description="Exclusive Gateway (Merge Node)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/ExclusiveGatewayJoin.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.ExclusiveGateway_MergeNode_3039"/>
+		<ownedConfigurations description="Exclusive Gateway (Merge Node)" id="bpmn.collaboration.exclusiveGateway.mergeNode.tool" label="Exclusive Gateway (Merge Node)" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/ExclusiveGatewayJoin.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.ExclusiveGateway_MergeNode_3039" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.collaboration.parallelGateway.forkNode.tool"
-				label="Parallel Gateway (Fork node)"
-				description="Parallel Gateway (Fork node)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/ParallelGatewayFork.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.ParallelGateway_ForkNode_3040"/>
+		<ownedConfigurations description="Parallel Gateway (Fork node)" id="bpmn.collaboration.parallelGateway.forkNode.tool" label="Parallel Gateway (Fork node)" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/ParallelGatewayFork.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.ParallelGateway_ForkNode_3040" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.collaboration.parallelGateway.joinNode.tool"
-				label="Parallel Gateway (Join node)"
-				description="Parallel Gateway (Join node)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/ParallelGatewayJoin.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.ParallelGateway_JoinNode_3041"/>
+		<ownedConfigurations description="Parallel Gateway (Join node)" id="bpmn.collaboration.parallelGateway.joinNode.tool" label="Parallel Gateway (Join node)" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/ParallelGatewayJoin.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.ParallelGateway_JoinNode_3041" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.collaboration.eventBasedGateway.forkNode.tool"
-				label="EventBasedGateway (Fork Node)"
-				description="EventBasedGateway (Fork Node)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/EventBasedGateway.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.EventBasedGateway_ForkNode_3040"/>
+		<ownedConfigurations description="EventBasedGateway (Fork Node)" id="bpmn.collaboration.eventBasedGateway.forkNode.tool" label="EventBasedGateway (Fork Node)" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/EventBasedGateway.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.EventBasedGateway_ForkNode_3040" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.collaboration.eventBasedGateway.interruptibleActivityRegion.tool"
-				label="EventBasedGateway (Interruptible Activity Region)"
-				description="EventBasedGateway (Interruptible Activity Region)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/EventBasedGateway.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.EventBasedGateway_InterruptibleActivityRegion_3068"/>
+		<ownedConfigurations description="EventBasedGateway (Interruptible Activity Region)" id="bpmn.collaboration.eventBasedGateway.interruptibleActivityRegion.tool" label="EventBasedGateway (Interruptible Activity Region)" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/EventBasedGateway.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.EventBasedGateway_InterruptibleActivityRegion_3068" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.collaboration.eventBasedGateway.structuredActivityNode.tool"
-				label="EventBasedGateway (Structured Activity Node)"
-				description="EventBasedGateway (Structured Activity Node)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/EventBasedGateway.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.EventBasedGateway_StructuredActivityNode_3065"/>
+		<ownedConfigurations description="EventBasedGateway (Structured Activity Node)" id="bpmn.collaboration.eventBasedGateway.structuredActivityNode.tool" label="EventBasedGateway (Structured Activity Node)" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/EventBasedGateway.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.EventBasedGateway_StructuredActivityNode_3065" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 		</ownedConfigurations>
 	</drawerConfigurations>
-	<drawerConfigurations
-			id="bpmn.collaboration.events"
-			label="Events"
-			description="Drawer Configuration for BPMN Collaboration Diagram Events">
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.collaboration.startEvent.tool"
-				label="Start Event"
-				description="Start Event (Initial node)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/StartEvent.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.StartEvent_InitialNode_3004"/>
+	<drawerConfigurations description="Drawer Configuration for BPMN Collaboration Diagram Events" id="bpmn.collaboration.events" label="Events">
+		<ownedConfigurations description="Start Event (Initial node)" id="bpmn.collaboration.startEvent.tool" label="Start Event" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/StartEvent.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.StartEvent_InitialNode_3004" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.collaboration.endEvent.tool"
-				label="End Event"
-				description="End Event (Flow final)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/EndEvent.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.EndEvent_FlowFinalNode_3006"/>
+		<ownedConfigurations description="End Event (Flow final)" id="bpmn.collaboration.endEvent.tool" label="End Event" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/EndEvent.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.EndEvent_FlowFinalNode_3006" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.collaboration.intermediateThrowEvent.tool"
-				label="Intermediate Throw Event"
-				description="Intermediate Throw Event (Call Operation Action)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/IntermediateThrowEvent.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.IntermediateThrowEvent_CallOperationAction_3010"/>
+		<ownedConfigurations description="Intermediate Throw Event (Call Operation Action)" id="bpmn.collaboration.intermediateThrowEvent.tool" label="Intermediate Throw Event" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/IntermediateThrowEvent.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.IntermediateThrowEvent_CallOperationAction_3010" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.collaboration.boundaryEvent.tool"
-				label="Boundary Event"
-				description="Boundary Event (Initial node)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/BoundaryEvent.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.BoundaryEvent_InitialNode_3004"/>
+		<ownedConfigurations description="Boundary Event (Initial node)" id="bpmn.collaboration.boundaryEvent.tool" label="Boundary Event" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/BoundaryEvent.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.BoundaryEvent_InitialNode_3004" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.collaboration.intermediateCatchEvent.tool"
-				label="Intermediate Catch Event"
-				description="Intermediate Catch Event (Accept Event Action)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/IntermediateThrowEvent.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.IntermediateCatchEvent_AcceptEventAction_3063"/>
+		<ownedConfigurations description="Intermediate Catch Event (Accept Event Action)" id="bpmn.collaboration.intermediateCatchEvent.tool" label="Intermediate Catch Event" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/IntermediateThrowEvent.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.IntermediateCatchEvent_AcceptEventAction_3063" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 		</ownedConfigurations>
 	</drawerConfigurations>
-	<drawerConfigurations
-			id="bpmn.collaboration.subprocesses"
-			label="Subprocesses"
-			description="Drawer Configuration for BPMN Collaboration Diagram Subprocesses">
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.collaboration.subprocess.tool"
-				label="Subprocess"
-				description="Subprocess (Structured Activity Node)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/SubProcess.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.SubProcess_StructuredActivityNode_3065"/>
+	<drawerConfigurations description="Drawer Configuration for BPMN Collaboration Diagram Subprocesses" id="bpmn.collaboration.subprocesses" label="Subprocesses">
+		<ownedConfigurations description="Subprocess (Structured Activity Node)" id="bpmn.collaboration.subprocess.tool" label="Subprocess" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/SubProcess.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.SubProcess_StructuredActivityNode_3065" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.collaboration.standardLoop.tool"
-				label="Standard Loop"
-				description="Standard Loop (Structured Activity Node)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/LoopNode.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.StandardLoopCharacteristics_LoopNode_3071"/>
+		<ownedConfigurations description="Standard Loop (Structured Activity Node)" id="bpmn.collaboration.standardLoop.tool" label="Standard Loop" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/LoopNode.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.StandardLoopCharacteristics_LoopNode_3071" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.collaboration.multiInstanceLoop.tool"
-				label="Multi Instance Loop"
-				description="Multi Instance (Expansion Region)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/ExpansionRegion.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.MultiInstanceLoopCharacteristics_ExpansionRegion_3070"/>
+		<ownedConfigurations description="Multi Instance (Expansion Region)" id="bpmn.collaboration.multiInstanceLoop.tool" label="Multi Instance Loop" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/ExpansionRegion.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.MultiInstanceLoopCharacteristics_ExpansionRegion_3070" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 		</ownedConfigurations>
 	</drawerConfigurations>
-	<drawerConfigurations
-			id="bpmn.collaboration.data"
-			label="Data"
-			description="Drawer Configuration for BPMN Collaboration Diagram Data">
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.collaboration.dataStoreReference.tool"
-				label="Data Store Reference"
-				description="Data Store Reference">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/DataStoreReference.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.DataStoreReference_DataStoreNode_3078"/>
+	<drawerConfigurations description="Drawer Configuration for BPMN Collaboration Diagram Data" id="bpmn.collaboration.data" label="Data">
+		<ownedConfigurations description="Data Store Reference" id="bpmn.collaboration.dataStoreReference.tool" label="Data Store Reference" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/DataStoreReference.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.DataStoreReference_DataStoreNode_3078" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.collaboration.dataInputTask.tool"
-				label="Data Input (Task)"
-				description="Data Input (Task)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/DataInput.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3013"/>
+		<ownedConfigurations description="Data Input (Task)" id="bpmn.collaboration.dataInputTask.tool" label="Data Input (Task)" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/DataInput.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.DataInput_InputPin_3013" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.collaboration.dataOutputTask.tool"
-				label="Data Output (Task)"
-				description="Data Output (Task)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/DataOutput.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3014"/>
+		<ownedConfigurations description="Data Output (Task)" id="bpmn.collaboration.dataOutputTask.tool" label="Data Output (Task)" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/DataOutput.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3014" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.collaboration.dataInputActivity.tool"
-				label="Data Input (Activity)"
-				description="Data Input (Activity Parameter Node)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/DataInputActivity.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.DataInput_ActivityParameterNode_3059"/>
+		<ownedConfigurations description="Data Input (Activity Parameter Node)" id="bpmn.collaboration.dataInputActivity.tool" label="Data Input (Activity)" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/DataInputActivity.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.DataInput_ActivityParameterNode_3059" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.collaboration.dataOutputActivity.tool"
-				label="Data Output (Activity)"
-				description="Data Output (Activity Parameter Node)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/DataOutputActivity.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.DataOutput_ActivityParameterNode_3059"/>
+		<ownedConfigurations description="Data Output (Activity Parameter Node)" id="bpmn.collaboration.dataOutputActivity.tool" label="Data Output (Activity)" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/DataOutputActivity.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.DataOutput_ActivityParameterNode_3059" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.collaboration.dataObject.tool"
-				label="Data Object"
-				description="Data Object">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/DataObject.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.DataObject_DataStoreNode_3078"/>
+		<ownedConfigurations description="Data Object" id="bpmn.collaboration.dataObject.tool" label="Data Object" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/DataObject.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.DataObject_DataStoreNode_3078" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 		</ownedConfigurations>
 	</drawerConfigurations>
-	<drawerConfigurations
-			id="bpmn.collaboration.pools"
-			label="Pools and Lanes"
-			description="Drawer Configuration for BPMN Collaboration Diagram Pools and Lanes">
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.collaboration.lane.tool"
-				label="Lane"
-				description="Lane (Activity Partition)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/Lane.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.Lane_ActivityPartition_3067"/>
+	<drawerConfigurations description="Drawer Configuration for BPMN Collaboration Diagram Pools and Lanes" id="bpmn.collaboration.pools" label="Pools and Lanes">
+		<ownedConfigurations description="Lane (Activity Partition)" id="bpmn.collaboration.lane.tool" label="Lane" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/Lane.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors><elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.Lane_ActivityPartition_3067" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementDescriptors>
 		</ownedConfigurations>
 	</drawerConfigurations>
 	<requiredProfiles>BPMNProfile</requiredProfiles>
-</paletteconfiguration:PaletteConfiguration>
+</paletteconfiguration:PaletteConfiguration>
\ No newline at end of file
diff --git a/org.eclipse.papyrus.bpmn.diagram.collaboration/plugin.xml b/org.eclipse.papyrus.bpmn.diagram.collaboration/plugin.xml
index 3077e60..db9520f 100755
--- a/org.eclipse.papyrus.bpmn.diagram.collaboration/plugin.xml
+++ b/org.eclipse.papyrus.bpmn.diagram.collaboration/plugin.xml
@@ -2,10 +2,10 @@
 <?eclipse version="3.4"?>
 <plugin>
     <extension
-         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
+         point="org.eclipse.papyrus.infra.gmfdiag.common.paletteDefinition">
       <paletteDefinition
             ID="org.eclipse.papyrus.bpmn.collaboration.palette"
-            class="org.eclipse.papyrus.uml.diagram.common.service.ExtendedPluginPaletteProvider"
+            class="org.eclipse.papyrus.infra.gmfdiag.common.service.palette.ExtendedPluginPaletteProvider"
             icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
             name="org.eclipse.papyrus.bpmn.collaboration.palette"
             path="model/collaboration.paletteConfiguration"
diff --git a/org.eclipse.papyrus.bpmn.diagram.common.tests/META-INF/MANIFEST.MF b/org.eclipse.papyrus.bpmn.diagram.common.tests/META-INF/MANIFEST.MF
index 71f0638..10456d9 100644
--- a/org.eclipse.papyrus.bpmn.diagram.common.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.papyrus.bpmn.diagram.common.tests/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
-Bundle-ActivationPolicy: lazy
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: org.eclipse.papyrus.bpmn.diagram.collaboration.tests
+Bundle-Vendor: %Bundle-Vendor
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.papyrus.bpmn.diagram.common.tests
 Bundle-Version: 0.9.0.qualifier
-Bundle-Vendor: CEA
-Fragment-Host: org.eclipse.papyrus.bpmn.diagram.collaboration;bundle-version="0.9.0"
+Fragment-Host: org.eclipse.papyrus.bpmn.diagram.common;bundle-version="0.9.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.eclipse.papyrus.bpmn.diagram.process;bundle-version="0.9.0",
  org.eclipse.papyrus.bpmn.diagram.collaboration;bundle-version="0.9.0"
+Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.papyrus.bpmn.diagram.common.tests/OSGI-INF/l10n/bundle.properties b/org.eclipse.papyrus.bpmn.diagram.common.tests/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000..376a893
--- /dev/null
+++ b/org.eclipse.papyrus.bpmn.diagram.common.tests/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,2 @@
+Bundle-Vendor =  Eclipse Modeling Project
+Bundle-Name = BPMN graphical tests
diff --git a/org.eclipse.papyrus.bpmn.diagram.common.tests/src/org/eclipse/papyrus/bpmn/diagram/common/PaletteTest.java b/org.eclipse.papyrus.bpmn.diagram.common.tests/src/org/eclipse/papyrus/bpmn/diagram/common/PaletteTest.java
index 34e3ce2..ee972a2 100644
--- a/org.eclipse.papyrus.bpmn.diagram.common.tests/src/org/eclipse/papyrus/bpmn/diagram/common/PaletteTest.java
+++ b/org.eclipse.papyrus.bpmn.diagram.common.tests/src/org/eclipse/papyrus/bpmn/diagram/common/PaletteTest.java
@@ -74,14 +74,16 @@
 		Document doc = builder.parse(new FileInputStream(file));
 		doc.getDocumentElement().normalize();
 		
-		NodeList nodeList = doc.getElementsByTagName("elementDescriptors");
+		NodeList nodeList = doc.getElementsByTagName("elementType");
 		Set<String> set = new HashSet<>();
 		
 		for(int i = 0; i < nodeList.getLength() ; i++){
 			Node node = nodeList.item(i);
 			if(node.getNodeType() == Node.ELEMENT_NODE){
 				Element element = (Element)node;
-				set.add(element.getAttribute("elementTypeId"));
+				String href = element.getAttribute("href");
+				String id = href.substring(href.indexOf("#") + 1);
+				set.add(id);
 			}
 		}
 		
diff --git a/org.eclipse.papyrus.bpmn.diagram.common/META-INF/MANIFEST.MF b/org.eclipse.papyrus.bpmn.diagram.common/META-INF/MANIFEST.MF
index 5bc813d..df41b7f 100755
--- a/org.eclipse.papyrus.bpmn.diagram.common/META-INF/MANIFEST.MF
+++ b/org.eclipse.papyrus.bpmn.diagram.common/META-INF/MANIFEST.MF
@@ -1,4 +1,10 @@
 Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Vendor: %Bundle-Vendor
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: org.eclipse.papyrus.bpmn.diagram.common;singleton:=true
+Bundle-Version: 0.9.0.qualifier
+Bundle-Activator: org.eclipse.papyrus.bpmn.diagram.common.Activator
 Require-Bundle: org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.bpmn;bundle-version="0.7.0",
  org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
@@ -19,12 +25,5 @@
  org.eclipse.papyrus.bpmn.diagram.common.factory,
  org.eclipse.papyrus.bpmn.diagram.common.figures,
  org.eclipse.papyrus.bpmn.diagram.common.providers
-Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 0.9.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.bpmn.diagram.common.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.bpmn.diagram.common;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/org.eclipse.papyrus.bpmn.diagram.common/OSGI-INF/l10n/bundle.properties b/org.eclipse.papyrus.bpmn.diagram.common/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000..b39db60
--- /dev/null
+++ b/org.eclipse.papyrus.bpmn.diagram.common/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,3 @@
+#Properties file for org.eclipse.papyrus.bpmn.diagram.collaboration
+Bundle-Vendor = Eclipse Modeling Project
+Bundle-Name = Common plugin for Papyrus BPMN
\ No newline at end of file
diff --git a/org.eclipse.papyrus.bpmn.diagram.common/build.properties b/org.eclipse.papyrus.bpmn.diagram.common/build.properties
index 915d8fb..08d1352 100755
--- a/org.eclipse.papyrus.bpmn.diagram.common/build.properties
+++ b/org.eclipse.papyrus.bpmn.diagram.common/build.properties
@@ -3,12 +3,12 @@
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               plugin.properties,\
                icons/,\
                build.properties,\
                about.html,\
                diagrams/,\
                css/,\
                shapes/,\
-               model/
+               model/,\
+               OSGI-INF/
 src.includes = about.html
diff --git a/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations b/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations
index d77bb82..fbca19d 100644
--- a/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations
+++ b/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations
@@ -1,586 +1,577 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:applystereotypeadvice="http://www.eclipse.org/papyrus/uml/types/applystereotypeadvice/1.1" xmlns:stereotypematcher="http://www.eclipse.org/papyrus/uml/types/stereotypematcher/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.bpmndi.elementTypes" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="BPMNProfile" xmi:id="_s7URMAkGEeWVleXnap4Kwg" xmi:version="2.0">
-  <elementTypeConfigurations hint="JoinNode_Shape" identifier="org.eclipse.papyrus.bpmndi.InclusiveGateway_JoinNode_3041" name="InclusiveGateway JoinNode" xmi:id="_s7URMQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/JoinNode.gif" xmi:id="_s7URMgkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulgXkQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5phdx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="ForkNode_Shape" identifier="org.eclipse.papyrus.bpmndi.InclusiveGateway_ForkNode_3040" name="InclusiveGateway ForkNode" xmi:id="_s7URMwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ForkNode.gif" xmi:id="_s7URNAkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulgXlAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5Cptx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="ForkNode_Shape" identifier="org.eclipse.papyrus.bpmndi.EventBasedGateway_ForkNode_3040" name="EventBasedGateway ForkNode" xmi:id="_s7URNQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ForkNode.gif" xmi:id="_s7URNgkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulgXrwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5Cptx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="StructuredActivityNode_Shape" identifier="org.eclipse.papyrus.bpmndi.EventBasedGateway_StructuredActivityNode_3065" name="EventBasedGateway StructuredActivityNode" xmi:id="_s7URNwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif" xmi:id="_s7UROAkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulgXsgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu63Tdx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="InterruptibleActivityRegion_Shape" identifier="org.eclipse.papyrus.bpmndi.EventBasedGateway_InterruptibleActivityRegion_3068" name="EventBasedGateway InterruptibleActivityRegion" xmi:id="_s7UROQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InterruptibleActivityRegion.gif" xmi:id="_s7UROgkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulgXtQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5pcdx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="JoinNode_Shape" identifier="org.eclipse.papyrus.bpmndi.NonExclusiveGateway_JoinNode_3041" name="NonExclusiveGateway JoinNode" xmi:id="_s7UROwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/JoinNode.gif" xmi:id="_s7URPAkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulgXxAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5phdx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="ForkNode_Shape" identifier="org.eclipse.papyrus.bpmndi.NonExclusiveGateway_ForkNode_3040" name="NonExclusiveGateway ForkNode" xmi:id="_s7URPQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ForkNode.gif" xmi:id="_s7URPgkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulgXxwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5Cptx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="JoinNode_Shape" identifier="org.eclipse.papyrus.bpmndi.ParallelGateway_JoinNode_3041" name="ParallelGateway JoinNode" xmi:id="_s7URPwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/JoinNode.gif" xmi:id="_s7URQAkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulgX1gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5phdx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="ForkNode_Shape" identifier="org.eclipse.papyrus.bpmndi.ParallelGateway_ForkNode_3040" name="ParallelGateway ForkNode" xmi:id="_s7URQQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ForkNode.gif" xmi:id="_s7URQgkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulgX2QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5Cptx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="JoinNode_Shape" identifier="org.eclipse.papyrus.bpmndi.ComplexGateway_JoinNode_3041" name="ComplexGateway JoinNode" xmi:id="_s7URQwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/JoinNode.gif" xmi:id="_s7URRAkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulgX6AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5phdx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="ForkNode_Shape" identifier="org.eclipse.papyrus.bpmndi.ComplexGateway_ForkNode_3040" name="ComplexGateway ForkNode" xmi:id="_s7URRQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ForkNode.gif" xmi:id="_s7URRgkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulgX6wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5Cptx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="DecisionNode_Shape" identifier="org.eclipse.papyrus.bpmndi.ExclusiveGateway_DecisionNode_3038" name="ExclusiveGateway DecisionNode" xmi:id="_s7URRwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DecisionNode.gif" xmi:id="_s7URSAkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulgX-gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu4cN9x0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="MergeNode_Shape" identifier="org.eclipse.papyrus.bpmndi.ExclusiveGateway_MergeNode_3039" name="ExclusiveGateway MergeNode" xmi:id="_s7URSQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/MergeNode.gif" xmi:id="_s7URSgkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulgX_QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5pqdx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="PapyrusUMLActivityDiagram" identifier="org.eclipse.papyrus.bpmndi.Definitions_Package_PapyrusUMLActivityDiagram" name="Definitions Package" xmi:id="_s7URSwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_s7URTAkGEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_s7URTQkGEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+<?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.2" xmlns:stereotypematcher="http://www.eclipse.org/papyrus/uml/types/stereotypematcher/1.1" xmi:id="org.eclipse.papyrus.bpmndi.elementTypesSet" identifier="org.eclipse.papyrus.bpmndi.elementTypesSet" name="BPMN PapyrusBPMNProfileDi" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.InclusiveGateway_JoinNode_3041" identifier="org.eclipse.papyrus.bpmndi.InclusiveGateway_JoinNode_3041" name="BPMN InclusiveGateway JoinNode" hint="JoinNode_Shape">
+    <iconEntry xmi:id="_s7URMgkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/JoinNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.InclusiveGateway_JoinNode"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.JoinNode_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.InclusiveGateway_ForkNode_3040" identifier="org.eclipse.papyrus.bpmndi.InclusiveGateway_ForkNode_3040" name="BPMN InclusiveGateway ForkNode" hint="ForkNode_Shape">
+    <iconEntry xmi:id="_s7URNAkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ForkNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.InclusiveGateway_ForkNode"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ForkNode_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.EventBasedGateway_ForkNode_3040" identifier="org.eclipse.papyrus.bpmndi.EventBasedGateway_ForkNode_3040" name="BPMN EventBasedGateway ForkNode" hint="ForkNode_Shape">
+    <iconEntry xmi:id="_s7URNgkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ForkNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.EventBasedGateway_ForkNode"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ForkNode_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.EventBasedGateway_StructuredActivityNode_3065" identifier="org.eclipse.papyrus.bpmndi.EventBasedGateway_StructuredActivityNode_3065" name="BPMN EventBasedGateway StructuredActivityNode" hint="StructuredActivityNode_Shape">
+    <iconEntry xmi:id="_s7UROAkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/StructuredActivityNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.EventBasedGateway_StructuredActivityNode"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.StructuredActivityNode_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.EventBasedGateway_InterruptibleActivityRegion_3068" identifier="org.eclipse.papyrus.bpmndi.EventBasedGateway_InterruptibleActivityRegion_3068" name="BPMN EventBasedGateway InterruptibleActivityRegion" hint="InterruptibleActivityRegion_Shape">
+    <iconEntry xmi:id="_s7UROgkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/InterruptibleActivityRegion.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.EventBasedGateway_InterruptibleActivityRegion"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InterruptibleActivityRegion_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.NonExclusiveGateway_JoinNode_3041" identifier="org.eclipse.papyrus.bpmndi.NonExclusiveGateway_JoinNode_3041" name="BPMN NonExclusiveGateway JoinNode" hint="JoinNode_Shape">
+    <iconEntry xmi:id="_s7URPAkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/JoinNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.NonExclusiveGateway_JoinNode"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.JoinNode_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.NonExclusiveGateway_ForkNode_3040" identifier="org.eclipse.papyrus.bpmndi.NonExclusiveGateway_ForkNode_3040" name="BPMN NonExclusiveGateway ForkNode" hint="ForkNode_Shape">
+    <iconEntry xmi:id="_s7URPgkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ForkNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.NonExclusiveGateway_ForkNode"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ForkNode_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.ParallelGateway_JoinNode_3041" identifier="org.eclipse.papyrus.bpmndi.ParallelGateway_JoinNode_3041" name="BPMN ParallelGateway JoinNode" hint="JoinNode_Shape">
+    <iconEntry xmi:id="_s7URQAkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/JoinNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.ParallelGateway_JoinNode"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.JoinNode_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.ParallelGateway_ForkNode_3040" identifier="org.eclipse.papyrus.bpmndi.ParallelGateway_ForkNode_3040" name="BPMN ParallelGateway ForkNode" hint="ForkNode_Shape">
+    <iconEntry xmi:id="_s7URQgkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ForkNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.ParallelGateway_ForkNode"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ForkNode_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.ComplexGateway_JoinNode_3041" identifier="org.eclipse.papyrus.bpmndi.ComplexGateway_JoinNode_3041" name="BPMN ComplexGateway JoinNode" hint="JoinNode_Shape">
+    <iconEntry xmi:id="_s7URRAkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/JoinNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.ComplexGateway_JoinNode"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.JoinNode_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.ComplexGateway_ForkNode_3040" identifier="org.eclipse.papyrus.bpmndi.ComplexGateway_ForkNode_3040" name="BPMN ComplexGateway ForkNode" hint="ForkNode_Shape">
+    <iconEntry xmi:id="_s7URRgkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ForkNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.ComplexGateway_ForkNode"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ForkNode_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.ExclusiveGateway_DecisionNode_3038" identifier="org.eclipse.papyrus.bpmndi.ExclusiveGateway_DecisionNode_3038" name="BPMN ExclusiveGateway DecisionNode" hint="DecisionNode_Shape">
+    <iconEntry xmi:id="_s7URSAkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/DecisionNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.ExclusiveGateway_DecisionNode"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DecisionNode_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.ExclusiveGateway_MergeNode_3039" identifier="org.eclipse.papyrus.bpmndi.ExclusiveGateway_MergeNode_3039" name="BPMN ExclusiveGateway MergeNode" hint="MergeNode_Shape">
+    <iconEntry xmi:id="_s7URSgkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/MergeNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.ExclusiveGateway_MergeNode"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.MergeNode_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.Definitions_Package_PapyrusUMLActivityDiagram" identifier="org.eclipse.papyrus.bpmndi.Definitions_Package_PapyrusUMLActivityDiagram" name="BPMN Definitions Package" hint="PapyrusUMLActivityDiagram">
+    <iconEntry xmi:id="_s7URTAkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_s7URTQkGEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::Definitions</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu6QX9x0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="ActivityPartition_Shape" identifier="org.eclipse.papyrus.bpmndi.LaneSet_ActivityPartition_3067" name="LaneSet ActivityPartition" xmi:id="_s7URTgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityPartition.gif" xmi:id="_s7URTwkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulgYGwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu4a9Nx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="Activity_Shape" identifier="org.eclipse.papyrus.bpmndi.BPMNProcess_Activity_2001" name="BPMNProcess (2001)" xmi:id="_s7URUAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Activity.gif" xmi:id="_s7URUQkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulgYJwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu4bDtx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="Activity_Shape_CN" identifier="org.eclipse.papyrus.bpmndi.BPMNProcess_Activity_3083" name="BPMNProcess (3083)" xmi:id="_s7URUgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Activity.gif" xmi:id="_s7URUwkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulgYJwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu4bENx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="ActivityPartition_Shape" identifier="org.eclipse.papyrus.bpmndi.Lane_ActivityPartition_3067" name="Lane ActivityPartition" xmi:id="_s7URVAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityPartition.gif" xmi:id="_s7URVQkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulgYMwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu4a9Nx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="CallOperationAction_Shape" identifier="org.eclipse.papyrus.bpmndi.EndEvent_CallOperationAction_3010" name="EndEvent CallOperationAction" xmi:id="_s7URVgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallOperationAction.gif" xmi:id="_s7URVwkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulgYlgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu4bc9x0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="FlowFinalNode_Shape" identifier="org.eclipse.papyrus.bpmndi.EndEvent_FlowFinalNode_3006" name="EndEvent FlowFinalNode" xmi:id="_s7URWAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FlowFinalNode.gif" xmi:id="_s7URWQkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulg-ogkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5CpNx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="AcceptEventAction_Shape" identifier="org.eclipse.papyrus.bpmndi.CatchEvent_AcceptEventAction_3063" name="CatchEvent AcceptEventAction" xmi:id="_s7URWgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AcceptEventAction.gif" xmi:id="_s7URWwkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulg-wwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu3zyNx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="InitialNode_Shape" identifier="org.eclipse.papyrus.bpmndi.CatchEvent_InitialNode_3004" name="CatchEvent InitialNode" xmi:id="_s7URXAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InitialNode.gif" xmi:id="_s7URXQkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulg-xgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5C3tx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="AcceptEventAction_Shape" identifier="org.eclipse.papyrus.bpmndi.StartEvent_AcceptEventAction_3063" name="StartEvent AcceptEventAction" xmi:id="_s7URXgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AcceptEventAction.gif" xmi:id="_s7URXwkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulg-2wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu3zyNx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="InitialNode_Shape" identifier="org.eclipse.papyrus.bpmndi.StartEvent_InitialNode_3004" name="StartEvent InitialNode" xmi:id="_s7URYAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InitialNode.gif" xmi:id="_s7URYQkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulg-3gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5C3tx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="AcceptEventAction_Shape" identifier="org.eclipse.papyrus.bpmndi.IntermediateCatchEvent_AcceptEventAction_3063" name="IntermediateCatchEvent AcceptEventAction" xmi:id="_s7URYgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AcceptEventAction.gif" xmi:id="_s7URYwkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulg_FAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu3zyNx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="InitialNode_Shape" identifier="org.eclipse.papyrus.bpmndi.IntermediateCatchEvent_InitialNode_3004" name="IntermediateCatchEvent InitialNode" xmi:id="_s7URZAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InitialNode.gif" xmi:id="_s7URZQkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulg_FwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5C3tx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="SendObjectAction_Shape" identifier="org.eclipse.papyrus.bpmndi.IntermediateThrowEvent_SendObjectAction_3042" name="IntermediateThrowEvent SendObjectAction" xmi:id="_s7URZgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/SendObjectAction.gif" xmi:id="_s7URZwkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulg_IAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu6RPNx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="CallOperationAction_Shape" identifier="org.eclipse.papyrus.bpmndi.IntermediateThrowEvent_CallOperationAction_3010" name="IntermediateThrowEvent CallOperationAction" xmi:id="_s7URaAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallOperationAction.gif" xmi:id="_s7URaQkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulg_IwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu4bc9x0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="FlowFinalNode_Shape" identifier="org.eclipse.papyrus.bpmndi.IntermediateThrowEvent_FlowFinalNode_3006" name="IntermediateThrowEvent FlowFinalNode" xmi:id="_s7URagkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FlowFinalNode.gif" xmi:id="_s7URawkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulg_JgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5CpNx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="CallOperationAction_Shape" identifier="org.eclipse.papyrus.bpmndi.ThrowEvent_CallOperationAction_3010" name="ThrowEvent CallOperationAction" xmi:id="_s7URbAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallOperationAction.gif" xmi:id="_s7URbQkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulg_OwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu4bc9x0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="FlowFinalNode_Shape" identifier="org.eclipse.papyrus.bpmndi.ThrowEvent_FlowFinalNode_3006" name="ThrowEvent FlowFinalNode" xmi:id="_s7URbgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FlowFinalNode.gif" xmi:id="_s7URbwkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulg_PgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5CpNx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="AcceptEventAction_Shape" identifier="org.eclipse.papyrus.bpmndi.BoundaryEvent_AcceptEventAction_3063" name="BoundaryEvent AcceptEventAction" xmi:id="_s7URcAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AcceptEventAction.gif" xmi:id="_s7URcQkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulg_RwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu3zyNx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="InitialNode_Shape" identifier="org.eclipse.papyrus.bpmndi.BoundaryEvent_InitialNode_3004" name="BoundaryEvent InitialNode" xmi:id="_s7URcgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InitialNode.gif" xmi:id="_s7URcwkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulg_SgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5C3tx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="CallOperationAction_Shape" identifier="org.eclipse.papyrus.bpmndi.ImplicitThrowEvent_CallOperationAction_3010" name="ImplicitThrowEvent CallOperationAction" xmi:id="_s7URdAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallOperationAction.gif" xmi:id="_s7URdQkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulg_UwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu4bc9x0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="FlowFinalNode_Shape" identifier="org.eclipse.papyrus.bpmndi.ImplicitThrowEvent_FlowFinalNode_3006" name="ImplicitThrowEvent FlowFinalNode" xmi:id="_s7URdgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FlowFinalNode.gif" xmi:id="_s7URdwkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulg_VgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5CpNx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="Comment_Shape" identifier="org.eclipse.papyrus.bpmndi.TextAnnotation_Comment_3080" name="TextAnnotation Comment" xmi:id="_s7UReAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_s7UReQkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulg_dAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu4budx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="ActivityPartition_Shape" identifier="org.eclipse.papyrus.bpmndi.Group_ActivityPartition_3067" name="Group ActivityPartition" xmi:id="_s7URegkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityPartition.gif" xmi:id="_s7URewkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulg_iQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu4a9Nx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="ControlFlow_Edge" identifier="org.eclipse.papyrus.bpmndi.SequenceFlow_ControlFlow_4004" name="SequenceFlow ControlFlow" xmi:id="_s7URfAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlFlow.gif" xmi:id="_s7URfQkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulg_xQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu4cHdx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="DataStoreNode_Shape" identifier="org.eclipse.papyrus.bpmndi.DataObjectReference_DataStoreNode_3078" name="DataObjectReference DataStoreNode" xmi:id="_s7URfgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataStoreNode.gif" xmi:id="_s7URfwkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAEAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu4cJdx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="ObjectFlow_Edge" identifier="org.eclipse.papyrus.bpmndi.DataOutputAssociation_ObjectFlow_4003" name="DataOutputAssociation ObjectFlow" xmi:id="_s7URgAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ObjectFlow.gif" xmi:id="_s7URgQkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAGQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5p99x0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="OutputPin_OpaqueActionOutputShape" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3014" name="DataOutput (3014)" xmi:id="_s7URggkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URgwkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAKwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu6QDdx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="OutputPin_CallBehaviorActionResultShape" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3020" name="DataOutput (3020)" xmi:id="_s7URhAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URhQkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAKwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5qOdx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="OutputPin_CallOperationActionResultShape" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3024" name="DataOutput (3024)" xmi:id="_s7URhgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URhwkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAKwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5qPdx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="OutputPin_AcceptEventActionResultShape" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3064" name="DataOutput (3064)" xmi:id="_s7URiAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URiQkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAKwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5qLdx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="OutputPin_ValueSpecificationActionResultShape" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3077" name="DataOutput (3077)" xmi:id="_s7URigkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URiwkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAKwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu6QWdx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="OutputPin_ReadSelfActionResultShape" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3084" name="DataOutput (3084)" xmi:id="_s7URjAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URjQkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAKwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu6QJ9x0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="OutputPin_CreateObjectActionResultShape" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3087" name="DataOutput (3087)" xmi:id="_s7URjgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URjwkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAKwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5qU9x0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="OutputPin_ReadStructuralFeatureActionResultShape" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3090" name="DataOutput (3090)" xmi:id="_s7URkAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URkQkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAKwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu6QK9x0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="OutputPin_AddStructuralFeatureValueActionResultShape" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3094" name="DataOutput (3094)" xmi:id="_s7URkgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URkwkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAKwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5qMdx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="OutputPin_ReadVariableActionResultShape" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3098" name="DataOutput (3098)" xmi:id="_s7URlAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URlQkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAKwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu6QL9x0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="OutputPin_LoopNodeBodyOutputShape" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3109" name="DataOutput (3109)" xmi:id="_s7URlgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URlwkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAKwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu6QA9x0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="OutputPin_LoopNodeResultShape" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3111" name="DataOutput (3111)" xmi:id="_s7URmAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URmQkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAKwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu6QCdx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="OutputPin_StructuredActivityNodeOutputShape" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3191" name="DataOutput (3191)" xmi:id="_s7URmgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URmwkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAKwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu6QTdx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="OutputPin_StartObjectBehaviorActionResultShape" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3125" name="DataOutput (3125)" xmi:id="_s7URnAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URnQkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAKwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu6QS9x0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="OutputPin_TestIdentityActionResultShape" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3126" name="DataOutput (3126)" xmi:id="_s7URngkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URnwkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAKwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu6QUdx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="OutputPin_ClearStructuralFeatureActionResultShape" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3127" name="DataOutput (3127)" xmi:id="_s7URoAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URoQkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAKwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5qQ9x0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="OutputPin_ReadLinkActionResultShape" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3128" name="DataOutput (3128)" xmi:id="_s7URogkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URowkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAKwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu6QG9x0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="OutputPin_ReadExtentActionResultShape" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3129" name="DataOutput (3129)" xmi:id="_s7URpAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URpQkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAKwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu6QE9x0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="OutputPin_ReadIsClassifiedObjectActionResultShape" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3130" name="DataOutput (3130)" xmi:id="_s7URpgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URpwkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAKwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu6QF9x0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="OutputPin_ReduceActionResultShape" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3131" name="DataOutput (3131)" xmi:id="_s7URqAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URqQkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAKwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu6QNdx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="OutputPin_CreateLinkObjectActionResultShape" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3202" name="DataOutput (3202)" xmi:id="_s7URqgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URqwkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAKwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5qT9x0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="Parameter_ParameterLabel" identifier="org.eclipse.papyrus.bpmndi.DataOutput_Parameter_3001" name="DataOutput Parameter" xmi:id="_s7URrAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Parameter.gif" xmi:id="_s7URrQkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhALgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu6Qf9x0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="ActivityParameterNode_Shape" identifier="org.eclipse.papyrus.bpmndi.DataOutput_ActivityParameterNode_3059" name="DataOutput ActivityParameterNode" xmi:id="_s7URrgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityParameterNode.gif" xmi:id="_s7URrwkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAMQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu4a8tx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="DataStoreNode_Shape" identifier="org.eclipse.papyrus.bpmndi.BPMNProperty_DataStoreNode_3078" name="BPMNProperty DataStoreNode" xmi:id="_s7URsAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataStoreNode.gif" xmi:id="_s7URsQkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAOgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu4cJdx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="ObjectFlow_Edge" identifier="org.eclipse.papyrus.bpmndi.DataInputAssociation_ObjectFlow_4003" name="DataInputAssociation ObjectFlow" xmi:id="_s7URsgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ObjectFlow.gif" xmi:id="_s7URswkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAWwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5p99x0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="DataStoreNode_Shape" identifier="org.eclipse.papyrus.bpmndi.DataStoreReference_DataStoreNode_3078" name="DataStoreReference DataStoreNode" xmi:id="_s7URtAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataStoreNode.gif" xmi:id="_s7URtQkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAYQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu4cJdx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="DataStoreNode_Shape" identifier="org.eclipse.papyrus.bpmndi.DataObject_DataStoreNode_3078" name="DataObject DataStoreNode" xmi:id="_s7URtgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataStoreNode.gif" xmi:id="_s7URtwkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAagkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu4cJdx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="InputPin_OpaqueActionInputShape" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3013" name="DataInput (3013)" xmi:id="_s7URuAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7URuQkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAcwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5DHtx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="InputPin_CallBehaviorActionArgumentShape" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3019" name="DataInput (3019)" xmi:id="_s7URugkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7URuwkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAcwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5C9tx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="InputPin_CallOperationActionArgumentShape" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3023" name="DataInput (3023)" xmi:id="_s7URvAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7URvQkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAcwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5C-tx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="InputPin_SendSignalActionArgumentShape" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3055" name="DataInput (3055)" xmi:id="_s7URvgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7URvwkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAcwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5o_9x0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="InputPin_ReadStructuralFeatureActionObjectShape" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3089" name="DataInput (3089)" xmi:id="_s7URwAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7URwQkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAcwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5DONx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="InputPin_AddStructuralFeatureValueActionObjectShape" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3092" name="DataInput (3092)" xmi:id="_s7URwgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7URwwkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAcwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5C6Nx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="InputPin_DestroyObjectActionTargetShape" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3096" name="DataInput (3096)" xmi:id="_s7URxAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7URxQkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAcwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5DFtx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="InputPin_AddVariableValueActionValueShape" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3101" name="DataInput (3101)" xmi:id="_s7URxgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7URxwkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAcwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5C8Nx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="InputPin_BroadcastSignalActionArgumentShape" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3103" name="DataInput (3103)" xmi:id="_s7URyAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7URyQkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAcwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5C8tx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="InputPin_LoopNodeVariableInputShape" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3105" name="DataInput (3105)" xmi:id="_s7URygkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7URywkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAcwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5DHNx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="InputPin_StructuredActivityNodeInputShape" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3188" name="DataInput (3188)" xmi:id="_s7URzAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7URzQkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAcwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5pE9x0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="InputPin_StartObjectBehaviorActionArgumentShape" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3133" name="DataInput (3133)" xmi:id="_s7URzgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7URzwkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAcwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5pDdx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="InputPin_TestIdentityActionFirstShape" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3134" name="DataInput (3134)" xmi:id="_s7UR0AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7UR0QkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAcwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5pFdx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="InputPin_ClearStructuralFeatureActionObjectShape" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3136" name="DataInput (3136)" xmi:id="_s7UR0gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7UR0wkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAcwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5DBtx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="InputPin_CreateLinkActionInputShape" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3137" name="DataInput (3137)" xmi:id="_s7UR1AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7UR1QkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAcwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5DDNx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="InputPin_ReadLinkActionInputShape" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3138" name="DataInput (3138)" xmi:id="_s7UR1gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7UR1wkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAcwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5DKtx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="InputPin_DestroyLinkActionInputShape" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3139" name="DataInput (3139)" xmi:id="_s7UR2AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7UR2QkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAcwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5DEtx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="InputPin_ClearAssociationActionObjectShape" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3140" name="DataInput (3140)" xmi:id="_s7UR2gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7UR2wkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAcwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5DAtx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="InputPin_ReclassifyObjectActionObjectShape" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3141" name="DataInput (3141)" xmi:id="_s7UR3AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7UR3QkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAcwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5DPtx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="ReadIsClassifiedObjectActionObjectShape" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3142" name="DataInput (3142)" xmi:id="_s7UR3gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7UR3wkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAcwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5DKNx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="InputPin_ReduceActionCollectionShape" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3143" name="DataInput (3143)" xmi:id="_s7UR4AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7UR4QkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAcwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5DQNx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="InputPin_StartClassifierBehaviorActionObjectShape" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3144" name="DataInput (3144)" xmi:id="_s7UR4gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7UR4wkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAcwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5pC9x0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="InputPin_CreateLinkObjectActionInputShape" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3199" name="DataInput (3199)" xmi:id="_s7UR5AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7UR5QkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAcwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5DDtx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="Parameter_ParameterLabel" identifier="org.eclipse.papyrus.bpmndi.DataInput_Parameter_3001" name="DataInput Parameter" xmi:id="_s7UR5gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Parameter.gif" xmi:id="_s7UR5wkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAdgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu6Qf9x0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="ActivityParameterNode_Shape" identifier="org.eclipse.papyrus.bpmndi.DataInput_ActivityParameterNode_3059" name="DataInput ActivityParameterNode" xmi:id="_s7UR6AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityParameterNode.gif" xmi:id="_s7UR6QkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAeQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu4a8tx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="ObjectFlow_Edge" identifier="org.eclipse.papyrus.bpmndi.DataAssociation_ObjectFlow_4003" name="DataAssociation ObjectFlow" xmi:id="_s7UR6gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ObjectFlow.gif" xmi:id="_s7UR6wkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAggkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5p99x0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="OpaqueAction_Shape" identifier="org.eclipse.papyrus.bpmndi.UserTask_OpaqueAction_3007" name="UserTask OpaqueAction" xmi:id="_s7UR7AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueAction.gif" xmi:id="_s7UR7QkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAiAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5p_dx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="OpaqueAction_Shape" identifier="org.eclipse.papyrus.bpmndi.ManualTask_OpaqueAction_3007" name="ManualTask OpaqueAction" xmi:id="_s7UR7gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueAction.gif" xmi:id="_s7UR7wkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhAuAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5p_dx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="Comment_Shape" identifier="org.eclipse.papyrus.bpmndi.Documentation_Comment_3080" name="Documentation Comment" xmi:id="_s7UR8AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_s7UR8QkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhBBgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu4budx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="Constraint_PreconditionLabel" identifier="org.eclipse.papyrus.bpmndi.BPMNRelationship_Constraint_3002" name="BPMNRelationship (3002)" xmi:id="_s7UR8gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_s7UR8wkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhBDwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu4cEdx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="Constraint_PostconditionLabel" identifier="org.eclipse.papyrus.bpmndi.BPMNRelationship_Constraint_3003" name="BPMNRelationship (3003)" xmi:id="_s7UR9AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_s7UR9QkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhBDwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu4cD9x0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="Constraint_Shape" identifier="org.eclipse.papyrus.bpmndi.BPMNRelationship_Constraint_3112" name="BPMNRelationship (3112)" xmi:id="_s7UR9gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_s7UR9wkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhBDwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu4cE9x0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="StructuredActivityNode_Shape" identifier="org.eclipse.papyrus.bpmndi.SubProcess_StructuredActivityNode_3065" name="SubProcess StructuredActivityNode" xmi:id="_s7UR-AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif" xmi:id="_s7UR-QkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhBVwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu63Tdx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="StructuredActivityNode_Shape" identifier="org.eclipse.papyrus.bpmndi.LoopCharacteristics_StructuredActivityNode_3065" name="LoopCharacteristics StructuredActivityNode" xmi:id="_s7UR-gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif" xmi:id="_s7UR-wkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhBcgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu63Tdx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations identifier="org.eclipse.papyrus.bpmndi.CallActivity_CallBehaviorAction" name="CallActivity CallBehaviorAction" xmi:id="_s7UR_AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallBehaviorAction.gif" xmi:id="_s7UR_QkGEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_s7UR_gkGEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi: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" xmi:id="org.eclipse.papyrus.bpmndi.LaneSet_ActivityPartition_3067" identifier="org.eclipse.papyrus.bpmndi.LaneSet_ActivityPartition_3067" name="BPMN LaneSet ActivityPartition" hint="ActivityPartition_Shape">
+    <iconEntry xmi:id="_s7URTwkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ActivityPartition.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.LaneSet_ActivityPartition"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActivityPartition_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.BPMNProcess_Activity_2001" identifier="org.eclipse.papyrus.bpmndi.BPMNProcess_Activity_2001" name="BPMN BPMNProcess" hint="Activity_Shape">
+    <iconEntry xmi:id="_s7URUQkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Activity.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.BPMNProcess_Activity"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Activity_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.BPMNProcess_Activity_3083" identifier="org.eclipse.papyrus.bpmndi.BPMNProcess_Activity_3083" name="BPMN BPMNProcess Child Node" hint="Activity_Shape_CN">
+    <iconEntry xmi:id="_s7URUwkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Activity.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.BPMNProcess_Activity"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Activity_Shape_CN"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.Lane_ActivityPartition_3067" identifier="org.eclipse.papyrus.bpmndi.Lane_ActivityPartition_3067" name="BPMN Lane ActivityPartition" hint="ActivityPartition_Shape">
+    <iconEntry xmi:id="_s7URVQkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ActivityPartition.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.Lane_ActivityPartition"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActivityPartition_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.EndEvent_CallOperationAction_3010" identifier="org.eclipse.papyrus.bpmndi.EndEvent_CallOperationAction_3010" name="BPMN EndEvent CallOperationAction" hint="CallOperationAction_Shape">
+    <iconEntry xmi:id="_s7URVwkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/CallOperationAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.EndEvent_CallOperationAction"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.CallOperationAction_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.EndEvent_FlowFinalNode_3006" identifier="org.eclipse.papyrus.bpmndi.EndEvent_FlowFinalNode_3006" name="BPMN EndEvent FlowFinalNode" hint="FlowFinalNode_Shape">
+    <iconEntry xmi:id="_s7URWQkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/FlowFinalNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.EndEvent_FlowFinalNode"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.FlowFinalNode_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.CatchEvent_AcceptEventAction_3063" identifier="org.eclipse.papyrus.bpmndi.CatchEvent_AcceptEventAction_3063" name="BPMN CatchEvent AcceptEventAction" hint="AcceptEventAction_Shape">
+    <iconEntry xmi:id="_s7URWwkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/AcceptEventAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.CatchEvent_AcceptEventAction"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.AcceptEventAction_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.CatchEvent_InitialNode_3004" identifier="org.eclipse.papyrus.bpmndi.CatchEvent_InitialNode_3004" name="BPMN CatchEvent InitialNode" hint="InitialNode_Shape">
+    <iconEntry xmi:id="_s7URXQkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/InitialNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.CatchEvent_InitialNode"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InitialNode_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.StartEvent_AcceptEventAction_3063" identifier="org.eclipse.papyrus.bpmndi.StartEvent_AcceptEventAction_3063" name="BPMN StartEvent AcceptEventAction" hint="AcceptEventAction_Shape">
+    <iconEntry xmi:id="_s7URXwkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/AcceptEventAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.StartEvent_AcceptEventAction"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.AcceptEventAction_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.StartEvent_InitialNode_3004" identifier="org.eclipse.papyrus.bpmndi.StartEvent_InitialNode_3004" name="BPMN StartEvent InitialNode" hint="InitialNode_Shape">
+    <iconEntry xmi:id="_s7URYQkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/InitialNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.StartEvent_InitialNode"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InitialNode_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.IntermediateCatchEvent_AcceptEventAction_3063" identifier="org.eclipse.papyrus.bpmndi.IntermediateCatchEvent_AcceptEventAction_3063" name="BPMN IntermediateCatchEvent AcceptEventAction" hint="AcceptEventAction_Shape">
+    <iconEntry xmi:id="_s7URYwkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/AcceptEventAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.IntermediateCatchEvent_AcceptEventAction"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.AcceptEventAction_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.IntermediateCatchEvent_InitialNode_3004" identifier="org.eclipse.papyrus.bpmndi.IntermediateCatchEvent_InitialNode_3004" name="BPMN IntermediateCatchEvent InitialNode" hint="InitialNode_Shape">
+    <iconEntry xmi:id="_s7URZQkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/InitialNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.IntermediateCatchEvent_InitialNode"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InitialNode_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.IntermediateThrowEvent_SendObjectAction_3042" identifier="org.eclipse.papyrus.bpmndi.IntermediateThrowEvent_SendObjectAction_3042" name="BPMN IntermediateThrowEvent SendObjectAction" hint="SendObjectAction_Shape">
+    <iconEntry xmi:id="_s7URZwkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/SendObjectAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.IntermediateThrowEvent_SendObjectAction"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.SendObjectAction_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.IntermediateThrowEvent_CallOperationAction_3010" identifier="org.eclipse.papyrus.bpmndi.IntermediateThrowEvent_CallOperationAction_3010" name="BPMN IntermediateThrowEvent CallOperationAction" hint="CallOperationAction_Shape">
+    <iconEntry xmi:id="_s7URaQkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/CallOperationAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.IntermediateThrowEvent_CallOperationAction"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.CallOperationAction_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.IntermediateThrowEvent_FlowFinalNode_3006" identifier="org.eclipse.papyrus.bpmndi.IntermediateThrowEvent_FlowFinalNode_3006" name="BPMN IntermediateThrowEvent FlowFinalNode" hint="FlowFinalNode_Shape">
+    <iconEntry xmi:id="_s7URawkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/FlowFinalNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.IntermediateThrowEvent_FlowFinalNode"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.FlowFinalNode_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.ThrowEvent_CallOperationAction_3010" identifier="org.eclipse.papyrus.bpmndi.ThrowEvent_CallOperationAction_3010" name="BPMN ThrowEvent CallOperationAction" hint="CallOperationAction_Shape">
+    <iconEntry xmi:id="_s7URbQkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/CallOperationAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.ThrowEvent_CallOperationAction"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.CallOperationAction_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.ThrowEvent_FlowFinalNode_3006" identifier="org.eclipse.papyrus.bpmndi.ThrowEvent_FlowFinalNode_3006" name="BPMN ThrowEvent FlowFinalNode" hint="FlowFinalNode_Shape">
+    <iconEntry xmi:id="_s7URbwkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/FlowFinalNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.ThrowEvent_FlowFinalNode"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.FlowFinalNode_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.BoundaryEvent_AcceptEventAction_3063" identifier="org.eclipse.papyrus.bpmndi.BoundaryEvent_AcceptEventAction_3063" name="BPMN BoundaryEvent AcceptEventAction" hint="AcceptEventAction_Shape">
+    <iconEntry xmi:id="_s7URcQkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/AcceptEventAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.BoundaryEvent_AcceptEventAction"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.AcceptEventAction_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.BoundaryEvent_InitialNode_3004" identifier="org.eclipse.papyrus.bpmndi.BoundaryEvent_InitialNode_3004" name="BPMN BoundaryEvent InitialNode" hint="InitialNode_Shape">
+    <iconEntry xmi:id="_s7URcwkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/InitialNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.BoundaryEvent_InitialNode"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InitialNode_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.ImplicitThrowEvent_CallOperationAction_3010" identifier="org.eclipse.papyrus.bpmndi.ImplicitThrowEvent_CallOperationAction_3010" name="BPMN ImplicitThrowEvent CallOperationAction" hint="CallOperationAction_Shape">
+    <iconEntry xmi:id="_s7URdQkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/CallOperationAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.ImplicitThrowEvent_CallOperationAction"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.CallOperationAction_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.ImplicitThrowEvent_FlowFinalNode_3006" identifier="org.eclipse.papyrus.bpmndi.ImplicitThrowEvent_FlowFinalNode_3006" name="BPMN ImplicitThrowEvent FlowFinalNode" hint="FlowFinalNode_Shape">
+    <iconEntry xmi:id="_s7URdwkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/FlowFinalNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.ImplicitThrowEvent_FlowFinalNode"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.FlowFinalNode_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.TextAnnotation_Comment_3080" identifier="org.eclipse.papyrus.bpmndi.TextAnnotation_Comment_3080" name="BPMN TextAnnotation Comment" hint="Comment_Shape">
+    <iconEntry xmi:id="_s7UReQkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Comment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.TextAnnotation_Comment"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.Group_ActivityPartition_3067" identifier="org.eclipse.papyrus.bpmndi.Group_ActivityPartition_3067" name="BPMN Group ActivityPartition" hint="ActivityPartition_Shape">
+    <iconEntry xmi:id="_s7URewkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ActivityPartition.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.Group_ActivityPartition"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActivityPartition_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.SequenceFlow_ControlFlow_4004" identifier="org.eclipse.papyrus.bpmndi.SequenceFlow_ControlFlow_4004" name="BPMN SequenceFlow ControlFlow" hint="ControlFlow_Edge">
+    <iconEntry xmi:id="_s7URfQkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ControlFlow.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.SequenceFlow_ControlFlow"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ControlFlow_Edge"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataObjectReference_DataStoreNode_3078" identifier="org.eclipse.papyrus.bpmndi.DataObjectReference_DataStoreNode_3078" name="BPMN DataObjectReference DataStoreNode" hint="DataStoreNode_Shape">
+    <iconEntry xmi:id="_s7URfwkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/DataStoreNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataObjectReference_DataStoreNode"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DataStoreNode_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataOutputAssociation_ObjectFlow_4003" identifier="org.eclipse.papyrus.bpmndi.DataOutputAssociation_ObjectFlow_4003" name="BPMN DataOutputAssociation ObjectFlow" hint="ObjectFlow_Edge">
+    <iconEntry xmi:id="_s7URgQkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ObjectFlow.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataOutputAssociation_ObjectFlow"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ObjectFlow_Edge"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3014" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3014" name="BPMN DataOutput (OpaqueActionOutputShape)" hint="OutputPin_OpaqueActionOutputShape">
+    <iconEntry xmi:id="_s7URgwkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataOutput_OutputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_OpaqueActionOutputShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3020" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3020" name="BPMN DataOutput (CallBehaviorActionResultShape)" hint="OutputPin_CallBehaviorActionResultShape">
+    <iconEntry xmi:id="_s7URhQkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataOutput_OutputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_CallBehaviorActionResultShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3024" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3024" name="BPMN DataOutput (CallOperationActionResultShape)" hint="OutputPin_CallOperationActionResultShape">
+    <iconEntry xmi:id="_s7URhwkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataOutput_OutputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_CallOperationActionResultShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3064" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3064" name="BPMN DataOutput (AcceptEventActionResultShape)" hint="OutputPin_AcceptEventActionResultShape">
+    <iconEntry xmi:id="_s7URiQkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataOutput_OutputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_AcceptEventActionResultShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3077" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3077" name="BPMN DataOutput (ValueSpecificationActionResultShape)" hint="OutputPin_ValueSpecificationActionResultShape">
+    <iconEntry xmi:id="_s7URiwkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataOutput_OutputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_ValueSpecificationActionResultShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3084" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3084" name="BPMN DataOutput (ReadSelfActionResultShape)" hint="OutputPin_ReadSelfActionResultShape">
+    <iconEntry xmi:id="_s7URjQkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataOutput_OutputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_ReadSelfActionResultShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3087" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3087" name="BPMN DataOutput (CreateObjectActionResultShape)" hint="OutputPin_CreateObjectActionResultShape">
+    <iconEntry xmi:id="_s7URjwkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataOutput_OutputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_CreateObjectActionResultShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3090" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3090" name="BPMN DataOutput (ReadStructuralFeatureActionResultShape)" hint="OutputPin_ReadStructuralFeatureActionResultShape">
+    <iconEntry xmi:id="_s7URkQkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataOutput_OutputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_ReadStructuralFeatureActionResultShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3094" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3094" name="BPMN DataOutput (AddStructuralFeatureValueActionResultShape)" hint="OutputPin_AddStructuralFeatureValueActionResultShape">
+    <iconEntry xmi:id="_s7URkwkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataOutput_OutputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_AddStructuralFeatureValueActionResultShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3098" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3098" name="BPMN DataOutput (ReadVariableActionResultShape)" hint="OutputPin_ReadVariableActionResultShape">
+    <iconEntry xmi:id="_s7URlQkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataOutput_OutputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_ReadVariableActionResultShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3109" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3109" name="BPMN DataOutput (LoopNodeBodyOutputShape)" hint="OutputPin_LoopNodeBodyOutputShape">
+    <iconEntry xmi:id="_s7URlwkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataOutput_OutputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_LoopNodeBodyOutputShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3111" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3111" name="BPMN DataOutput (LoopNodeResultShape)" hint="OutputPin_LoopNodeResultShape">
+    <iconEntry xmi:id="_s7URmQkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataOutput_OutputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_LoopNodeResultShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3191" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3191" name="BPMN DataOutput (StructuredActivityNodeOutputShape)" hint="OutputPin_StructuredActivityNodeOutputShape">
+    <iconEntry xmi:id="_s7URmwkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataOutput_OutputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_StructuredActivityNodeOutputShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3125" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3125" name="BPMN DataOutput (StartObjectBehaviorActionResultShape)" hint="OutputPin_StartObjectBehaviorActionResultShape">
+    <iconEntry xmi:id="_s7URnQkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataOutput_OutputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_StartObjectBehaviorActionResultShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3126" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3126" name="BPMN DataOutput (TestIdentityActionResultShape)" hint="OutputPin_TestIdentityActionResultShape">
+    <iconEntry xmi:id="_s7URnwkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataOutput_OutputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_TestIdentityActionResultShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3127" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3127" name="BPMN DataOutput (ClearStructuralFeatureActionResultShape)" hint="OutputPin_ClearStructuralFeatureActionResultShape">
+    <iconEntry xmi:id="_s7URoQkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataOutput_OutputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_ClearStructuralFeatureActionResultShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3128" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3128" name="BPMN DataOutput (ReadLinkActionResultShape)" hint="OutputPin_ReadLinkActionResultShape">
+    <iconEntry xmi:id="_s7URowkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataOutput_OutputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_ReadLinkActionResultShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3129" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3129" name="BPMN DataOutput (ReadExtentActionResultShape)" hint="OutputPin_ReadExtentActionResultShape">
+    <iconEntry xmi:id="_s7URpQkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataOutput_OutputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_ReadExtentActionResultShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3130" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3130" name="BPMN DataOutput (ReadIsClassifiedObjectActionResultShape)" hint="OutputPin_ReadIsClassifiedObjectActionResultShape">
+    <iconEntry xmi:id="_s7URpwkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataOutput_OutputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_ReadIsClassifiedObjectActionResultShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3131" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3131" name="BPMN DataOutput (ReduceActionResultShape)" hint="OutputPin_ReduceActionResultShape">
+    <iconEntry xmi:id="_s7URqQkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataOutput_OutputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_ReduceActionResultShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3202" identifier="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3202" name="BPMN DataOutput (CreateLinkObjectActionResultShape)" hint="OutputPin_CreateLinkObjectActionResultShape">
+    <iconEntry xmi:id="_s7URqwkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataOutput_OutputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_CreateLinkObjectActionResultShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataOutput_Parameter_3001" identifier="org.eclipse.papyrus.bpmndi.DataOutput_Parameter_3001" name="BPMN DataOutput Parameter" hint="Parameter_ParameterLabel">
+    <iconEntry xmi:id="_s7URrQkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Parameter.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataOutput_Parameter"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Parameter_ParameterLabel"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataOutput_ActivityParameterNode_3059" identifier="org.eclipse.papyrus.bpmndi.DataOutput_ActivityParameterNode_3059" name="BPMN DataOutput ActivityParameterNode" hint="ActivityParameterNode_Shape">
+    <iconEntry xmi:id="_s7URrwkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ActivityParameterNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataOutput_ActivityParameterNode"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActivityParameterNode_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.BPMNProperty_DataStoreNode_3078" identifier="org.eclipse.papyrus.bpmndi.BPMNProperty_DataStoreNode_3078" name="BPMN BPMNProperty DataStoreNode" hint="DataStoreNode_Shape">
+    <iconEntry xmi:id="_s7URsQkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/DataStoreNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.BPMNProperty_DataStoreNode"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DataStoreNode_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataInputAssociation_ObjectFlow_4003" identifier="org.eclipse.papyrus.bpmndi.DataInputAssociation_ObjectFlow_4003" name="BPMN DataInputAssociation ObjectFlow" hint="ObjectFlow_Edge">
+    <iconEntry xmi:id="_s7URswkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ObjectFlow.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataInputAssociation_ObjectFlow"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ObjectFlow_Edge"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataStoreReference_DataStoreNode_3078" identifier="org.eclipse.papyrus.bpmndi.DataStoreReference_DataStoreNode_3078" name="BPMN DataStoreReference DataStoreNode" hint="DataStoreNode_Shape">
+    <iconEntry xmi:id="_s7URtQkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/DataStoreNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataStoreReference_DataStoreNode"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DataStoreNode_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataObject_DataStoreNode_3078" identifier="org.eclipse.papyrus.bpmndi.DataObject_DataStoreNode_3078" name="BPMN DataObject DataStoreNode" hint="DataStoreNode_Shape">
+    <iconEntry xmi:id="_s7URtwkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/DataStoreNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataObject_DataStoreNode"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DataStoreNode_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3013" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3013" name="BPMN DataInput (OpaqueActionInputShape)" hint="InputPin_OpaqueActionInputShape">
+    <iconEntry xmi:id="_s7URuQkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataInput_InputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_OpaqueActionInputShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3019" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3019" name="BPMN DataInput (CallBehaviorActionArgumentShape)" hint="InputPin_CallBehaviorActionArgumentShape">
+    <iconEntry xmi:id="_s7URuwkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataInput_InputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_CallBehaviorActionArgumentShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3023" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3023" name="BPMN DataInput (CallOperationActionArgumentShape)" hint="InputPin_CallOperationActionArgumentShape">
+    <iconEntry xmi:id="_s7URvQkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataInput_InputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_CallOperationActionArgumentShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3055" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3055" name="BPMN DataInput (SendSignalActionArgumentShape)" hint="InputPin_SendSignalActionArgumentShape">
+    <iconEntry xmi:id="_s7URvwkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataInput_InputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_SendSignalActionArgumentShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3089" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3089" name="BPMN DataInput (ReadStructuralFeatureActionObjectShape)" hint="InputPin_ReadStructuralFeatureActionObjectShape">
+    <iconEntry xmi:id="_s7URwQkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataInput_InputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_ReadStructuralFeatureActionObjectShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3092" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3092" name="BPMN DataInput (AddStructuralFeatureValueActionObjectShape)" hint="InputPin_AddStructuralFeatureValueActionObjectShape">
+    <iconEntry xmi:id="_s7URwwkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataInput_InputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_AddStructuralFeatureValueActionObjectShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3096" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3096" name="BPMN DataInput (DestroyObjectActionTargetShape)" hint="InputPin_DestroyObjectActionTargetShape">
+    <iconEntry xmi:id="_s7URxQkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataInput_InputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_DestroyObjectActionTargetShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3101" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3101" name="BPMN DataInput (AddVariableValueActionValueShape)" hint="InputPin_AddVariableValueActionValueShape">
+    <iconEntry xmi:id="_s7URxwkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataInput_InputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_AddVariableValueActionValueShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3103" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3103" name="BPMN DataInput (BroadcastSignalActionArgumentShape)" hint="InputPin_BroadcastSignalActionArgumentShape">
+    <iconEntry xmi:id="_s7URyQkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataInput_InputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_BroadcastSignalActionArgumentShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3105" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3105" name="BPMN DataInput (LoopNodeVariableInputShape)" hint="InputPin_LoopNodeVariableInputShape">
+    <iconEntry xmi:id="_s7URywkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataInput_InputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_LoopNodeVariableInputShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3188" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3188" name="BPMN DataInput (StructuredActivityNodeInputShape)" hint="InputPin_StructuredActivityNodeInputShape">
+    <iconEntry xmi:id="_s7URzQkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataInput_InputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_StructuredActivityNodeInputShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3133" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3133" name="BPMN DataInput (StartObjectBehaviorActionArgumentShape)" hint="InputPin_StartObjectBehaviorActionArgumentShape">
+    <iconEntry xmi:id="_s7URzwkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataInput_InputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_StartObjectBehaviorActionArgumentShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3134" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3134" name="BPMN DataInput (TestIdentityActionFirstShape)" hint="InputPin_TestIdentityActionFirstShape">
+    <iconEntry xmi:id="_s7UR0QkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataInput_InputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_TestIdentityActionFirstShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3136" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3136" name="BPMN DataInput (ClearStructuralFeatureActionObjectShape)" hint="InputPin_ClearStructuralFeatureActionObjectShape">
+    <iconEntry xmi:id="_s7UR0wkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataInput_InputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_ClearStructuralFeatureActionObjectShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3137" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3137" name="BPMN DataInput (CreateLinkActionInputShape)" hint="InputPin_CreateLinkActionInputShape">
+    <iconEntry xmi:id="_s7UR1QkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataInput_InputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_CreateLinkActionInputShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3138" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3138" name="BPMN DataInput (ReadLinkActionInputShape)" hint="InputPin_ReadLinkActionInputShape">
+    <iconEntry xmi:id="_s7UR1wkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataInput_InputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_ReadLinkActionInputShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3139" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3139" name="BPMN DataInput (DestroyLinkActionInputShape)" hint="InputPin_DestroyLinkActionInputShape">
+    <iconEntry xmi:id="_s7UR2QkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataInput_InputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_DestroyLinkActionInputShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3140" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3140" name="BPMN DataInput (ClearAssociationActionObjectShape)" hint="InputPin_ClearAssociationActionObjectShape">
+    <iconEntry xmi:id="_s7UR2wkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataInput_InputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_ClearAssociationActionObjectShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3141" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3141" name="BPMN DataInput (ReclassifyObjectActionObjectShape)" hint="InputPin_ReclassifyObjectActionObjectShape">
+    <iconEntry xmi:id="_s7UR3QkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataInput_InputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_ReclassifyObjectActionObjectShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3142" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3142" name="BPMN DataInput (ReadIsClassifiedObjectActionObjectShape)" hint="ReadIsClassifiedObjectActionObjectShape">
+    <iconEntry xmi:id="_s7UR3wkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataInput_InputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_ReadIsClassifiedObjectActionObjectShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3143" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3143" name="BPMN DataInput (ReduceActionCollectionShape)" hint="InputPin_ReduceActionCollectionShape">
+    <iconEntry xmi:id="_s7UR4QkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataInput_InputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_ReduceActionCollectionShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3144" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3144" name="BPMN DataInput (StartClassifierBehaviorActionObjectShape)" hint="InputPin_StartClassifierBehaviorActionObjectShape">
+    <iconEntry xmi:id="_s7UR4wkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataInput_InputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_StartClassifierBehaviorActionObjectShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3199" identifier="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3199" name="BPMN DataInput (CreateLinkObjectActionInputShape)" hint="InputPin_CreateLinkObjectActionInputShape">
+    <iconEntry xmi:id="_s7UR5QkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataInput_InputPin"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_CreateLinkObjectActionInputShape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataInput_Parameter_3001" identifier="org.eclipse.papyrus.bpmndi.DataInput_Parameter_3001" name="BPMN DataInput Parameter" hint="Parameter_ParameterLabel">
+    <iconEntry xmi:id="_s7UR5wkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Parameter.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataInput_Parameter"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Parameter_ParameterLabel"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataInput_ActivityParameterNode_3059" identifier="org.eclipse.papyrus.bpmndi.DataInput_ActivityParameterNode_3059" name="BPMN DataInput ActivityParameterNode" hint="ActivityParameterNode_Shape">
+    <iconEntry xmi:id="_s7UR6QkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ActivityParameterNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataInput_ActivityParameterNode"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActivityParameterNode_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.DataAssociation_ObjectFlow_4003" identifier="org.eclipse.papyrus.bpmndi.DataAssociation_ObjectFlow_4003" name="BPMN DataAssociation ObjectFlow" hint="ObjectFlow_Edge">
+    <iconEntry xmi:id="_s7UR6wkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ObjectFlow.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataAssociation_ObjectFlow"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ObjectFlow_Edge"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.UserTask_OpaqueAction_3007" identifier="org.eclipse.papyrus.bpmndi.UserTask_OpaqueAction_3007" name="BPMN UserTask OpaqueAction" hint="OpaqueAction_Shape">
+    <iconEntry xmi:id="_s7UR7QkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/OpaqueAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.UserTask_OpaqueAction"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OpaqueAction_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.ManualTask_OpaqueAction_3007" identifier="org.eclipse.papyrus.bpmndi.ManualTask_OpaqueAction_3007" name="BPMN ManualTask OpaqueAction" hint="OpaqueAction_Shape">
+    <iconEntry xmi:id="_s7UR7wkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/OpaqueAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.ManualTask_OpaqueAction"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OpaqueAction_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.Documentation_Comment_3080" identifier="org.eclipse.papyrus.bpmndi.Documentation_Comment_3080" name="BPMN Documentation Comment" hint="Comment_Shape">
+    <iconEntry xmi:id="_s7UR8QkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Comment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.Documentation_Comment"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.BPMNRelationship_Constraint_3002" identifier="org.eclipse.papyrus.bpmndi.BPMNRelationship_Constraint_3002" name="BPMN BPMNRelationship (PreconditionLabel)" hint="Constraint_PreconditionLabel">
+    <iconEntry xmi:id="_s7UR8wkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.BPMNRelationship_Constraint"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_PreconditionLabel"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.BPMNRelationship_Constraint_3003" identifier="org.eclipse.papyrus.bpmndi.BPMNRelationship_Constraint_3003" name="BPMN BPMNRelationship (PostconditionLabel)" hint="Constraint_PostconditionLabel">
+    <iconEntry xmi:id="_s7UR9QkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.BPMNRelationship_Constraint"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_PostconditionLabel"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.BPMNRelationship_Constraint_3112" identifier="org.eclipse.papyrus.bpmndi.BPMNRelationship_Constraint_3112" name="BPMN BPMNRelationship" hint="Constraint_Shape">
+    <iconEntry xmi:id="_s7UR9wkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.BPMNRelationship_Constraint"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.SubProcess_StructuredActivityNode_3065" identifier="org.eclipse.papyrus.bpmndi.SubProcess_StructuredActivityNode_3065" name="BPMN SubProcess StructuredActivityNode" hint="StructuredActivityNode_Shape">
+    <iconEntry xmi:id="_s7UR-QkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/StructuredActivityNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.SubProcess_StructuredActivityNode"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.StructuredActivityNode_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.LoopCharacteristics_StructuredActivityNode_3065" identifier="org.eclipse.papyrus.bpmndi.LoopCharacteristics_StructuredActivityNode_3065" name="BPMN LoopCharacteristics StructuredActivityNode" hint="StructuredActivityNode_Shape">
+    <iconEntry xmi:id="_s7UR-wkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/StructuredActivityNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.LoopCharacteristics_StructuredActivityNode"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.StructuredActivityNode_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.CallActivity_CallBehaviorAction" identifier="org.eclipse.papyrus.bpmndi.CallActivity_CallBehaviorAction" name="BPMN CallActivity CallBehaviorAction">
+    <iconEntry xmi:id="_s7UR_QkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/CallBehaviorAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_s7UR_gkGEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::CallActivity</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu4baNx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="OpaqueAction_Shape" identifier="org.eclipse.papyrus.bpmndi.BusinessRuleTask_OpaqueAction_3007" name="BusinessRuleTask OpaqueAction" xmi:id="_s7UR_wkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueAction.gif" xmi:id="_s7USAAkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhBigkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5p_dx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="ControlFlow_Edge" identifier="org.eclipse.papyrus.bpmndi.ComplexBehaviorDefinition_ControlFlow_4004" name="ComplexBehaviorDefinition ControlFlow" xmi:id="_s7USAQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlFlow.gif" xmi:id="_s7USAgkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhBlgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu4cHdx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="StructuredActivityNode_Shape" identifier="org.eclipse.papyrus.bpmndi.AdHocSubProcess_StructuredActivityNode_3065" name="AdHocSubProcess StructuredActivityNode" xmi:id="_s7USAwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif" xmi:id="_s7USBAkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhBogkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu63Tdx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="OpaqueAction_Shape" identifier="org.eclipse.papyrus.bpmndi.ScriptTask_OpaqueAction_3007" name="ScriptTask OpaqueAction" xmi:id="_s7USBQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueAction.gif" xmi:id="_s7USBgkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhBrgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5p_dx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="CallOperationAction_Shape" identifier="org.eclipse.papyrus.bpmndi.SendTask_CallOperationAction_3010" name="SendTask CallOperationAction" xmi:id="_s7USBwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallOperationAction.gif" xmi:id="_s7USCAkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhBwwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu4bc9x0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="StructuredActivityNode_Shape" identifier="org.eclipse.papyrus.bpmndi.Transaction_StructuredActivityNode_3065" name="Transaction StructuredActivityNode" xmi:id="_s7USCQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif" xmi:id="_s7USCgkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhBzwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu63Tdx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="LoopNode_Shape" identifier="org.eclipse.papyrus.bpmndi.StandardLoopCharacteristics_LoopNode_3071" name="StandardLoopCharacteristics LoopNode" xmi:id="_s7USCwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LoopNode.gif" xmi:id="_s7USDAkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhB2wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5podx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="StructuredActivityNode_Shape" identifier="org.eclipse.papyrus.bpmndi.StandardLoopCharacteristics_StructuredActivityNode_3065" name="StandardLoopCharacteristics StructuredActivityNode" xmi:id="_s7USDQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif" xmi:id="_s7USDgkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhB3gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu63Tdx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="AcceptEventAction_Shape" identifier="org.eclipse.papyrus.bpmndi.ReceiveTask_AcceptEventAction_3063" name="ReceiveTask AcceptEventAction" xmi:id="_s7USDwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AcceptEventAction.gif" xmi:id="_s7USEAkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhB5AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu3zyNx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="CallOperationAction_Shape" identifier="org.eclipse.papyrus.bpmndi.ServiceTask_CallOperationAction_3010" name="ServiceTask CallOperationAction" xmi:id="_s7USEQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallOperationAction.gif" xmi:id="_s7USEgkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhB9gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu4bc9x0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="ExpansionRegion_Shape" identifier="org.eclipse.papyrus.bpmndi.MultiInstanceLoopCharacteristics_ExpansionRegion_3070" name="MultiInstanceLoopCharacteristics ExpansionRegion" xmi:id="_s7USEwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExpansionRegion.gif" xmi:id="_s7USFAkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhCAgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5Cetx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="StructuredActivityNode_Shape" identifier="org.eclipse.papyrus.bpmndi.MultiInstanceLoopCharacteristics_StructuredActivityNode_3065" name="MultiInstanceLoopCharacteristics StructuredActivityNode" xmi:id="_s7USFQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif" xmi:id="_s7USFgkGEeWVleXnap4Kwg"/>
-    
-    
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhCBQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/><specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu63Tdx0EeWVxMf7SXAfhg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmndi.definitions_PapyrusUMLActivityDiagram" target="_s7URSwkGEeWVleXnap4Kwg" xmi:id="_s7USFwkGEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Definitions" updateName="true" xmi:id="_s7USGAkGEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmndi.callActivity" target="_s7UR_AkGEeWVleXnap4Kwg" xmi:id="_s7USGQkGEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CallActivity" updateName="true" xmi:id="_s7USGgkGEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-</elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.CallBehaviorAction_BaseType"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.BusinessRuleTask_OpaqueAction_3007" identifier="org.eclipse.papyrus.bpmndi.BusinessRuleTask_OpaqueAction_3007" name="BPMN BusinessRuleTask OpaqueAction" hint="OpaqueAction_Shape">
+    <iconEntry xmi:id="_s7USAAkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/OpaqueAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.BusinessRuleTask_OpaqueAction"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OpaqueAction_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.ComplexBehaviorDefinition_ControlFlow_4004" identifier="org.eclipse.papyrus.bpmndi.ComplexBehaviorDefinition_ControlFlow_4004" name="BPMN ComplexBehaviorDefinition ControlFlow" hint="ControlFlow_Edge">
+    <iconEntry xmi:id="_s7USAgkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ControlFlow.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.ComplexBehaviorDefinition_ControlFlow"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ControlFlow_Edge"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.AdHocSubProcess_StructuredActivityNode_3065" identifier="org.eclipse.papyrus.bpmndi.AdHocSubProcess_StructuredActivityNode_3065" name="BPMN AdHocSubProcess StructuredActivityNode" hint="StructuredActivityNode_Shape">
+    <iconEntry xmi:id="_s7USBAkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/StructuredActivityNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.AdHocSubProcess_StructuredActivityNode"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.StructuredActivityNode_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.ScriptTask_OpaqueAction_3007" identifier="org.eclipse.papyrus.bpmndi.ScriptTask_OpaqueAction_3007" name="BPMN ScriptTask OpaqueAction" hint="OpaqueAction_Shape">
+    <iconEntry xmi:id="_s7USBgkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/OpaqueAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.ScriptTask_OpaqueAction"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OpaqueAction_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.SendTask_CallOperationAction_3010" identifier="org.eclipse.papyrus.bpmndi.SendTask_CallOperationAction_3010" name="BPMN SendTask CallOperationAction" hint="CallOperationAction_Shape">
+    <iconEntry xmi:id="_s7USCAkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/CallOperationAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.SendTask_CallOperationAction"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.CallOperationAction_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.Transaction_StructuredActivityNode_3065" identifier="org.eclipse.papyrus.bpmndi.Transaction_StructuredActivityNode_3065" name="BPMN Transaction StructuredActivityNode" hint="StructuredActivityNode_Shape">
+    <iconEntry xmi:id="_s7USCgkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/StructuredActivityNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.Transaction_StructuredActivityNode"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.StructuredActivityNode_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.StandardLoopCharacteristics_LoopNode_3071" identifier="org.eclipse.papyrus.bpmndi.StandardLoopCharacteristics_LoopNode_3071" name="BPMN StandardLoopCharacteristics LoopNode" hint="LoopNode_Shape">
+    <iconEntry xmi:id="_s7USDAkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/LoopNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.StandardLoopCharacteristics_LoopNode"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.LoopNode_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.StandardLoopCharacteristics_StructuredActivityNode_3065" identifier="org.eclipse.papyrus.bpmndi.StandardLoopCharacteristics_StructuredActivityNode_3065" name="BPMN StandardLoopCharacteristics StructuredActivityNode" hint="StructuredActivityNode_Shape">
+    <iconEntry xmi:id="_s7USDgkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/StructuredActivityNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.StandardLoopCharacteristics_StructuredActivityNode"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.StructuredActivityNode_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.ReceiveTask_AcceptEventAction_3063" identifier="org.eclipse.papyrus.bpmndi.ReceiveTask_AcceptEventAction_3063" name="BPMN ReceiveTask AcceptEventAction" hint="AcceptEventAction_Shape">
+    <iconEntry xmi:id="_s7USEAkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/AcceptEventAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.ReceiveTask_AcceptEventAction"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.AcceptEventAction_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.ServiceTask_CallOperationAction_3010" identifier="org.eclipse.papyrus.bpmndi.ServiceTask_CallOperationAction_3010" name="BPMN ServiceTask CallOperationAction" hint="CallOperationAction_Shape">
+    <iconEntry xmi:id="_s7USEgkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/CallOperationAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.ServiceTask_CallOperationAction"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.CallOperationAction_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.MultiInstanceLoopCharacteristics_ExpansionRegion_3070" identifier="org.eclipse.papyrus.bpmndi.MultiInstanceLoopCharacteristics_ExpansionRegion_3070" name="BPMN MultiInstanceLoopCharacteristics ExpansionRegion" hint="ExpansionRegion_Shape">
+    <iconEntry xmi:id="_s7USFAkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ExpansionRegion.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.MultiInstanceLoopCharacteristics_ExpansionRegion"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ExpansionRegion_Shape"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmndi.MultiInstanceLoopCharacteristics_StructuredActivityNode_3065" identifier="org.eclipse.papyrus.bpmndi.MultiInstanceLoopCharacteristics_StructuredActivityNode_3065" name="BPMN MultiInstanceLoopCharacteristics StructuredActivityNode" hint="StructuredActivityNode_Shape">
+    <iconEntry xmi:id="_s7USFgkGEeWVleXnap4Kwg" iconPath="/icons/full/obj16/StructuredActivityNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.MultiInstanceLoopCharacteristics_StructuredActivityNode"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.StructuredActivityNode_Shape"/>
+  </elementTypeConfigurations>
+</elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/org.eclipse.papyrus.bpmn.diagram.common/model/customBpmndi.elementtypesconfigurations b/org.eclipse.papyrus.bpmn.diagram.common/model/customBpmndi.elementtypesconfigurations
index 84251f7..5264dc5 100644
--- a/org.eclipse.papyrus.bpmn.diagram.common/model/customBpmndi.elementtypesconfigurations
+++ b/org.eclipse.papyrus.bpmn.diagram.common/model/customBpmndi.elementtypesconfigurations
@@ -1,55 +1,16 @@
 <?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.2"
-    xmi:id="_s7URMAkGEeWVleXnap4Kwg"
-    identifier="org.eclipse.papyrus.custombpmndi.elementTypeSetCustom"
-    name="BPMNProfile"
-    metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_ODZj0BBDEeWXVJ4WhgYiRw"
-      identifier="org.eclipse.papyrus.custombpmndi.Lane_Partition"
-      name="Lane ActivityPartition"
-      hint="lane_partition">
-    <iconEntry
-        xmi:id="_ODZj0RBDEeWXVJ4WhgYiRw"
-        iconPath="/icons/full/obj16/ActivityPartition.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes
-        xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-        href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulgYMwkFEeWVleXnap4Kwg"/>
+<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.2" xmi:id="org.eclipse.papyrus.custombpmndi.elementTypesSet" identifier="org.eclipse.papyrus.custombpmndi.elementTypesSet" name="PapyrusBPMNCustomProfileDi" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.custombpmndi.Lane_Partition" identifier="org.eclipse.papyrus.custombpmndi.Lane_Partition" name="BPMN Custom Lane ActivityPartition" hint="lane_partition">
+    <iconEntry xmi:id="_ODZj0RBDEeWXVJ4WhgYiRw" iconPath="/icons/full/obj16/ActivityPartition.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.Lane_ActivityPartition"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_s7UR7gkGEeWVleXnap4Kwg3"
-      identifier="org.eclipse.papyrus.custombpmndi.Task_Action_3007"
-      name="Task Action"
-      hint="OpaqueAction_Shape">
-    <iconEntry
-        xmi:id="_s7UR7wkGEeWVleXnap4Kwg4"
-        iconPath="/icons/full/obj16/OpaqueAction.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes
-        xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-        href="platform:/plugin/org.eclipse.papyrus.bpmn/model/customBpmn.elementtypesconfigurations#_ulhBugkFEeWVleXnap4Kwg1"/>
-    <specializedTypes
-        xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-        href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5p_dx0EeWVxMf7SXAfhg"/>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.custombpmndi.Task_Action_3007" identifier="org.eclipse.papyrus.custombpmndi.Task_Action_3007" name="BPMN Custom Task Action" hint="OpaqueAction_Shape">
+    <iconEntry xmi:id="_s7UR7wkGEeWVleXnap4Kwg4" iconPath="/icons/full/obj16/OpaqueAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/customBpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.Task_OpaqueAction"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OpaqueAction_Shape"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_0BsBkI7jEeatoqPlpEWHdw"
-      identifier="org.eclipse.papyrus.custombpmndi.CallActivity_CallBehaviorAction"
-      name="Macro Task Action"
-      hint="CallBehaviorAction_Shape">
-    <specializedTypes
-        xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-        href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#_ulhBeAkFEeWVleXnap4Kwg"/>
-    <specializedTypes
-        xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-        href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu4bb9x0EeWVxMf7SXAfhg"/>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.custombpmndi.CallActivity_CallBehaviorAction" identifier="org.eclipse.papyrus.custombpmndi.CallActivity_CallBehaviorAction" name="BPMN Custom Call Activity Action" hint="CallBehaviorAction_Shape">
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.CallActivity_CallBehaviorAction"/>
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.CallBehaviorAction_Shape"/>
   </elementTypeConfigurations>
 </elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/org.eclipse.papyrus.bpmn.diagram.common/plugin.properties b/org.eclipse.papyrus.bpmn.diagram.common/plugin.properties
deleted file mode 100755
index 0b03951..0000000
--- a/org.eclipse.papyrus.bpmn.diagram.common/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.papyrus.bpmn.diagram.common
-Bundle-Vendor =  Eclipse Modeling Project
-Bundle-Name = Common plugin for Papyrus BPMN (Incubation)
\ No newline at end of file
diff --git a/org.eclipse.papyrus.bpmn.diagram.common/plugin.xml b/org.eclipse.papyrus.bpmn.diagram.common/plugin.xml
index 64d8cfa..73de52b 100755
--- a/org.eclipse.papyrus.bpmn.diagram.common/plugin.xml
+++ b/org.eclipse.papyrus.bpmn.diagram.common/plugin.xml
@@ -107,14 +107,14 @@
    <extension
          point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
       <elementTypeSet
-            clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
+            clientContextID="org.eclipse.papyrus.bpmn.descriptionLanguage"
             path="model/bpmndi.elementtypesconfigurations">
       </elementTypeSet>
    </extension>
    <extension
          point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
       <elementTypeSet
-            clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
+            clientContextID="org.eclipse.papyrus.bpmn.descriptionLanguage"
             path="model/customBpmndi.elementtypesconfigurations">
       </elementTypeSet>
    </extension>
diff --git a/org.eclipse.papyrus.bpmn.diagram.process/META-INF/MANIFEST.MF b/org.eclipse.papyrus.bpmn.diagram.process/META-INF/MANIFEST.MF
index a81502a..d710745 100755
--- a/org.eclipse.papyrus.bpmn.diagram.process/META-INF/MANIFEST.MF
+++ b/org.eclipse.papyrus.bpmn.diagram.process/META-INF/MANIFEST.MF
@@ -1,4 +1,10 @@
 Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Vendor: %Bundle-Vendor
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: org.eclipse.papyrus.bpmn.diagram.process;singleton:=true
+Bundle-Version: 0.9.0.qualifier
+Bundle-Activator: org.eclipse.papyrus.bpmn.diagram.process.Activator
 Export-Package: org.eclipse.papyrus.bpmn.diagram.process
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
@@ -10,11 +16,5 @@
  org.eclipse.gmf.runtime.diagram.core,
  org.eclipse.papyrus.uml.diagram.activity,
  org.eclipse.gmf.runtime.diagram.ui
-Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 0.9.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.bpmn.diagram.process.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.bpmn.diagram.process;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/org.eclipse.papyrus.bpmn.diagram.process/build.properties b/org.eclipse.papyrus.bpmn.diagram.process/build.properties
index 4982bf1..4812589 100755
--- a/org.eclipse.papyrus.bpmn.diagram.process/build.properties
+++ b/org.eclipse.papyrus.bpmn.diagram.process/build.properties
@@ -4,8 +4,7 @@
                .,\
                plugin.xml,\
                model/,\
-               OSGI-INF/l10n/bundle.properties,\
-               OSGI-INF/,\
-               about.html
+               about.html,\
+               OSGI-INF/
 src.includes = about.html
 
diff --git a/org.eclipse.papyrus.bpmn.diagram.process/model/bpmnDiagramExpansion.xmi b/org.eclipse.papyrus.bpmn.diagram.process/model/bpmnDiagramExpansion.xmi
index fea3a97..3088b96 100755
--- a/org.eclipse.papyrus.bpmn.diagram.process/model/bpmnDiagramExpansion.xmi
+++ b/org.eclipse.papyrus.bpmn.diagram.process/model/bpmnDiagramExpansion.xmi
@@ -3,6 +3,7 @@
     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.2"
     xmlns:expansionmodel="http:///expansionmodel.ecore"
     xmi:id="_BOX98NnkEeSFtu511b-yaw"
     ID="BPMN Process Diagram">
@@ -23,8 +24,11 @@
         xsi:type="expansionmodel:Representation"
         editPartQualifiedName="org.eclipse.papyrus.bpmn.diagram.common.edit.part.LaneEditPart"
         name="Lane overloads activity partition"
-        viewFactory="org.eclipse.papyrus.bpmn.diagram.common.factory.LaneViewFactory"
-        graphicalElementType="org.eclipse.papyrus.bpmn.process.Lane_Partition"/>
+        viewFactory="org.eclipse.papyrus.bpmn.diagram.common.factory.LaneViewFactory">
+      <graphicalElementTypeRef
+          xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+          href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/customBpmndi.elementtypesconfigurations#org.eclipse.papyrus.custombpmndi.Lane_Partition"/>
+    </representations>
   </libraries>
   <libraries
       name="reusedCompartment">
diff --git a/org.eclipse.papyrus.bpmn.diagram.process/model/process.paletteConfiguration b/org.eclipse.papyrus.bpmn.diagram.process/model/process.paletteConfiguration
index d3dc587..cafacb8 100755
--- a/org.eclipse.papyrus.bpmn.diagram.process/model/process.paletteConfiguration
+++ b/org.eclipse.papyrus.bpmn.diagram.process/model/process.paletteConfiguration
@@ -1,406 +1,242 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<paletteconfiguration:PaletteConfiguration
-		xmi:version="2.0"
-		xmlns:xmi="http://www.omg.org/XMI"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7"
-		id="org.eclipse.papyrus.bpmn.process.palette"
-		label="BPMN Process Palette Model"
-		description="Palette configuration for BPMN Process Diagram">
-	<drawerConfigurations
-			id="bpmn.process.connectors"
-			label="Connectors"
-			description="Drawer Configuration for BPMN Process Diagram Connectors">
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.process.sequenceFlow.tool"
-				label="Sequence Flow"
-				description="Sequence Flow (Control Flow)"
-				kind="ConnectionTool">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/SequenceFlow.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.SequenceFlow_ControlFlow_4004"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<paletteconfiguration:PaletteConfiguration xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2"
+										   xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" description="Palette configuration for BPMN Process Diagram" id="org.eclipse.papyrus.bpmn.process.palette"
+										   label="BPMN Process Palette Model" xmi:version="2.0">
+	<drawerConfigurations description="Drawer Configuration for BPMN Process Diagram Connectors" id="bpmn.process.connectors" label="Connectors">
+		<ownedConfigurations description="Sequence Flow (Control Flow)" id="bpmn.process.sequenceFlow.tool" kind="ConnectionTool" label="Sequence Flow" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/SequenceFlow.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors>
+				<elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.SequenceFlow_ControlFlow_4004"
+							 xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>
+			</elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.process.dataAssociation.tool"
-				label="Data Association "
-				description="Data Association (Object Flow)"
-				kind="ConnectionTool">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/DataAssociation.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.DataAssociation_ObjectFlow_4003"/>
+		<ownedConfigurations description="Data Association (Object Flow)" id="bpmn.process.dataAssociation.tool" kind="ConnectionTool" label="Data Association " xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/DataAssociation.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors>
+				<elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.DataAssociation_ObjectFlow_4003"
+							 xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>
+			</elementDescriptors>
 		</ownedConfigurations>
 	</drawerConfigurations>
-	<drawerConfigurations
-			id="bpmn.process.tasks"
-			label="Tasks"
-			description="Drawer Configuration for BPMN Process Diagram Tasks">
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.process.macrotask.tool"
-				label="Call Activity"
-				description="Call Activity (Call Behavior Action)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/CallBehaviorAction.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.custombpmndi.CallActivity_CallBehaviorAction"/>
+	<drawerConfigurations description="Drawer Configuration for BPMN Process Diagram Tasks" id="bpmn.process.tasks" label="Tasks">
+		<ownedConfigurations description="Call Activity (Call Behavior Action)" id="bpmn.process.macrotask.tool" label="Call Activity" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/CallBehaviorAction.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors>
+				<elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/customBpmndi.elementtypesconfigurations#org.eclipse.papyrus.custombpmndi.CallActivity_CallBehaviorAction"
+							 xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>
+			</elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.process.task.tool"
-				label="Task"
-				description="Task (Opaque Action)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/Task.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.custombpmndi.Task_Action_3007"/>
+		<ownedConfigurations description="Task (Opaque Action)" id="bpmn.process.task.tool" label="Task" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/Task.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors>
+				<elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/customBpmndi.elementtypesconfigurations#org.eclipse.papyrus.custombpmndi.Task_Action_3007" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>
+			</elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.process.manualTask.tool"
-				label="Manual Task"
-				description="Manual Task (Opaque Action)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/ManualTask.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.ManualTask_OpaqueAction_3007"/>
+		<ownedConfigurations description="Manual Task (Opaque Action)" id="bpmn.process.manualTask.tool" label="Manual Task" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/ManualTask.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors>
+				<elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.ManualTask_OpaqueAction_3007" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>
+			</elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.process.userTask.tool"
-				label="User Task"
-				description="User Task (Opaque Action)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/UserTask.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.UserTask_OpaqueAction_3007"/>
+		<ownedConfigurations description="User Task (Opaque Action)" id="bpmn.process.userTask.tool" label="User Task" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/UserTask.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors>
+				<elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.UserTask_OpaqueAction_3007" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>
+			</elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.process.scriptTask.tool"
-				label="Script Task"
-				description="Script Task (Opaque Action)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/ScriptTask.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.ScriptTask_OpaqueAction_3007"/>
+		<ownedConfigurations description="Script Task (Opaque Action)" id="bpmn.process.scriptTask.tool" label="Script Task" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/ScriptTask.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors>
+				<elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.ScriptTask_OpaqueAction_3007" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>
+			</elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.process.businessRuleTask.tool"
-				label="Business Rule Task"
-				description="Business Rule Task (Opaque Action)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/BusinessRuleTask.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.BusinessRuleTask_OpaqueAction_3007"/>
+		<ownedConfigurations description="Business Rule Task (Opaque Action)" id="bpmn.process.businessRuleTask.tool" label="Business Rule Task" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/BusinessRuleTask.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors>
+				<elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.BusinessRuleTask_OpaqueAction_3007"
+							 xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>
+			</elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.process.sendTask.tool"
-				label="Send Task"
-				description="Send Task (Call Operation Action)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/SendTask.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.SendTask_CallOperationAction_3010"/>
+		<ownedConfigurations description="Send Task (Call Operation Action)" id="bpmn.process.sendTask.tool" label="Send Task" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/SendTask.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors>
+				<elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.SendTask_CallOperationAction_3010"
+							 xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>
+			</elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.process.serviceTask.tool"
-				label="Service Task"
-				description="Service Task (Call Operation Action)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/ServiceTask.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.ServiceTask_CallOperationAction_3010"/>
+		<ownedConfigurations description="Service Task (Call Operation Action)" id="bpmn.process.serviceTask.tool" label="Service Task" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/ServiceTask.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors>
+				<elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.ServiceTask_CallOperationAction_3010"
+							 xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>
+			</elementDescriptors>
 		</ownedConfigurations>
 	</drawerConfigurations>
-	<drawerConfigurations
-			id="bpmn.process.gateways"
-			label="Gateways"
-			description="Drawer Configuration for BPMN Process Diagram Gateways">
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.process.inclusiveGateway.forkNode.tool"
-				label="Inclusive Gateway (Fork node)"
-				description="Inclusive Gateway (Fork node)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/InclusiveGatewayFork.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.InclusiveGateway_ForkNode_3040"/>
+	<drawerConfigurations description="Drawer Configuration for BPMN Process Diagram Gateways" id="bpmn.process.gateways" label="Gateways">
+		<ownedConfigurations description="Inclusive Gateway (Fork node)" id="bpmn.process.inclusiveGateway.forkNode.tool" label="Inclusive Gateway (Fork node)" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/InclusiveGatewayFork.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors>
+				<elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.InclusiveGateway_ForkNode_3040"
+							 xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>
+			</elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.process.inclusiveGateway.joinNode.tool"
-				label="Inclusive Gateway (Join node)"
-				description="Inclusive Gateway (Join node)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/InclusiveGatewayJoin.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.InclusiveGateway_JoinNode_3041"/>
+		<ownedConfigurations description="Inclusive Gateway (Join node)" id="bpmn.process.inclusiveGateway.joinNode.tool" label="Inclusive Gateway (Join node)" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/InclusiveGatewayJoin.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors>
+				<elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.InclusiveGateway_JoinNode_3041"
+							 xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>
+			</elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.process.exclusiveGateway.decisionNode.tool"
-				label="Exclusive Gateway (Decision node)"
-				description="Exclusive Gateway (Decision node)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/ExclusiveGatewayFork.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.ExclusiveGateway_DecisionNode_3038"/>
+		<ownedConfigurations description="Exclusive Gateway (Decision node)" id="bpmn.process.exclusiveGateway.decisionNode.tool" label="Exclusive Gateway (Decision node)" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/ExclusiveGatewayFork.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors>
+				<elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.ExclusiveGateway_DecisionNode_3038"
+							 xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>
+			</elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.process.exclusiveGateway.mergeNode.tool"
-				label="Exclusive Gateway (Merge Node)"
-				description="Exclusive Gateway (Merge Node)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/ExclusiveGatewayJoin.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.ExclusiveGateway_MergeNode_3039"/>
+		<ownedConfigurations description="Exclusive Gateway (Merge Node)" id="bpmn.process.exclusiveGateway.mergeNode.tool" label="Exclusive Gateway (Merge Node)" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/ExclusiveGatewayJoin.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors>
+				<elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.ExclusiveGateway_MergeNode_3039"
+							 xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>
+			</elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.process.parallelGateway.forkNode.tool"
-				label="Parallel Gateway (Fork node)"
-				description="Parallel Gateway (Fork node)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/ParallelGatewayFork.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.ParallelGateway_ForkNode_3040"/>
+		<ownedConfigurations description="Parallel Gateway (Fork node)" id="bpmn.process.parallelGateway.forkNode.tool" label="Parallel Gateway (Fork node)" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/ParallelGatewayFork.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors>
+				<elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.ParallelGateway_ForkNode_3040"
+							 xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>
+			</elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.process.parallelGateway.joinNode.tool"
-				label="Parallel Gateway (Join node)"
-				description="Parallel Gateway (Join node)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/ParallelGatewayJoin.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.ParallelGateway_JoinNode_3041"/>
+		<ownedConfigurations description="Parallel Gateway (Join node)" id="bpmn.process.parallelGateway.joinNode.tool" label="Parallel Gateway (Join node)" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/ParallelGatewayJoin.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors>
+				<elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.ParallelGateway_JoinNode_3041"
+							 xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>
+			</elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.process.eventBasedGateway.forkNode.tool"
-				label="EventBasedGateway (Fork Node)"
-				description="EventBasedGateway (Fork Node)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/EventBasedGateway.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.EventBasedGateway_ForkNode_3040"/>
+		<ownedConfigurations description="EventBasedGateway (Fork Node)" id="bpmn.process.eventBasedGateway.forkNode.tool" label="EventBasedGateway (Fork Node)" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/EventBasedGateway.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors>
+				<elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.EventBasedGateway_ForkNode_3040"
+							 xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>
+			</elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.process.eventBasedGateway.interruptibleActivityRegion.tool"
-				label="EventBasedGateway (Interruptible Activity Region)"
-				description="EventBasedGateway (Interruptible Activity Region)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/EventBasedGateway.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.EventBasedGateway_InterruptibleActivityRegion_3068"/>
+		<ownedConfigurations description="EventBasedGateway (Interruptible Activity Region)" id="bpmn.process.eventBasedGateway.interruptibleActivityRegion.tool" label="EventBasedGateway (Interruptible Activity Region)"
+							 xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/EventBasedGateway.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors>
+				<elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.EventBasedGateway_InterruptibleActivityRegion_3068"
+							 xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>
+			</elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.process.eventBasedGateway.structuredActivityNode.tool"
-				label="EventBasedGateway (Structured Activity Node)"
-				description="EventBasedGateway (Structured Activity Node)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/EventBasedGateway.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.EventBasedGateway_StructuredActivityNode_3065"/>
+		<ownedConfigurations description="EventBasedGateway (Structured Activity Node)" id="bpmn.process.eventBasedGateway.structuredActivityNode.tool" label="EventBasedGateway (Structured Activity Node)" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/EventBasedGateway.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors>
+				<elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.EventBasedGateway_StructuredActivityNode_3065"
+							 xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>
+			</elementDescriptors>
 		</ownedConfigurations>
 	</drawerConfigurations>
-	<drawerConfigurations
-			id="bpmn.process.events"
-			label="Events"
-			description="Drawer Configuration for BPMN Process Diagram Events">
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.process.startEvent.tool"
-				label="Start Event"
-				description="Start Event (Initial node)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/StartEvent.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.StartEvent_InitialNode_3004"/>
+	<drawerConfigurations description="Drawer Configuration for BPMN Process Diagram Events" id="bpmn.process.events" label="Events">
+		<ownedConfigurations description="Start Event (Initial node)" id="bpmn.process.startEvent.tool" label="Start Event" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/StartEvent.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors>
+				<elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.StartEvent_InitialNode_3004" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>
+			</elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.process.endEvent.tool"
-				label="End Event"
-				description="End Event (Flow final)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/EndEvent.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.EndEvent_FlowFinalNode_3006"/>
+		<ownedConfigurations description="End Event (Flow final)" id="bpmn.process.endEvent.tool" label="End Event" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/EndEvent.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors>
+				<elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.EndEvent_FlowFinalNode_3006" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>
+			</elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.process.intermediateThrowEvent.tool"
-				label="Intermediate Throw Event"
-				description="Intermediate Throw Event (Call Operation Action)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/IntermediateThrowEvent.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.IntermediateThrowEvent_CallOperationAction_3010"/>
+		<ownedConfigurations description="Intermediate Throw Event (Call Operation Action)" id="bpmn.process.intermediateThrowEvent.tool" label="Intermediate Throw Event" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/IntermediateThrowEvent.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors>
+				<elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.IntermediateThrowEvent_CallOperationAction_3010"
+							 xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>
+			</elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.process.boundaryEvent.tool"
-				label="Boundary Event"
-				description="Boundary Event (Initial node)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/BoundaryEvent.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.BoundaryEvent_InitialNode_3004"/>
+		<ownedConfigurations description="Boundary Event (Initial node)" id="bpmn.process.boundaryEvent.tool" label="Boundary Event" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/BoundaryEvent.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors>
+				<elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.BoundaryEvent_InitialNode_3004"
+							 xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>
+			</elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.process.intermediateCatchEvent.tool"
-				label="Intermediate Catch Event"
-				description="Intermediate Catch Event (Accept Event Action)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/IntermediateThrowEvent.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.IntermediateCatchEvent_AcceptEventAction_3063"/>
+		<ownedConfigurations description="Intermediate Catch Event (Accept Event Action)" id="bpmn.process.intermediateCatchEvent.tool" label="Intermediate Catch Event" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/IntermediateThrowEvent.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors>
+				<elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.IntermediateCatchEvent_AcceptEventAction_3063"
+							 xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>
+			</elementDescriptors>
 		</ownedConfigurations>
 	</drawerConfigurations>
-	<drawerConfigurations
-			id="bpmn.process.subprocesses"
-			label="Subprocesses"
-			description="Drawer Configuration for BPMN Process Diagram Subprocesses">
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.process.subprocess.tool"
-				label="Subprocess"
-				description="Subprocess (Structured Activity Node)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/SubProcess.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.SubProcess_StructuredActivityNode_3065"/>
+	<drawerConfigurations description="Drawer Configuration for BPMN Process Diagram Subprocesses" id="bpmn.process.subprocesses" label="Subprocesses">
+		<ownedConfigurations description="Subprocess (Structured Activity Node)" id="bpmn.process.subprocess.tool" label="Subprocess" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/SubProcess.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors>
+				<elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.SubProcess_StructuredActivityNode_3065"
+							 xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>
+			</elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.process.standardLoop.tool"
-				label="Standard Loop"
-				description="Standard Loop (Structured Activity Node)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/LoopNode.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.StandardLoopCharacteristics_LoopNode_3071"/>
+		<ownedConfigurations description="Standard Loop (Structured Activity Node)" id="bpmn.process.standardLoop.tool" label="Standard Loop" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/LoopNode.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors>
+				<elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.StandardLoopCharacteristics_LoopNode_3071"
+							 xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>
+			</elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.process.multiInstanceLoop.tool"
-				label="Multi Instance Loop"
-				description="Multi Instance (Expansion Region)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/ExpansionRegion.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.MultiInstanceLoopCharacteristics_ExpansionRegion_3070"/>
+		<ownedConfigurations description="Multi Instance (Expansion Region)" id="bpmn.process.multiInstanceLoop.tool" label="Multi Instance Loop" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/ExpansionRegion.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors>
+				<elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.MultiInstanceLoopCharacteristics_ExpansionRegion_3070"
+							 xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>
+			</elementDescriptors>
 		</ownedConfigurations>
 	</drawerConfigurations>
-	<drawerConfigurations
-			id="bpmn.process.data"
-			label="Data"
-			description="Drawer Configuration for BPMN Process Diagram Data">
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.process.dataStoreReference.tool"
-				label="Data Store Reference"
-				description="Data Store Reference">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/DataStoreReference.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.DataStoreReference_DataStoreNode_3078"/>
+	<drawerConfigurations description="Drawer Configuration for BPMN Process Diagram Data" id="bpmn.process.data" label="Data">
+		<ownedConfigurations description="Data Store Reference" id="bpmn.process.dataStoreReference.tool" label="Data Store Reference" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/DataStoreReference.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors>
+				<elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.DataStoreReference_DataStoreNode_3078"
+							 xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>
+			</elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.process.dataInputTask.tool"
-				label="Data Input (Task)"
-				description="Data Input (Task)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/DataInput.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.DataInput_InputPin_3013"/>
+		<ownedConfigurations description="Data Input (Task)" id="bpmn.process.dataInputTask.tool" label="Data Input (Task)" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/DataInput.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors>
+				<elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.DataInput_InputPin_3013" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>
+			</elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.process.dataOutputTask.tool"
-				label="Data Output (Task)"
-				description="Data Output (Task)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/DataOutput.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3014"/>
+		<ownedConfigurations description="Data Output (Task)" id="bpmn.process.dataOutputTask.tool" label="Data Output (Task)" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/DataOutput.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors>
+				<elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.DataOutput_OutputPin_3014" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>
+			</elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.process.dataInputActivity.tool"
-				label="Data Input (Activity)"
-				description="Data Input (Activity Parameter Node)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/DataInputActivity.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.DataInput_ActivityParameterNode_3059"/>
+		<ownedConfigurations description="Data Input (Activity Parameter Node)" id="bpmn.process.dataInputActivity.tool" label="Data Input (Activity)" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/DataInputActivity.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors>
+				<elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.DataInput_ActivityParameterNode_3059"
+							 xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>
+			</elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.process.dataOutputActivity.tool"
-				label="Data Output (Activity)"
-				description="Data Output (Activity Parameter Node)">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/DataOutputActivity.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.DataOutput_ActivityParameterNode_3059"/>
+		<ownedConfigurations description="Data Output (Activity Parameter Node)" id="bpmn.process.dataOutputActivity.tool" label="Data Output (Activity)" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/DataOutputActivity.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors>
+				<elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.DataOutput_ActivityParameterNode_3059"
+							 xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>
+			</elementDescriptors>
 		</ownedConfigurations>
-		<ownedConfigurations
-				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.process.dataObject.tool"
-				label="Data Object"
-				description="Data Object">
-			<icon
-					pluginID="org.eclipse.papyrus.bpmn"
-					iconPath="/icons/DataObject.png"/>
-			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmndi.DataObject_DataStoreNode_3078"/>
+		<ownedConfigurations description="Data Object" id="bpmn.process.dataObject.tool" label="Data Object" xsi:type="paletteconfiguration:ToolConfiguration">
+			<icon iconPath="/icons/DataObject.png" pluginID="org.eclipse.papyrus.bpmn"/>
+			<elementDescriptors>
+				<elementType href="platform:/plugin/org.eclipse.papyrus.bpmn.diagram.common/model/bpmndi.elementtypesconfigurations#org.eclipse.papyrus.bpmndi.DataObject_DataStoreNode_3078"
+							 xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>
+			</elementDescriptors>
 		</ownedConfigurations>
 	</drawerConfigurations>
 	<requiredProfiles>BPMNProfile</requiredProfiles>
-</paletteconfiguration:PaletteConfiguration>
+</paletteconfiguration:PaletteConfiguration>
\ No newline at end of file
diff --git a/org.eclipse.papyrus.bpmn.diagram.process/plugin.xml b/org.eclipse.papyrus.bpmn.diagram.process/plugin.xml
index 736c493..beec33e 100755
--- a/org.eclipse.papyrus.bpmn.diagram.process/plugin.xml
+++ b/org.eclipse.papyrus.bpmn.diagram.process/plugin.xml
@@ -2,10 +2,10 @@
 <?eclipse version="3.4"?>
 <plugin>
     <extension
-         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
+         point="org.eclipse.papyrus.infra.gmfdiag.common.paletteDefinition">
       <paletteDefinition
             ID="org.eclipse.papyrus.bpmn.process.palette"
-            class="org.eclipse.papyrus.uml.diagram.common.service.ExtendedPluginPaletteProvider"
+            class="org.eclipse.papyrus.infra.gmfdiag.common.service.palette.ExtendedPluginPaletteProvider"
             icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
             name="org.eclipse.papyrus.bpmn.process.palette"
             path="model/process.paletteConfiguration"
diff --git a/org.eclipse.papyrus.bpmn.diagram.ui/META-INF/MANIFEST.MF b/org.eclipse.papyrus.bpmn.diagram.ui/META-INF/MANIFEST.MF
index 57d51eb..5eb0b4b 100755
--- a/org.eclipse.papyrus.bpmn.diagram.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.papyrus.bpmn.diagram.ui/META-INF/MANIFEST.MF
@@ -1,16 +1,15 @@
 Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Vendor: %Bundle-Vendor
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: org.eclipse.papyrus.bpmn.diagram.ui;singleton:=true
+Bundle-Version: 0.9.0.qualifier
+Bundle-Activator: org.eclipse.papyrus.bpmn.diagram.ui.Activator
 Require-Bundle: org.eclipse.ui;bundle-version="3.107.0",
  org.eclipse.ui.ide;bundle-version="3.11.0",
  org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.2.0",
  org.eclipse.papyrus.bpmn.diagram.common;bundle-version="0.7.0",
  org.eclipse.papyrus.bpmn;bundle-version="0.7.0"
 Export-Package: org.eclipse.papyrus.bpmn.diagram.ui
-Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 0.9.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.bpmn.diagram.ui.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.bpmn.diagram.ui;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/org.eclipse.papyrus.bpmn.diagram.ui/OSGI-INF/l10n/bundle.properties b/org.eclipse.papyrus.bpmn.diagram.ui/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000..608d552
--- /dev/null
+++ b/org.eclipse.papyrus.bpmn.diagram.ui/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,6 @@
+Bundle-Vendor =  Eclipse Modeling Project
+Bundle-Name = UI for creation of BPMN models
+wizard.name = Papyrus BPMN Model
+wizard.name.0 = Papyrus BPMN Project
+wizard.description = New Bpmn Project
+extension.name = New BPMN Child
\ No newline at end of file
diff --git a/org.eclipse.papyrus.bpmn.diagram.ui/build.properties b/org.eclipse.papyrus.bpmn.diagram.ui/build.properties
index 7e85f2d..68cffc1 100755
--- a/org.eclipse.papyrus.bpmn.diagram.ui/build.properties
+++ b/org.eclipse.papyrus.bpmn.diagram.ui/build.properties
@@ -3,7 +3,7 @@
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               plugin.properties,\
                about.html,\
-               model/
+               model/,\
+               OSGI-INF/
 src.includes = about.html
diff --git a/org.eclipse.papyrus.bpmn.diagram.ui/model/BpmnNewChildMenu.creationmenumodel b/org.eclipse.papyrus.bpmn.diagram.ui/model/BpmnNewChildMenu.creationmenumodel
new file mode 100755
index 0000000..370fff2
--- /dev/null
+++ b/org.eclipse.papyrus.bpmn.diagram.ui/model/BpmnNewChildMenu.creationmenumodel
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="ASCII" standalone="no"?>
+<ElementCreationMenuModel:Folder xmlns:ElementCreationMenuModel="http://www.eclipse.org/papyrus/infra/newchild/elementcreationmenumodel" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="New BPMN Child" xmi:version="2.0">
+  <menu icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/SequenceFlow.png" label="SequenceFlow" role="" xsi:type="ElementCreationMenuModel:CreationMenu">
+    <elementType href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.SequenceFlow_ControlFlow" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
+  </menu>
+  <menu icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/DataAssociation.png" label="Data Association" xsi:type="ElementCreationMenuModel:CreationMenu">
+    <elementType href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataAssociation_ObjectFlow" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
+  </menu>
+  <menu icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/CallBehaviorAction.png" label="Macro Task" xsi:type="ElementCreationMenuModel:CreationMenu">
+    <elementType href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.CallActivity_CallBehaviorAction" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
+  </menu>
+  <menu icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/Task.png" label="Task" xsi:type="ElementCreationMenuModel:CreationMenu">
+    <elementType href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.Task_OpaqueAction" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
+  </menu>
+  <menu icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/ManualTask.png" label="Manual Task" xsi:type="ElementCreationMenuModel:CreationMenu">
+    <elementType href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.ManualTask_OpaqueAction" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
+  </menu>
+  <menu icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/UserTask.png" label="User Task" xsi:type="ElementCreationMenuModel:CreationMenu">
+    <elementType href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.UserTask_OpaqueAction" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
+  </menu>
+  <menu icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/ScriptTask.png" label="Script Task" xsi:type="ElementCreationMenuModel:CreationMenu">
+    <elementType href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.ScriptTask_OpaqueAction" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
+  </menu>
+  <menu icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/BusinessRuleTask.png" label="Business Rule Task" xsi:type="ElementCreationMenuModel:CreationMenu">
+    <elementType href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.BusinessRuleTask_OpaqueAction" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
+  </menu>
+  <menu icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/SendTask.png" label="Send Task" xsi:type="ElementCreationMenuModel:CreationMenu">
+    <elementType href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.SendTask_CallOperationAction" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
+  </menu>
+  <menu icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/ServiceTask.png" label="ServiceTask" xsi:type="ElementCreationMenuModel:CreationMenu">
+    <elementType href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.ServiceTask_CallOperationAction" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
+  </menu>
+  <menu icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/InclusiveGatewayFork.png" label="Inclusive Gateway (Fork Node)" xsi:type="ElementCreationMenuModel:CreationMenu">
+    <elementType href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.InclusiveGateway_ForkNode" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
+  </menu>
+  <menu icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/InclusiveGatewayJoin.png" label="Inclusive Gateway (Join Node)" xsi:type="ElementCreationMenuModel:CreationMenu">
+    <elementType href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.InclusiveGateway_JoinNode" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
+  </menu>
+  <menu icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/ExclusiveGatewayFork.png" label="Exclusive Gateway (Decision Node)" xsi:type="ElementCreationMenuModel:CreationMenu">
+    <elementType href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.ExclusiveGateway_DecisionNode" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
+  </menu>
+  <menu icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/ExclusiveGatewayJoin.png" label="Exclusive Gateway (Merge Node)" xsi:type="ElementCreationMenuModel:CreationMenu">
+    <elementType href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.ExclusiveGateway_MergeNode" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
+  </menu>
+  <menu icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/ParallelGatewayFork.png" label="ParallelGateway (Fork Node)" xsi:type="ElementCreationMenuModel:CreationMenu">
+    <elementType href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.ParallelGateway_ForkNode" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
+  </menu>
+  <menu icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/ParallelGatewayJoin.png" label="ParallelGateway (Join Node)" xsi:type="ElementCreationMenuModel:CreationMenu">
+    <elementType href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.ParallelGateway_JoinNode" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
+  </menu>
+  <menu icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/EventBasedGateway.png" label="Event Based Gateway" xsi:type="ElementCreationMenuModel:CreationMenu">
+    <elementType href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.EventBasedGateway_ForkNode" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
+  </menu>
+  <menu icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/StartEvent.png" label="Start Event" xsi:type="ElementCreationMenuModel:CreationMenu">
+    <elementType href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.StartEvent_InitialNode" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
+  </menu>
+  <menu icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/EndEvent.png" label="End Event" role="" xsi:type="ElementCreationMenuModel:CreationMenu">
+    <elementType href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.EndEvent_FlowFinalNode" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
+  </menu>
+  <menu icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/IntermediateThrowEvent.png" label="Intermediate Throw Event" xsi:type="ElementCreationMenuModel:CreationMenu">
+    <elementType href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.IntermediateThrowEvent_SendObjectAction" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
+  </menu>
+  <menu icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/BoundaryEvent.png" label="Boundary Event" xsi:type="ElementCreationMenuModel:CreationMenu">
+    <elementType href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.BoundaryEvent_InitialNode" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
+  </menu>
+  <menu icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/SubProcess.png" label="SubProcess" xsi:type="ElementCreationMenuModel:CreationMenu">
+    <elementType href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.SubProcess_StructuredActivityNode" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
+  </menu>
+  <menu icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/DataStoreReference.png" label="Data Store Reference" xsi:type="ElementCreationMenuModel:CreationMenu">
+    <elementType href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataStoreReference_DataStoreNode" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
+  </menu>
+  <menu icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/DataStore.png" label="Data Store" xsi:type="ElementCreationMenuModel:CreationMenu">
+    <elementType href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataStore_Class" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
+  </menu>
+  <menu icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/DataInput.png" label="Data Input" xsi:type="ElementCreationMenuModel:CreationMenu">
+    <elementType href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataInput_InputPin" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
+  </menu>
+  <menu icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/DataOutput.png" label="Data Output" xsi:type="ElementCreationMenuModel:CreationMenu">
+    <elementType href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataOutput_OutputPin" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
+  </menu>
+  <menu icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/DataInputActivity.png" label="Data Input Activity" xsi:type="ElementCreationMenuModel:CreationMenu">
+    <elementType href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataInput_ActivityParameterNode" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
+  </menu>
+  <menu icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/DataOutputActivity.png" label="Data Output Activity" xsi:type="ElementCreationMenuModel:CreationMenu">
+    <elementType href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataOutput_ActivityParameterNode" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
+  </menu>
+  <menu icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/DataObject.png" label="Data Object" xsi:type="ElementCreationMenuModel:CreationMenu">
+    <elementType href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.DataObject_DataStoreNode" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
+  </menu>
+  <menu icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/Lane.png" label="Lane" xsi:type="ElementCreationMenuModel:CreationMenu">
+    <elementType href="platform:/plugin/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations#org.eclipse.papyrus.bpmn.Lane_ActivityPartition" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
+  </menu>
+</ElementCreationMenuModel:Folder>
diff --git a/org.eclipse.papyrus.bpmn.diagram.ui/model/BpmnNewChildMenu.xmi b/org.eclipse.papyrus.bpmn.diagram.ui/model/BpmnNewChildMenu.xmi
deleted file mode 100755
index 1f35ab7..0000000
--- a/org.eclipse.papyrus.bpmn.diagram.ui/model/BpmnNewChildMenu.xmi
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<ElementCreationMenuModel:Folder
-    xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ElementCreationMenuModel="http://www.eclipse.org/papyrus/infra/newchild/elementcreationmenumodel"
-    label="New BPMN Child">
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      label="SequenceFlow"
-      icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/SequenceFlow.png"
-      elementTypeIdRef="org.eclipse.papyrus.bpmn.SequenceFlow_ControlFlow"
-      role=""/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      label="Data Association"
-      icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/DataAssociation.png"
-      elementTypeIdRef="org.eclipse.papyrus.bpmn.DataAssociation_ObjectFlow"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      label="Macro Task"
-      icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/CallBehaviorAction.png"
-      elementTypeIdRef="org.eclipse.papyrus.bpmn.CallActivity_CallBehaviorAction"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      label="Task"
-      icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/Task.png"
-      elementTypeIdRef="org.eclipse.papyrus.bpmn.Task_OpaqueAction"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      label="Manual Task"
-      icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/ManualTask.png"
-      elementTypeIdRef="org.eclipse.papyrus.bpmn.ManualTask_OpaqueAction"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      label="User Task"
-      icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/UserTask.png"
-      elementTypeIdRef="org.eclipse.papyrus.bpmn.UserTask_OpaqueAction"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      label="Script Task"
-      icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/ScriptTask.png"
-      elementTypeIdRef="org.eclipse.papyrus.bpmn.ScriptTask_OpaqueAction"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      label="Business Rule Task"
-      icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/BusinessRuleTask.png"
-      elementTypeIdRef="org.eclipse.papyrus.bpmn.BusinessRuleTask_OpaqueAction"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      label="Send Task"
-      icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/SendTask.png"
-      elementTypeIdRef="org.eclipse.papyrus.bpmn.SendTask_CallOperationAction"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      label="ServiceTask"
-      icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/ServiceTask.png"
-      elementTypeIdRef="org.eclipse.papyrus.bpmn.ServiceTask_CallOperationAction"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      label="Inclusive Gateway (Fork Node)"
-      icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/InclusiveGatewayFork.png"
-      elementTypeIdRef="org.eclipse.papyrus.bpmn.InclusiveGateway_ForkNode"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      label="Inclusive Gateway (Join Node)"
-            icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/InclusiveGatewayJoin.png"
-      elementTypeIdRef="org.eclipse.papyrus.bpmn.InclusiveGateway_JoinNode"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      label="Exclusive Gateway (Decision Node)"
-      icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/ExclusiveGatewayFork.png"
-      elementTypeIdRef="org.eclipse.papyrus.bpmn.ExclusiveGateway_DecisionNode"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      label="Exclusive Gateway (Merge Node)"
-      icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/ExclusiveGatewayJoin.png"
-      elementTypeIdRef="org.eclipse.papyrus.bpmn.ExclusiveGateway_MergeNode"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      label="ParallelGateway (Fork Node)"
-      icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/ParallelGatewayFork.png"
-      elementTypeIdRef="org.eclipse.papyrus.bpmn.ParallelGateway_ForkNode"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      label="ParallelGateway (Join Node)"
-      icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/ParallelGatewayJoin.png"
-      elementTypeIdRef="org.eclipse.papyrus.bpmn.ParallelGateway_JoinNode"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      label="Event Based Gateway"
-      icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/EventBasedGateway.png"
-      elementTypeIdRef="org.eclipse.papyrus.bpmn.EventBasedGateway_ForkNode"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      label="Start Event"
-      icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/StartEvent.png"
-      elementTypeIdRef="org.eclipse.papyrus.bpmn.StartEvent_InitialNode"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      label="End Event"
-      icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/EndEvent.png"
-      elementTypeIdRef="org.eclipse.papyrus.bpmn.EndEvent_FlowFinalNode"
-      role=""/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      label="Intermediate Throw Event"
-      icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/IntermediateThrowEvent.png"
-      elementTypeIdRef="org.eclipse.papyrus.bpmn.IntermediateThrowEvent_SendObjectAction"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      label="Boundary Event"
-      icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/BoundaryEvent.png"
-      elementTypeIdRef="org.eclipse.papyrus.bpmn.BoundaryEvent_InitialNode"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      label="SubProcess"
-      icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/SubProcess.png"
-      elementTypeIdRef="org.eclipse.papyrus.bpmn.SubProcess_StructuredActivityNode"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      label="Data Store Reference"
-      icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/DataStoreReference.png"
-      elementTypeIdRef="org.eclipse.papyrus.bpmn.DataStoreReference_DataStoreNode"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      label="Data Store"
-      icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/DataStore.png"
-      elementTypeIdRef="org.eclipse.papyrus.bpmn.DataStore_Class"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      label="Data Input"
-      icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/DataInput.png"
-      elementTypeIdRef="org.eclipse.papyrus.bpmn.DataInput_InputPin"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      label="Data Output"
-      icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/DataOutput.png"
-      elementTypeIdRef="org.eclipse.papyrus.bpmn.DataOutput_OutputPin"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-        label="Data Input Activity"
-        icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/DataInputActivity.png"
-        elementTypeIdRef="org.eclipse.papyrus.bpmn.DataInput_ActivityParameterNode"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-        label="Data Output Activity"
-        icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/DataOutputActivity.png"
-        elementTypeIdRef="org.eclipse.papyrus.bpmn.DataOutput_ActivityParameterNode"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      label="Data Object"
-      icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/DataObject.png"
-      elementTypeIdRef="org.eclipse.papyrus.bpmn.DataObject_DataStoreNode"/>
-  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      label="Lane"
-      icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/Lane.png"
-      elementTypeIdRef="org.eclipse.papyrus.bpmn.Lane_ActivityPartition"/>
-</ElementCreationMenuModel:Folder>
diff --git a/org.eclipse.papyrus.bpmn.diagram.ui/plugin.xml b/org.eclipse.papyrus.bpmn.diagram.ui/plugin.xml
index f577868..9dd65cb 100755
--- a/org.eclipse.papyrus.bpmn.diagram.ui/plugin.xml
+++ b/org.eclipse.papyrus.bpmn.diagram.ui/plugin.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <plugin>
-   <extension
+<!--   <extension
          point="org.eclipse.ui.newWizards">
       <wizard
             canFinishEarly="false"
@@ -27,12 +27,12 @@
             %wizard.description
          </description>
       </wizard>
-   </extension>
+   </extension>-->
    <extension
          name="%extension.name"
          point="org.eclipse.papyrus.infra.newchild">
       <menuCreationModel
-            model="model/BpmnNewChildMenu.xmi">
+            model="model/BpmnNewChildMenu.creationmenumodel">
       </menuCreationModel>
    </extension>
   <!-- 
diff --git a/org.eclipse.papyrus.bpmn.diagram.ui/src/org/eclipse/papyrus/bpmn/diagram/ui/NewBpmnModelWizard.java b/org.eclipse.papyrus.bpmn.diagram.ui/src/org/eclipse/papyrus/bpmn/diagram/ui/NewBpmnModelWizard.java
index 4e3a5b4..db749cb 100755
--- a/org.eclipse.papyrus.bpmn.diagram.ui/src/org/eclipse/papyrus/bpmn/diagram/ui/NewBpmnModelWizard.java
+++ b/org.eclipse.papyrus.bpmn.diagram.ui/src/org/eclipse/papyrus/bpmn/diagram/ui/NewBpmnModelWizard.java
@@ -48,10 +48,10 @@
 		return "Bpmn Model";
 	}
 
-	@Override
-	protected String[] getDiagramCategoryIds() {
-		return new String[] { CreateBpmnModelCommand.COMMAND_ID };
-	}
+//	@Override
+//	protected String[] getDiagramCategoryIds() {
+//		return new String[] { CreateBpmnModelCommand.COMMAND_ID };
+//	}
 
 
 
diff --git a/org.eclipse.papyrus.bpmn.diagram.ui/src/org/eclipse/papyrus/bpmn/diagram/ui/NewBpmnProjectWizard.java b/org.eclipse.papyrus.bpmn.diagram.ui/src/org/eclipse/papyrus/bpmn/diagram/ui/NewBpmnProjectWizard.java
index 533ae58..7b8ce08 100755
--- a/org.eclipse.papyrus.bpmn.diagram.ui/src/org/eclipse/papyrus/bpmn/diagram/ui/NewBpmnProjectWizard.java
+++ b/org.eclipse.papyrus.bpmn.diagram.ui/src/org/eclipse/papyrus/bpmn/diagram/ui/NewBpmnProjectWizard.java
@@ -45,10 +45,10 @@
 	/**
 	 * {@inheritDoc}
 	 */
-	@Override
-	protected String[] getDiagramCategoryIds() {
-		return new String[] { CreateBpmnModelCommand.COMMAND_ID };
-	}
+//	@Override
+//	protected String[] getDiagramCategoryIds() {
+//		return new String[] { CreateBpmnModelCommand.COMMAND_ID };
+//	}
 
 
 }
diff --git a/org.eclipse.papyrus.bpmn.diagram/build.properties b/org.eclipse.papyrus.bpmn.diagram/build.properties
index 5ceb810..84b0fc1 100755
--- a/org.eclipse.papyrus.bpmn.diagram/build.properties
+++ b/org.eclipse.papyrus.bpmn.diagram/build.properties
@@ -4,7 +4,6 @@
                .,\
                plugin.xml,\
                viewpoints/,\
-               OSGI-INF/l10n/bundle.properties,\
                OSGI-INF/,\
                about.html
 src.includes = about.html
diff --git a/org.eclipse.papyrus.bpmn.targetplatform.oxygen/org.eclipse.papyrus.bpmn.targetplatform.oxygen.target b/org.eclipse.papyrus.bpmn.targetplatform.oxygen/org.eclipse.papyrus.bpmn.targetplatform.oxygen.target
index 647bcc6..364feca 100755
--- a/org.eclipse.papyrus.bpmn.targetplatform.oxygen/org.eclipse.papyrus.bpmn.targetplatform.oxygen.target
+++ b/org.eclipse.papyrus.bpmn.targetplatform.oxygen/org.eclipse.papyrus.bpmn.targetplatform.oxygen.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+
 <target name="Papyrus Oxygen" sequenceNumber="1487075885">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
@@ -15,7 +15,7 @@
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrus.views.properties.model.xwt" version="0.0.0"/>
-      <repository id="eclipse-papyrus-oxygen-nightly" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/main/"/>
+      <repository id="eclipse-papyrus-oxygen-nightly" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen/"/>
     </location>
   </locations>
 </target>
diff --git a/org.eclipse.papyrus.bpmn.tests/META-INF/MANIFEST.MF b/org.eclipse.papyrus.bpmn.tests/META-INF/MANIFEST.MF
index 4ce36e0..a437d54 100755
--- a/org.eclipse.papyrus.bpmn.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.papyrus.bpmn.tests/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
-Bundle-ActivationPolicy: lazy
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Test
+Bundle-Vendor: %Bundle-Vendor
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.papyrus.bpmn.tests
 Bundle-Version: 0.9.0.qualifier
-Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
 Fragment-Host: org.eclipse.papyrus.bpmn;bundle-version="0.9.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
diff --git a/org.eclipse.papyrus.bpmn.tests/OSGI-INF/l10n/bundle.properties b/org.eclipse.papyrus.bpmn.tests/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000..87f9b75
--- /dev/null
+++ b/org.eclipse.papyrus.bpmn.tests/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,2 @@
+Bundle-Vendor =  Eclipse Modeling Project
+Bundle-Name = BPMN profiles tests
\ No newline at end of file
diff --git a/org.eclipse.papyrus.bpmn.tests/src/org/eclipse/papyrus/bpmn/test/BPMNProcessCustomTest.java b/org.eclipse.papyrus.bpmn.tests/src/org/eclipse/papyrus/bpmn/bpmnprofiletest/BPMNProcessCustomTest.java
similarity index 98%
rename from org.eclipse.papyrus.bpmn.tests/src/org/eclipse/papyrus/bpmn/test/BPMNProcessCustomTest.java
rename to org.eclipse.papyrus.bpmn.tests/src/org/eclipse/papyrus/bpmn/bpmnprofiletest/BPMNProcessCustomTest.java
index 4febba8..ea92375 100755
--- a/org.eclipse.papyrus.bpmn.tests/src/org/eclipse/papyrus/bpmn/test/BPMNProcessCustomTest.java
+++ b/org.eclipse.papyrus.bpmn.tests/src/org/eclipse/papyrus/bpmn/bpmnprofiletest/BPMNProcessCustomTest.java
@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  *****************************************************************************/
-package org.eclipse.papyrus.bpmn.test;
+package org.eclipse.papyrus.bpmn.bpmnprofiletest;
 
 
 import static org.junit.Assert.assertEquals;
diff --git a/org.eclipse.papyrus.bpmn.tests/src/org/eclipse/papyrus/bpmn/test/BoundaryEventCustomTest.java b/org.eclipse.papyrus.bpmn.tests/src/org/eclipse/papyrus/bpmn/bpmnprofiletest/BoundaryEventCustomTest.java
similarity index 89%
rename from org.eclipse.papyrus.bpmn.tests/src/org/eclipse/papyrus/bpmn/test/BoundaryEventCustomTest.java
rename to org.eclipse.papyrus.bpmn.tests/src/org/eclipse/papyrus/bpmn/bpmnprofiletest/BoundaryEventCustomTest.java
index 08d9e7d..22b120b 100755
--- a/org.eclipse.papyrus.bpmn.tests/src/org/eclipse/papyrus/bpmn/test/BoundaryEventCustomTest.java
+++ b/org.eclipse.papyrus.bpmn.tests/src/org/eclipse/papyrus/bpmn/bpmnprofiletest/BoundaryEventCustomTest.java
@@ -8,12 +8,11 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  *****************************************************************************/
-package org.eclipse.papyrus.bpmn.test;
+package org.eclipse.papyrus.bpmn.bpmnprofiletest;
 
 import static org.junit.Assert.assertEquals;
 
 import org.eclipse.papyrus.bpmn.BPMNProfile.BPMNActivity;
-import org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProcess;
 import org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage;
 import org.eclipse.papyrus.bpmn.BPMNProfile.BoundaryEvent;
 import org.eclipse.papyrus.bpmn.BPMNProfile.Task;
@@ -35,36 +34,34 @@
 	private OpaqueAction action;
 	private BoundaryEvent boundaryEvent;
 
-	@Before	
-	public void setUp(){
+	@Before
+	public void setUp() {
 		Model model = BPMNResource.createBPMNModel();
-		
+
 		Activity activity = UMLFactory.eINSTANCE.createActivity();
 		model.getPackagedElements().add(activity);
 		StereotypeApplicationHelper.getInstance(null).applyStereotype(activity, BPMNProfilePackage.eINSTANCE.getBPMNProcess());
-		BPMNProcess bpmnProcess = UMLUtil.getStereotypeApplication(activity, BPMNProcess.class);
-		
+
 		action = UMLFactory.eINSTANCE.createOpaqueAction();
-		activity.getOwnedNodes().add(action);		
+		activity.getOwnedNodes().add(action);
 		Task task = (Task) StereotypeApplicationHelper.getInstance(null).applyStereotype(action, BPMNProfilePackage.eINSTANCE.getTask());
-		
+
 		ChangeEvent changeEvent = UMLFactory.eINSTANCE.createChangeEvent();
 		model.getPackagedElements().add(changeEvent);
 		boundaryEvent = (BoundaryEvent) StereotypeApplicationHelper.getInstance(null).applyStereotype(changeEvent, BPMNProfilePackage.eINSTANCE.getBoundaryEvent());
 		task.getBoundaryEventRefs().add(boundaryEvent);
 		boundaryEvent.setBase_ActivityNode(task.getBase_ActivityNode());
 	}
-	
+
 	@Test
 	public void basicGetAttachedToRefGeneratedTest() {
-		try{
+		try {
 			boundaryEvent.getAttachedToRef();
-		}
-		catch(UnsupportedOperationException e){
+		} catch (UnsupportedOperationException e) {
 			Assert.fail("missing custom code !");
 		}
 	}
-	
+
 	@Test
 	public void basicGetAttachedToRefCustomTest() {
 		BPMNActivity bmpnActivity = BoundaryEventCustom.basicGetAttachedToRef(boundaryEvent);
@@ -72,7 +69,7 @@
 		assertEquals(bmpnActivity, UMLUtil.getStereotypeApplication(action, BPMNActivity.class));
 	}
 
-	
+
 	@Test
 	public void basicGetAttachedToRefTest() {
 		BPMNActivity bmpnActivity = boundaryEvent.getAttachedToRef();
diff --git a/org.eclipse.papyrus.bpmn.tests/src/org/eclipse/papyrus/bpmn/test/CallActivityCustomTest.java b/org.eclipse.papyrus.bpmn.tests/src/org/eclipse/papyrus/bpmn/bpmnprofiletest/CallActivityCustomTest.java
similarity index 80%
rename from org.eclipse.papyrus.bpmn.tests/src/org/eclipse/papyrus/bpmn/test/CallActivityCustomTest.java
rename to org.eclipse.papyrus.bpmn.tests/src/org/eclipse/papyrus/bpmn/bpmnprofiletest/CallActivityCustomTest.java
index 23d2c7b..3f5a7ad 100755
--- a/org.eclipse.papyrus.bpmn.tests/src/org/eclipse/papyrus/bpmn/test/CallActivityCustomTest.java
+++ b/org.eclipse.papyrus.bpmn.tests/src/org/eclipse/papyrus/bpmn/bpmnprofiletest/CallActivityCustomTest.java
@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  *****************************************************************************/
-package org.eclipse.papyrus.bpmn.test;
+package org.eclipse.papyrus.bpmn.bpmnprofiletest;
 
 import static org.junit.Assert.assertEquals;
 
@@ -16,7 +16,6 @@
 import org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage;
 import org.eclipse.papyrus.bpmn.BPMNProfile.CallActivity;
 import org.eclipse.papyrus.bpmn.BPMNProfile.CallableElement;
-import org.eclipse.papyrus.bpmn.BPMNProfile.Task;
 import org.eclipse.papyrus.bpmn.BPMNProfile.impl.CallActivityCustom;
 import org.eclipse.papyrus.bpmn.util.BPMNResource;
 import org.eclipse.uml2.uml.Activity;
@@ -25,7 +24,6 @@
 import org.eclipse.uml2.uml.Model;
 import org.eclipse.uml2.uml.OpaqueAction;
 import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.util.UMLUtil;
 import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
 import org.junit.Assert;
 import org.junit.Before;
@@ -36,14 +34,12 @@
  */
 public class CallActivityCustomTest {
 
-	private BPMNProcess bpmnProcess;
 	private BPMNProcess bpmnSubProcess;
-	private Task task;
 	private CallActivity callActivity;
 	private Activity activity2;
 
 	@Before
-	public void setUp(){
+	public void setUp() {
 		Model model = BPMNResource.createBPMNModel();
 
 		Activity activity = UMLFactory.eINSTANCE.createActivity();
@@ -52,47 +48,44 @@
 
 		OpaqueAction action = UMLFactory.eINSTANCE.createOpaqueAction();
 		activity.getOwnedNodes().add(action);
-		task = (Task) StereotypeApplicationHelper.getInstance(null).applyStereotype(action, BPMNProfilePackage.eINSTANCE.getTask());
+		StereotypeApplicationHelper.getInstance(null).applyStereotype(action, BPMNProfilePackage.eINSTANCE.getTask());
 
-		bpmnProcess = UMLUtil.getStereotypeApplication(activity, BPMNProcess.class);
-		
 		CallBehaviorAction callBehaviorAction = UMLFactory.eINSTANCE.createCallBehaviorAction();
 		activity.getOwnedNodes().add(callBehaviorAction);
 		callActivity = (CallActivity) StereotypeApplicationHelper.getInstance(null).applyStereotype(callBehaviorAction, BPMNProfilePackage.eINSTANCE.getCallActivity());
-	
+
 		activity2 = UMLFactory.eINSTANCE.createActivity();
 		model.getPackagedElements().add(activity2);
 		bpmnSubProcess = (BPMNProcess) StereotypeApplicationHelper.getInstance(null).applyStereotype(activity2, BPMNProfilePackage.eINSTANCE.getBPMNProcess());
-		
-		callBehaviorAction.setBehavior((Behavior)activity2);
+
+		callBehaviorAction.setBehavior((Behavior) activity2);
 	}
-	
+
 	/*
 	 * test that custom code is present in generated code
 	 */
 	@Test
-	public void basicGetCalledElementRefGeneratedTest(){
-		try{
+	public void basicGetCalledElementRefGeneratedTest() {
+		try {
 			callActivity.getCalledElementRef();
-		}
-		catch(UnsupportedOperationException e){
+		} catch (UnsupportedOperationException e) {
 			Assert.fail("missing custom code !");
 		}
 	}
-	
+
 	@Test
-	public void basicGetCalledElementRefCustomTest(){
+	public void basicGetCalledElementRefCustomTest() {
 		CallableElement e = CallActivityCustom.basicGetCalledElementRef(callActivity);
 		Assert.assertNotNull(e);
 		assertEquals(e, bpmnSubProcess);
 	}
-	
+
 	@Test
-	public void basicGetCalledElementRefTest(){
+	public void basicGetCalledElementRefTest() {
 		CallableElement e = callActivity.getCalledElementRef();
 		Assert.assertNotNull(e);
 		assertEquals(e, bpmnSubProcess);
 	}
-	
-	
+
+
 }
diff --git a/org.eclipse.papyrus.bpmn.tests/src/org/eclipse/papyrus/bpmn/test/FlowElementCustomTest.java b/org.eclipse.papyrus.bpmn.tests/src/org/eclipse/papyrus/bpmn/bpmnprofiletest/FlowElementCustomTest.java
similarity index 88%
rename from org.eclipse.papyrus.bpmn.tests/src/org/eclipse/papyrus/bpmn/test/FlowElementCustomTest.java
rename to org.eclipse.papyrus.bpmn.tests/src/org/eclipse/papyrus/bpmn/bpmnprofiletest/FlowElementCustomTest.java
index fb3c301..69ec37b 100755
--- a/org.eclipse.papyrus.bpmn.tests/src/org/eclipse/papyrus/bpmn/test/FlowElementCustomTest.java
+++ b/org.eclipse.papyrus.bpmn.tests/src/org/eclipse/papyrus/bpmn/bpmnprofiletest/FlowElementCustomTest.java
@@ -8,13 +8,12 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  *****************************************************************************/
-package org.eclipse.papyrus.bpmn.test;
+package org.eclipse.papyrus.bpmn.bpmnprofiletest;
 
 import org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProcess;
 import org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage;
 import org.eclipse.papyrus.bpmn.BPMNProfile.BoundaryEvent;
 import org.eclipse.papyrus.bpmn.BPMNProfile.FlowElement;
-import org.eclipse.papyrus.bpmn.BPMNProfile.FlowElementsContainer;
 import org.eclipse.papyrus.bpmn.BPMNProfile.Task;
 import org.eclipse.papyrus.bpmn.BPMNProfile.impl.FlowElementCustom;
 import org.eclipse.papyrus.bpmn.util.BPMNResource;
@@ -35,46 +34,45 @@
 	BPMNProcess bpmnProcess;
 	BoundaryEvent boundaryEvent;
 	Task task;
-	
-	@Before	
-	public void setUp(){
+
+	@Before
+	public void setUp() {
 		Model model = BPMNResource.createBPMNModel();
-		
+
 		Activity activity = UMLFactory.eINSTANCE.createActivity();
 		model.getPackagedElements().add(activity);
 		StereotypeApplicationHelper.getInstance(null).applyStereotype(activity, BPMNProfilePackage.eINSTANCE.getBPMNProcess());
 		bpmnProcess = UMLUtil.getStereotypeApplication(activity, BPMNProcess.class);
-		
+
 		action = UMLFactory.eINSTANCE.createOpaqueAction();
-		activity.getOwnedNodes().add(action);		
+		activity.getOwnedNodes().add(action);
 		task = (Task) StereotypeApplicationHelper.getInstance(null).applyStereotype(action, BPMNProfilePackage.eINSTANCE.getTask());
-		
+
 		ChangeEvent changeEvent = UMLFactory.eINSTANCE.createChangeEvent();
 		model.getPackagedElements().add(changeEvent);
 		boundaryEvent = (BoundaryEvent) StereotypeApplicationHelper.getInstance(null).applyStereotype(changeEvent, BPMNProfilePackage.eINSTANCE.getBoundaryEvent());
 		task.getBoundaryEventRefs().add(boundaryEvent);
 		boundaryEvent.setBase_ActivityNode(task.getBase_ActivityNode());
 	}
-	
+
 	@Test
-	public void basicGetContainerGeneratedTest(){
-		try{
+	public void basicGetContainerGeneratedTest() {
+		try {
 			FlowElement fe = UMLUtil.getStereotypeApplication(task.getBase_Element(), FlowElement.class);
 			fe.getContainer();
-		}
-		catch(UnsupportedOperationException e){
+		} catch (UnsupportedOperationException e) {
 			Assert.fail("missing custom code !");
 		}
 	}
-	
+
 	@Test
-	public void basicGetContainerCustomTest(){
+	public void basicGetContainerCustomTest() {
 		Assert.assertEquals(bpmnProcess, FlowElementCustom.basicGetContainer(UMLUtil.getStereotypeApplication(task.getBase_Element(), FlowElement.class)));
 		Assert.assertEquals(bpmnProcess, FlowElementCustom.basicGetContainer(UMLUtil.getStereotypeApplication(boundaryEvent.getBase_Element(), FlowElement.class)));
 	}
-	
+
 	@Test
-	public void basicGetContainerTest(){
+	public void basicGetContainerTest() {
 		FlowElement fe1 = UMLUtil.getStereotypeApplication(task.getBase_Element(), FlowElement.class);
 		Assert.assertEquals(bpmnProcess, fe1.getContainer());
 		FlowElement fe2 = UMLUtil.getStereotypeApplication(boundaryEvent.getBase_Element(), FlowElement.class);
diff --git a/org.eclipse.papyrus.bpmn.tests/src/org/eclipse/papyrus/bpmn/test/StandardLoopCharacteristicsCustomTest.java b/org.eclipse.papyrus.bpmn.tests/src/org/eclipse/papyrus/bpmn/bpmnprofiletest/StandardLoopCharacteristicsCustomTest.java
similarity index 86%
rename from org.eclipse.papyrus.bpmn.tests/src/org/eclipse/papyrus/bpmn/test/StandardLoopCharacteristicsCustomTest.java
rename to org.eclipse.papyrus.bpmn.tests/src/org/eclipse/papyrus/bpmn/bpmnprofiletest/StandardLoopCharacteristicsCustomTest.java
index c3b7a79..df05b9c 100755
--- a/org.eclipse.papyrus.bpmn.tests/src/org/eclipse/papyrus/bpmn/test/StandardLoopCharacteristicsCustomTest.java
+++ b/org.eclipse.papyrus.bpmn.tests/src/org/eclipse/papyrus/bpmn/bpmnprofiletest/StandardLoopCharacteristicsCustomTest.java
@@ -10,16 +10,14 @@
  *   CEA - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.bpmn.test;
+package org.eclipse.papyrus.bpmn.bpmnprofiletest;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import org.eclipse.papyrus.bpmn.BPMNProfile.BPMNExpression;
-import org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProcess;
 import org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage;
 import org.eclipse.papyrus.bpmn.BPMNProfile.StandardLoopCharacteristics;
-import org.eclipse.papyrus.bpmn.BPMNProfile.Task;
 import org.eclipse.papyrus.bpmn.BPMNProfile.impl.StandardLoopCharacteristicsCustom;
 import org.eclipse.papyrus.bpmn.util.BPMNResource;
 import org.eclipse.uml2.uml.Activity;
@@ -40,80 +38,75 @@
  */
 public class StandardLoopCharacteristicsCustomTest {
 
-	private BPMNProcess bpmnProcess;
-	private Task task;
 	private StandardLoopCharacteristics loop;
 	private BPMNExpression bex;
 
 	@Before
-	public void setUp(){
+	public void setUp() {
 		Model model = BPMNResource.createBPMNModel();
 
 		Activity activity = UMLFactory.eINSTANCE.createActivity();
 		model.getPackagedElements().add(activity);
 		StereotypeApplicationHelper.getInstance(null).applyStereotype(activity, BPMNProfilePackage.eINSTANCE.getBPMNProcess());
-		bpmnProcess = UMLUtil.getStereotypeApplication(activity, BPMNProcess.class);
-		
+
 		LoopNode loopNode = UMLFactory.eINSTANCE.createLoopNode();
 		activity.getOwnedNodes().add(loopNode);
 		StereotypeApplicationHelper.getInstance(null).applyStereotype(loopNode, BPMNProfilePackage.eINSTANCE.getStandardLoopCharacteristics());
 		loop = UMLUtil.getStereotypeApplication(loopNode, StandardLoopCharacteristics.class);
-		
+
 		OpaqueAction action = UMLFactory.eINSTANCE.createOpaqueAction();
 		loopNode.getNodes().add(action);
-		task = (Task) StereotypeApplicationHelper.getInstance(null).applyStereotype(action, BPMNProfilePackage.eINSTANCE.getTask());
-		
+		StereotypeApplicationHelper.getInstance(null).applyStereotype(action, BPMNProfilePackage.eINSTANCE.getTask());
+
 		loopNode.setIsTestedFirst(true);
-		
+
 		ValueSpecificationAction valueSpecificationAction = UMLFactory.eINSTANCE.createValueSpecificationAction();
 		loopNode.getNodes().add(valueSpecificationAction);
 		loopNode.getTests().add(valueSpecificationAction);
 		bex = (BPMNExpression) StereotypeApplicationHelper.getInstance(null).applyStereotype(valueSpecificationAction, BPMNProfilePackage.eINSTANCE.getBPMNExpression());
-		
+
 		OutputPin outputPin = UMLFactory.eINSTANCE.createOutputPin();
-		
+
 		valueSpecificationAction.setResult(outputPin);
 	}
-	
+
 	@Test
 	public void isTestBeforeGeneratedTest() {
-		try{
+		try {
 			loop.isTestBefore();
-		}
-		catch(UnsupportedOperationException e){
+		} catch (UnsupportedOperationException e) {
 			Assert.fail("missing custom code !");
 		}
 	}
-	
+
 	@Test
 	public void isTestBeforeCustomTest() {
 		assertTrue(StandardLoopCharacteristicsCustom.isTestBefore(loop));
 	}
-	
+
 	@Test
 	public void isTestBeforeTest() {
 		assertTrue(loop.isTestBefore());
 
 	}
-	
+
 	@Test
 	public void basicGetLoopConditionGeneratedTest() {
-		try{
+		try {
 			loop.getLoopCondition();
-		}
-		catch(UnsupportedOperationException e){
+		} catch (UnsupportedOperationException e) {
 			Assert.fail("missing custom code !");
 		}
 	}
-	
+
 	@Test
 	public void basicGetLoopConditionCustomTest() {
 		assertEquals(bex, StandardLoopCharacteristicsCustom.basicGetLoopCondition(loop));
 	}
-	
+
 	@Test
 	public void basicGetLoopConditionTest() {
 		assertEquals(bex, loop.getLoopCondition());
 	}
-	
+
 }
diff --git a/org.eclipse.papyrus.bpmn.tests/src/org/eclipse/papyrus/bpmn/test/BpmnElementTypesConfigurationsTest.java b/org.eclipse.papyrus.bpmn.tests/src/org/eclipse/papyrus/bpmn/test/BpmnElementTypesConfigurationsTest.java
new file mode 100644
index 0000000..6cd82e8
--- /dev/null
+++ b/org.eclipse.papyrus.bpmn.tests/src/org/eclipse/papyrus/bpmn/test/BpmnElementTypesConfigurationsTest.java
@@ -0,0 +1,79 @@
+/*****************************************************************************
+ * Copyright (c) 2017 CEA.
+ * <p>
+ * 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
+ * <p>
+ * Contributors:
+ * Géry Deloge (CEATech AQUI) gery.deloge@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.bpmn.test;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
+
+@SuppressWarnings("nls") 
+public class BpmnElementTypesConfigurationsTest {
+
+	private static final String elementTypesConfiguration = "../org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations";
+	private static final String elementTypesCustomConfiguration = "../org.eclipse.papyrus.bpmn/model/customBpmn.elementtypesconfigurations";
+
+
+	private Document openDoc(String file) throws ParserConfigurationException, IOException, SAXException {
+		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+		DocumentBuilder builder = factory.newDocumentBuilder();
+		Document doc = builder.parse(new FileInputStream(file));
+		doc.getDocumentElement().normalize();
+		return doc;
+	}
+
+	@Test
+	public void checkId() throws ParserConfigurationException, IOException, SAXException {
+		Document doc = openDoc(elementTypesConfiguration);
+		NodeList nodeList = doc.getElementsByTagName("elementTypeConfigurations");
+
+		for (int i = 0; i < nodeList.getLength(); i++) {
+			Node node = nodeList.item(i);
+			if (node.getNodeType() == Node.ELEMENT_NODE) {
+				Element element = (Element) node;
+				String identifier = element.getAttribute("identifier");
+				String xmiid = element.getAttribute("xmi:id");
+
+				Assert.assertEquals("xmi::id and identifier should be equal", xmiid, identifier);
+			}
+		}
+	}
+
+
+	@Test
+	public void checkCustomId() throws ParserConfigurationException, IOException, SAXException {
+		Document doc = openDoc(elementTypesCustomConfiguration);
+		NodeList nodeList = doc.getElementsByTagName("elementTypeConfigurations");
+
+		for (int i = 0; i < nodeList.getLength(); i++) {
+			Node node = nodeList.item(i);
+			if (node.getNodeType() == Node.ELEMENT_NODE) {
+				Element element = (Element) node;
+				String identifier = element.getAttribute("identifier");
+				String xmiid = element.getAttribute("xmi:id");
+
+				Assert.assertEquals("xmi::id and identifier should be equal", xmiid, identifier);
+			}
+		}
+	}
+
+}
diff --git a/org.eclipse.papyrus.bpmn/META-INF/MANIFEST.MF b/org.eclipse.papyrus.bpmn/META-INF/MANIFEST.MF
index fb47e70..be06208 100755
--- a/org.eclipse.papyrus.bpmn/META-INF/MANIFEST.MF
+++ b/org.eclipse.papyrus.bpmn/META-INF/MANIFEST.MF
@@ -1,4 +1,10 @@
 Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-Vendor: %Bundle-Vendor
+Bundle-SymbolicName: org.eclipse.papyrus.bpmn;singleton:=true
+Bundle-Version: 0.9.0.qualifier
+Bundle-Activator: org.eclipse.papyrus.bpmn.Activator
 Export-Package: org.eclipse.papyrus.bpmn,
  org.eclipse.papyrus.bpmn.BPMNProfile,
  org.eclipse.papyrus.bpmn.BPMNProfile.impl,
@@ -10,13 +16,6 @@
  org.apache.log4j;bundle-version="1.2.15",
  org.eclipse.emf.ecore,
  org.eclipse.emf.common
-Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
-Bundle-Version: 0.9.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.bpmn.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.bpmn;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/org.eclipse.papyrus.bpmn/OSGI-INF/l10n/bundle.properties b/org.eclipse.papyrus.bpmn/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000..fddf8b8
--- /dev/null
+++ b/org.eclipse.papyrus.bpmn/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,2 @@
+Bundle-Name = UML Profile for BPMN definition
+Bundle-Vendor = Eclipse Modeling Project
\ No newline at end of file
diff --git a/org.eclipse.papyrus.bpmn/build.properties b/org.eclipse.papyrus.bpmn/build.properties
index a2e9a71..c2814a6 100755
--- a/org.eclipse.papyrus.bpmn/build.properties
+++ b/org.eclipse.papyrus.bpmn/build.properties
@@ -5,12 +5,11 @@
                .,\
                plugin.xml,\
                icons/,\
-               plugin.properties,\
                model/,\
                properties/,\
                build.properties,\
                about.html,\
                pom.xml,\
-               resources/
-src.includes = about.html,\
-               resources/
+               resources/,\
+               OSGI-INF/
+src.includes = about.html
diff --git a/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations b/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations
index 7acf434..5f66f8e 100755
--- a/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations
+++ b/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations
@@ -1,4550 +1,4551 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:applystereotypeadvice="http://www.eclipse.org/papyrus/uml/types/applystereotypeadvice/1.1" xmlns:stereotypematcher="http://www.eclipse.org/papyrus/uml/types/stereotypematcher/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.bpmn.elementTypes" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="BPMNProfile" xmi:id="_ulgXkAkFEeWVleXnap4Kwg" xmi:version="2.0">
-  <elementTypeConfigurations hint="UML::JoinNode" identifier="org.eclipse.papyrus.bpmn.InclusiveGateway_JoinNode" name="InclusiveGateway JoinNode" xmi:id="_ulgXkQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/JoinNode.gif" xmi:id="_ulgXkgkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgXkwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+<?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.2" xmlns:stereotypematcher="http://www.eclipse.org/papyrus/uml/types/stereotypematcher/1.1" xmi:id="org.eclipse.papyrus.bpmn.elementTypesSet" identifier="org.eclipse.papyrus.bpmn.elementTypesSet" name="PapyrusBPMNProfile" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.InclusiveGateway_JoinNode" identifier="org.eclipse.papyrus.bpmn.InclusiveGateway_JoinNode" name="InclusiveGateway JoinNode" hint="UML::JoinNode">
+    <iconEntry xmi:id="_ulgXkgkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/JoinNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgXkwkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::InclusiveGateway</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Scz2VVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ForkNode" identifier="org.eclipse.papyrus.bpmn.InclusiveGateway_ForkNode" name="InclusiveGateway ForkNode" xmi:id="_ulgXlAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ForkNode.gif" xmi:id="_ulgXlQkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgXlgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.JoinNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.InclusiveGateway_ForkNode" identifier="org.eclipse.papyrus.bpmn.InclusiveGateway_ForkNode" name="InclusiveGateway ForkNode" hint="UML::ForkNode">
+    <iconEntry xmi:id="_ulgXlQkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ForkNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgXlgkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::InclusiveGateway</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Scklw1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ControlNode" identifier="org.eclipse.papyrus.bpmn.InclusiveGateway_ControlNode" name="InclusiveGateway ControlNode" xmi:id="_ulgXlwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlNode.gif" xmi:id="_ulgXmAkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgXmQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ForkNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.InclusiveGateway_ControlNode" identifier="org.eclipse.papyrus.bpmn.InclusiveGateway_ControlNode" name="InclusiveGateway ControlNode" hint="UML::ControlNode">
+    <iconEntry xmi:id="_ulgXmAkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ControlNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgXmQkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::InclusiveGateway</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_SccDGVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityGroup" identifier="org.eclipse.papyrus.bpmn.InclusiveGateway_ActivityGroup" name="InclusiveGateway ActivityGroup" xmi:id="_ulgXmgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityGroup.gif" xmi:id="_ulgXmwkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgXnAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ControlNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.InclusiveGateway_ActivityGroup" identifier="org.eclipse.papyrus.bpmn.InclusiveGateway_ActivityGroup" name="InclusiveGateway ActivityGroup" hint="UML::ActivityGroup">
+    <iconEntry xmi:id="_ulgXmwkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ActivityGroup.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgXnAkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::InclusiveGateway</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScTgI1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.InclusiveGateway_ActivityNode" name="InclusiveGateway ActivityNode" xmi:id="_ulgXnQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulgXngkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgXnwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActivityGroup"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.InclusiveGateway_ActivityNode" identifier="org.eclipse.papyrus.bpmn.InclusiveGateway_ActivityNode" name="InclusiveGateway ActivityNode" hint="UML::ActivityNode">
+    <iconEntry xmi:id="_ulgXngkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ActivityNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgXnwkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::InclusiveGateway</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScTgJVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.InclusiveGateway_Element" name="InclusiveGateway Element" xmi:id="_ulgXoAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgXoQkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgXogkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActivityNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.InclusiveGateway_Element" identifier="org.eclipse.papyrus.bpmn.InclusiveGateway_Element" name="InclusiveGateway Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulgXoQkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgXogkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::InclusiveGateway</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ControlNode" identifier="org.eclipse.papyrus.bpmn.Gateway_ControlNode" name="Gateway ControlNode" xmi:id="_ulgXowkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlNode.gif" xmi:id="_ulgXpAkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgXpQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.Gateway_ControlNode" identifier="org.eclipse.papyrus.bpmn.Gateway_ControlNode" name="Gateway ControlNode" hint="UML::ControlNode">
+    <iconEntry xmi:id="_ulgXpAkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ControlNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgXpQkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::Gateway</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_SccDGVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityGroup" identifier="org.eclipse.papyrus.bpmn.Gateway_ActivityGroup" name="Gateway ActivityGroup" xmi:id="_ulgXpgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityGroup.gif" xmi:id="_ulgXpwkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgXqAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ControlNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.Gateway_ActivityGroup" identifier="org.eclipse.papyrus.bpmn.Gateway_ActivityGroup" name="Gateway ActivityGroup" hint="UML::ActivityGroup">
+    <iconEntry xmi:id="_ulgXpwkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ActivityGroup.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgXqAkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::Gateway</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScTgI1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.Gateway_ActivityNode" name="Gateway ActivityNode" xmi:id="_ulgXqQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulgXqgkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgXqwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActivityGroup"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.Gateway_ActivityNode" identifier="org.eclipse.papyrus.bpmn.Gateway_ActivityNode" name="Gateway ActivityNode" hint="UML::ActivityNode">
+    <iconEntry xmi:id="_ulgXqgkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ActivityNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgXqwkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::Gateway</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScTgJVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Gateway_Element" name="Gateway Element" xmi:id="_ulgXrAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgXrQkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgXrgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActivityNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.Gateway_Element" identifier="org.eclipse.papyrus.bpmn.Gateway_Element" name="Gateway Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulgXrQkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgXrgkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::Gateway</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ForkNode" identifier="org.eclipse.papyrus.bpmn.EventBasedGateway_ForkNode" name="EventBasedGateway ForkNode" xmi:id="_ulgXrwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ForkNode.gif" xmi:id="_ulgXsAkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgXsQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.EventBasedGateway_ForkNode" identifier="org.eclipse.papyrus.bpmn.EventBasedGateway_ForkNode" name="EventBasedGateway ForkNode" hint="UML::ForkNode">
+    <iconEntry xmi:id="_ulgXsAkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ForkNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgXsQkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::EventBasedGateway</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Scklw1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::StructuredActivityNode" identifier="org.eclipse.papyrus.bpmn.EventBasedGateway_StructuredActivityNode" name="EventBasedGateway StructuredActivityNode" xmi:id="_ulgXsgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif" xmi:id="_ulgXswkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgXtAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ForkNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.EventBasedGateway_StructuredActivityNode" identifier="org.eclipse.papyrus.bpmn.EventBasedGateway_StructuredActivityNode" name="EventBasedGateway StructuredActivityNode" hint="UML::StructuredActivityNode">
+    <iconEntry xmi:id="_ulgXswkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/StructuredActivityNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgXtAkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::EventBasedGateway</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_SdGxQFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::InterruptibleActivityRegion" identifier="org.eclipse.papyrus.bpmn.EventBasedGateway_InterruptibleActivityRegion" name="EventBasedGateway InterruptibleActivityRegion" xmi:id="_ulgXtQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InterruptibleActivityRegion.gif" xmi:id="_ulgXtgkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgXtwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.StructuredActivityNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.EventBasedGateway_InterruptibleActivityRegion" identifier="org.eclipse.papyrus.bpmn.EventBasedGateway_InterruptibleActivityRegion" name="EventBasedGateway InterruptibleActivityRegion" hint="UML::InterruptibleActivityRegion">
+    <iconEntry xmi:id="_ulgXtgkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/InterruptibleActivityRegion.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgXtwkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::EventBasedGateway</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScwL-VYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ControlNode" identifier="org.eclipse.papyrus.bpmn.EventBasedGateway_ControlNode" name="EventBasedGateway ControlNode" xmi:id="_ulgXuAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlNode.gif" xmi:id="_ulgXuQkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgXugkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InterruptibleActivityRegion"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.EventBasedGateway_ControlNode" identifier="org.eclipse.papyrus.bpmn.EventBasedGateway_ControlNode" name="EventBasedGateway ControlNode" hint="UML::ControlNode">
+    <iconEntry xmi:id="_ulgXuQkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ControlNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgXugkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::EventBasedGateway</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_SccDGVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityGroup" identifier="org.eclipse.papyrus.bpmn.EventBasedGateway_ActivityGroup" name="EventBasedGateway ActivityGroup" xmi:id="_ulgXuwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityGroup.gif" xmi:id="_ulgXvAkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgXvQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ControlNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.EventBasedGateway_ActivityGroup" identifier="org.eclipse.papyrus.bpmn.EventBasedGateway_ActivityGroup" name="EventBasedGateway ActivityGroup" hint="UML::ActivityGroup">
+    <iconEntry xmi:id="_ulgXvAkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ActivityGroup.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgXvQkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::EventBasedGateway</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScTgI1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.EventBasedGateway_ActivityNode" name="EventBasedGateway ActivityNode" xmi:id="_ulgXvgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulgXvwkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgXwAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActivityGroup"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.EventBasedGateway_ActivityNode" identifier="org.eclipse.papyrus.bpmn.EventBasedGateway_ActivityNode" name="EventBasedGateway ActivityNode" hint="UML::ActivityNode">
+    <iconEntry xmi:id="_ulgXvwkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ActivityNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgXwAkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::EventBasedGateway</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScTgJVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.EventBasedGateway_Element" name="EventBasedGateway Element" xmi:id="_ulgXwQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgXwgkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgXwwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActivityNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.EventBasedGateway_Element" identifier="org.eclipse.papyrus.bpmn.EventBasedGateway_Element" name="EventBasedGateway Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulgXwgkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgXwwkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::EventBasedGateway</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::JoinNode" identifier="org.eclipse.papyrus.bpmn.NonExclusiveGateway_JoinNode" name="NonExclusiveGateway JoinNode" xmi:id="_ulgXxAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/JoinNode.gif" xmi:id="_ulgXxQkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgXxgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.NonExclusiveGateway_JoinNode" identifier="org.eclipse.papyrus.bpmn.NonExclusiveGateway_JoinNode" name="NonExclusiveGateway JoinNode" hint="UML::JoinNode">
+    <iconEntry xmi:id="_ulgXxQkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/JoinNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgXxgkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::NonExclusiveGateway</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Scz2VVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ForkNode" identifier="org.eclipse.papyrus.bpmn.NonExclusiveGateway_ForkNode" name="NonExclusiveGateway ForkNode" xmi:id="_ulgXxwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ForkNode.gif" xmi:id="_ulgXyAkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgXyQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.JoinNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.NonExclusiveGateway_ForkNode" identifier="org.eclipse.papyrus.bpmn.NonExclusiveGateway_ForkNode" name="NonExclusiveGateway ForkNode" hint="UML::ForkNode">
+    <iconEntry xmi:id="_ulgXyAkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ForkNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgXyQkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::NonExclusiveGateway</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Scklw1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ControlNode" identifier="org.eclipse.papyrus.bpmn.NonExclusiveGateway_ControlNode" name="NonExclusiveGateway ControlNode" xmi:id="_ulgXygkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlNode.gif" xmi:id="_ulgXywkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgXzAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ForkNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.NonExclusiveGateway_ControlNode" identifier="org.eclipse.papyrus.bpmn.NonExclusiveGateway_ControlNode" name="NonExclusiveGateway ControlNode" hint="UML::ControlNode">
+    <iconEntry xmi:id="_ulgXywkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ControlNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgXzAkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::NonExclusiveGateway</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_SccDGVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityGroup" identifier="org.eclipse.papyrus.bpmn.NonExclusiveGateway_ActivityGroup" name="NonExclusiveGateway ActivityGroup" xmi:id="_ulgXzQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityGroup.gif" xmi:id="_ulgXzgkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgXzwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ControlNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.NonExclusiveGateway_ActivityGroup" identifier="org.eclipse.papyrus.bpmn.NonExclusiveGateway_ActivityGroup" name="NonExclusiveGateway ActivityGroup" hint="UML::ActivityGroup">
+    <iconEntry xmi:id="_ulgXzgkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ActivityGroup.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgXzwkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::NonExclusiveGateway</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScTgI1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.NonExclusiveGateway_ActivityNode" name="NonExclusiveGateway ActivityNode" xmi:id="_ulgX0AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulgX0QkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgX0gkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActivityGroup"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.NonExclusiveGateway_ActivityNode" identifier="org.eclipse.papyrus.bpmn.NonExclusiveGateway_ActivityNode" name="NonExclusiveGateway ActivityNode" hint="UML::ActivityNode">
+    <iconEntry xmi:id="_ulgX0QkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ActivityNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgX0gkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::NonExclusiveGateway</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScTgJVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.NonExclusiveGateway_Element" name="NonExclusiveGateway Element" xmi:id="_ulgX0wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgX1AkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgX1QkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActivityNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.NonExclusiveGateway_Element" identifier="org.eclipse.papyrus.bpmn.NonExclusiveGateway_Element" name="NonExclusiveGateway Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulgX1AkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgX1QkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::NonExclusiveGateway</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::JoinNode" identifier="org.eclipse.papyrus.bpmn.ParallelGateway_JoinNode" name="ParallelGateway JoinNode" xmi:id="_ulgX1gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/JoinNode.gif" xmi:id="_ulgX1wkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgX2AkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.ParallelGateway_JoinNode" identifier="org.eclipse.papyrus.bpmn.ParallelGateway_JoinNode" name="ParallelGateway JoinNode" hint="UML::JoinNode">
+    <iconEntry xmi:id="_ulgX1wkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/JoinNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgX2AkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::ParallelGateway</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Scz2VVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ForkNode" identifier="org.eclipse.papyrus.bpmn.ParallelGateway_ForkNode" name="ParallelGateway ForkNode" xmi:id="_ulgX2QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ForkNode.gif" xmi:id="_ulgX2gkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgX2wkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.JoinNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.ParallelGateway_ForkNode" identifier="org.eclipse.papyrus.bpmn.ParallelGateway_ForkNode" name="ParallelGateway ForkNode" hint="UML::ForkNode">
+    <iconEntry xmi:id="_ulgX2gkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ForkNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgX2wkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::ParallelGateway</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Scklw1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ControlNode" identifier="org.eclipse.papyrus.bpmn.ParallelGateway_ControlNode" name="ParallelGateway ControlNode" xmi:id="_ulgX3AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlNode.gif" xmi:id="_ulgX3QkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgX3gkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ForkNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.ParallelGateway_ControlNode" identifier="org.eclipse.papyrus.bpmn.ParallelGateway_ControlNode" name="ParallelGateway ControlNode" hint="UML::ControlNode">
+    <iconEntry xmi:id="_ulgX3QkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ControlNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgX3gkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::ParallelGateway</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_SccDGVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityGroup" identifier="org.eclipse.papyrus.bpmn.ParallelGateway_ActivityGroup" name="ParallelGateway ActivityGroup" xmi:id="_ulgX3wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityGroup.gif" xmi:id="_ulgX4AkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgX4QkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ControlNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.ParallelGateway_ActivityGroup" identifier="org.eclipse.papyrus.bpmn.ParallelGateway_ActivityGroup" name="ParallelGateway ActivityGroup" hint="UML::ActivityGroup">
+    <iconEntry xmi:id="_ulgX4AkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ActivityGroup.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgX4QkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::ParallelGateway</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScTgI1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.ParallelGateway_ActivityNode" name="ParallelGateway ActivityNode" xmi:id="_ulgX4gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulgX4wkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgX5AkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActivityGroup"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.ParallelGateway_ActivityNode" identifier="org.eclipse.papyrus.bpmn.ParallelGateway_ActivityNode" name="ParallelGateway ActivityNode" hint="UML::ActivityNode">
+    <iconEntry xmi:id="_ulgX4wkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ActivityNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgX5AkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::ParallelGateway</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScTgJVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ParallelGateway_Element" name="ParallelGateway Element" xmi:id="_ulgX5QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgX5gkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgX5wkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActivityNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.ParallelGateway_Element" identifier="org.eclipse.papyrus.bpmn.ParallelGateway_Element" name="ParallelGateway Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulgX5gkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgX5wkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::ParallelGateway</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::JoinNode" identifier="org.eclipse.papyrus.bpmn.ComplexGateway_JoinNode" name="ComplexGateway JoinNode" xmi:id="_ulgX6AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/JoinNode.gif" xmi:id="_ulgX6QkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgX6gkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.ComplexGateway_JoinNode" identifier="org.eclipse.papyrus.bpmn.ComplexGateway_JoinNode" name="ComplexGateway JoinNode" hint="UML::JoinNode">
+    <iconEntry xmi:id="_ulgX6QkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/JoinNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgX6gkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::ComplexGateway</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Scz2VVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ForkNode" identifier="org.eclipse.papyrus.bpmn.ComplexGateway_ForkNode" name="ComplexGateway ForkNode" xmi:id="_ulgX6wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ForkNode.gif" xmi:id="_ulgX7AkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgX7QkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.JoinNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.ComplexGateway_ForkNode" identifier="org.eclipse.papyrus.bpmn.ComplexGateway_ForkNode" name="ComplexGateway ForkNode" hint="UML::ForkNode">
+    <iconEntry xmi:id="_ulgX7AkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ForkNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgX7QkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::ComplexGateway</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Scklw1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ControlNode" identifier="org.eclipse.papyrus.bpmn.ComplexGateway_ControlNode" name="ComplexGateway ControlNode" xmi:id="_ulgX7gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlNode.gif" xmi:id="_ulgX7wkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgX8AkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ForkNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.ComplexGateway_ControlNode" identifier="org.eclipse.papyrus.bpmn.ComplexGateway_ControlNode" name="ComplexGateway ControlNode" hint="UML::ControlNode">
+    <iconEntry xmi:id="_ulgX7wkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ControlNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgX8AkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::ComplexGateway</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_SccDGVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityGroup" identifier="org.eclipse.papyrus.bpmn.ComplexGateway_ActivityGroup" name="ComplexGateway ActivityGroup" xmi:id="_ulgX8QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityGroup.gif" xmi:id="_ulgX8gkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgX8wkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ControlNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.ComplexGateway_ActivityGroup" identifier="org.eclipse.papyrus.bpmn.ComplexGateway_ActivityGroup" name="ComplexGateway ActivityGroup" hint="UML::ActivityGroup">
+    <iconEntry xmi:id="_ulgX8gkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ActivityGroup.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgX8wkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::ComplexGateway</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScTgI1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.ComplexGateway_ActivityNode" name="ComplexGateway ActivityNode" xmi:id="_ulgX9AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulgX9QkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgX9gkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActivityGroup"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.ComplexGateway_ActivityNode" identifier="org.eclipse.papyrus.bpmn.ComplexGateway_ActivityNode" name="ComplexGateway ActivityNode" hint="UML::ActivityNode">
+    <iconEntry xmi:id="_ulgX9QkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ActivityNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgX9gkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::ComplexGateway</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScTgJVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ComplexGateway_Element" name="ComplexGateway Element" xmi:id="_ulgX9wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgX-AkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgX-QkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActivityNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.ComplexGateway_Element" identifier="org.eclipse.papyrus.bpmn.ComplexGateway_Element" name="ComplexGateway Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulgX-AkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgX-QkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::ComplexGateway</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::DecisionNode" identifier="org.eclipse.papyrus.bpmn.ExclusiveGateway_DecisionNode" name="ExclusiveGateway DecisionNode" xmi:id="_ulgX-gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DecisionNode.gif" xmi:id="_ulgX-wkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgX_AkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.ExclusiveGateway_DecisionNode" identifier="org.eclipse.papyrus.bpmn.ExclusiveGateway_DecisionNode" name="ExclusiveGateway DecisionNode" hint="UML::DecisionNode">
+    <iconEntry xmi:id="_ulgX-wkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/DecisionNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgX_AkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::ExclusiveGateway</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_SccqGVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::MergeNode" identifier="org.eclipse.papyrus.bpmn.ExclusiveGateway_MergeNode" name="ExclusiveGateway MergeNode" xmi:id="_ulgX_QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/MergeNode.gif" xmi:id="_ulgX_gkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgX_wkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DecisionNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.ExclusiveGateway_MergeNode" identifier="org.eclipse.papyrus.bpmn.ExclusiveGateway_MergeNode" name="ExclusiveGateway MergeNode" hint="UML::MergeNode">
+    <iconEntry xmi:id="_ulgX_gkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/MergeNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgX_wkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::ExclusiveGateway</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc59ElYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ControlNode" identifier="org.eclipse.papyrus.bpmn.ExclusiveGateway_ControlNode" name="ExclusiveGateway ControlNode" xmi:id="_ulgYAAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlNode.gif" xmi:id="_ulgYAQkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYAgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.MergeNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.ExclusiveGateway_ControlNode" identifier="org.eclipse.papyrus.bpmn.ExclusiveGateway_ControlNode" name="ExclusiveGateway ControlNode" hint="UML::ControlNode">
+    <iconEntry xmi:id="_ulgYAQkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ControlNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYAgkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::ExclusiveGateway</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_SccDGVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityGroup" identifier="org.eclipse.papyrus.bpmn.ExclusiveGateway_ActivityGroup" name="ExclusiveGateway ActivityGroup" xmi:id="_ulgYAwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityGroup.gif" xmi:id="_ulgYBAkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYBQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ControlNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.ExclusiveGateway_ActivityGroup" identifier="org.eclipse.papyrus.bpmn.ExclusiveGateway_ActivityGroup" name="ExclusiveGateway ActivityGroup" hint="UML::ActivityGroup">
+    <iconEntry xmi:id="_ulgYBAkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ActivityGroup.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYBQkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::ExclusiveGateway</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScTgI1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.ExclusiveGateway_ActivityNode" name="ExclusiveGateway ActivityNode" xmi:id="_ulgYBgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulgYBwkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYCAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActivityGroup"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.ExclusiveGateway_ActivityNode" identifier="org.eclipse.papyrus.bpmn.ExclusiveGateway_ActivityNode" name="ExclusiveGateway ActivityNode" hint="UML::ActivityNode">
+    <iconEntry xmi:id="_ulgYBwkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ActivityNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYCAkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::ExclusiveGateway</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScTgJVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ExclusiveGateway_Element" name="ExclusiveGateway Element" xmi:id="_ulgYCQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYCgkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYCwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActivityNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.ExclusiveGateway_Element" identifier="org.eclipse.papyrus.bpmn.ExclusiveGateway_Element" name="ExclusiveGateway Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulgYCgkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYCwkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::ExclusiveGateway</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.RootElement_PackageableElement" name="RootElement PackageableElement" xmi:id="_ulgYDAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulgYDQkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYDgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.RootElement_PackageableElement" identifier="org.eclipse.papyrus.bpmn.RootElement_PackageableElement" name="RootElement PackageableElement" hint="UML::PackageableElement">
+    <iconEntry xmi:id="_ulgYDQkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/PackageableElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYDgkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::RootElement</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc9ncVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.RootElement_Element" name="RootElement Element" xmi:id="_ulgYDwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYEAkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYEQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.PackageableElement"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.RootElement_Element" identifier="org.eclipse.papyrus.bpmn.RootElement_Element" name="RootElement Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulgYEAkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYEQkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::RootElement</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageImport" identifier="org.eclipse.papyrus.bpmn.Import_UML::PackageImport" name="Import" xmi:id="_ulgYEgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageImport.gif" xmi:id="_ulgYEwkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYFAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.Import_UML::PackageImport" identifier="org.eclipse.papyrus.bpmn.Import_UML::PackageImport" name="Import" hint="UML::PackageImport">
+    <iconEntry xmi:id="_ulgYEwkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/PackageImport.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYFAkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::Import</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_8kkk8GN5EeSrwvaW5Is9PQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Package" identifier="org.eclipse.papyrus.bpmn.Definitions_Package" name="Definitions Package" xmi:id="_ulgYFQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_ulgYFgkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYFwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.PackageImport"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.Definitions_Package" identifier="org.eclipse.papyrus.bpmn.Definitions_Package" name="Definitions Package" hint="UML::Package">
+    <iconEntry xmi:id="_ulgYFgkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYFwkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::Definitions</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc9nZVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Definitions_Element" name="Definitions Element" xmi:id="_ulgYGAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYGQkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYGgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi: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" xmi:id="org.eclipse.papyrus.bpmn.Definitions_Element" identifier="org.eclipse.papyrus.bpmn.Definitions_Element" name="Definitions Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulgYGQkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYGgkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::Definitions</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityPartition" identifier="org.eclipse.papyrus.bpmn.LaneSet_ActivityPartition" name="LaneSet ActivityPartition" xmi:id="_ulgYGwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityPartition.gif" xmi:id="_ulgYHAkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYHQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.LaneSet_ActivityPartition" identifier="org.eclipse.papyrus.bpmn.LaneSet_ActivityPartition" name="LaneSet ActivityPartition" hint="UML::ActivityPartition">
+    <iconEntry xmi:id="_ulgYHAkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ActivityPartition.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYHQkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::LaneSet</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScTgKVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.LaneSet_Element" name="LaneSet Element" xmi:id="_ulgYHgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYHwkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYIAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActivityPartition"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.LaneSet_Element" identifier="org.eclipse.papyrus.bpmn.LaneSet_Element" name="LaneSet Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulgYHwkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYIAkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::LaneSet</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Class" identifier="org.eclipse.papyrus.bpmn.Monitoring_Class" name="Monitoring Class" xmi:id="_ulgYIQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_ulgYIgkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYIwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.Monitoring_Class" identifier="org.eclipse.papyrus.bpmn.Monitoring_Class" name="Monitoring Class" hint="UML::Class">
+    <iconEntry xmi:id="_ulgYIgkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYIwkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::Monitoring</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sca0wVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Monitoring_Element" name="Monitoring Element" xmi:id="_ulgYJAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYJQkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYJgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi: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" xmi:id="org.eclipse.papyrus.bpmn.Monitoring_Element" identifier="org.eclipse.papyrus.bpmn.Monitoring_Element" name="Monitoring Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulgYJQkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYJgkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::Monitoring</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Activity" identifier="org.eclipse.papyrus.bpmn.BPMNProcess_Activity" name="BPMNProcess Activity" xmi:id="_ulgYJwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Activity.gif" xmi:id="_ulgYKAkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYKQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.BPMNProcess_Activity" identifier="org.eclipse.papyrus.bpmn.BPMNProcess_Activity" name="BPMNProcess Activity" hint="UML::Activity">
+    <iconEntry xmi:id="_ulgYKAkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Activity.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYKQkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::BPMNProcess</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScTgG1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Behavior" identifier="org.eclipse.papyrus.bpmn.BPMNProcess_Behavior" name="BPMNProcess Behavior" xmi:id="_ulgYKgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Behavior.gif" xmi:id="_ulgYKwkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYLAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Activity"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.BPMNProcess_Behavior" identifier="org.eclipse.papyrus.bpmn.BPMNProcess_Behavior" name="BPMNProcess Behavior" hint="UML::Behavior">
+    <iconEntry xmi:id="_ulgYKwkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Behavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYLAkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::BPMNProcess</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScaNsFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.BPMNProcess_PackageableElement" name="BPMNProcess PackageableElement" xmi:id="_ulgYLQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulgYLgkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYLwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Behavior"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.BPMNProcess_PackageableElement" identifier="org.eclipse.papyrus.bpmn.BPMNProcess_PackageableElement" name="BPMNProcess PackageableElement" hint="UML::PackageableElement">
+    <iconEntry xmi:id="_ulgYLgkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/PackageableElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYLwkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::BPMNProcess</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc9ncVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.BPMNProcess_Element" name="BPMNProcess Element" xmi:id="_ulgYMAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYMQkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYMgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.PackageableElement"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.BPMNProcess_Element" identifier="org.eclipse.papyrus.bpmn.BPMNProcess_Element" name="BPMNProcess Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulgYMQkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYMgkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::BPMNProcess</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityPartition" identifier="org.eclipse.papyrus.bpmn.Lane_ActivityPartition" name="Lane ActivityPartition" xmi:id="_ulgYMwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityPartition.gif" xmi:id="_ulgYNAkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYNQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.Lane_ActivityPartition" identifier="org.eclipse.papyrus.bpmn.Lane_ActivityPartition" name="Lane ActivityPartition" hint="UML::ActivityPartition">
+    <iconEntry xmi:id="_ulgYNAkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ActivityPartition.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYNQkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::Lane</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScTgKVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Lane_Element" name="Lane Element" xmi:id="_ulgYNgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYNwkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYOAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActivityPartition"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.Lane_Element" identifier="org.eclipse.papyrus.bpmn.Lane_Element" name="Lane Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulgYNwkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYOAkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::Lane</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::OpaqueBehavior" identifier="org.eclipse.papyrus.bpmn.GlobalScriptTask_OpaqueBehavior" name="GlobalScriptTask OpaqueBehavior" xmi:id="_ulgYOQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueBehavior.gif" xmi:id="_ulgYOgkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYOwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.GlobalScriptTask_OpaqueBehavior" identifier="org.eclipse.papyrus.bpmn.GlobalScriptTask_OpaqueBehavior" name="GlobalScriptTask OpaqueBehavior" hint="UML::OpaqueBehavior">
+    <iconEntry xmi:id="_ulgYOgkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/OpaqueBehavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYOwkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::GlobalScriptTask</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc7LGVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Behavior" identifier="org.eclipse.papyrus.bpmn.GlobalScriptTask_Behavior" name="GlobalScriptTask Behavior" xmi:id="_ulgYPAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Behavior.gif" xmi:id="_ulgYPQkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYPgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OpaqueBehavior"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.GlobalScriptTask_Behavior" identifier="org.eclipse.papyrus.bpmn.GlobalScriptTask_Behavior" name="GlobalScriptTask Behavior" hint="UML::Behavior">
+    <iconEntry xmi:id="_ulgYPQkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Behavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYPgkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::GlobalScriptTask</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScaNsFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.GlobalScriptTask_PackageableElement" name="GlobalScriptTask PackageableElement" xmi:id="_ulgYPwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulgYQAkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYQQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Behavior"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.GlobalScriptTask_PackageableElement" identifier="org.eclipse.papyrus.bpmn.GlobalScriptTask_PackageableElement" name="GlobalScriptTask PackageableElement" hint="UML::PackageableElement">
+    <iconEntry xmi:id="_ulgYQAkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/PackageableElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYQQkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::GlobalScriptTask</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc9ncVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.GlobalScriptTask_Element" name="GlobalScriptTask Element" xmi:id="_ulgYQgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYQwkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYRAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.PackageableElement"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.GlobalScriptTask_Element" identifier="org.eclipse.papyrus.bpmn.GlobalScriptTask_Element" name="GlobalScriptTask Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulgYQwkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYRAkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::GlobalScriptTask</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Class" identifier="org.eclipse.papyrus.bpmn.Auditing_Class" name="Auditing Class" xmi:id="_ulgYRQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_ulgYRgkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYRwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.Auditing_Class" identifier="org.eclipse.papyrus.bpmn.Auditing_Class" name="Auditing Class" hint="UML::Class">
+    <iconEntry xmi:id="_ulgYRgkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYRwkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::Auditing</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sca0wVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Auditing_Element" name="Auditing Element" xmi:id="_ulgYSAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYSQkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYSgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi: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" xmi:id="org.eclipse.papyrus.bpmn.Auditing_Element" identifier="org.eclipse.papyrus.bpmn.Auditing_Element" name="Auditing Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulgYSQkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYSgkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::Auditing</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::OpaqueBehavior" identifier="org.eclipse.papyrus.bpmn.GlobalTask_OpaqueBehavior" name="GlobalTask OpaqueBehavior" xmi:id="_ulgYSwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueBehavior.gif" xmi:id="_ulgYTAkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYTQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.GlobalTask_OpaqueBehavior" identifier="org.eclipse.papyrus.bpmn.GlobalTask_OpaqueBehavior" name="GlobalTask OpaqueBehavior" hint="UML::OpaqueBehavior">
+    <iconEntry xmi:id="_ulgYTAkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/OpaqueBehavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYTQkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::GlobalTask</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc7LGVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Behavior" identifier="org.eclipse.papyrus.bpmn.GlobalTask_Behavior" name="GlobalTask Behavior" xmi:id="_ulgYTgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Behavior.gif" xmi:id="_ulgYTwkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYUAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OpaqueBehavior"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.GlobalTask_Behavior" identifier="org.eclipse.papyrus.bpmn.GlobalTask_Behavior" name="GlobalTask Behavior" hint="UML::Behavior">
+    <iconEntry xmi:id="_ulgYTwkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Behavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYUAkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::GlobalTask</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScaNsFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.GlobalTask_PackageableElement" name="GlobalTask PackageableElement" xmi:id="_ulgYUQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulgYUgkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYUwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Behavior"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.GlobalTask_PackageableElement" identifier="org.eclipse.papyrus.bpmn.GlobalTask_PackageableElement" name="GlobalTask PackageableElement" hint="UML::PackageableElement">
+    <iconEntry xmi:id="_ulgYUgkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/PackageableElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYUwkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::GlobalTask</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc9ncVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.GlobalTask_Element" name="GlobalTask Element" xmi:id="_ulgYVAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYVQkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYVgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.PackageableElement"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.GlobalTask_Element" identifier="org.eclipse.papyrus.bpmn.GlobalTask_Element" name="GlobalTask Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulgYVQkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYVgkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::GlobalTask</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::OpaqueBehavior" identifier="org.eclipse.papyrus.bpmn.GlobalBusinessRuleTask_OpaqueBehavior" name="GlobalBusinessRuleTask OpaqueBehavior" xmi:id="_ulgYVwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueBehavior.gif" xmi:id="_ulgYWAkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYWQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.GlobalBusinessRuleTask_OpaqueBehavior" identifier="org.eclipse.papyrus.bpmn.GlobalBusinessRuleTask_OpaqueBehavior" name="GlobalBusinessRuleTask OpaqueBehavior" hint="UML::OpaqueBehavior">
+    <iconEntry xmi:id="_ulgYWAkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/OpaqueBehavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYWQkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::GlobalBusinessRuleTask</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc7LGVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Behavior" identifier="org.eclipse.papyrus.bpmn.GlobalBusinessRuleTask_Behavior" name="GlobalBusinessRuleTask Behavior" xmi:id="_ulgYWgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Behavior.gif" xmi:id="_ulgYWwkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYXAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OpaqueBehavior"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.GlobalBusinessRuleTask_Behavior" identifier="org.eclipse.papyrus.bpmn.GlobalBusinessRuleTask_Behavior" name="GlobalBusinessRuleTask Behavior" hint="UML::Behavior">
+    <iconEntry xmi:id="_ulgYWwkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Behavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYXAkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::GlobalBusinessRuleTask</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScaNsFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.GlobalBusinessRuleTask_PackageableElement" name="GlobalBusinessRuleTask PackageableElement" xmi:id="_ulgYXQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulgYXgkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYXwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Behavior"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.GlobalBusinessRuleTask_PackageableElement" identifier="org.eclipse.papyrus.bpmn.GlobalBusinessRuleTask_PackageableElement" name="GlobalBusinessRuleTask PackageableElement" hint="UML::PackageableElement">
+    <iconEntry xmi:id="_ulgYXgkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/PackageableElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYXwkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::GlobalBusinessRuleTask</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc9ncVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.GlobalBusinessRuleTask_Element" name="GlobalBusinessRuleTask Element" xmi:id="_ulgYYAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYYQkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYYgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.PackageableElement"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.GlobalBusinessRuleTask_Element" identifier="org.eclipse.papyrus.bpmn.GlobalBusinessRuleTask_Element" name="GlobalBusinessRuleTask Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulgYYQkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYYgkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::GlobalBusinessRuleTask</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::CallEvent" identifier="org.eclipse.papyrus.bpmn.CompensateEventDefinition_CallEvent" name="CompensateEventDefinition CallEvent" xmi:id="_ulgYYwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallEvent.gif" xmi:id="_ulgYZAkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYZQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.CompensateEventDefinition_CallEvent" identifier="org.eclipse.papyrus.bpmn.CompensateEventDefinition_CallEvent" name="CompensateEventDefinition CallEvent" hint="UML::CallEvent">
+    <iconEntry xmi:id="_ulgYZAkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/CallEvent.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYZQkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::CompensateEventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScaNylYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Event" identifier="org.eclipse.papyrus.bpmn.CompensateEventDefinition_Event" name="CompensateEventDefinition Event" xmi:id="_ulgYZgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Event.gif" xmi:id="_ulgYZwkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYaAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CallEvent"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.CompensateEventDefinition_Event" identifier="org.eclipse.papyrus.bpmn.CompensateEventDefinition_Event" name="CompensateEventDefinition Event" hint="UML::Event">
+    <iconEntry xmi:id="_ulgYZwkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Event.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYaAkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::CompensateEventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Scg7ZFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.CompensateEventDefinition_PackageableElement" name="CompensateEventDefinition PackageableElement" xmi:id="_ulgYaQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulgYagkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYawkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Event"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.CompensateEventDefinition_PackageableElement" identifier="org.eclipse.papyrus.bpmn.CompensateEventDefinition_PackageableElement" name="CompensateEventDefinition PackageableElement" hint="UML::PackageableElement">
+    <iconEntry xmi:id="_ulgYagkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/PackageableElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYawkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::CompensateEventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc9ncVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.CompensateEventDefinition_Element" name="CompensateEventDefinition Element" xmi:id="_ulgYbAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYbQkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYbgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.PackageableElement"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.CompensateEventDefinition_Element" identifier="org.eclipse.papyrus.bpmn.CompensateEventDefinition_Element" name="CompensateEventDefinition Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulgYbQkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYbgkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::CompensateEventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::CallEvent" identifier="org.eclipse.papyrus.bpmn.EscalationEventDefinition_CallEvent" name="EscalationEventDefinition CallEvent" xmi:id="_ulgYbwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallEvent.gif" xmi:id="_ulgYcAkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYcQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.EscalationEventDefinition_CallEvent" identifier="org.eclipse.papyrus.bpmn.EscalationEventDefinition_CallEvent" name="EscalationEventDefinition CallEvent" hint="UML::CallEvent">
+    <iconEntry xmi:id="_ulgYcAkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/CallEvent.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYcQkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::EscalationEventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScaNylYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Event" identifier="org.eclipse.papyrus.bpmn.EscalationEventDefinition_Event" name="EscalationEventDefinition Event" xmi:id="_ulgYcgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Event.gif" xmi:id="_ulgYcwkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYdAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CallEvent"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.EscalationEventDefinition_Event" identifier="org.eclipse.papyrus.bpmn.EscalationEventDefinition_Event" name="EscalationEventDefinition Event" hint="UML::Event">
+    <iconEntry xmi:id="_ulgYcwkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Event.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYdAkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::EscalationEventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Scg7ZFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.EscalationEventDefinition_PackageableElement" name="EscalationEventDefinition PackageableElement" xmi:id="_ulgYdQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulgYdgkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYdwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Event"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.EscalationEventDefinition_PackageableElement" identifier="org.eclipse.papyrus.bpmn.EscalationEventDefinition_PackageableElement" name="EscalationEventDefinition PackageableElement" hint="UML::PackageableElement">
+    <iconEntry xmi:id="_ulgYdgkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/PackageableElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYdwkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::EscalationEventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc9ncVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.EscalationEventDefinition_Element" name="EscalationEventDefinition Element" xmi:id="_ulgYeAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYeQkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYegkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.PackageableElement"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.EscalationEventDefinition_Element" identifier="org.eclipse.papyrus.bpmn.EscalationEventDefinition_Element" name="EscalationEventDefinition Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulgYeQkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYegkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::EscalationEventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ChangeEvent" identifier="org.eclipse.papyrus.bpmn.TimerEventDefinition_ChangeEvent" name="TimerEventDefinition ChangeEvent" xmi:id="_ulgYewkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ChangeEvent.gif" xmi:id="_ulgYfAkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYfQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.TimerEventDefinition_ChangeEvent" identifier="org.eclipse.papyrus.bpmn.TimerEventDefinition_ChangeEvent" name="TimerEventDefinition ChangeEvent" hint="UML::ChangeEvent">
+    <iconEntry xmi:id="_ulgYfAkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ChangeEvent.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYfQkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::TimerEventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScaN3FYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Event" identifier="org.eclipse.papyrus.bpmn.TimerEventDefinition_Event" name="TimerEventDefinition Event" xmi:id="_ulgYfgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Event.gif" xmi:id="_ulgYfwkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYgAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ChangeEvent"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.TimerEventDefinition_Event" identifier="org.eclipse.papyrus.bpmn.TimerEventDefinition_Event" name="TimerEventDefinition Event" hint="UML::Event">
+    <iconEntry xmi:id="_ulgYfwkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Event.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYgAkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::TimerEventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Scg7ZFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.TimerEventDefinition_PackageableElement" name="TimerEventDefinition PackageableElement" xmi:id="_ulgYgQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulgYggkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYgwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Event"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.TimerEventDefinition_PackageableElement" identifier="org.eclipse.papyrus.bpmn.TimerEventDefinition_PackageableElement" name="TimerEventDefinition PackageableElement" hint="UML::PackageableElement">
+    <iconEntry xmi:id="_ulgYggkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/PackageableElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYgwkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::TimerEventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc9ncVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.TimerEventDefinition_Element" name="TimerEventDefinition Element" xmi:id="_ulgYhAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYhQkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYhgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.PackageableElement"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.TimerEventDefinition_Element" identifier="org.eclipse.papyrus.bpmn.TimerEventDefinition_Element" name="TimerEventDefinition Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulgYhQkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYhgkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::TimerEventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::CallEvent" identifier="org.eclipse.papyrus.bpmn.SignalEventDefinition_CallEvent" name="SignalEventDefinition CallEvent" xmi:id="_ulgYhwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallEvent.gif" xmi:id="_ulgYiAkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYiQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.SignalEventDefinition_CallEvent" identifier="org.eclipse.papyrus.bpmn.SignalEventDefinition_CallEvent" name="SignalEventDefinition CallEvent" hint="UML::CallEvent">
+    <iconEntry xmi:id="_ulgYiAkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/CallEvent.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYiQkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::SignalEventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScaNylYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Event" identifier="org.eclipse.papyrus.bpmn.SignalEventDefinition_Event" name="SignalEventDefinition Event" xmi:id="_ulgYigkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Event.gif" xmi:id="_ulgYiwkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYjAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CallEvent"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.SignalEventDefinition_Event" identifier="org.eclipse.papyrus.bpmn.SignalEventDefinition_Event" name="SignalEventDefinition Event" hint="UML::Event">
+    <iconEntry xmi:id="_ulgYiwkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Event.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYjAkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::SignalEventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Scg7ZFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.SignalEventDefinition_PackageableElement" name="SignalEventDefinition PackageableElement" xmi:id="_ulgYjQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulgYjgkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYjwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Event"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.SignalEventDefinition_PackageableElement" identifier="org.eclipse.papyrus.bpmn.SignalEventDefinition_PackageableElement" name="SignalEventDefinition PackageableElement" hint="UML::PackageableElement">
+    <iconEntry xmi:id="_ulgYjgkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/PackageableElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYjwkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::SignalEventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc9ncVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.SignalEventDefinition_Element" name="SignalEventDefinition Element" xmi:id="_ulgYkAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYkQkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYkgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.PackageableElement"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.SignalEventDefinition_Element" identifier="org.eclipse.papyrus.bpmn.SignalEventDefinition_Element" name="SignalEventDefinition Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulgYkQkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYkgkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::SignalEventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::FinalNode" identifier="org.eclipse.papyrus.bpmn.EndEvent_FinalNode" name="EndEvent FinalNode" xmi:id="_ulgYkwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FinalNode.gif" xmi:id="_ulgYlAkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulgYlQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.EndEvent_FinalNode" identifier="org.eclipse.papyrus.bpmn.EndEvent_FinalNode" name="EndEvent FinalNode" hint="UML::FinalNode">
+    <iconEntry xmi:id="_ulgYlAkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/FinalNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulgYlQkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::EndEvent</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Scj-sFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::CallOperationAction" identifier="org.eclipse.papyrus.bpmn.EndEvent_CallOperationAction" name="EndEvent CallOperationAction" xmi:id="_ulgYlgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallOperationAction.gif" xmi:id="_ulg-oAkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg-oQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.FinalNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.EndEvent_CallOperationAction" identifier="org.eclipse.papyrus.bpmn.EndEvent_CallOperationAction" name="EndEvent CallOperationAction" hint="UML::CallOperationAction">
+    <iconEntry xmi:id="_ulg-oAkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/CallOperationAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg-oQkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::EndEvent</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScaN0lYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::FlowFinalNode" identifier="org.eclipse.papyrus.bpmn.EndEvent_FlowFinalNode" name="EndEvent FlowFinalNode" xmi:id="_ulg-ogkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FlowFinalNode.gif" xmi:id="_ulg-owkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg-pAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CallOperationAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.EndEvent_FlowFinalNode" identifier="org.eclipse.papyrus.bpmn.EndEvent_FlowFinalNode" name="EndEvent FlowFinalNode" hint="UML::FlowFinalNode">
+    <iconEntry xmi:id="_ulg-owkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/FlowFinalNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg-pAkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::EndEvent</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScklwVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.EndEvent_ActivityNode" name="EndEvent ActivityNode" xmi:id="_ulg-pQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulg-pgkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg-pwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.FlowFinalNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.EndEvent_ActivityNode" identifier="org.eclipse.papyrus.bpmn.EndEvent_ActivityNode" name="EndEvent ActivityNode" hint="UML::ActivityNode">
+    <iconEntry xmi:id="_ulg-pgkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ActivityNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg-pwkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::EndEvent</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScTgJVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.EndEvent_Element" name="EndEvent Element" xmi:id="_ulg-qAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg-qQkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg-qgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActivityNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.EndEvent_Element" identifier="org.eclipse.papyrus.bpmn.EndEvent_Element" name="EndEvent Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulg-qQkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg-qgkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::EndEvent</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Event" identifier="org.eclipse.papyrus.bpmn.EventDefinition_Event" name="EventDefinition Event" xmi:id="_ulg-qwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Event.gif" xmi:id="_ulg-rAkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg-rQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.EventDefinition_Event" identifier="org.eclipse.papyrus.bpmn.EventDefinition_Event" name="EventDefinition Event" hint="UML::Event">
+    <iconEntry xmi:id="_ulg-rAkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Event.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg-rQkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::EventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Scg7ZFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.EventDefinition_PackageableElement" name="EventDefinition PackageableElement" xmi:id="_ulg-rgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg-rwkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg-sAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Event"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.EventDefinition_PackageableElement" identifier="org.eclipse.papyrus.bpmn.EventDefinition_PackageableElement" name="EventDefinition PackageableElement" hint="UML::PackageableElement">
+    <iconEntry xmi:id="_ulg-rwkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/PackageableElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg-sAkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::EventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc9ncVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.EventDefinition_Element" name="EventDefinition Element" xmi:id="_ulg-sQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg-sgkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg-swkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.PackageableElement"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.EventDefinition_Element" identifier="org.eclipse.papyrus.bpmn.EventDefinition_Element" name="EventDefinition Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulg-sgkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg-swkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::EventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.BPMNEvent_ActivityNode" name="BPMNEvent ActivityNode" xmi:id="_ulg-tAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulg-tQkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg-tgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.BPMNEvent_ActivityNode" identifier="org.eclipse.papyrus.bpmn.BPMNEvent_ActivityNode" name="BPMNEvent ActivityNode" hint="UML::ActivityNode">
+    <iconEntry xmi:id="_ulg-tQkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ActivityNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg-tgkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::BPMNEvent</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScTgJVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.BPMNEvent_Element" name="BPMNEvent Element" xmi:id="_ulg-twkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg-uAkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg-uQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActivityNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.BPMNEvent_Element" identifier="org.eclipse.papyrus.bpmn.BPMNEvent_Element" name="BPMNEvent Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulg-uAkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg-uQkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::BPMNEvent</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Class" identifier="org.eclipse.papyrus.bpmn.Error_Class" name="Error Class" xmi:id="_ulg-ugkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_ulg-uwkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg-vAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.Error_Class" identifier="org.eclipse.papyrus.bpmn.Error_Class" name="Error Class" hint="UML::Class">
+    <iconEntry xmi:id="_ulg-uwkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg-vAkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::Error</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sca0wVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.Error_PackageableElement" name="Error PackageableElement" xmi:id="_ulg-vQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg-vgkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg-vwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi: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" xmi:id="org.eclipse.papyrus.bpmn.Error_PackageableElement" identifier="org.eclipse.papyrus.bpmn.Error_PackageableElement" name="Error PackageableElement" hint="UML::PackageableElement">
+    <iconEntry xmi:id="_ulg-vgkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/PackageableElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg-vwkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::Error</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc9ncVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Error_Element" name="Error Element" xmi:id="_ulg-wAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg-wQkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg-wgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.PackageableElement"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.Error_Element" identifier="org.eclipse.papyrus.bpmn.Error_Element" name="Error Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulg-wQkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg-wgkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::Error</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::AcceptEventAction" identifier="org.eclipse.papyrus.bpmn.CatchEvent_AcceptEventAction" name="CatchEvent AcceptEventAction" xmi:id="_ulg-wwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AcceptEventAction.gif" xmi:id="_ulg-xAkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg-xQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.CatchEvent_AcceptEventAction" identifier="org.eclipse.papyrus.bpmn.CatchEvent_AcceptEventAction" name="CatchEvent AcceptEventAction" hint="UML::AcceptEventAction">
+    <iconEntry xmi:id="_ulg-xAkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/AcceptEventAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg-xQkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::CatchEvent</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScQcu1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::InitialNode" identifier="org.eclipse.papyrus.bpmn.CatchEvent_InitialNode" name="CatchEvent InitialNode" xmi:id="_ulg-xgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InitialNode.gif" xmi:id="_ulg-xwkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg-yAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.AcceptEventAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.CatchEvent_InitialNode" identifier="org.eclipse.papyrus.bpmn.CatchEvent_InitialNode" name="CatchEvent InitialNode" hint="UML::InitialNode">
+    <iconEntry xmi:id="_ulg-xwkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/InitialNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg-yAkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::CatchEvent</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sco3OVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.CatchEvent_ActivityNode" name="CatchEvent ActivityNode" xmi:id="_ulg-yQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulg-ygkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg-ywkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InitialNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.CatchEvent_ActivityNode" identifier="org.eclipse.papyrus.bpmn.CatchEvent_ActivityNode" name="CatchEvent ActivityNode" hint="UML::ActivityNode">
+    <iconEntry xmi:id="_ulg-ygkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ActivityNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg-ywkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::CatchEvent</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScTgJVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.CatchEvent_Element" name="CatchEvent Element" xmi:id="_ulg-zAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg-zQkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg-zgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActivityNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.CatchEvent_Element" identifier="org.eclipse.papyrus.bpmn.CatchEvent_Element" name="CatchEvent Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulg-zQkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg-zgkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::CatchEvent</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::CallEvent" identifier="org.eclipse.papyrus.bpmn.MessageEventDefinition_CallEvent" name="MessageEventDefinition CallEvent" xmi:id="_ulg-zwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallEvent.gif" xmi:id="_ulg-0AkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg-0QkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.MessageEventDefinition_CallEvent" identifier="org.eclipse.papyrus.bpmn.MessageEventDefinition_CallEvent" name="MessageEventDefinition CallEvent" hint="UML::CallEvent">
+    <iconEntry xmi:id="_ulg-0AkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/CallEvent.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg-0QkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::MessageEventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScaNylYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Event" identifier="org.eclipse.papyrus.bpmn.MessageEventDefinition_Event" name="MessageEventDefinition Event" xmi:id="_ulg-0gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Event.gif" xmi:id="_ulg-0wkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg-1AkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CallEvent"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.MessageEventDefinition_Event" identifier="org.eclipse.papyrus.bpmn.MessageEventDefinition_Event" name="MessageEventDefinition Event" hint="UML::Event">
+    <iconEntry xmi:id="_ulg-0wkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Event.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg-1AkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::MessageEventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Scg7ZFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.MessageEventDefinition_PackageableElement" name="MessageEventDefinition PackageableElement" xmi:id="_ulg-1QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg-1gkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg-1wkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Event"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.MessageEventDefinition_PackageableElement" identifier="org.eclipse.papyrus.bpmn.MessageEventDefinition_PackageableElement" name="MessageEventDefinition PackageableElement" hint="UML::PackageableElement">
+    <iconEntry xmi:id="_ulg-1gkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/PackageableElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg-1wkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::MessageEventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc9ncVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.MessageEventDefinition_Element" name="MessageEventDefinition Element" xmi:id="_ulg-2AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg-2QkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg-2gkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.PackageableElement"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.MessageEventDefinition_Element" identifier="org.eclipse.papyrus.bpmn.MessageEventDefinition_Element" name="MessageEventDefinition Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulg-2QkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg-2gkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::MessageEventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::AcceptEventAction" identifier="org.eclipse.papyrus.bpmn.StartEvent_AcceptEventAction" name="StartEvent AcceptEventAction" xmi:id="_ulg-2wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AcceptEventAction.gif" xmi:id="_ulg-3AkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg-3QkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.StartEvent_AcceptEventAction" identifier="org.eclipse.papyrus.bpmn.StartEvent_AcceptEventAction" name="StartEvent AcceptEventAction" hint="UML::AcceptEventAction">
+    <iconEntry xmi:id="_ulg-3AkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/AcceptEventAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg-3QkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::StartEvent</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScQcu1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::InitialNode" identifier="org.eclipse.papyrus.bpmn.StartEvent_InitialNode" name="StartEvent InitialNode" xmi:id="_ulg-3gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InitialNode.gif" xmi:id="_ulg-3wkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg-4AkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.AcceptEventAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.StartEvent_InitialNode" identifier="org.eclipse.papyrus.bpmn.StartEvent_InitialNode" name="StartEvent InitialNode" hint="UML::InitialNode">
+    <iconEntry xmi:id="_ulg-3wkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/InitialNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg-4AkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::StartEvent</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sco3OVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.StartEvent_ActivityNode" name="StartEvent ActivityNode" xmi:id="_ulg-4QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulg-4gkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg-4wkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InitialNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.StartEvent_ActivityNode" identifier="org.eclipse.papyrus.bpmn.StartEvent_ActivityNode" name="StartEvent ActivityNode" hint="UML::ActivityNode">
+    <iconEntry xmi:id="_ulg-4gkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ActivityNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg-4wkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::StartEvent</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScTgJVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.StartEvent_Element" name="StartEvent Element" xmi:id="_ulg-5AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg-5QkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg-5gkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActivityNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.StartEvent_Element" identifier="org.eclipse.papyrus.bpmn.StartEvent_Element" name="StartEvent Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulg-5QkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg-5gkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::StartEvent</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Class" identifier="org.eclipse.papyrus.bpmn.BPMNSignal_Class" name="BPMNSignal Class" xmi:id="_ulg-5wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_ulg-6AkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg-6QkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.BPMNSignal_Class" identifier="org.eclipse.papyrus.bpmn.BPMNSignal_Class" name="BPMNSignal Class" hint="UML::Class">
+    <iconEntry xmi:id="_ulg-6AkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg-6QkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::BPMNSignal</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sca0wVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.BPMNSignal_PackageableElement" name="BPMNSignal PackageableElement" xmi:id="_ulg-6gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg-6wkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg-7AkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi: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" xmi:id="org.eclipse.papyrus.bpmn.BPMNSignal_PackageableElement" identifier="org.eclipse.papyrus.bpmn.BPMNSignal_PackageableElement" name="BPMNSignal PackageableElement" hint="UML::PackageableElement">
+    <iconEntry xmi:id="_ulg-6wkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/PackageableElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg-7AkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::BPMNSignal</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc9ncVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.BPMNSignal_Element" name="BPMNSignal Element" xmi:id="_ulg-7QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg-7gkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg-7wkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.PackageableElement"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.BPMNSignal_Element" identifier="org.eclipse.papyrus.bpmn.BPMNSignal_Element" name="BPMNSignal Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulg-7gkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg-7wkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::BPMNSignal</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ChangeEvent" identifier="org.eclipse.papyrus.bpmn.ConditionalEventDefinition_ChangeEvent" name="ConditionalEventDefinition ChangeEvent" xmi:id="_ulg-8AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ChangeEvent.gif" xmi:id="_ulg-8QkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg-8gkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.ConditionalEventDefinition_ChangeEvent" identifier="org.eclipse.papyrus.bpmn.ConditionalEventDefinition_ChangeEvent" name="ConditionalEventDefinition ChangeEvent" hint="UML::ChangeEvent">
+    <iconEntry xmi:id="_ulg-8QkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ChangeEvent.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg-8gkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::ConditionalEventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScaN3FYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Event" identifier="org.eclipse.papyrus.bpmn.ConditionalEventDefinition_Event" name="ConditionalEventDefinition Event" xmi:id="_ulg-8wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Event.gif" xmi:id="_ulg-9AkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg-9QkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ChangeEvent"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.ConditionalEventDefinition_Event" identifier="org.eclipse.papyrus.bpmn.ConditionalEventDefinition_Event" name="ConditionalEventDefinition Event" hint="UML::Event">
+    <iconEntry xmi:id="_ulg-9AkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Event.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg-9QkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::ConditionalEventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Scg7ZFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.ConditionalEventDefinition_PackageableElement" name="ConditionalEventDefinition PackageableElement" xmi:id="_ulg-9gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg-9wkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg--AkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Event"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.ConditionalEventDefinition_PackageableElement" identifier="org.eclipse.papyrus.bpmn.ConditionalEventDefinition_PackageableElement" name="ConditionalEventDefinition PackageableElement" hint="UML::PackageableElement">
+    <iconEntry xmi:id="_ulg-9wkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/PackageableElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg--AkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::ConditionalEventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc9ncVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ConditionalEventDefinition_Element" name="ConditionalEventDefinition Element" xmi:id="_ulg--QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg--gkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg--wkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.PackageableElement"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.ConditionalEventDefinition_Element" identifier="org.eclipse.papyrus.bpmn.ConditionalEventDefinition_Element" name="ConditionalEventDefinition Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulg--gkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg--wkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::ConditionalEventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::CallEvent" identifier="org.eclipse.papyrus.bpmn.LinkEventDefinition_CallEvent" name="LinkEventDefinition CallEvent" xmi:id="_ulg-_AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallEvent.gif" xmi:id="_ulg-_QkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg-_gkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.LinkEventDefinition_CallEvent" identifier="org.eclipse.papyrus.bpmn.LinkEventDefinition_CallEvent" name="LinkEventDefinition CallEvent" hint="UML::CallEvent">
+    <iconEntry xmi:id="_ulg-_QkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/CallEvent.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg-_gkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::LinkEventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScaNylYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Event" identifier="org.eclipse.papyrus.bpmn.LinkEventDefinition_Event" name="LinkEventDefinition Event" xmi:id="_ulg-_wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Event.gif" xmi:id="_ulg_AAkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_AQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CallEvent"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.LinkEventDefinition_Event" identifier="org.eclipse.papyrus.bpmn.LinkEventDefinition_Event" name="LinkEventDefinition Event" hint="UML::Event">
+    <iconEntry xmi:id="_ulg_AAkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Event.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_AQkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::LinkEventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Scg7ZFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.LinkEventDefinition_PackageableElement" name="LinkEventDefinition PackageableElement" xmi:id="_ulg_AgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg_AwkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_BAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Event"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.LinkEventDefinition_PackageableElement" identifier="org.eclipse.papyrus.bpmn.LinkEventDefinition_PackageableElement" name="LinkEventDefinition PackageableElement" hint="UML::PackageableElement">
+    <iconEntry xmi:id="_ulg_AwkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/PackageableElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_BAkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::LinkEventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc9ncVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.LinkEventDefinition_Element" name="LinkEventDefinition Element" xmi:id="_ulg_BQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_BgkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_BwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.PackageableElement"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.LinkEventDefinition_Element" identifier="org.eclipse.papyrus.bpmn.LinkEventDefinition_Element" name="LinkEventDefinition Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulg_BgkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_BwkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::LinkEventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::CallEvent" identifier="org.eclipse.papyrus.bpmn.ErrorEventDefinition_CallEvent" name="ErrorEventDefinition CallEvent" xmi:id="_ulg_CAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallEvent.gif" xmi:id="_ulg_CQkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_CgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.ErrorEventDefinition_CallEvent" identifier="org.eclipse.papyrus.bpmn.ErrorEventDefinition_CallEvent" name="ErrorEventDefinition CallEvent" hint="UML::CallEvent">
+    <iconEntry xmi:id="_ulg_CQkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/CallEvent.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_CgkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::ErrorEventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScaNylYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Event" identifier="org.eclipse.papyrus.bpmn.ErrorEventDefinition_Event" name="ErrorEventDefinition Event" xmi:id="_ulg_CwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Event.gif" xmi:id="_ulg_DAkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_DQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CallEvent"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.ErrorEventDefinition_Event" identifier="org.eclipse.papyrus.bpmn.ErrorEventDefinition_Event" name="ErrorEventDefinition Event" hint="UML::Event">
+    <iconEntry xmi:id="_ulg_DAkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Event.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_DQkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::ErrorEventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Scg7ZFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.ErrorEventDefinition_PackageableElement" name="ErrorEventDefinition PackageableElement" xmi:id="_ulg_DgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg_DwkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_EAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Event"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.ErrorEventDefinition_PackageableElement" identifier="org.eclipse.papyrus.bpmn.ErrorEventDefinition_PackageableElement" name="ErrorEventDefinition PackageableElement" hint="UML::PackageableElement">
+    <iconEntry xmi:id="_ulg_DwkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/PackageableElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_EAkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::ErrorEventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc9ncVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ErrorEventDefinition_Element" name="ErrorEventDefinition Element" xmi:id="_ulg_EQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_EgkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_EwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.PackageableElement"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.ErrorEventDefinition_Element" identifier="org.eclipse.papyrus.bpmn.ErrorEventDefinition_Element" name="ErrorEventDefinition Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulg_EgkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_EwkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::ErrorEventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::AcceptEventAction" identifier="org.eclipse.papyrus.bpmn.IntermediateCatchEvent_AcceptEventAction" name="IntermediateCatchEvent AcceptEventAction" xmi:id="_ulg_FAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AcceptEventAction.gif" xmi:id="_ulg_FQkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_FgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.IntermediateCatchEvent_AcceptEventAction" identifier="org.eclipse.papyrus.bpmn.IntermediateCatchEvent_AcceptEventAction" name="IntermediateCatchEvent AcceptEventAction" hint="UML::AcceptEventAction">
+    <iconEntry xmi:id="_ulg_FQkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/AcceptEventAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_FgkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::IntermediateCatchEvent</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScQcu1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::InitialNode" identifier="org.eclipse.papyrus.bpmn.IntermediateCatchEvent_InitialNode" name="IntermediateCatchEvent InitialNode" xmi:id="_ulg_FwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InitialNode.gif" xmi:id="_ulg_GAkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_GQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.AcceptEventAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.IntermediateCatchEvent_InitialNode" identifier="org.eclipse.papyrus.bpmn.IntermediateCatchEvent_InitialNode" name="IntermediateCatchEvent InitialNode" hint="UML::InitialNode">
+    <iconEntry xmi:id="_ulg_GAkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/InitialNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_GQkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::IntermediateCatchEvent</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sco3OVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.IntermediateCatchEvent_ActivityNode" name="IntermediateCatchEvent ActivityNode" xmi:id="_ulg_GgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulg_GwkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_HAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InitialNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.IntermediateCatchEvent_ActivityNode" identifier="org.eclipse.papyrus.bpmn.IntermediateCatchEvent_ActivityNode" name="IntermediateCatchEvent ActivityNode" hint="UML::ActivityNode">
+    <iconEntry xmi:id="_ulg_GwkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ActivityNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_HAkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::IntermediateCatchEvent</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScTgJVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.IntermediateCatchEvent_Element" name="IntermediateCatchEvent Element" xmi:id="_ulg_HQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_HgkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_HwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActivityNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.IntermediateCatchEvent_Element" identifier="org.eclipse.papyrus.bpmn.IntermediateCatchEvent_Element" name="IntermediateCatchEvent Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulg_HgkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_HwkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::IntermediateCatchEvent</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::SendObjectAction" identifier="org.eclipse.papyrus.bpmn.IntermediateThrowEvent_SendObjectAction" name="IntermediateThrowEvent SendObjectAction" xmi:id="_ulg_IAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/SendObjectAction.gif" xmi:id="_ulg_IQkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_IgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.IntermediateThrowEvent_SendObjectAction" identifier="org.eclipse.papyrus.bpmn.IntermediateThrowEvent_SendObjectAction" name="IntermediateThrowEvent SendObjectAction" hint="UML::SendObjectAction">
+    <iconEntry xmi:id="_ulg_IQkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/SendObjectAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_IgkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::IntermediateThrowEvent</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_SdBR0lYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::CallOperationAction" identifier="org.eclipse.papyrus.bpmn.IntermediateThrowEvent_CallOperationAction" name="IntermediateThrowEvent CallOperationAction" xmi:id="_ulg_IwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallOperationAction.gif" xmi:id="_ulg_JAkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_JQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.SendObjectAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.IntermediateThrowEvent_CallOperationAction" identifier="org.eclipse.papyrus.bpmn.IntermediateThrowEvent_CallOperationAction" name="IntermediateThrowEvent CallOperationAction" hint="UML::CallOperationAction">
+    <iconEntry xmi:id="_ulg_JAkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/CallOperationAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_JQkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::IntermediateThrowEvent</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScaN0lYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::FlowFinalNode" identifier="org.eclipse.papyrus.bpmn.IntermediateThrowEvent_FlowFinalNode" name="IntermediateThrowEvent FlowFinalNode" xmi:id="_ulg_JgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FlowFinalNode.gif" xmi:id="_ulg_JwkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_KAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CallOperationAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.IntermediateThrowEvent_FlowFinalNode" identifier="org.eclipse.papyrus.bpmn.IntermediateThrowEvent_FlowFinalNode" name="IntermediateThrowEvent FlowFinalNode" hint="UML::FlowFinalNode">
+    <iconEntry xmi:id="_ulg_JwkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/FlowFinalNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_KAkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::IntermediateThrowEvent</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScklwVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.IntermediateThrowEvent_ActivityNode" name="IntermediateThrowEvent ActivityNode" xmi:id="_ulg_KQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulg_KgkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_KwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.FlowFinalNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.IntermediateThrowEvent_ActivityNode" identifier="org.eclipse.papyrus.bpmn.IntermediateThrowEvent_ActivityNode" name="IntermediateThrowEvent ActivityNode" hint="UML::ActivityNode">
+    <iconEntry xmi:id="_ulg_KgkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ActivityNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_KwkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::IntermediateThrowEvent</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScTgJVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.IntermediateThrowEvent_Element" name="IntermediateThrowEvent Element" xmi:id="_ulg_LAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_LQkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_LgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActivityNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.IntermediateThrowEvent_Element" identifier="org.eclipse.papyrus.bpmn.IntermediateThrowEvent_Element" name="IntermediateThrowEvent Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulg_LQkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_LgkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::IntermediateThrowEvent</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::CallEvent" identifier="org.eclipse.papyrus.bpmn.TerminateEventDefinition_CallEvent" name="TerminateEventDefinition CallEvent" xmi:id="_ulg_LwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallEvent.gif" xmi:id="_ulg_MAkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_MQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.TerminateEventDefinition_CallEvent" identifier="org.eclipse.papyrus.bpmn.TerminateEventDefinition_CallEvent" name="TerminateEventDefinition CallEvent" hint="UML::CallEvent">
+    <iconEntry xmi:id="_ulg_MAkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/CallEvent.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_MQkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::TerminateEventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScaNylYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Event" identifier="org.eclipse.papyrus.bpmn.TerminateEventDefinition_Event" name="TerminateEventDefinition Event" xmi:id="_ulg_MgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Event.gif" xmi:id="_ulg_MwkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_NAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CallEvent"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.TerminateEventDefinition_Event" identifier="org.eclipse.papyrus.bpmn.TerminateEventDefinition_Event" name="TerminateEventDefinition Event" hint="UML::Event">
+    <iconEntry xmi:id="_ulg_MwkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Event.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_NAkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::TerminateEventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Scg7ZFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.TerminateEventDefinition_PackageableElement" name="TerminateEventDefinition PackageableElement" xmi:id="_ulg_NQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg_NgkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_NwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Event"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.TerminateEventDefinition_PackageableElement" identifier="org.eclipse.papyrus.bpmn.TerminateEventDefinition_PackageableElement" name="TerminateEventDefinition PackageableElement" hint="UML::PackageableElement">
+    <iconEntry xmi:id="_ulg_NgkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/PackageableElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_NwkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::TerminateEventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc9ncVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.TerminateEventDefinition_Element" name="TerminateEventDefinition Element" xmi:id="_ulg_OAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_OQkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_OgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.PackageableElement"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.TerminateEventDefinition_Element" identifier="org.eclipse.papyrus.bpmn.TerminateEventDefinition_Element" name="TerminateEventDefinition Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulg_OQkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_OgkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::TerminateEventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::CallOperationAction" identifier="org.eclipse.papyrus.bpmn.ThrowEvent_CallOperationAction" name="ThrowEvent CallOperationAction" xmi:id="_ulg_OwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallOperationAction.gif" xmi:id="_ulg_PAkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_PQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.ThrowEvent_CallOperationAction" identifier="org.eclipse.papyrus.bpmn.ThrowEvent_CallOperationAction" name="ThrowEvent CallOperationAction" hint="UML::CallOperationAction">
+    <iconEntry xmi:id="_ulg_PAkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/CallOperationAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_PQkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::ThrowEvent</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScaN0lYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::FlowFinalNode" identifier="org.eclipse.papyrus.bpmn.ThrowEvent_FlowFinalNode" name="ThrowEvent FlowFinalNode" xmi:id="_ulg_PgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FlowFinalNode.gif" xmi:id="_ulg_PwkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_QAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CallOperationAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.ThrowEvent_FlowFinalNode" identifier="org.eclipse.papyrus.bpmn.ThrowEvent_FlowFinalNode" name="ThrowEvent FlowFinalNode" hint="UML::FlowFinalNode">
+    <iconEntry xmi:id="_ulg_PwkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/FlowFinalNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_QAkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::ThrowEvent</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScklwVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.ThrowEvent_ActivityNode" name="ThrowEvent ActivityNode" xmi:id="_ulg_QQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulg_QgkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_QwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.FlowFinalNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.ThrowEvent_ActivityNode" identifier="org.eclipse.papyrus.bpmn.ThrowEvent_ActivityNode" name="ThrowEvent ActivityNode" hint="UML::ActivityNode">
+    <iconEntry xmi:id="_ulg_QgkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ActivityNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_QwkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::ThrowEvent</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScTgJVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ThrowEvent_Element" name="ThrowEvent Element" xmi:id="_ulg_RAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_RQkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_RgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActivityNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.ThrowEvent_Element" identifier="org.eclipse.papyrus.bpmn.ThrowEvent_Element" name="ThrowEvent Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulg_RQkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_RgkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::ThrowEvent</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::AcceptEventAction" identifier="org.eclipse.papyrus.bpmn.BoundaryEvent_AcceptEventAction" name="BoundaryEvent AcceptEventAction" xmi:id="_ulg_RwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AcceptEventAction.gif" xmi:id="_ulg_SAkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_SQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.BoundaryEvent_AcceptEventAction" identifier="org.eclipse.papyrus.bpmn.BoundaryEvent_AcceptEventAction" name="BoundaryEvent AcceptEventAction" hint="UML::AcceptEventAction">
+    <iconEntry xmi:id="_ulg_SAkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/AcceptEventAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_SQkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::BoundaryEvent</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScQcu1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::InitialNode" identifier="org.eclipse.papyrus.bpmn.BoundaryEvent_InitialNode" name="BoundaryEvent InitialNode" xmi:id="_ulg_SgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InitialNode.gif" xmi:id="_ulg_SwkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_TAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.AcceptEventAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.BoundaryEvent_InitialNode" identifier="org.eclipse.papyrus.bpmn.BoundaryEvent_InitialNode" name="BoundaryEvent InitialNode" hint="UML::InitialNode">
+    <iconEntry xmi:id="_ulg_SwkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/InitialNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_TAkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::BoundaryEvent</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sco3OVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.BoundaryEvent_ActivityNode" name="BoundaryEvent ActivityNode" xmi:id="_ulg_TQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulg_TgkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_TwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InitialNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.BoundaryEvent_ActivityNode" identifier="org.eclipse.papyrus.bpmn.BoundaryEvent_ActivityNode" name="BoundaryEvent ActivityNode" hint="UML::ActivityNode">
+    <iconEntry xmi:id="_ulg_TgkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ActivityNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_TwkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::BoundaryEvent</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScTgJVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.BoundaryEvent_Element" name="BoundaryEvent Element" xmi:id="_ulg_UAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_UQkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_UgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActivityNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.BoundaryEvent_Element" identifier="org.eclipse.papyrus.bpmn.BoundaryEvent_Element" name="BoundaryEvent Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulg_UQkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_UgkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::BoundaryEvent</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::CallOperationAction" identifier="org.eclipse.papyrus.bpmn.ImplicitThrowEvent_CallOperationAction" name="ImplicitThrowEvent CallOperationAction" xmi:id="_ulg_UwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallOperationAction.gif" xmi:id="_ulg_VAkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_VQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.ImplicitThrowEvent_CallOperationAction" identifier="org.eclipse.papyrus.bpmn.ImplicitThrowEvent_CallOperationAction" name="ImplicitThrowEvent CallOperationAction" hint="UML::CallOperationAction">
+    <iconEntry xmi:id="_ulg_VAkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/CallOperationAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_VQkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::ImplicitThrowEvent</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScaN0lYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::FlowFinalNode" identifier="org.eclipse.papyrus.bpmn.ImplicitThrowEvent_FlowFinalNode" name="ImplicitThrowEvent FlowFinalNode" xmi:id="_ulg_VgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FlowFinalNode.gif" xmi:id="_ulg_VwkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_WAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CallOperationAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.ImplicitThrowEvent_FlowFinalNode" identifier="org.eclipse.papyrus.bpmn.ImplicitThrowEvent_FlowFinalNode" name="ImplicitThrowEvent FlowFinalNode" hint="UML::FlowFinalNode">
+    <iconEntry xmi:id="_ulg_VwkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/FlowFinalNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_WAkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::ImplicitThrowEvent</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScklwVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.ImplicitThrowEvent_ActivityNode" name="ImplicitThrowEvent ActivityNode" xmi:id="_ulg_WQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulg_WgkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_WwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.FlowFinalNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.ImplicitThrowEvent_ActivityNode" identifier="org.eclipse.papyrus.bpmn.ImplicitThrowEvent_ActivityNode" name="ImplicitThrowEvent ActivityNode" hint="UML::ActivityNode">
+    <iconEntry xmi:id="_ulg_WgkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ActivityNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_WwkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::ImplicitThrowEvent</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScTgJVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ImplicitThrowEvent_Element" name="ImplicitThrowEvent Element" xmi:id="_ulg_XAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_XQkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_XgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActivityNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.ImplicitThrowEvent_Element" identifier="org.eclipse.papyrus.bpmn.ImplicitThrowEvent_Element" name="ImplicitThrowEvent Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulg_XQkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_XgkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::ImplicitThrowEvent</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::CallEvent" identifier="org.eclipse.papyrus.bpmn.CancelEventDefinition_CallEvent" name="CancelEventDefinition CallEvent" xmi:id="_ulg_XwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallEvent.gif" xmi:id="_ulg_YAkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_YQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.CancelEventDefinition_CallEvent" identifier="org.eclipse.papyrus.bpmn.CancelEventDefinition_CallEvent" name="CancelEventDefinition CallEvent" hint="UML::CallEvent">
+    <iconEntry xmi:id="_ulg_YAkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/CallEvent.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_YQkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::CancelEventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScaNylYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Event" identifier="org.eclipse.papyrus.bpmn.CancelEventDefinition_Event" name="CancelEventDefinition Event" xmi:id="_ulg_YgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Event.gif" xmi:id="_ulg_YwkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_ZAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CallEvent"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.CancelEventDefinition_Event" identifier="org.eclipse.papyrus.bpmn.CancelEventDefinition_Event" name="CancelEventDefinition Event" hint="UML::Event">
+    <iconEntry xmi:id="_ulg_YwkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Event.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_ZAkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::CancelEventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Scg7ZFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.CancelEventDefinition_PackageableElement" name="CancelEventDefinition PackageableElement" xmi:id="_ulg_ZQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg_ZgkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_ZwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Event"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.CancelEventDefinition_PackageableElement" identifier="org.eclipse.papyrus.bpmn.CancelEventDefinition_PackageableElement" name="CancelEventDefinition PackageableElement" hint="UML::PackageableElement">
+    <iconEntry xmi:id="_ulg_ZgkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/PackageableElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_ZwkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::CancelEventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc9ncVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.CancelEventDefinition_Element" name="CancelEventDefinition Element" xmi:id="_ulg_aAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_aQkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_agkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.PackageableElement"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.CancelEventDefinition_Element" identifier="org.eclipse.papyrus.bpmn.CancelEventDefinition_Element" name="CancelEventDefinition Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulg_aQkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_agkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::CancelEventDefinition</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Class" identifier="org.eclipse.papyrus.bpmn.Escalation_Class" name="Escalation Class" xmi:id="_ulg_awkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_ulg_bAkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_bQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.Escalation_Class" identifier="org.eclipse.papyrus.bpmn.Escalation_Class" name="Escalation Class" hint="UML::Class">
+    <iconEntry xmi:id="_ulg_bAkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_bQkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::Escalation</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sca0wVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.Escalation_PackageableElement" name="Escalation PackageableElement" xmi:id="_ulg_bgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg_bwkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_cAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi: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" xmi:id="org.eclipse.papyrus.bpmn.Escalation_PackageableElement" identifier="org.eclipse.papyrus.bpmn.Escalation_PackageableElement" name="Escalation PackageableElement" hint="UML::PackageableElement">
+    <iconEntry xmi:id="_ulg_bwkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/PackageableElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_cAkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::Escalation</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc9ncVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Escalation_Element" name="Escalation Element" xmi:id="_ulg_cQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_cgkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_cwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.PackageableElement"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.Escalation_Element" identifier="org.eclipse.papyrus.bpmn.Escalation_Element" name="Escalation Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulg_cgkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_cwkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::Escalation</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Comment" identifier="org.eclipse.papyrus.bpmn.TextAnnotation_Comment" name="TextAnnotation Comment" xmi:id="_ulg_dAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_ulg_dQkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_dgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.TextAnnotation_Comment" identifier="org.eclipse.papyrus.bpmn.TextAnnotation_Comment" name="TextAnnotation Comment" hint="UML::Comment">
+    <iconEntry xmi:id="_ulg_dQkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Comment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_dgkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::TextAnnotation</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Scbb2FYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.TextAnnotation_Element" name="TextAnnotation Element" xmi:id="_ulg_dwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_eAkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_eQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Comment"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.TextAnnotation_Element" identifier="org.eclipse.papyrus.bpmn.TextAnnotation_Element" name="TextAnnotation Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulg_eAkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_eQkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::TextAnnotation</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Enumeration" identifier="org.eclipse.papyrus.bpmn.Category_Enumeration" name="Category Enumeration" xmi:id="_ulg_egkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Enumeration.gif" xmi:id="_ulg_ewkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_fAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.Category_Enumeration" identifier="org.eclipse.papyrus.bpmn.Category_Enumeration" name="Category Enumeration" hint="UML::Enumeration">
+    <iconEntry xmi:id="_ulg_ewkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Enumeration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_fAkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::Category</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUVlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.Category_PackageableElement" name="Category PackageableElement" xmi:id="_ulg_fQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg_fgkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_fwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Enumeration"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.Category_PackageableElement" identifier="org.eclipse.papyrus.bpmn.Category_PackageableElement" name="Category PackageableElement" hint="UML::PackageableElement">
+    <iconEntry xmi:id="_ulg_fgkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/PackageableElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_fwkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::Category</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc9ncVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Category_Element" name="Category Element" xmi:id="_ulg_gAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_gQkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_ggkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.PackageableElement"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.Category_Element" identifier="org.eclipse.papyrus.bpmn.Category_Element" name="Category Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulg_gQkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_ggkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::Category</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Dependency" identifier="org.eclipse.papyrus.bpmn.BPMNAssociation_Dependency" name="BPMNAssociation Dependency" xmi:id="_ulg_gwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_ulg_hAkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_hQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.BPMNAssociation_Dependency" identifier="org.eclipse.papyrus.bpmn.BPMNAssociation_Dependency" name="BPMNAssociation Dependency" hint="UML::Dependency">
+    <iconEntry xmi:id="_ulg_hAkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Dependency.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_hQkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::BPMNAssociation</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_SccqG1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.BPMNAssociation_Element" name="BPMNAssociation Element" xmi:id="_ulg_hgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_hwkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_iAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Dependency"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.BPMNAssociation_Element" identifier="org.eclipse.papyrus.bpmn.BPMNAssociation_Element" name="BPMNAssociation Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulg_hwkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_iAkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::BPMNAssociation</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityPartition" identifier="org.eclipse.papyrus.bpmn.Group_ActivityPartition" name="Group ActivityPartition" xmi:id="_ulg_iQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityPartition.gif" xmi:id="_ulg_igkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_iwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.Group_ActivityPartition" identifier="org.eclipse.papyrus.bpmn.Group_ActivityPartition" name="Group ActivityPartition" hint="UML::ActivityPartition">
+    <iconEntry xmi:id="_ulg_igkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ActivityPartition.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_iwkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::Group</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScTgKVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Group_Element" name="Group Element" xmi:id="_ulg_jAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_jQkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_jgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActivityPartition"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.Group_Element" identifier="org.eclipse.papyrus.bpmn.Group_Element" name="Group Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulg_jQkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_jgkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::Group</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::EnumerationLiteral" identifier="org.eclipse.papyrus.bpmn.CategoryValue_EnumerationLiteral" name="CategoryValue EnumerationLiteral" xmi:id="_ulg_jwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/EnumerationLiteral.gif" xmi:id="_ulg_kAkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_kQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.CategoryValue_EnumerationLiteral" identifier="org.eclipse.papyrus.bpmn.CategoryValue_EnumerationLiteral" name="CategoryValue EnumerationLiteral" hint="UML::EnumerationLiteral">
+    <iconEntry xmi:id="_ulg_kAkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/EnumerationLiteral.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_kQkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::CategoryValue</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUWFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.CategoryValue_Element" name="CategoryValue Element" xmi:id="_ulg_kgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_kwkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_lAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.EnumerationLiteral"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.CategoryValue_Element" identifier="org.eclipse.papyrus.bpmn.CategoryValue_Element" name="CategoryValue Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulg_kwkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_lAkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::CategoryValue</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.BPMNArtifact" name="BPMNArtifact" xmi:id="_ulg_lQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_lgkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_lwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.BPMNArtifact" identifier="org.eclipse.papyrus.bpmn.BPMNArtifact" name="BPMNArtifact" hint="UML::Element">
+    <iconEntry xmi:id="_ulg_lgkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_lwkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::BPMNArtifact</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.FlowNode_ActivityNode" name="FlowNode ActivityNode" xmi:id="_ulg_mAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulg_mQkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_mgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.FlowNode_ActivityNode" identifier="org.eclipse.papyrus.bpmn.FlowNode_ActivityNode" name="FlowNode ActivityNode" hint="UML::ActivityNode">
+    <iconEntry xmi:id="_ulg_mQkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ActivityNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_mgkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::FlowNode</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScTgJVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.FlowNode_Element" name="FlowNode Element" xmi:id="_ulg_mwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_nAkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_nQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActivityNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.FlowNode_Element" identifier="org.eclipse.papyrus.bpmn.FlowNode_Element" name="FlowNode Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulg_nAkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_nQkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::FlowNode</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::OpaqueExpression" identifier="org.eclipse.papyrus.bpmn.FormalExpression_OpaqueExpression" name="FormalExpression OpaqueExpression" xmi:id="_ulg_ngkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueExpression.gif" xmi:id="_ulg_nwkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_oAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.FormalExpression_OpaqueExpression" identifier="org.eclipse.papyrus.bpmn.FormalExpression_OpaqueExpression" name="FormalExpression OpaqueExpression" hint="UML::OpaqueExpression">
+    <iconEntry xmi:id="_ulg_nwkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/OpaqueExpression.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_oAkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::FormalExpression</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc7yIVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.FormalExpression_Element" name="FormalExpression Element" xmi:id="_ulg_oQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_ogkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_owkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OpaqueExpression"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.FormalExpression_Element" identifier="org.eclipse.papyrus.bpmn.FormalExpression_Element" name="FormalExpression Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulg_ogkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_owkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::FormalExpression</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Class" identifier="org.eclipse.papyrus.bpmn.Resource_Class" name="Resource Class" xmi:id="_ulg_pAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_ulg_pQkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_pgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.Resource_Class" identifier="org.eclipse.papyrus.bpmn.Resource_Class" name="Resource Class" hint="UML::Class">
+    <iconEntry xmi:id="_ulg_pQkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_pgkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::Resource</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sca0wVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.Resource_PackageableElement" name="Resource PackageableElement" xmi:id="_ulg_pwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg_qAkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_qQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi: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" xmi:id="org.eclipse.papyrus.bpmn.Resource_PackageableElement" identifier="org.eclipse.papyrus.bpmn.Resource_PackageableElement" name="Resource PackageableElement" hint="UML::PackageableElement">
+    <iconEntry xmi:id="_ulg_qAkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/PackageableElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_qQkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::Resource</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc9ncVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Resource_Element" name="Resource Element" xmi:id="_ulg_qgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_qwkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_rAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.PackageableElement"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.Resource_Element" identifier="org.eclipse.papyrus.bpmn.Resource_Element" name="Resource Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulg_qwkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_rAkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::Resource</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.FlowElement" name="FlowElement" xmi:id="_ulg_rQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_rgkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_rwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.FlowElement" identifier="org.eclipse.papyrus.bpmn.FlowElement" name="FlowElement" hint="UML::Element">
+    <iconEntry xmi:id="_ulg_rgkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_rwkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::FlowElement</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Property" identifier="org.eclipse.papyrus.bpmn.CorrelationPropertyBinding_Property" name="CorrelationPropertyBinding Property" xmi:id="_ulg_sAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_ulg_sQkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_sgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.CorrelationPropertyBinding_Property" identifier="org.eclipse.papyrus.bpmn.CorrelationPropertyBinding_Property" name="CorrelationPropertyBinding Property" hint="UML::Property">
+    <iconEntry xmi:id="_ulg_sQkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_sgkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::CorrelationPropertyBinding</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc-1cFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.CorrelationPropertyBinding_Element" name="CorrelationPropertyBinding Element" xmi:id="_ulg_swkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_tAkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_tQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi: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="org.eclipse.papyrus.bpmn.CorrelationPropertyBinding_Element" identifier="org.eclipse.papyrus.bpmn.CorrelationPropertyBinding_Element" name="CorrelationPropertyBinding Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulg_tAkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_tQkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::CorrelationPropertyBinding</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Class" identifier="org.eclipse.papyrus.bpmn.CorrelationSubscription_Class" name="CorrelationSubscription Class" xmi:id="_ulg_tgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_ulg_twkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_uAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.CorrelationSubscription_Class" identifier="org.eclipse.papyrus.bpmn.CorrelationSubscription_Class" name="CorrelationSubscription Class" hint="UML::Class">
+    <iconEntry xmi:id="_ulg_twkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_uAkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::CorrelationSubscription</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sca0wVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.CorrelationSubscription_Element" name="CorrelationSubscription Element" xmi:id="_ulg_uQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_ugkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_uwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi: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" xmi:id="org.eclipse.papyrus.bpmn.CorrelationSubscription_Element" identifier="org.eclipse.papyrus.bpmn.CorrelationSubscription_Element" name="CorrelationSubscription Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulg_ugkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_uwkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::CorrelationSubscription</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Behavior" identifier="org.eclipse.papyrus.bpmn.CallableElement_Behavior" name="CallableElement Behavior" xmi:id="_ulg_vAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Behavior.gif" xmi:id="_ulg_vQkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_vgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.CallableElement_Behavior" identifier="org.eclipse.papyrus.bpmn.CallableElement_Behavior" name="CallableElement Behavior" hint="UML::Behavior">
+    <iconEntry xmi:id="_ulg_vQkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Behavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_vgkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::CallableElement</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScaNsFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.CallableElement_PackageableElement" name="CallableElement PackageableElement" xmi:id="_ulg_vwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg_wAkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_wQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Behavior"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.CallableElement_PackageableElement" identifier="org.eclipse.papyrus.bpmn.CallableElement_PackageableElement" name="CallableElement PackageableElement" hint="UML::PackageableElement">
+    <iconEntry xmi:id="_ulg_wAkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/PackageableElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_wQkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::CallableElement</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc9ncVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.CallableElement_Element" name="CallableElement Element" xmi:id="_ulg_wgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_wwkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_xAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.PackageableElement"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.CallableElement_Element" identifier="org.eclipse.papyrus.bpmn.CallableElement_Element" name="CallableElement Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulg_wwkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_xAkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::CallableElement</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ControlFlow" identifier="org.eclipse.papyrus.bpmn.SequenceFlow_ControlFlow" name="SequenceFlow ControlFlow" xmi:id="_ulg_xQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlFlow.gif" xmi:id="_ulg_xgkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_xwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.SequenceFlow_ControlFlow" identifier="org.eclipse.papyrus.bpmn.SequenceFlow_ControlFlow" name="SequenceFlow ControlFlow" hint="UML::ControlFlow">
+    <iconEntry xmi:id="_ulg_xgkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/ControlFlow.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_xwkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::SequenceFlow</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_SccDF1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.SequenceFlow_Element" name="SequenceFlow Element" xmi:id="_ulg_yAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_yQkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_ygkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ControlFlow"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.SequenceFlow_Element" identifier="org.eclipse.papyrus.bpmn.SequenceFlow_Element" name="SequenceFlow Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulg_yQkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_ygkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::SequenceFlow</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Dependency" identifier="org.eclipse.papyrus.bpmn.CorrelationPropertyRetrievalExpression_Dependency" name="CorrelationPropertyRetrievalExpression Dependency" xmi:id="_ulg_ywkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_ulg_zAkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_zQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.CorrelationPropertyRetrievalExpression_Dependency" identifier="org.eclipse.papyrus.bpmn.CorrelationPropertyRetrievalExpression_Dependency" name="CorrelationPropertyRetrievalExpression Dependency" hint="UML::Dependency">
+    <iconEntry xmi:id="_ulg_zAkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Dependency.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_zQkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::CorrelationPropertyRetrievalExpression</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_SccqG1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.CorrelationPropertyRetrievalExpression_Element" name="CorrelationPropertyRetrievalExpression Element" xmi:id="_ulg_zgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_zwkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_0AkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Dependency"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.CorrelationPropertyRetrievalExpression_Element" identifier="org.eclipse.papyrus.bpmn.CorrelationPropertyRetrievalExpression_Element" name="CorrelationPropertyRetrievalExpression Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulg_zwkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_0AkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::CorrelationPropertyRetrievalExpression</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::OpaqueExpression" identifier="org.eclipse.papyrus.bpmn.BPMNExpression_OpaqueExpression" name="BPMNExpression OpaqueExpression" xmi:id="_ulg_0QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueExpression.gif" xmi:id="_ulg_0gkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_0wkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.BPMNExpression_OpaqueExpression" identifier="org.eclipse.papyrus.bpmn.BPMNExpression_OpaqueExpression" name="BPMNExpression OpaqueExpression" hint="UML::OpaqueExpression">
+    <iconEntry xmi:id="_ulg_0gkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/OpaqueExpression.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_0wkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::BPMNExpression</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc7yIVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.BPMNExpression_Element" name="BPMNExpression Element" xmi:id="_ulg_1AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_1QkFEeWVleXnap4Kwg"/>
-    
-    <matcherConfiguration xmi:id="_ulg_1gkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
+    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OpaqueExpression"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.bpmn.BPMNExpression_Element" identifier="org.eclipse.papyrus.bpmn.BPMNExpression_Element" name="BPMNExpression Element" hint="UML::Element">
+    <iconEntry xmi:id="_ulg_1QkFEeWVleXnap4Kwg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ulg_1gkFEeWVleXnap4Kwg">
       <stereotypesQualifiedNames>BPMNProfile::BPMNExpression</stereotypesQualifiedNames>
     </matcherConfiguration>
-  <specializedTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/></elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Property" identifier="org.eclipse.papyrus.bpmn.CorrelationProperty_Property" name="CorrelationProperty Property" xmi:id="_ulg_1wkFEeWVl